Rename RuleDto characteristic to subCharacteristic

3 files changed, 30 insertions, 30 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java b/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
index 7b63b0c01b0..b7965d3bdb1 100644
--- a/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
@@ -49,8 +49,8 @@ public final class RuleDto {
   private String noteUserLogin;
   private Date noteCreatedAt;
   private Date noteUpdatedAt;
-  private Integer characteristicId;
-  private Integer defaultCharacteristicId;
+  private Integer subCharacteristicId;
+  private Integer defaultSubCharacteristicId;
   private String remediationFunction;
   private String defaultRemediationFunction;
   private String remediationCoefficient;
@@ -207,22 +207,22 @@ public final class RuleDto {
   }
 
   @CheckForNull
-  public Integer getCharacteristicId() {
-    return characteristicId;
+  public Integer getSubCharacteristicId() {
+    return subCharacteristicId;
   }
 
-  public RuleDto setCharacteristicId(@Nullable Integer characteristicId) {
-    this.characteristicId = characteristicId;
+  public RuleDto setSubCharacteristicId(@Nullable Integer subCharacteristicId) {
+    this.subCharacteristicId = subCharacteristicId;
     return this;
   }
 
   @CheckForNull
-  public Integer getDefaultCharacteristicId() {
-    return defaultCharacteristicId;
+  public Integer getDefaultSubCharacteristicId() {
+    return defaultSubCharacteristicId;
   }
 
-  public RuleDto setDefaultCharacteristicId(@Nullable Integer defaultCharacteristicId) {
-    this.defaultCharacteristicId = defaultCharacteristicId;
+  public RuleDto setDefaultSubCharacteristicId(@Nullable Integer defaultSubCharacteristicId) {
+    this.defaultSubCharacteristicId = defaultSubCharacteristicId;
     return this;
   }
 
@@ -315,7 +315,7 @@ public final class RuleDto {
   }
 
   public boolean hasCharacteristic(){
-    return (characteristicId != null && !RuleDto.DISABLED_CHARACTERISTIC_ID.equals(characteristicId)) || (characteristicId == null && defaultCharacteristicId != null);
+    return (subCharacteristicId != null && !RuleDto.DISABLED_CHARACTERISTIC_ID.equals(subCharacteristicId)) || (subCharacteristicId == null && defaultSubCharacteristicId != null);
   }
 
   @Override
diff --git a/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml b/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml
index 235f5322d26..1b5f75a1542 100644
--- a/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml
@@ -19,8 +19,8 @@
     r.note_user_login as "noteUserLogin",
     r.note_created_at as "noteCreatedAt",
     r.note_updated_at as "noteUpdatedAt",
-    r.characteristic_id as "characteristicId",
-    r.default_characteristic_id as "defaultCharacteristicId",
+    r.characteristic_id as "subCharacteristicId",
+    r.default_characteristic_id as "defaultSubCharacteristicId",
     r.remediation_function as "remediationFunction",
     r.default_remediation_function as "defaultRemediationFunction",
     r.remediation_factor as "remediationCoefficient",
@@ -60,7 +60,7 @@
   <select id="selectBySubCharacteristicId" resultType="Rule">
     select <include refid="selectColumns"/> from rules r
     <where>
-      and (r.characteristic_id=#{characteristicId} or r.default_characteristic_id=#{characteristicId})
+      and (r.characteristic_id=#{subCharacteristicId} or r.default_characteristic_id=#{subCharacteristicId})
     </where>
   </select>
 
@@ -80,8 +80,8 @@
     note_user_login=#{noteUserLogin},
     note_created_at=#{noteCreatedAt},
     note_updated_at=#{noteUpdatedAt},
-    characteristic_id=#{characteristicId},
-    default_characteristic_id=#{defaultCharacteristicId},
+    characteristic_id=#{subCharacteristicId},
+    default_characteristic_id=#{defaultSubCharacteristicId},
     remediation_function=#{remediationFunction},
     default_remediation_function=#{defaultRemediationFunction},
     remediation_factor=#{remediationCoefficient},
@@ -105,7 +105,7 @@
     insert into rules <include refid="insertColumns"/>
     values (#{ruleKey}, #{repositoryKey}, #{description}, #{status}, #{name}, #{configKey},
       #{severity}, #{cardinality}, #{language}, #{parentId},
-      #{characteristicId}, #{defaultCharacteristicId}, #{remediationFunction}, #{defaultRemediationFunction},
+      #{subCharacteristicId}, #{defaultSubCharacteristicId}, #{remediationFunction}, #{defaultRemediationFunction},
       #{remediationCoefficient}, #{defaultRemediationCoefficient}, #{remediationOffset}, #{defaultRemediationOffset},
       #{effortToFixDescription},
       #{createdAt}, #{updatedAt})
@@ -115,7 +115,7 @@
     insert into rules <include refid="insertColumns"/>
     values (#{ruleKey}, #{repositoryKey}, #{description}, #{status}, #{name}, #{configKey},
     #{severity}, #{cardinality}, #{language}, #{parentId},
-    #{characteristicId}, #{defaultCharacteristicId}, #{remediationFunction}, #{defaultRemediationFunction},
+    #{subCharacteristicId}, #{defaultSubCharacteristicId}, #{remediationFunction}, #{defaultRemediationFunction},
     #{remediationCoefficient}, #{defaultRemediationCoefficient}, #{remediationOffset}, #{defaultRemediationOffset},
     #{effortToFixDescription},
     #{createdAt}, #{updatedAt})
diff --git a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
index 7fc19af9bdd..6c1e89118a4 100644
--- a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
@@ -59,8 +59,8 @@ public class RuleDaoTest extends AbstractDaoTestCase {
     assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY);
     assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle");
     assertThat(ruleDto.getNoteData()).isEqualTo("Rule note with accents \u00e9\u00e8\u00e0");
-    assertThat(ruleDto.getCharacteristicId()).isEqualTo(100);
-    assertThat(ruleDto.getDefaultCharacteristicId()).isEqualTo(101);
+    assertThat(ruleDto.getSubCharacteristicId()).isEqualTo(100);
+    assertThat(ruleDto.getDefaultSubCharacteristicId()).isEqualTo(101);
     assertThat(ruleDto.getRemediationFunction()).isEqualTo("linear");
     assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("linear_offset");
     assertThat(ruleDto.getRemediationCoefficient()).isEqualTo("1h");
@@ -83,8 +83,8 @@ public class RuleDaoTest extends AbstractDaoTestCase {
     assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY);
     assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle");
     assertThat(ruleDto.getNoteData()).isEqualTo("Rule note with accents \u00e9\u00e8\u00e0");
-    assertThat(ruleDto.getCharacteristicId()).isEqualTo(100);
-    assertThat(ruleDto.getDefaultCharacteristicId()).isEqualTo(101);
+    assertThat(ruleDto.getSubCharacteristicId()).isEqualTo(100);
+    assertThat(ruleDto.getDefaultSubCharacteristicId()).isEqualTo(101);
     assertThat(ruleDto.getRemediationFunction()).isEqualTo("LINEAR");
     assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("LINEAR_OFFSET");
     assertThat(ruleDto.getRemediationCoefficient()).isEqualTo("1h");
@@ -173,8 +173,8 @@ public class RuleDaoTest extends AbstractDaoTestCase {
       .setNoteUserLogin("admin")
       .setNoteCreatedAt(DateUtils.parseDate("2013-12-19"))
       .setNoteUpdatedAt(DateUtils.parseDate("2013-12-20"))
-      .setCharacteristicId(100)
-      .setDefaultCharacteristicId(101)
+      .setSubCharacteristicId(100)
+      .setDefaultSubCharacteristicId(101)
       .setRemediationFunction("linear")
       .setDefaultRemediationFunction("linear_offset")
       .setRemediationCoefficient("1h")
@@ -205,8 +205,8 @@ public class RuleDaoTest extends AbstractDaoTestCase {
       .setCardinality(Cardinality.MULTIPLE)
       .setLanguage("dart")
       .setParentId(3)
-      .setCharacteristicId(100)
-      .setDefaultCharacteristicId(101)
+      .setSubCharacteristicId(100)
+      .setDefaultSubCharacteristicId(101)
       .setRemediationFunction("linear")
       .setDefaultRemediationFunction("linear_offset")
       .setRemediationCoefficient("1h")
@@ -238,8 +238,8 @@ public class RuleDaoTest extends AbstractDaoTestCase {
       .setCardinality(Cardinality.MULTIPLE)
       .setLanguage("dart")
       .setParentId(3)
-      .setCharacteristicId(100)
-      .setDefaultCharacteristicId(101)
+      .setSubCharacteristicId(100)
+      .setDefaultSubCharacteristicId(101)
       .setRemediationFunction("linear")
       .setDefaultRemediationFunction("linear_offset")
       .setRemediationCoefficient("1h")
@@ -262,8 +262,8 @@ public class RuleDaoTest extends AbstractDaoTestCase {
       .setCardinality(Cardinality.SINGLE)
       .setLanguage("js")
       .setParentId(null)
-      .setCharacteristicId(102)
-      .setDefaultCharacteristicId(103)
+      .setSubCharacteristicId(102)
+      .setDefaultSubCharacteristicId(103)
       .setRemediationFunction("linear_offset")
       .setDefaultRemediationFunction("linear")
       .setRemediationCoefficient("5d")