Refactor ioc containers to allow views to work as a task.

Signed-off-by: Julien Lancelot <julien.lancelot@gmail.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java
index 39a81ebffdb..8bc1d412bbe 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java
@@ -34,9 +34,11 @@ import javax.annotation.Nullable;
 public class TaskBootstrapContainer extends Container {
 
   private String taskCommand;
+  private ProjectReactor reactor;
 
-  public TaskBootstrapContainer(@Nullable String taskCommand) {
+  public TaskBootstrapContainer(@Nullable String taskCommand, @Nullable ProjectReactor reactor) {
     this.taskCommand = taskCommand;
+    this.reactor = reactor;
   }
 
   @Override
@@ -63,11 +65,11 @@ public class TaskBootstrapContainer extends Container {
   }
 
   private void executeTask(TaskDefinition taskDefinition) {
-    boolean projectPresent = container.getComponentByType(ProjectReactor.class) != null;
+    boolean projectPresent = (reactor != null);
     if (ExtensionUtils.requiresProject(taskDefinition.getTask()) && !projectPresent) {
       throw new SonarException("Task '" + taskDefinition.getName() + "' requires to be run on a project");
     }
-    Container childModule = new TaskContainer(taskDefinition, projectPresent);
+    Container childModule = new ProjectLessTaskContainer(taskDefinition, reactor);
     try {
       installChild(childModule);
       childModule.start();