Improve quality

diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdComponents.java b/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdComponents.java
index a30c6d0d8323b81577955636464f7271fdb6e2b5..e2c5555d4e20b85183317873f0b7ef02520e83da 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdComponents.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/cpd/CpdComponents.java
@@ -30,7 +30,7 @@ public final class CpdComponents {
   private CpdComponents() {
   }
 
-  public static List<? extends Object> all() {
+  public static List all() {
     return ImmutableList.of(
       CpdSensor.class,
       CpdMappings.class,

diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java b/sonar-batch/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java
index 9ab9c176ae623353603a71ec1734e9cf37d31f41..a14ad0dec9535b7896dfa510bad9dba38451e15c 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.batch.rule;
 
-import org.sonar.batch.protocol.input.Rule;
-
 import org.sonar.batch.protocol.input.RulesSearchResult;
 import org.sonar.batch.bootstrap.WSLoader;
 
@@ -48,7 +46,7 @@ public class DefaultRulesLoader implements RulesLoader {
     return rules;
   }
 
-  private String getUrl(int page) {
+  private static String getUrl(int page) {
     return RULES_SEARCH_URL + "&p=" + page;
   }
 }

diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java b/sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java
index fc0f28ed66eb90e0c49912f0c0143cebf21c15d9..285d5e6668fe25e64166aae05b5c0bdaa47f4eaf 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java
@@ -95,14 +95,16 @@ public class RuleFinderCompatibility implements RuleFinder {
   }
 
   private Collection<Rule> byRepository(RuleQuery query) {
-    return Collections2.transform(rules.findByRepository(query.getRepositoryKey()), new Function<org.sonar.api.batch.rule.Rule, Rule>() {
-      @Override
-      public Rule apply(@Nonnull org.sonar.api.batch.rule.Rule input) {
-        return toRule(input);
-      }
-    });
+    return Collections2.transform(rules.findByRepository(query.getRepositoryKey()), RuleTransformer);
   }
 
+  private static Function<org.sonar.api.batch.rule.Rule, Rule> RuleTransformer = new Function<org.sonar.api.batch.rule.Rule, Rule>() {
+    @Override
+    public Rule apply(@Nonnull org.sonar.api.batch.rule.Rule input) {
+      return toRule(input);
+    }
+  };
+
   private Collection<Rule> byKey(RuleQuery query) {
     Rule rule = toRule(rules.find(RuleKey.of(query.getRepositoryKey(), query.getKey())));
     return rule != null ? Arrays.asList(rule) : Collections.<Rule>emptyList();

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java
index 9be4093233a7b126539922051cea4ffcc96432fe..37400982c112d20c00fd81d1c37bef5ab5eeb914 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java
@@ -28,7 +28,6 @@ import org.sonar.api.batch.BatchSide;
 import org.sonar.api.issue.Issue;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.api.resources.Project;
-import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.batch.DefaultProjectTree;
 import org.sonar.batch.index.BatchComponent;