diff options
| author | Viktor Vorona <viktor.vorona@sonarsource.com> | 2024-12-17 11:42:51 +0100 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2024-12-24 13:31:10 +0000 |
| commit | f5b254facace24c53468d53dd7f2aeb15b40b223 (patch) | |
| tree | 3c736e70b927998abf1df12563148cbfc00fa7e2 /server/sonar-webserver-common | |
| parent | c97f38af457c276d5a14022ba490cc412a952373 (diff) | |
| download | sonarqube-f5b254facace24c53468d53dd7f2aeb15b40b223.tar.gz sonarqube-f5b254facace24c53468d53dd7f2aeb15b40b223.zip | |
SONAR-23402 Support case with empty CleanCodeAttribute
Diffstat (limited to 'server/sonar-webserver-common')
2 files changed, 4 insertions, 3 deletions
diff --git a/server/sonar-webserver-common/src/it/java/org/sonar/server/common/rule/RuleCreatorIT.java b/server/sonar-webserver-common/src/it/java/org/sonar/server/common/rule/RuleCreatorIT.java index c06e4bb444c..e68e487abe3 100644 --- a/server/sonar-webserver-common/src/it/java/org/sonar/server/common/rule/RuleCreatorIT.java +++ b/server/sonar-webserver-common/src/it/java/org/sonar/server/common/rule/RuleCreatorIT.java @@ -144,7 +144,7 @@ public class RuleCreatorIT { } private static void assertCleanCodeInformation(RuleDto rule) { - assertThat(rule.getCleanCodeAttribute()).isEqualTo(CleanCodeAttribute.CONVENTIONAL); + assertThat(rule.getCleanCodeAttribute()).isEqualTo(CleanCodeAttribute.CLEAR); assertThat(rule.getDefaultImpacts()).extracting(ImpactDto::getSoftwareQuality, ImpactDto::getSeverity) .containsExactly(tuple(MAINTAINABILITY, MEDIUM)); } @@ -195,7 +195,7 @@ public class RuleCreatorIT { assertThat(rule).isNotNull(); assertThat(rule.getStatus()).isEqualTo(RuleStatus.READY); assertThat(rule.getSeverityString()).isEqualTo(Severity.MAJOR); - assertThat(rule.getCleanCodeAttribute()).isEqualTo(CleanCodeAttribute.CONVENTIONAL); + assertThat(rule.getCleanCodeAttribute()).isEqualTo(CleanCodeAttribute.CLEAR); assertThat(rule.getDefaultImpacts()).extracting(ImpactDto::getSoftwareQuality, ImpactDto::getSeverity).containsExactly(tuple( convertToSoftwareQuality(RuleType.valueOf(templateRule.getType())), convertToImpactSeverity(requireNonNull(Severity.MAJOR)))); diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/common/rule/RuleCreator.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/common/rule/RuleCreator.java index 004ff3188d4..67ee3870030 100644 --- a/server/sonar-webserver-common/src/main/java/org/sonar/server/common/rule/RuleCreator.java +++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/common/rule/RuleCreator.java @@ -232,7 +232,8 @@ public class RuleCreator { if (type == RuleType.SECURITY_HOTSPOT.getDbConstant()) { ruleDto.setType(type).setSeverity(severity); } else { - ruleDto.setCleanCodeAttribute(ofNullable(newRule.getCleanCodeAttribute()).orElse(CleanCodeAttribute.CONVENTIONAL)); + CleanCodeAttribute cleanCodeAttributeFromTemplate = ofNullable(templateRuleDto.getCleanCodeAttribute()).orElse(CleanCodeAttribute.CONVENTIONAL); + ruleDto.setCleanCodeAttribute(ofNullable(newRule.getCleanCodeAttribute()).orElse(cleanCodeAttributeFromTemplate)); if (!CollectionUtils.isEmpty(newRule.getImpacts())) { newRule.getImpacts().stream() |