API: apply the same pattern between rules and profiles API. The extension point to define rules is org.sonar.api.rules.RuleRepository. The classes AnnotationRuleParser and XMLRuleParser are components that can be used but not extended.

3 files changed, 6 insertions, 8 deletions

diff --git a/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsRuleFinder.java b/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsRuleFinder.java
index 44c279b4f6e..ab3af9d93a6 100644
--- a/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsRuleFinder.java
+++ b/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsRuleFinder.java
@@ -25,13 +25,14 @@ import java.util.List;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.rules.RuleQuery;
+import org.sonar.api.rules.XMLRuleParser;
 
 public class FindbugsRuleFinder implements RuleFinder {
 
   private final List<Rule> findbugsRules;
 
   public FindbugsRuleFinder() {
-    FindbugsRuleRepository repo = new FindbugsRuleRepository();
+    FindbugsRuleRepository repo = new FindbugsRuleRepository(new XMLRuleParser());
     findbugsRules = repo.createRules();
     for(Rule rule : findbugsRules){
       rule.setRepositoryKey(FindbugsConstants.REPOSITORY_KEY);
diff --git a/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsRuleRepositoryTest.java b/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsRuleRepositoryTest.java
index d8c9ff8a32c..511232b7a6d 100644
--- a/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsRuleRepositoryTest.java
+++ b/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsRuleRepositoryTest.java
@@ -27,12 +27,13 @@ import java.util.List;
 
 import org.junit.Test;
 import org.sonar.api.rules.Rule;
+import org.sonar.api.rules.XMLRuleParser;
 
 public class FindbugsRuleRepositoryTest {
 
   @Test
   public void testLoadRepositoryFromXml() {
-    FindbugsRuleRepository repository = new FindbugsRuleRepository();
+    FindbugsRuleRepository repository = new FindbugsRuleRepository(new XMLRuleParser());
     List<Rule> rules = repository.createRules();
     assertThat(rules.size(), greaterThan(300));
     for (Rule rule : rules) {
diff --git a/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsTests.java b/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsTests.java
index e051e7c52a7..f805a005459 100644
--- a/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsTests.java
+++ b/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsTests.java
@@ -35,11 +35,7 @@ import org.mockito.stubbing.Answer;
 import org.sonar.api.CoreProperties;

 import org.sonar.api.profiles.RulesProfile;

 import org.sonar.api.resources.Java;

-import org.sonar.api.rules.ActiveRule;

-import org.sonar.api.rules.Rule;

-import org.sonar.api.rules.RulePriority;

-import org.sonar.api.rules.RuleQuery;

-import org.sonar.api.rules.RulesManager;

+import org.sonar.api.rules.*;

 import org.sonar.test.TestUtils;

 import org.xml.sax.SAXException;

 

@@ -93,7 +89,7 @@ public abstract class FindbugsTests {
     RulesProfile profile = RulesProfile.create();

     profile.setName(RulesProfile.SONAR_WAY_FINDBUGS_NAME);

     profile.setLanguage(Java.KEY);

-    for (Rule rule : new FindbugsRuleRepository().createRules()) {

+    for (Rule rule : new FindbugsRuleRepository(new XMLRuleParser()).createRules()) {

       rule.setRepositoryKey(FindbugsConstants.REPOSITORY_KEY);

       profile.activateRule(rule, null);

     }