aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-batch/src
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2015-07-28 09:08:56 +0200
committerDuarte Meneses <duarte.meneses@sonarsource.com>2015-07-28 14:54:10 +0200
commitda4d4ce1007379c26b70e38b5acb84c8718d96df (patch)
tree839220431f6434dee0f4d949a7cc33e029d12867 /sonar-batch/src
parentb36bc464f98e0136d41e60774093aa946b207999 (diff)
downloadsonarqube-da4d4ce1007379c26b70e38b5acb84c8718d96df.tar.gz
sonarqube-da4d4ce1007379c26b70e38b5acb84c8718d96df.zip
Improve quality
Diffstat (limited to 'sonar-batch/src')
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/cpd/CpdComponents.java2
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java4
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java14
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java1
4 files changed, 10 insertions, 11 deletions
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 a30c6d0d832..e2c5555d4e2 100644
--- 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 9ab9c176ae6..a14ad0dec95 100644
--- 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 fc0f28ed66e..285d5e6668f 100644
--- 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 9be4093233a..37400982c11 100644
--- 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;