From a8b0bf6f8eafc033ce0a1f97609a25f23a95b0bc Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Wed, 26 Apr 2023 10:59:00 -0500 Subject: [PATCH] Revert "SONAR-19050 consistent use of CodeCharacteristic term" This reverts commit 0b503717636f050a87e93c73e7c2d8771bfdc8d1. --- .../src/main/java/org/sonar/db/issue/IssueDto.java | 5 ++--- .../src/main/java/org/sonar/db/rule/RuleDto.java | 2 +- ...va => RuleTypeToRuleCharacteristicConverter.java} | 10 +++++----- .../src/test/java/org/sonar/db/rule/RuleDtoTest.java | 2 +- ...> RuleTypeToRuleCharacteristicConverterTest.java} | 12 ++++++------ .../issue/index/IssueIteratorForSingleChunk.java | 5 ++--- 6 files changed, 17 insertions(+), 19 deletions(-) rename server/sonar-db-dao/src/main/java/org/sonar/db/rule/{RuleTypeToCodeCharacteristicConverter.java => RuleTypeToRuleCharacteristicConverter.java} (81%) rename server/sonar-db-dao/src/test/java/org/sonar/db/rule/{RuleTypeToCodeCharacteristicConverterTest.java => RuleTypeToRuleCharacteristicConverterTest.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 abbef0bc7f2..e3c25bcd54c 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,12 +42,11 @@ 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.RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic; +import static org.sonar.db.rule.RuleTypeToRuleCharacteristicConverter.convertToRuleCharacteristic; public final class IssueDto implements Serializable { @@ -729,7 +728,7 @@ public final class IssueDto implements Serializable { @CheckForNull public CodeCharacteristic getEffectiveRuleCharacteristic() { - return ruleCharacteristic != null ? ruleCharacteristic : RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic(ruleType); + return ruleCharacteristic != null ? ruleCharacteristic : convertToRuleCharacteristic(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 01fe39ea256..a3f1180e9c0 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 : RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic(type); + return characteristic != null ? characteristic : RuleTypeToRuleCharacteristicConverter.convertToRuleCharacteristic(type); } public RuleDto setCharacteristic(@Nullable CodeCharacteristic characteristic) { diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverter.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverter.java similarity index 81% rename from server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverter.java rename to server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverter.java index 76165c2c06c..38f8b643900 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverter.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverter.java @@ -22,19 +22,19 @@ package org.sonar.db.rule; import org.sonar.api.code.CodeCharacteristic; import org.sonar.api.rules.RuleType; -public class RuleTypeToCodeCharacteristicConverter { +public class RuleTypeToRuleCharacteristicConverter { - private RuleTypeToCodeCharacteristicConverter() { + private RuleTypeToRuleCharacteristicConverter() { } - public static CodeCharacteristic convertToCodeCharacteristic(int ruleType) { + public static CodeCharacteristic convertToRuleCharacteristic(int ruleType) { if (ruleType == 0) { return CodeCharacteristic.CLEAR; } - return convertToCodeCharacteristic(RuleType.valueOf(ruleType)); + return convertToRuleCharacteristic(RuleType.valueOf(ruleType)); } - public static CodeCharacteristic convertToCodeCharacteristic(RuleType ruleType) { + public static CodeCharacteristic convertToRuleCharacteristic(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 f805010721a..e8483c24d5b 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 = RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic(RuleType.BUG); + CodeCharacteristic expected = RuleTypeToRuleCharacteristicConverter.convertToRuleCharacteristic(RuleType.BUG); assertThat(effectiveCharacteristic).isEqualTo(expected); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverterTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverterTest.java similarity index 81% rename from server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverterTest.java rename to server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverterTest.java index b6d8073e43d..508b40744b4 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToCodeCharacteristicConverterTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTypeToRuleCharacteristicConverterTest.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.RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic; +import static org.sonar.db.rule.RuleTypeToRuleCharacteristicConverter.convertToRuleCharacteristic; @RunWith(DataProviderRunner.class) -public class RuleTypeToCodeCharacteristicConverterTest { +public class RuleTypeToRuleCharacteristicConverterTest { @Test - @UseDataProvider("ruleTypeToCodeCharacteristicData") - public void convertToCodeCharacteristic_when_receivedNonNullRuleType_should_convertToCorrespondingDefaultCharacteristic(RuleType type, + @UseDataProvider("ruleTypeToRulCharacteristicData") + public void convertToRuleCharacteristic_when_receivedNonNullRuleType_should_convertToCorrespondingDefaultCharacteristic(RuleType type, CodeCharacteristic expectedCharacteristic) { - assertThat(convertToCodeCharacteristic(type)).isEqualTo(expectedCharacteristic); + assertThat(convertToRuleCharacteristic(type)).isEqualTo(expectedCharacteristic); } @DataProvider - public static Object[][] ruleTypeToCodeCharacteristicData() { + public static Object[][] ruleTypeToRulCharacteristicData() { 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 28b9d5e522f..94f6523dceb 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,7 +38,6 @@ 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; @@ -46,7 +45,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.RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic; +import static org.sonar.db.rule.RuleTypeToRuleCharacteristicConverter.convertToRuleCharacteristic; import static org.sonar.server.security.SecurityStandards.fromSecurityStandards; /** @@ -245,7 +244,7 @@ class IssueIteratorForSingleChunk implements IssueIterator { doc.setIsNewCodeReference(!isNullOrEmpty(rs.getString(24))); String characteristic = rs.getString(25); - doc.setCharacteristic(characteristic != null ? characteristic : RuleTypeToCodeCharacteristicConverter.convertToCodeCharacteristic(rs.getInt(26)).name()); + doc.setCharacteristic(characteristic != null ? characteristic : convertToRuleCharacteristic(rs.getInt(26)).name()); return doc; } -- 2.39.5