aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-batch
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2015-08-20 18:05:27 +0200
committerDuarte Meneses <duarte.meneses@sonarsource.com>2015-08-21 13:55:09 +0200
commitfc7e84440749ea77c2bd69128115e3848d2050f0 (patch)
treeaf30436b5defc5a6bf8ba98c36bdb14bc7a8ba80 /sonar-batch
parent7370c19e9acfefb2b9ac1fb3aeea7fd73f5a5fc3 (diff)
downloadsonarqube-fc7e84440749ea77c2bd69128115e3848d2050f0.tar.gz
sonarqube-fc7e84440749ea77c2bd69128115e3848d2050f0.zip
Improve quality
Diffstat (limited to 'sonar-batch')
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java5
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java3
-rw-r--r--sonar-batch/src/test/java/org/sonar/batch/mediumtest/cache/CacheSyncTest.java10
3 files changed, 8 insertions, 10 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java
index 61726ba4108..52d73c8bf41 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java
@@ -27,20 +27,25 @@ import java.util.Arrays;
import org.sonar.api.batch.AnalysisMode;
public abstract class AbstractAnalysisMode implements AnalysisMode {
+ protected final static String[] VALID_MODES = {CoreProperties.ANALYSIS_MODE_PREVIEW, CoreProperties.ANALYSIS_MODE_PUBLISH, CoreProperties.ANALYSIS_MODE_ISSUES};
+
protected boolean preview;
protected boolean issues;
protected AbstractAnalysisMode() {
}
+ @Override
public boolean isPreview() {
return preview;
}
+ @Override
public boolean isIssues() {
return issues;
}
+ @Override
public boolean isPublish() {
return !preview && !issues;
}
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
index 364a408b5ce..c97dd5fa912 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
@@ -68,8 +68,7 @@ public class BatchPluginRepository implements PluginRepository, Startable {
private void logPlugins() {
if (infosByKeys.isEmpty()) {
LOG.debug("No plugins loaded");
- }
- else {
+ } else {
LOG.debug("Plugins:");
for (PluginInfo p : infosByKeys.values()) {
LOG.debug(" {}-{}", p.getName(), p.getVersion());
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cache/CacheSyncTest.java b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cache/CacheSyncTest.java
index a0d2ef8b7f8..3c5d2749926 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cache/CacheSyncTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cache/CacheSyncTest.java
@@ -22,7 +22,6 @@ package org.sonar.batch.mediumtest.cache;
import org.sonar.batch.protocol.input.FileData;
import org.junit.Test;
-import org.junit.Rule;
import com.google.common.collect.ImmutableMap;
import org.junit.After;
import org.sonar.api.CoreProperties;
@@ -33,13 +32,8 @@ import org.sonar.xoo.rule.XooRulesDefinition;
import java.util.Date;
-import org.junit.rules.TemporaryFolder;
-
public class CacheSyncTest {
- @Rule
- public TemporaryFolder temp = new TemporaryFolder();
-
public BatchMediumTester tester;
@After
@@ -56,7 +50,7 @@ public class CacheSyncTest {
String[] hashes = new String[] {
"line1", "line2"
};
-
+
tester = BatchMediumTester.builder()
.bootstrapProperties(ImmutableMap.of(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_ISSUES))
.registerPlugin("xoo", new XooPlugin())
@@ -69,7 +63,7 @@ public class CacheSyncTest {
tester.start();
tester.syncProject("test-project");
-
+
}
}