From 7b9679e8749287b46b195464a22fbd751dbf5cf3 Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Thu, 24 Jul 2014 09:28:10 +0200
Subject: [PATCH] SONAR-5389 Do not expose rule name in active rule as we may
 drop it soon

---
 .../java/org/sonar/batch/scan2/DefaultSensorContext.java    | 6 +++---
 .../src/main/java/org/sonar/api/batch/rule/ActiveRule.java  | 6 ------
 .../sonar/api/batch/rule/internal/DefaultActiveRule.java    | 3 +--
 .../api/batch/rule/internal/ActiveRulesBuilderTest.java     | 2 +-
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java b/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java
index f54dab6af55..6f4b2bdec70 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java
@@ -24,8 +24,8 @@ import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.measure.Metric;
-import org.sonar.api.batch.rule.ActiveRule;
 import org.sonar.api.batch.rule.ActiveRules;
+import org.sonar.api.batch.rule.internal.DefaultActiveRule;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.issue.Issue;
 import org.sonar.api.batch.sensor.issue.IssueBuilder;
@@ -128,7 +128,7 @@ public class DefaultSensorContext implements SensorContext {
       resourceKey = def.getKey();
     }
     RuleKey ruleKey = issue.ruleKey();
-    ActiveRule activeRule = activeRules.find(ruleKey);
+    DefaultActiveRule activeRule = (DefaultActiveRule) activeRules.find(ruleKey);
     if (activeRule == null) {
       // rule does not exist or is not enabled -> ignore the issue
       return false;
@@ -147,7 +147,7 @@ public class DefaultSensorContext implements SensorContext {
     return false;
   }
 
-  private void updateIssue(DefaultIssue issue, ActiveRule activeRule) {
+  private void updateIssue(DefaultIssue issue, DefaultActiveRule activeRule) {
     if (Strings.isNullOrEmpty(issue.message())) {
       issue.setMessage(activeRule.name());
     }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRule.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRule.java
index d24fa2eed84..35447556df9 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/ActiveRule.java
@@ -33,12 +33,6 @@ public interface ActiveRule {
 
   RuleKey ruleKey();
 
-  /**
-   * Name of the rule.
-   * @since 4.5
-   */
-  String name();
-
   /**
    * Non-null severity.
    * @see org.sonar.api.rule.Severity
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/DefaultActiveRule.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/DefaultActiveRule.java
index b37fc6a8890..08d34525d69 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/DefaultActiveRule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/rule/internal/DefaultActiveRule.java
@@ -28,7 +28,7 @@ import javax.annotation.concurrent.Immutable;
 import java.util.Map;
 
 @Immutable
-class DefaultActiveRule implements ActiveRule {
+public class DefaultActiveRule implements ActiveRule {
   private final RuleKey ruleKey;
   private final String name;
   private final String severity, internalKey, language;
@@ -48,7 +48,6 @@ class DefaultActiveRule implements ActiveRule {
     return ruleKey;
   }
 
-  @Override
   public String name() {
     return name;
   }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/rule/internal/ActiveRulesBuilderTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/rule/internal/ActiveRulesBuilderTest.java
index 3d2ac27b8a1..448880b9e4b 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/rule/internal/ActiveRulesBuilderTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/rule/internal/ActiveRulesBuilderTest.java
@@ -59,7 +59,7 @@ public class ActiveRulesBuilderTest {
     ActiveRule squid1 = activeRules.find(RuleKey.of("squid", "S0001"));
     assertThat(squid1.ruleKey().repository()).isEqualTo("squid");
     assertThat(squid1.ruleKey().rule()).isEqualTo("S0001");
-    assertThat(squid1.name()).isEqualTo("My Rule");
+    assertThat(((DefaultActiveRule) squid1).name()).isEqualTo("My Rule");
     assertThat(squid1.severity()).isEqualTo(Severity.CRITICAL);
     assertThat(squid1.internalKey()).isEqualTo("__S0001__");
     assertThat(squid1.params()).hasSize(1);
-- 
2.39.5