SONAR-7330 remove column RULES.CHARACTERISTIC_ID and DEFAULT_CHARACTERISTIC_ID

10 files changed, 4 insertions, 60 deletions

diff --git a/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java
index 22ed140485f..070873f0c51 100644
--- a/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java
@@ -60,8 +60,6 @@ public class RuleDto {
   private String noteUserLogin;
   private Date noteCreatedAt;
   private Date noteUpdatedAt;
-  private Integer subCharacteristicId;
-  private Integer defaultSubCharacteristicId;
   private String remediationFunction;
   private String defaultRemediationFunction;
   private String remediationCoefficient;
@@ -244,35 +242,6 @@ public class RuleDto {
   }
 
   @CheckForNull
-  public Integer getSubCharacteristicId() {
-    return subCharacteristicId;
-  }
-
-  public RuleDto setSubCharacteristicId(@Nullable Integer subCharacteristicId) {
-    this.subCharacteristicId = subCharacteristicId;
-    return this;
-  }
-
-  @CheckForNull
-  public Integer getDefaultSubCharacteristicId() {
-    return defaultSubCharacteristicId;
-  }
-
-  public RuleDto setDefaultSubCharacteristicId(@Nullable Integer defaultSubCharacteristicId) {
-    this.defaultSubCharacteristicId = defaultSubCharacteristicId;
-    return this;
-  }
-
-  @CheckForNull
-  public Integer getEffectiveSubCharacteristicId() {
-    Integer effective = subCharacteristicId == null ? defaultSubCharacteristicId : subCharacteristicId;
-    if (effective != null && effective != DISABLED_CHARACTERISTIC_ID) {
-      return effective;
-    }
-    return null;
-  }
-
-  @CheckForNull
   public String getRemediationFunction() {
     return remediationFunction;
   }
diff --git a/sonar-db/src/main/java/org/sonar/db/rule/RuleMapper.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleMapper.java
index f2bc49ffb0c..8001cc380fb 100644
--- a/sonar-db/src/main/java/org/sonar/db/rule/RuleMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleMapper.java
@@ -39,8 +39,6 @@ public interface RuleMapper {
 
   List<RuleDto> selectNonManual();
 
-  List<RuleDto> selectBySubCharacteristicId(int characteristicId);
-
   RuleDto selectById(long id);
 
   List<RuleDto> selectByIds(@Param("ids") List<Integer> ids);
diff --git a/sonar-db/src/main/java/org/sonar/db/version/v55/DropRulesDateColumns.java b/sonar-db/src/main/java/org/sonar/db/version/v55/DropRulesDateColumns.java
index 38f440cda5b..082f44d6806 100644
--- a/sonar-db/src/main/java/org/sonar/db/version/v55/DropRulesDateColumns.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/v55/DropRulesDateColumns.java
@@ -47,7 +47,7 @@ public class DropRulesDateColumns extends DdlChange {
   @VisibleForTesting
   String generateSql() {
     return new DropColumnsBuilder(db.getDialect(), "rules",
-      "created_at", "updated_at")
+      "created_at", "updated_at", "characteristic_id", "default_characteristic_id")
       .build();
   }
 
diff --git a/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
index 3492b3e79ff..aded450d199 100644
--- a/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
@@ -20,8 +20,6 @@
     r.note_user_login as "noteUserLogin",
     r.note_created_at as "noteCreatedAt",
     r.note_updated_at as "noteUpdatedAt",
-    r.characteristic_id as "subCharacteristicId",
-    r.default_characteristic_id as "defaultSubCharacteristicId",
     r.remediation_function as "remediationFunction",
     r.default_remediation_function as "defaultRemediationFunction",
     r.remediation_coeff as "remediationCoefficient",
@@ -104,13 +102,6 @@
     where r.plugin_name != 'manual'
   </select>
 
-  <select id="selectBySubCharacteristicId" resultType="Rule">
-    select
-    <include refid="selectColumns"/>
-    from rules r
-    where (r.characteristic_id=#{subCharacteristicId} or r.default_characteristic_id=#{subCharacteristicId})
-  </select>
-
   <select id="selectByQuery" parameterType="map" resultType="Rule">
     SELECT
     <include refid="selectColumns"/>
@@ -147,8 +138,6 @@
     note_user_login=#{noteUserLogin},
     note_created_at=#{noteCreatedAt},
     note_updated_at=#{noteUpdatedAt},
-    characteristic_id=#{subCharacteristicId},
-    default_characteristic_id=#{defaultSubCharacteristicId},
     remediation_function=#{remediationFunction},
     default_remediation_function=#{defaultRemediationFunction},
     remediation_coeff=#{remediationCoefficient},
@@ -165,7 +154,7 @@
   <sql id="insertColumns">
     (plugin_rule_key, plugin_name, description, description_format, status, name, plugin_config_key, priority,
     is_template, language, template_id,
-    characteristic_id, default_characteristic_id, remediation_function, default_remediation_function,
+    remediation_function, default_remediation_function,
     remediation_coeff, default_remediation_coeff, remediation_offset, default_remediation_offset,
     effort_to_fix_description, tags, system_tags, note_data, note_user_login, note_created_at, note_updated_at,
     created_at, updated_at)
@@ -176,7 +165,7 @@
     <include refid="insertColumns"/>
     values (#{ruleKey}, #{repositoryKey}, #{description}, #{descriptionFormat}, #{status}, #{name}, #{configKey},
     #{severity}, #{isTemplate}, #{language}, #{templateId},
-    #{subCharacteristicId}, #{defaultSubCharacteristicId}, #{remediationFunction}, #{defaultRemediationFunction},
+    #{remediationFunction}, #{defaultRemediationFunction},
     #{remediationCoefficient}, #{defaultRemediationCoefficient}, #{remediationOffset}, #{defaultRemediationOffset},
     #{effortToFixDescription}, #{tagsField}, #{systemTagsField}, #{noteData}, #{noteUserLogin}, #{noteCreatedAt},
     #{noteUpdatedAt}, #{createdAt}, #{updatedAt})
@@ -190,7 +179,6 @@
     #{configKey,jdbcType=VARCHAR},
     #{severity,jdbcType=INTEGER}, #{isTemplate,jdbcType=BOOLEAN}, #{language,jdbcType=VARCHAR},
     #{templateId,jdbcType=INTEGER},
-    #{subCharacteristicId,jdbcType=INTEGER}, #{defaultSubCharacteristicId,jdbcType=INTEGER},
     #{remediationFunction,jdbcType=VARCHAR}, #{defaultRemediationFunction,jdbcType=VARCHAR},
     #{remediationCoefficient,jdbcType=VARCHAR}, #{defaultRemediationCoefficient,jdbcType=VARCHAR},
     #{remediationOffset,jdbcType=VARCHAR}, #{defaultRemediationOffset,jdbcType=VARCHAR},
diff --git a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
index e48a5310fbe..1ce64fed989 100644
--- a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -113,8 +113,6 @@ CREATE TABLE "RULES" (
   "NOTE_USER_LOGIN" VARCHAR(255),
   "NOTE_CREATED_AT" TIMESTAMP,
   "NOTE_UPDATED_AT" TIMESTAMP,
-  "CHARACTERISTIC_ID" INTEGER,
-  "DEFAULT_CHARACTERISTIC_ID" INTEGER,
   "REMEDIATION_FUNCTION" VARCHAR(20),
   "DEFAULT_REMEDIATION_FUNCTION" VARCHAR(20),
   "REMEDIATION_COEFF" VARCHAR(20),
diff --git a/sonar-db/src/test/java/org/sonar/db/version/v55/DropRulesDateColumnsTest.java b/sonar-db/src/test/java/org/sonar/db/version/v55/DropRulesDateColumnsTest.java
index f05eda3ea48..96c357151a8 100644
--- a/sonar-db/src/test/java/org/sonar/db/version/v55/DropRulesDateColumnsTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/version/v55/DropRulesDateColumnsTest.java
@@ -44,7 +44,7 @@ public class DropRulesDateColumnsTest {
   public void generate_sql_on_postgresql() {
     when(database.getDialect()).thenReturn(new PostgreSql());
     assertThat(migration.generateSql()).isEqualTo(
-      "ALTER TABLE rules DROP COLUMN created_at, DROP COLUMN updated_at"
+      "ALTER TABLE rules DROP COLUMN created_at, DROP COLUMN updated_at, DROP COLUMN characteristic_id, DROP COLUMN default_characteristic_id"
       );
   }
 
diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter-result.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter-result.xml
index 497ceafcf7f..97c6a59f3f7 100644
--- a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter-result.xml
@@ -2,7 +2,6 @@
     <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED"
            plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" template_id="3"
            note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
-           characteristic_id="100" default_characteristic_id="101"
            remediation_function="linear" default_remediation_function="linear_offset"
            remediation_coeff="1h" default_remediation_coeff="5d"
            remediation_offset="5min" default_remediation_offset="10h"
diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter.xml
index 75036a0b316..df6a143c5d3 100644
--- a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter.xml
@@ -2,7 +2,6 @@
     <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED"
            plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" template_id="3"
            note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
-           characteristic_id="100" default_characteristic_id="101"
            remediation_function="linear" default_remediation_function="linear_offset"
            remediation_coeff="1h" default_remediation_coeff="5d"
            remediation_offset="5min" default_remediation_offset="10h"
diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectEnabledAndNonManual.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectEnabledAndNonManual.xml
index 1ae601a67ab..92cd6f505ba 100644
--- a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectEnabledAndNonManual.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectEnabledAndNonManual.xml
@@ -2,7 +2,6 @@
 
   <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"
          note_data="Rule note with accents éèà" note_user_login="polop.palap" note_created_at="2013-12-25" description_format="HTML"
-         characteristic_id="100" default_characteristic_id="101"
          remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET"
          remediation_coeff="1h" default_remediation_coeff="5d"
          remediation_offset="5min" default_remediation_offset="10h"
@@ -12,7 +11,6 @@
 
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="squid" name="Avoid Null" description="Should avoid NULL" status="REMOVED"
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" description_format="HTML"
-         characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
          remediation_coeff="[null]" default_remediation_coeff="[null]"
          remediation_offset="[null]" default_remediation_offset="[null]"
@@ -22,7 +20,6 @@
 
   <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY"
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" description_format="HTML"
-         characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
          remediation_coeff="[null]" default_remediation_coeff="[null]"
          remediation_offset="[null]" default_remediation_offset="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/version/v51/FeedIssueTagsTest/before.xml b/sonar-db/src/test/resources/org/sonar/db/version/v51/FeedIssueTagsTest/before.xml
index 63b14662f3d..5a310cac0fb 100644
--- a/sonar-db/src/test/resources/org/sonar/db/version/v51/FeedIssueTagsTest/before.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/version/v51/FeedIssueTagsTest/before.xml
@@ -5,7 +5,6 @@
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
          description_format="HTML" plugin_config_key="[null]"
          tags="tag3,tag4" system_tags="tag1,tag2"
-         characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
          remediation_coeff="[null]" default_remediation_coeff="[null]"
          remediation_offset="[null]" default_remediation_offset="[null]"
@@ -17,7 +16,6 @@
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
          description_format="HTML" plugin_config_key="[null]"
          tags="tag3,tag4" system_tags=""
-         characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
          remediation_coeff="[null]" default_remediation_coeff="[null]"
          remediation_offset="[null]" default_remediation_offset="[null]"
@@ -29,7 +27,6 @@
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
          description_format="HTML" plugin_config_key="[null]"
          tags="[null]" system_tags="tag1,tag2"
-         characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
          remediation_coeff="[null]" default_remediation_coeff="[null]"
          remediation_offset="[null]" default_remediation_offset="[null]"
@@ -41,7 +38,6 @@
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
          description_format="HTML" plugin_config_key="[null]"
          tags="[null]" system_tags="[null]"
-         characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
          remediation_coeff="[null]" default_remediation_coeff="[null]"
          remediation_offset="[null]" default_remediation_offset="[null]"