From eba174a010c3b24fa5d28cf5588f50d696041bba Mon Sep 17 00:00:00 2001 From: Lukasz Jarocki Date: Mon, 24 Apr 2023 09:15:32 +0200 Subject: [PATCH] SONAR-19050 consistent use of CodeCharacteristic term --- .../src/main/java/org/sonar/db/issue/IssueDto.java | 5 +++-- .../src/main/java/org/sonar/db/rule/RuleDto.java | 2 +- ...va => RuleTypeToCodeCharacteristicConverter.java} | 10 +++++----- .../src/test/java/org/sonar/db/rule/RuleDtoTest.java | 2 +- ...> RuleTypeToCodeCharacteristicConverterTest.java} | 12 ++++++------ .../issue/index/IssueIteratorForSingleChunk.java | 5 +++-- 6 files changed, 19 insertions(+), 17 deletions(-) rename server/sonar-db-dao/src/main/java/org/sonar/db/rule/{RuleTypeToRuleCharacteristicConverter.java => RuleTypeToCodeCharacteristicConverter.java} (81%) rename server/sonar-db-dao/src/test/java/org/sonar/db/rule/{RuleTypeToRuleCharacteristicConverterTest.java => RuleTypeToCodeCharacteristicConverterTest.java} (81%) diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDto.java index e3c25bcd54c..abbef0bc7f2 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDto.java @@ -42,11 +42,12 @@ import org.sonar.core.issue.DefaultIssue; import org.sonar.db.component.ComponentDto; import org.sonar.db.protobuf.DbIssues; import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleTypeToCodeCharacteristicConverter; import static com.google.common.base.Preconditions.checkArgument; import static org.sonar.api.utils.DateUtils.dateToLong; import static org.sonar.api.utils.DateUtils.longToDate; -import static org.sonar.db.rule.RuleTypeToRuleCharacteristicConverter.convertToRuleCharacteristic; +import static org.sonar.db.rule.RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic; public final class IssueDto implements Serializable { @@ -728,7 +729,7 @@ public final class IssueDto implements Serializable { @CheckForNull public CodeCharacteristic getEffectiveRuleCharacteristic() { - return ruleCharacteristic != null ? ruleCharacteristic : convertToRuleCharacteristic(ruleType); + return ruleCharacteristic != null ? ruleCharacteristic : RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic(ruleType); } public int getRuleType() { diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java index a3f1180e9c0..01fe39ea256 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java @@ -403,7 +403,7 @@ public class RuleDto { } public CodeCharacteristic getEffectiveCharacteristic() { - return characteristic != null ? characteristic : RuleTypeToRuleCharacteristicConverter.convertToRuleCharacteristic(type); + return characteristic != null ? characteristic : RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic(type); } public RuleDto setCharacteristic(@Nullable CodeCharacteristic characteristic) { diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverter.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverter.java similarity index 81% rename from server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverter.java rename to server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverter.java index 38f8b643900..76165c2c06c 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverter.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverter.java @@ -22,19 +22,19 @@ package org.sonar.db.rule; import org.sonar.api.code.CodeCharacteristic; import org.sonar.api.rules.RuleType; -public class RuleTypeToRuleCharacteristicConverter { +public class RuleTypeToCodeCharacteristicConverter { - private RuleTypeToRuleCharacteristicConverter() { + private RuleTypeToCodeCharacteristicConverter() { } - public static CodeCharacteristic convertToRuleCharacteristic(int ruleType) { + public static CodeCharacteristic convertToCodeCharacteristic(int ruleType) { if (ruleType == 0) { return CodeCharacteristic.CLEAR; } - return convertToRuleCharacteristic(RuleType.valueOf(ruleType)); + return convertToCodeCharacteristic(RuleType.valueOf(ruleType)); } - public static CodeCharacteristic convertToRuleCharacteristic(RuleType ruleType) { + public static CodeCharacteristic convertToCodeCharacteristic(RuleType ruleType) { return switch (ruleType) { case BUG -> CodeCharacteristic.ROBUST; case CODE_SMELL -> CodeCharacteristic.CLEAR; diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDtoTest.java index e8483c24d5b..f805010721a 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDtoTest.java @@ -189,7 +189,7 @@ public class RuleDtoTest { assertThat(characteristic).isNull(); CodeCharacteristic effectiveCharacteristic = rule.getEffectiveCharacteristic(); - CodeCharacteristic expected = RuleTypeToRuleCharacteristicConverter.convertToRuleCharacteristic(RuleType.BUG); + CodeCharacteristic expected = RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic(RuleType.BUG); assertThat(effectiveCharacteristic).isEqualTo(expected); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverterTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverterTest.java similarity index 81% rename from server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverterTest.java rename to server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverterTest.java index 508b40744b4..b6d8073e43d 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverterTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverterTest.java @@ -28,20 +28,20 @@ import org.sonar.api.code.CodeCharacteristic; import org.sonar.api.rules.RuleType; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.db.rule.RuleTypeToRuleCharacteristicConverter.convertToRuleCharacteristic; +import static org.sonar.db.rule.RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic; @RunWith(DataProviderRunner.class) -public class RuleTypeToRuleCharacteristicConverterTest { +public class RuleTypeToCodeCharacteristicConverterTest { @Test - @UseDataProvider("ruleTypeToRulCharacteristicData") - public void convertToRuleCharacteristic_when_receivedNonNullRuleType_should_convertToCorrespondingDefaultCharacteristic(RuleType type, + @UseDataProvider("ruleTypeToCodeCharacteristicData") + public void convertToCodeCharacteristic_when_receivedNonNullRuleType_should_convertToCorrespondingDefaultCharacteristic(RuleType type, CodeCharacteristic expectedCharacteristic) { - assertThat(convertToRuleCharacteristic(type)).isEqualTo(expectedCharacteristic); + assertThat(convertToCodeCharacteristic(type)).isEqualTo(expectedCharacteristic); } @DataProvider - public static Object[][] ruleTypeToRulCharacteristicData() { + public static Object[][] ruleTypeToCodeCharacteristicData() { return new Object[][] { {RuleType.CODE_SMELL, CodeCharacteristic.CLEAR}, {RuleType.BUG, CodeCharacteristic.ROBUST}, diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/index/IssueIteratorForSingleChunk.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/index/IssueIteratorForSingleChunk.java index 94f6523dceb..28b9d5e522f 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/index/IssueIteratorForSingleChunk.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/index/IssueIteratorForSingleChunk.java @@ -38,6 +38,7 @@ import org.sonar.db.DatabaseUtils; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.ResultSetIterator; +import org.sonar.db.rule.RuleTypeToCodeCharacteristicConverter; import org.sonar.server.security.SecurityStandards; import static com.google.common.base.Preconditions.checkArgument; @@ -45,7 +46,7 @@ import static org.elasticsearch.common.Strings.isNullOrEmpty; import static org.sonar.api.utils.DateUtils.longToDate; import static org.sonar.db.DatabaseUtils.getLong; import static org.sonar.db.rule.RuleDto.deserializeSecurityStandardsString; -import static org.sonar.db.rule.RuleTypeToRuleCharacteristicConverter.convertToRuleCharacteristic; +import static org.sonar.db.rule.RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic; import static org.sonar.server.security.SecurityStandards.fromSecurityStandards; /** @@ -244,7 +245,7 @@ class IssueIteratorForSingleChunk implements IssueIterator { doc.setIsNewCodeReference(!isNullOrEmpty(rs.getString(24))); String characteristic = rs.getString(25); - doc.setCharacteristic(characteristic != null ? characteristic : convertToRuleCharacteristic(rs.getInt(26)).name()); + doc.setCharacteristic(characteristic != null ? characteristic : RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic(rs.getInt(26)).name()); return doc; } -- 2.39.5