Merge remote-tracking branch 'origin/master'

4 files changed, 15 insertions, 5 deletions

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/BootstrapModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java
index 6e2d80571c6..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
  */
@@ -37,11 +39,15 @@ 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);
   }
 
-  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;
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