From 39d168937fa9e3b659126920fd247a294cc41457 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Tue, 22 Jan 2013 10:15:35 +0100 Subject: Fix some quality flaws. --- .../src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sonar-batch') diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java index 6e2d80571c6..85f9a105c1a 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java @@ -37,6 +37,10 @@ public class BootstrapModule extends Module { private GlobalBatchProperties globalProperties; private String taskCommand; + /** + * @deprecated Use {@link #BootstrapModule(GlobalBatchProperties, String, ProjectReactor, Object...)} + */ + @Deprecated public BootstrapModule(ProjectReactor reactor, Object... boostrapperComponents) { this(new GlobalBatchProperties(), null, reactor, boostrapperComponents); } -- cgit v1.2.3 From eb958e64cf79c3279fd78f5d2377230f87a77053 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Wed, 23 Jan 2013 09:42:36 +0100 Subject: Fix some quality flaws. --- .../src/main/java/org/sonar/batch/bootstrap/BatchSettings.java | 4 ++-- .../src/main/java/org/sonar/batch/bootstrap/TaskBootstrapModule.java | 4 +++- sonar-batch/src/main/java/org/sonar/batch/tasks/Tasks.java | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'sonar-batch') diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java index 0987d020216..0131e8b59e9 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java @@ -47,7 +47,7 @@ public class BatchSettings extends Settings { this(bootstrapSettings, propertyDefinitions, null, client, deprecatedConfiguration, globalProperties); } - public BatchSettings(BootstrapSettings bootstrapSettings, PropertyDefinitions propertyDefinitions, ProjectReactor reactor, + public BatchSettings(BootstrapSettings bootstrapSettings, PropertyDefinitions propertyDefinitions, @Nullable ProjectReactor reactor, ServerClient client, Configuration deprecatedConfiguration, GlobalBatchProperties globalProperties) { super(propertyDefinitions); this.deprecatedConfiguration = deprecatedConfiguration; @@ -58,7 +58,7 @@ public class BatchSettings extends Settings { BatchSettings() { } - private void init(BootstrapSettings bootstrapSettings, ProjectReactor reactor, ServerClient client, + private void init(BootstrapSettings bootstrapSettings, @Nullable ProjectReactor reactor, ServerClient client, GlobalBatchProperties globalProperties) { LoggerFactory.getLogger(BatchSettings.class).info("Load batch settings"); diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapModule.java index 052d9a07931..5db5fcf3454 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapModule.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapModule.java @@ -26,6 +26,8 @@ import org.sonar.batch.tasks.InspectionTask; import org.sonar.batch.tasks.ListTasksTask; import org.sonar.batch.tasks.Tasks; +import javax.annotation.Nullable; + /** * Level-2 components. Collect tasks definitions. */ @@ -33,7 +35,7 @@ public class TaskBootstrapModule extends Module { private String taskCommand; - public TaskBootstrapModule(String taskCommand) { + public TaskBootstrapModule(@Nullable String taskCommand) { this.taskCommand = taskCommand; } diff --git a/sonar-batch/src/main/java/org/sonar/batch/tasks/Tasks.java b/sonar-batch/src/main/java/org/sonar/batch/tasks/Tasks.java index 8e5b8698eb4..9ff56cdd9ba 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/tasks/Tasks.java +++ b/sonar-batch/src/main/java/org/sonar/batch/tasks/Tasks.java @@ -29,6 +29,8 @@ import org.sonar.api.task.TaskComponent; import org.sonar.api.task.TaskDefinition; import org.sonar.api.utils.SonarException; +import javax.annotation.Nullable; + import java.util.HashMap; import java.util.Map; import java.util.regex.Pattern; @@ -49,7 +51,7 @@ public class Tasks implements TaskComponent { this.taskDefinitions = taskDefinitions; } - public TaskDefinition getTaskDefinition(String command) { + public TaskDefinition getTaskDefinition(@Nullable String command) { String finalCommand = command; if (StringUtils.isBlank(finalCommand)) { // Try with a property -- cgit v1.2.3 From ce1e7b754c6c08ba1696f9ec70c3ab62bfb5690b Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Wed, 23 Jan 2013 09:45:04 +0100 Subject: Fix some quality flaws. --- .../src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sonar-batch') diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java index 85f9a105c1a..c65099b3f22 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java @@ -27,6 +27,8 @@ import org.sonar.batch.FakeMavenPluginExecutor; import org.sonar.batch.MavenPluginExecutor; import org.sonar.core.config.Logback; +import javax.annotation.Nullable; + /** * Level 1 components */ @@ -45,7 +47,7 @@ public class BootstrapModule extends Module { this(new GlobalBatchProperties(), null, reactor, boostrapperComponents); } - public BootstrapModule(GlobalBatchProperties globalProperties, String taskCommand, ProjectReactor reactor, + public BootstrapModule(GlobalBatchProperties globalProperties, @Nullable String taskCommand, @Nullable ProjectReactor reactor, Object... boostrapperComponents) { this.globalProperties = globalProperties; this.taskCommand = taskCommand; -- cgit v1.2.3