SONAR-5056 Display debt information from rules instead of characteristics

2 files changed, 63 insertions, 1 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java
index d30275399ea..39453f963ff 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java
@@ -36,7 +36,10 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import javax.persistence.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
 
 @Entity
 @Table(name = "rules")
@@ -117,6 +120,12 @@ public class Rule {
   @JoinColumn(name = "parent_id", updatable = true, nullable = true)
   private Rule parent = null;
 
+  @Column(name = "characteristic_id", updatable = true, nullable = true)
+  private Integer characteristicId;
+
+  @Column(name = "default_characteristic_id", updatable = true, nullable = true)
+  private Integer defaultCharacteristicId;
+
   @org.hibernate.annotations.Cascade({org.hibernate.annotations.CascadeType.ALL, org.hibernate.annotations.CascadeType.DELETE_ORPHAN})
   @OneToMany(mappedBy = "rule")
   private List<RuleParam> params = new ArrayList<RuleParam>();
@@ -439,6 +448,47 @@ public class Rule {
     this.tags = tags;
   }
 
+  /**
+   * For internal use only.
+   *
+   * @since 4.3
+   */
+  @CheckForNull
+  public Integer getCharacteristicId() {
+    return characteristicId;
+  }
+
+  /**
+   * For internal use only.
+   *
+   * @since 4.3
+   */
+  public Rule setCharacteristicId(@Nullable Integer characteristicId) {
+    this.characteristicId = characteristicId;
+    return this;
+  }
+
+
+  /**
+   * For internal use only.
+   *
+   * @since 4.3
+   */
+  @CheckForNull
+  public Integer getDefaultCharacteristicId() {
+    return defaultCharacteristicId;
+  }
+
+  /**
+   * For internal use only.
+   *
+   * @since 4.3
+   */
+  public Rule setDefaultCharacteristicId(@Nullable Integer defaultCharacteristicId) {
+    this.defaultCharacteristicId = defaultCharacteristicId;
+    return this;
+  }
+
   @Override
   public boolean equals(Object obj) {
     if (!(obj instanceof Rule)) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/Characteristic.java b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/Characteristic.java
index 47dcf172d71..c39eba4108a 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/Characteristic.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/Characteristic.java
@@ -42,11 +42,23 @@ public interface Characteristic {
   @CheckForNull
   Integer parentId();
 
+  /**
+   * @deprecated since 4.3. return null
+   */
+  @Deprecated
   @CheckForNull
   Integer rootId();
 
+  /**
+   * @deprecated since 4.3. return null
+   */
+  @Deprecated
   RuleKey ruleKey();
 
+  /**
+   * @deprecated since 4.3. return null
+   */
+  @Deprecated
   String function();
 
   /**