SONAR-6589 remove ComputationContainer (and use only CEContainer)

server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java

@@ -25,7 +25,7 @@
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
-import org.sonar.server.computation.activity.CEActivityManager;
+import org.sonar.server.computation.activity.ActivityManager;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.ComponentTreeBuilders;
 import org.sonar.server.computation.language.LanguageRepository;
@@ -44,12 +44,12 @@ public class ComputationService {
   private final ReportQueue.Item item;
   private final ComputationSteps steps;
   private final BatchReportReader reportReader;
-  private final CEActivityManager activityManager;
+  private final ActivityManager activityManager;
   private final System2 system;
   private final DbClient dbClient;
   private final LanguageRepository languageRepository;
 
-  public ComputationService(ReportQueue.Item item, ComputationSteps steps, CEActivityManager activityManager, System2 system,
+  public ComputationService(ReportQueue.Item item, ComputationSteps steps, ActivityManager activityManager, System2 system,
     BatchReportReader reportReader, DbClient dbClient, LanguageRepository languageRepository) {
     this.item = item;
     this.steps = steps;

server/sonar-server/src/main/java/org/sonar/server/computation/ComputationThread.java

@@ -20,9 +20,11 @@
 
 package org.sonar.server.computation;
 
-import com.google.common.annotations.VisibleForTesting;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
+import org.sonar.core.platform.ComponentContainer;
+import org.sonar.server.computation.container.ComputeEngineContainer;
+import org.sonar.server.computation.container.ContainerFactory;
 
 /**
  * This thread pops a report from the queue and integrate it.
@@ -32,17 +34,13 @@ public class ComputationThread implements Runnable {
   private static final Logger LOG = Loggers.get(ComputationThread.class);
 
   private final ReportQueue queue;
-  private final ComputationContainer container;
+  private final ComponentContainer sqContainer;
+  private final ContainerFactory containerFactory;
 
-  public ComputationThread(ReportQueue queue) {
+  public ComputationThread(ReportQueue queue, ComponentContainer sqContainer, ContainerFactory containerFactory) {
     this.queue = queue;
-    this.container = new ComputationContainer();
-  }
-
-  @VisibleForTesting
-  ComputationThread(ReportQueue queue, ComputationContainer container) {
-    this.queue = queue;
-    this.container = container;
+    this.sqContainer = sqContainer;
+    this.containerFactory = containerFactory;
   }
 
   @Override
@@ -53,15 +51,20 @@ public void run() {
     } catch (Exception e) {
       LOG.error("Failed to pop the queue of analysis reports", e);
     }
-    if (item != null) {
-      try {
-        container.execute(item);
-      } catch (Throwable e) {
-        LOG.error(String.format(
-          "Failed to process analysis report %d of project %s", item.dto.getId(), item.dto.getProjectKey()), e);
-      } finally {
-        removeSilentlyFromQueue(item);
-      }
+    if (item == null) {
+      return;
+    }
+
+    ComputeEngineContainer computeEngineContainer = containerFactory.create(sqContainer, item);
+    try {
+      computeEngineContainer.process();
+    } catch (Throwable e) {
+      LOG.error(String.format(
+        "Failed to process analysis report %d of project %s", item.dto.getId(), item.dto.getProjectKey()), e);
+    } finally {
+      computeEngineContainer.cleanup();
+
+      removeSilentlyFromQueue(item);
     }
   }
 

server/sonar-server/src/main/java/org/sonar/server/computation/ComputationThreadLauncher.java

@@ -22,38 +22,47 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.picocontainer.Startable;
-import org.sonar.api.platform.Server;
-import org.sonar.api.platform.ServerStartHandler;
-
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import org.picocontainer.Startable;
+import org.sonar.api.platform.Server;
+import org.sonar.api.platform.ServerStartHandler;
+import org.sonar.core.platform.ComponentContainer;
+import org.sonar.server.computation.container.ContainerFactory;
+import org.sonar.server.computation.container.ContainerFactoryImpl;
 
 public class ComputationThreadLauncher implements Startable, ServerStartHandler {
 
   public static final String THREAD_NAME_PREFIX = "computation-";
 
   private final ReportQueue queue;
+  private final ComponentContainer sqContainer;
   private final ScheduledExecutorService executorService;
+  private final ContainerFactory containerFactory;
 
   private final long delayBetweenTasks;
   private final long delayForFirstStart;
   private final TimeUnit timeUnit;
 
-  public ComputationThreadLauncher(ReportQueue queue) {
+  public ComputationThreadLauncher(ReportQueue queue, ComponentContainer sqContainer) {
     this.queue = queue;
+    this.sqContainer = sqContainer;
     this.executorService = Executors.newSingleThreadScheduledExecutor(newThreadFactory());
+    this.containerFactory = new ContainerFactoryImpl();
 
     this.delayBetweenTasks = 10;
     this.delayForFirstStart = 0;
     this.timeUnit = TimeUnit.SECONDS;
   }
 
   @VisibleForTesting
-  ComputationThreadLauncher(ReportQueue queue, long delayForFirstStart, long delayBetweenTasks, TimeUnit timeUnit) {
+  ComputationThreadLauncher(ReportQueue queue, ComponentContainer sqContainer, ContainerFactory containerFactory,
+    long delayForFirstStart, long delayBetweenTasks, TimeUnit timeUnit) {
     this.queue = queue;
+    this.sqContainer = sqContainer;
+    this.containerFactory = containerFactory;
     this.executorService = Executors.newSingleThreadScheduledExecutor(newThreadFactory());
 
     this.delayBetweenTasks = delayBetweenTasks;
@@ -72,12 +81,12 @@ public void stop() {
   }
 
   public void startAnalysisTaskNow() {
-    executorService.execute(new ComputationThread(queue));
+    executorService.execute(new ComputationThread(queue, sqContainer, containerFactory));
   }
 
   @Override
   public void onServerStart(Server server) {
-    executorService.scheduleAtFixedRate(new ComputationThread(queue), delayForFirstStart, delayBetweenTasks, timeUnit);
+    executorService.scheduleAtFixedRate(new ComputationThread(queue, sqContainer, containerFactory), delayForFirstStart, delayBetweenTasks, timeUnit);
   }
 
   private ThreadFactory newThreadFactory() {

server/sonar-server/src/main/java/org/sonar/server/computation/activity/CEActivityManager.java → server/sonar-server/src/main/java/org/sonar/server/computation/activity/ActivityManager.java

@@ -31,11 +31,11 @@
 import static org.sonar.api.utils.DateUtils.formatDateTimeNullSafe;
 import static org.sonar.api.utils.DateUtils.longToDate;
 
-public class CEActivityManager {
+public class ActivityManager {
   private final ActivityService activityService;
   private final DbClient dbClient;
 
-  public CEActivityManager(ActivityService activityService, DbClient dbClient) {
+  public ActivityManager(ActivityService activityService, DbClient dbClient) {
     this.activityService = activityService;
     this.dbClient = dbClient;
   }

server/sonar-server/src/main/java/org/sonar/server/computation/batch/CEBatchReportReader.java → server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java

@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.NoSuchElementException;
 import javax.annotation.CheckForNull;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -35,10 +36,10 @@
 import org.sonar.server.computation.ReportQueue;
 import org.sonar.server.util.CloseableIterator;
 
-public class CEBatchReportReader implements BatchReportReader {
+public class BatchReportReaderImpl implements BatchReportReader {
   private final org.sonar.batch.protocol.output.BatchReportReader delegate;
 
-  public CEBatchReportReader(ReportExtractor reportExtractor, ReportQueue.Item item) {
+  public BatchReportReaderImpl(ReportExtractor reportExtractor, ReportQueue.Item item) {
     this.delegate = new org.sonar.batch.protocol.output.BatchReportReader(reportExtractor.extractReportInDir(item));
   }
 
@@ -132,10 +133,16 @@ public boolean hasNext() {
         }
 
         @Override
-        protected String doNext() {
+        public String next() {
           return lineIterator.next();
         }
 
+        @Override
+        protected String doNext() {
+          // never called anyway
+          throw new NoSuchElementException("Empty closeable Iterator has no element");
+        }
+
         @Override
         protected void doClose() throws Exception {
           lineIterator.close();