Fix some quality flaws.

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 0987d0202164a2f046985dcf310758799da2ef0a..0131e8b59e99c9e5b4890ce041bd5fc1643d7f8c 100644 (file)
--- 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 052d9a0793196d42e6c54bd639b4690980119297..5db5fcf3454b381830632ac64dafeabbafe86f4b 100644 (file)
--- 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 8e5b8698eb4a6e391dc8c01a5035cb595654498e..9ff56cdd9ba0869459d87493bec277aa93bad6ca 100644 (file)
--- 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