Add type to internal DefaultRule

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/DefaultRule.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/DefaultRule.java
index 5a6d01172009d58deec5ce774304828056f18420..f216f04260645f8261e39c804d338bbceecbbf6f 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/DefaultRule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/DefaultRule.java
@@ -39,6 +39,7 @@ public class DefaultRule implements Rule {
   private final Integer id;
   private final String name;
   private final String severity;
+  private final String type;
   private final String description;
   private final String internalKey;
   private final RuleStatus status;
@@ -49,6 +50,7 @@ public class DefaultRule implements Rule {
     this.id = newRule.id;
     this.name = newRule.name;
     this.severity = newRule.severity;
+    this.type = newRule.type;
     this.description = newRule.description;
     this.internalKey = newRule.internalKey;
     this.status = newRule.status;
@@ -80,6 +82,11 @@ public class DefaultRule implements Rule {
     return severity;
   }
 
+  @CheckForNull
+  public String type() {
+    return type;
+  }
+
   @Override
   public String description() {
     return description;

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/NewRule.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/NewRule.java
index 70fded597b9586a08b2cbcc2811d91460a41b699..395d5e181469fbc5d67b8420e0f4e4563fe44a65 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/NewRule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/NewRule.java
@@ -37,6 +37,7 @@ public class NewRule {
   String name;
   String description;
   String severity = DEFAULT_SEVERITY;
+  String type;
   String internalKey;
   RuleStatus status = RuleStatus.defaultStatus();
   Map<String, NewRuleParam> params = new HashMap<>();
@@ -64,6 +65,11 @@ public class NewRule {
     this.severity = StringUtils.defaultIfBlank(severity, DEFAULT_SEVERITY);
     return this;
   }
+  
+  public NewRule setType(@Nullable String type) {
+    this.type = type;
+    return this;
+  }
 
   public NewRule setStatus(@Nullable RuleStatus s) {
     this.status = (RuleStatus) ObjectUtils.defaultIfNull(s, RuleStatus.defaultStatus());

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ChecksMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ChecksMediumTest.java
index 6c4066433b23dfd44ee3fea8886f3b6f986ed3c0..d3221b9a39651c15c6a63931fdcd584c005e9b10 100644 (file)
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ChecksMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ChecksMediumTest.java
@@ -98,8 +98,8 @@ public class ChecksMediumTest {
 
   }
 
-  private LoadedActiveRule createActiveRuleWithParam(String repositoryKey, String ruleKey, @Nullable String templateRuleKey, String name, @Nullable String severity,
-    @Nullable String internalKey, @Nullable String languag, String paramKey, String paramValue) {
+  private LoadedActiveRule createActiveRuleWithParam(String repositoryKey, String ruleKey, @Nullable String templateRuleKey, String name,
+    @Nullable String severity, @Nullable String internalKey, @Nullable String languag, String paramKey, String paramValue) {
     LoadedActiveRule r = new LoadedActiveRule();
 
     r.setInternalKey(internalKey);