From 20fef3a1e9c6a8206035e03828c81c332c281620 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Mon, 21 Sep 2015 14:59:53 +0200 Subject: [PATCH] SONAR-6831 move queue related classes to their own package --- .../ComputeEngineProcessingModule.java | 3 +++ .../batch/BatchReportDirectoryHolder.java | 3 ++- .../container/ComputeEngineContainer.java | 3 ++- .../container/ContainerFactory.java | 2 +- .../container/ContainerFactoryImpl.java | 2 +- ...ReportComputeEngineContainerPopulator.java | 2 +- .../log/CeFileAppenderFactory.java | 4 ++-- .../server/computation/log/CeLogging.java | 2 +- .../server/computation/log/LogFileRef.java | 2 +- .../monitoring/ComputeEngineQueueMonitor.java | 2 +- .../{ => queue}/CeProcessingScheduler.java | 2 +- .../CeProcessingSchedulerExecutorService.java | 2 +- ...rocessingSchedulerExecutorServiceImpl.java | 2 +- .../CeProcessingSchedulerImpl.java | 3 ++- .../computation/{ => queue}/CeQueue.java | 2 +- .../{ => queue}/CeQueueCleaner.java | 3 ++- .../computation/{ => queue}/CeQueueImpl.java | 2 +- .../{ => queue}/CeQueueInitializer.java | 2 +- .../{ => queue}/CeQueueListener.java | 2 +- .../computation/{ => queue}/CeTask.java | 2 +- .../computation/{ => queue}/CeTaskSubmit.java | 4 ++-- .../{ => queue}/CeWorkerRunnable.java | 3 ++- .../computation/queue/package-info.java | 24 +++++++++++++++++++ .../report}/CleanReportQueueListener.java | 5 +++- .../{ => queue/report}/ReportSubmitter.java | 6 ++++- .../report}/ReportTaskProcessor.java | 4 +++- .../queue/report/package-info.java | 24 +++++++++++++++++++ .../computation/step/ExtractReportStep.java | 4 ++-- .../computation/ws/CancelAllWsAction.java | 2 +- .../server/computation/ws/CancelWsAction.java | 2 +- .../server/computation/ws/SubmitWsAction.java | 4 ++-- .../platformlevel/PlatformLevel4.java | 10 ++++---- ...rtComputeEngineContainerPopulatorTest.java | 2 +- .../server/computation/log/CeLoggingTest.java | 2 +- .../ComputeEngineQueueMonitorTest.java | 2 +- .../CeProcessingSchedulerImplTest.java | 3 ++- .../{ => queue}/CeQueueCleanerTest.java | 5 +++- .../{ => queue}/CeQueueImplTest.java | 2 +- .../{ => queue}/CeQueueInitializerTest.java | 6 ++++- .../computation/{ => queue}/CeTaskTest.java | 2 +- .../{ => queue}/CeWorkerRunnableTest.java | 3 ++- .../report}/CleanReportQueueListenerTest.java | 4 +++- .../report}/ReportSubmitterTest.java | 6 ++++- .../step/ComputationStepsTest.java | 2 +- .../computation/ws/CancelAllWsActionTest.java | 2 +- .../computation/ws/CancelWsActionTest.java | 2 +- .../sonar/server/computation/ws/CeWsTest.java | 2 +- .../computation/ws/SubmitWsActionTest.java | 4 ++-- 48 files changed, 134 insertions(+), 54 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeProcessingScheduler.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeProcessingSchedulerExecutorService.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeProcessingSchedulerExecutorServiceImpl.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeProcessingSchedulerImpl.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeQueue.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeQueueCleaner.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeQueueImpl.java (99%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeQueueInitializer.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeQueueListener.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeTask.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeTaskSubmit.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/CeWorkerRunnable.java (96%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/queue/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue/report}/CleanReportQueueListener.java (85%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue/report}/ReportSubmitter.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue/report}/ReportTaskProcessor.java (91%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/package-info.java rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => queue}/CeProcessingSchedulerImplTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => queue}/CeQueueCleanerTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => queue}/CeQueueImplTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => queue}/CeQueueInitializerTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => queue}/CeTaskTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => queue}/CeWorkerRunnableTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => queue/report}/CleanReportQueueListenerTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => queue/report}/ReportSubmitterTest.java (93%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineProcessingModule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineProcessingModule.java index a5d48d7db31..8766d7a8e27 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineProcessingModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineProcessingModule.java @@ -21,6 +21,9 @@ package org.sonar.server.computation; import org.sonar.core.platform.Module; import org.sonar.server.computation.container.ContainerFactoryImpl; +import org.sonar.server.computation.queue.CeProcessingSchedulerExecutorServiceImpl; +import org.sonar.server.computation.queue.CeProcessingSchedulerImpl; +import org.sonar.server.computation.queue.report.ReportTaskProcessor; public class ComputeEngineProcessingModule extends Module { @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportDirectoryHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportDirectoryHolder.java index bb76947dbda..e4fbb915ec3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportDirectoryHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportDirectoryHolder.java @@ -20,10 +20,11 @@ package org.sonar.server.computation.batch; import java.io.File; +import org.sonar.server.computation.queue.CeTask; public interface BatchReportDirectoryHolder { /** - * The File of the directory where the Batch report files for the current {@link org.sonar.server.computation.CeTask} are stored. + * The File of the directory where the Batch report files for the current {@link CeTask} are stored. * * @throws IllegalStateException if the holder is empty (ie. there is no directory yet) */ diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainer.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainer.java index 87c091348ab..2c59268c8c0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainer.java @@ -21,9 +21,10 @@ package org.sonar.server.computation.container; import org.sonar.core.platform.ComponentContainer; import org.sonar.core.platform.ContainerPopulator; +import org.sonar.server.computation.queue.CeTask; /** - * The Compute Engine container. Created for a specific parent {@link ComponentContainer} and a specific {@link org.sonar.server.computation.CeTask}. + * The Compute Engine container. Created for a specific parent {@link ComponentContainer} and a specific {@link CeTask}. */ public interface ComputeEngineContainer extends ContainerPopulator.Container { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactory.java index c1011f6969f..4c3a9576393 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactory.java @@ -20,7 +20,7 @@ package org.sonar.server.computation.container; import org.sonar.core.platform.ComponentContainer; -import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.queue.CeTask; /** * Compute diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactoryImpl.java index ed41a1c1f11..e1dfd4f2ac8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactoryImpl.java @@ -20,7 +20,7 @@ package org.sonar.server.computation.container; import org.sonar.core.platform.ComponentContainer; -import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.queue.CeTask; public class ContainerFactoryImpl implements ContainerFactory { @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java index cc8f01c859c..bea46557942 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; import org.sonar.core.issue.tracking.Tracker; import org.sonar.core.platform.ContainerPopulator; -import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.queue.CeTask; import org.sonar.server.computation.ComputationStepExecutor; import org.sonar.server.computation.ComputationTempFolderProvider; import org.sonar.server.computation.analysis.ReportAnalysisMetadataHolder; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeFileAppenderFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeFileAppenderFactory.java index d2eaacc7d10..29197d29924 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeFileAppenderFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeFileAppenderFactory.java @@ -25,7 +25,7 @@ import ch.qos.logback.core.FileAppender; import ch.qos.logback.core.sift.AppenderFactory; import com.google.common.annotations.VisibleForTesting; import java.io.File; -import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.queue.CeTask; import static java.lang.String.format; @@ -47,7 +47,7 @@ public class CeFileAppenderFactory implements AppenderFactory { /** * @param context * @param discriminatingValue path of log file relative to the directory data/ce/logs - * @see CeLogging#initForTask(CeTask) + * @see CeLogging#initForTask(CeTask) */ @Override public FileAppender buildAppender(Context context, String discriminatingValue) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeLogging.java b/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeLogging.java index f1c0d8095db..8df51dd2335 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeLogging.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeLogging.java @@ -36,7 +36,7 @@ import org.apache.log4j.MDC; import org.sonar.api.config.Settings; import org.sonar.process.ProcessProperties; import org.sonar.process.Props; -import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.queue.CeTask; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/log/LogFileRef.java b/server/sonar-server/src/main/java/org/sonar/server/computation/log/LogFileRef.java index 896b4b8a79b..d530a51e89a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/log/LogFileRef.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/log/LogFileRef.java @@ -25,7 +25,7 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeQueueDto; -import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.queue.CeTask; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/monitoring/ComputeEngineQueueMonitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/monitoring/ComputeEngineQueueMonitor.java index a5b525d06ac..f78dfb43efc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/monitoring/ComputeEngineQueueMonitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/monitoring/ComputeEngineQueueMonitor.java @@ -20,7 +20,7 @@ package org.sonar.server.computation.monitoring; import java.util.LinkedHashMap; -import org.sonar.server.computation.CeQueue; +import org.sonar.server.computation.queue.CeQueue; import org.sonar.server.platform.monitoring.BaseMonitorMBean; public class ComputeEngineQueueMonitor extends BaseMonitorMBean implements ComputeEngineQueueMonitorMBean { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingScheduler.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingScheduler.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingScheduler.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingScheduler.java index 184b4000257..fa82e55a0f1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingScheduler.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingScheduler.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; public interface CeProcessingScheduler { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingSchedulerExecutorService.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingSchedulerExecutorService.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingSchedulerExecutorService.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingSchedulerExecutorService.java index d3ff04189d4..54d0be270ae 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingSchedulerExecutorService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingSchedulerExecutorService.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import org.sonar.server.util.StoppableScheduledExecutorService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingSchedulerExecutorServiceImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingSchedulerExecutorServiceImpl.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingSchedulerExecutorServiceImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingSchedulerExecutorServiceImpl.java index 80870386e2c..e9eb954a6d5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingSchedulerExecutorServiceImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingSchedulerExecutorServiceImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.util.concurrent.Executors; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingSchedulerImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingSchedulerImpl.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingSchedulerImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingSchedulerImpl.java index 43bbca2ecaf..4b918246c7d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeProcessingSchedulerImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeProcessingSchedulerImpl.java @@ -17,9 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import java.util.concurrent.TimeUnit; +import org.sonar.server.computation.queue.report.ReportTaskProcessor; import org.sonar.server.computation.log.CeLogging; public class CeProcessingSchedulerImpl implements CeProcessingScheduler { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueue.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueue.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeQueue.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueue.java index 7669bda2124..74adfcc6020 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueue.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueue.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import com.google.common.base.Optional; import org.sonar.db.ce.CeActivityDto; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueCleaner.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueCleaner.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueCleaner.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueCleaner.java index 7b67aa34bb8..6ac6a8928e4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueCleaner.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueCleaner.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import java.util.HashSet; import java.util.Set; @@ -29,6 +29,7 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.ce.CeQueueDto; import org.sonar.db.ce.CeTaskTypes; +import org.sonar.server.computation.ReportFiles; /** * Cleans-up the Compute Engine queue and resets the JMX counters. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueImpl.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueImpl.java index 67cd61d6bd8..f3ce365a2e1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import com.google.common.base.Optional; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueInitializer.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueInitializer.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueInitializer.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueInitializer.java index 8c75db5b04e..526eb16f0bd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueInitializer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueInitializer.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import org.picocontainer.Startable; import org.sonar.api.server.ServerSide; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueListener.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueListener.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueListener.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueListener.java index 420c660dd70..938c4d17398 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueListener.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueListener.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import org.sonar.db.ce.CeActivityDto; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeTask.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeTask.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeTask.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeTask.java index 62ef351b83a..7867c83aea9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeTask.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeTask.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import com.google.common.base.Objects; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeTaskSubmit.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeTaskSubmit.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeTaskSubmit.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeTaskSubmit.java index d7d21f4904f..affa52fee02 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeTaskSubmit.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeTaskSubmit.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import java.util.Objects; import javax.annotation.CheckForNull; @@ -65,7 +65,7 @@ public final class CeTaskSubmit { private String componentUuid; private String submitterLogin; - Builder(String uuid) { + public Builder(String uuid) { this.uuid = uuid; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeWorkerRunnable.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeWorkerRunnable.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeWorkerRunnable.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeWorkerRunnable.java index 42d4741136d..20cebe76f53 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeWorkerRunnable.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeWorkerRunnable.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import com.google.common.base.Optional; import org.sonar.api.utils.log.Logger; @@ -26,6 +26,7 @@ import org.sonar.api.utils.log.Loggers; import org.sonar.core.util.logs.Profiler; import org.sonar.db.ce.CeActivityDto; import org.sonar.server.computation.log.CeLogging; +import org.sonar.server.computation.queue.report.ReportTaskProcessor; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/package-info.java new file mode 100644 index 00000000000..e94d884b437 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +@ParametersAreNonnullByDefault +package org.sonar.server.computation.queue; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CleanReportQueueListener.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/CleanReportQueueListener.java similarity index 85% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CleanReportQueueListener.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/CleanReportQueueListener.java index 16a793ea6a1..7a0b38cc8dd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CleanReportQueueListener.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/CleanReportQueueListener.java @@ -17,9 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue.report; import org.sonar.db.ce.CeActivityDto; +import org.sonar.server.computation.ReportFiles; +import org.sonar.server.computation.queue.CeQueueListener; +import org.sonar.server.computation.queue.CeTask; public class CleanReportQueueListener implements CeQueueListener { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ReportSubmitter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportSubmitter.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/ReportSubmitter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportSubmitter.java index 0a564abb0cd..f8489f639bd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ReportSubmitter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportSubmitter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue.report; import java.io.InputStream; import javax.annotation.Nullable; @@ -30,6 +30,10 @@ import org.sonar.db.ce.CeTaskTypes; import org.sonar.db.component.ComponentDto; import org.sonar.server.component.ComponentService; import org.sonar.server.component.NewComponent; +import org.sonar.server.computation.ReportFiles; +import org.sonar.server.computation.queue.CeQueue; +import org.sonar.server.computation.queue.CeTask; +import org.sonar.server.computation.queue.CeTaskSubmit; import org.sonar.server.permission.PermissionService; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ReportTaskProcessor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportTaskProcessor.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/ReportTaskProcessor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportTaskProcessor.java index e8dc5803bde..21b64ed186d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ReportTaskProcessor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportTaskProcessor.java @@ -17,11 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue.report; import org.sonar.core.platform.ComponentContainer; +import org.sonar.server.computation.ComputationStepExecutor; import org.sonar.server.computation.container.ComputeEngineContainer; import org.sonar.server.computation.container.ContainerFactory; +import org.sonar.server.computation.queue.CeTask; public class ReportTaskProcessor { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/package-info.java new file mode 100644 index 00000000000..bda36b5fa1e --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +@ParametersAreNonnullByDefault +package org.sonar.server.computation.queue.report; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExtractReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExtractReportStep.java index d7065e4cac7..878ee5aeaa5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExtractReportStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExtractReportStep.java @@ -26,12 +26,12 @@ import org.sonar.api.utils.TempFolder; import org.sonar.api.utils.ZipUtils; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.queue.CeTask; import org.sonar.server.computation.ReportFiles; import org.sonar.server.computation.batch.MutableBatchReportDirectoryHolder; /** - * Extracts the content zip file of the {@link org.sonar.server.computation.CeTask} to a temp directory and adds a {@link File} + * Extracts the content zip file of the {@link CeTask} to a temp directory and adds a {@link File} * representing that temp directory to the {@link MutableBatchReportDirectoryHolder}. */ public class ExtractReportStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/CancelAllWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/CancelAllWsAction.java index eb2df43f108..23150d2ba0f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/CancelAllWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/CancelAllWsAction.java @@ -23,7 +23,7 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.web.UserRole; -import org.sonar.server.computation.CeQueue; +import org.sonar.server.computation.queue.CeQueue; import org.sonar.server.user.UserSession; public class CancelAllWsAction implements CeWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/CancelWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/CancelWsAction.java index 22f380069fa..3b39b2a7e85 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/CancelWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/CancelWsAction.java @@ -24,7 +24,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.web.UserRole; import org.sonar.core.util.Uuids; -import org.sonar.server.computation.CeQueue; +import org.sonar.server.computation.queue.CeQueue; import org.sonar.server.user.UserSession; public class CancelWsAction implements CeWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/SubmitWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/SubmitWsAction.java index 2ea8ce25027..64c1f2daf13 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/SubmitWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/SubmitWsAction.java @@ -24,8 +24,8 @@ import org.apache.commons.lang.StringUtils; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; -import org.sonar.server.computation.CeTask; -import org.sonar.server.computation.ReportSubmitter; +import org.sonar.server.computation.queue.CeTask; +import org.sonar.server.computation.queue.report.ReportSubmitter; import org.sonar.server.ws.WsUtils; import org.sonarqube.ws.WsCe; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index 3e7c66f713f..efacdd7b99b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -62,13 +62,13 @@ import org.sonar.server.component.DefaultRubyComponentService; import org.sonar.server.component.ws.ComponentsWs; import org.sonar.server.component.ws.EventsWs; import org.sonar.server.component.ws.ResourcesWs; -import org.sonar.server.computation.CeQueueCleaner; -import org.sonar.server.computation.CeQueueImpl; -import org.sonar.server.computation.CeQueueInitializer; -import org.sonar.server.computation.CleanReportQueueListener; +import org.sonar.server.computation.queue.CeQueueImpl; +import org.sonar.server.computation.queue.CeQueueCleaner; +import org.sonar.server.computation.queue.CeQueueInitializer; +import org.sonar.server.computation.queue.report.CleanReportQueueListener; import org.sonar.server.computation.ComputeEngineProcessingModule; import org.sonar.server.computation.ReportFiles; -import org.sonar.server.computation.ReportSubmitter; +import org.sonar.server.computation.queue.report.ReportSubmitter; import org.sonar.server.computation.dbcleaner.IndexPurgeListener; import org.sonar.server.computation.dbcleaner.ProjectCleaner; import org.sonar.server.computation.log.CeLogging; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulatorTest.java index 3d4656b63c1..9ca4ace9f7c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulatorTest.java @@ -27,7 +27,7 @@ import java.util.List; import javax.annotation.Nullable; import org.junit.Test; import org.sonar.core.platform.ComponentContainer; -import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.queue.CeTask; import org.sonar.server.computation.step.ComputationStep; import static com.google.common.base.Predicates.notNull; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/log/CeLoggingTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/log/CeLoggingTest.java index 9e6aeca37d1..3ef849ba270 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/log/CeLoggingTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/log/CeLoggingTest.java @@ -35,7 +35,7 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.MDC; import org.sonar.api.config.Settings; import org.sonar.process.ProcessProperties; -import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.queue.CeTask; import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/monitoring/ComputeEngineQueueMonitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/monitoring/ComputeEngineQueueMonitorTest.java index bbd2cc07c58..2320bfc8dc4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/monitoring/ComputeEngineQueueMonitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/monitoring/ComputeEngineQueueMonitorTest.java @@ -20,7 +20,7 @@ package org.sonar.server.computation.monitoring; import org.junit.Test; -import org.sonar.server.computation.CeQueueImpl; +import org.sonar.server.computation.queue.CeQueueImpl; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/CeProcessingSchedulerImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeProcessingSchedulerImplTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/CeProcessingSchedulerImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeProcessingSchedulerImplTest.java index 50e17638f45..2a031bfb52d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/CeProcessingSchedulerImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeProcessingSchedulerImplTest.java @@ -17,10 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import java.util.concurrent.TimeUnit; import org.junit.Test; +import org.sonar.server.computation.queue.report.ReportTaskProcessor; import org.sonar.server.computation.log.CeLogging; import static org.mockito.Matchers.any; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/CeQueueCleanerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueCleanerTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/CeQueueCleanerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueCleanerTest.java index db5786da94d..2aecacba19c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/CeQueueCleanerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueCleanerTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import java.io.File; import java.io.IOException; @@ -31,6 +31,9 @@ import org.sonar.db.DbSession; import org.sonar.db.DbTester; import org.sonar.db.ce.CeQueueDto; import org.sonar.db.ce.CeTaskTypes; +import org.sonar.server.computation.ReportFiles; +import org.sonar.server.computation.queue.CeQueueCleaner; +import org.sonar.server.computation.queue.CeQueueImpl; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/CeQueueImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueImplTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/computation/CeQueueImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueImplTest.java index 212cc4d044a..b2d3faef125 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/CeQueueImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import com.google.common.base.Optional; import org.junit.Rule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/CeQueueInitializerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueInitializerTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/CeQueueInitializerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueInitializerTest.java index 37ffc3a04cc..79c30700f12 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/CeQueueInitializerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueInitializerTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import java.io.File; import java.io.IOException; @@ -31,8 +31,12 @@ import org.sonar.db.DbSession; import org.sonar.db.DbTester; import org.sonar.db.ce.CeQueueDto; import org.sonar.db.ce.CeTaskTypes; +import org.sonar.server.computation.ReportFiles; import org.sonar.server.computation.monitoring.CEQueueStatus; import org.sonar.server.computation.monitoring.CEQueueStatusImpl; +import org.sonar.server.computation.queue.CeProcessingScheduler; +import org.sonar.server.computation.queue.CeQueueCleaner; +import org.sonar.server.computation.queue.CeQueueInitializer; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/CeTaskTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeTaskTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/CeTaskTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeTaskTest.java index b950ca753f9..85fb27dcdd0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/CeTaskTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeTaskTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/CeWorkerRunnableTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeWorkerRunnableTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/CeWorkerRunnableTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeWorkerRunnableTest.java index 89dc70c6c93..f7ed66b6797 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/CeWorkerRunnableTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeWorkerRunnableTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue; import com.google.common.base.Optional; import org.junit.Test; @@ -25,6 +25,7 @@ import org.mockito.InOrder; import org.mockito.Mockito; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeTaskTypes; +import org.sonar.server.computation.queue.report.ReportTaskProcessor; import org.sonar.server.computation.log.CeLogging; import static org.mockito.Mockito.doThrow; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/CleanReportQueueListenerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/CleanReportQueueListenerTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/CleanReportQueueListenerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/CleanReportQueueListenerTest.java index f87f16e60ba..6bd893f4677 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/CleanReportQueueListenerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/CleanReportQueueListenerTest.java @@ -17,11 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue.report; import org.junit.Test; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeTaskTypes; +import org.sonar.server.computation.ReportFiles; +import org.sonar.server.computation.queue.CeTask; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ReportSubmitterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/ReportSubmitterTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/ReportSubmitterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/ReportSubmitterTest.java index 6abbf2a15ae..14a43069951 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ReportSubmitterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/ReportSubmitterTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.queue.report; import org.apache.commons.io.IOUtils; import org.hamcrest.Description; @@ -29,6 +29,10 @@ import org.sonar.db.ce.CeTaskTypes; import org.sonar.db.component.ComponentDto; import org.sonar.server.component.ComponentService; import org.sonar.server.component.NewComponent; +import org.sonar.server.computation.ReportFiles; +import org.sonar.server.computation.queue.CeQueue; +import org.sonar.server.computation.queue.CeQueueImpl; +import org.sonar.server.computation.queue.CeTaskSubmit; import org.sonar.server.permission.PermissionService; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java index 65616a7bde0..cb05ce578d2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java @@ -27,7 +27,7 @@ import java.util.Set; import org.junit.Test; import org.picocontainer.ComponentAdapter; import org.sonar.core.platform.ComponentContainer; -import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.queue.CeTask; import org.sonar.server.computation.container.ComputeEngineContainerImpl; import org.sonar.server.computation.container.ReportComputeEngineContainerPopulator; import org.sonar.server.computation.container.StepsExplorer; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CancelAllWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CancelAllWsActionTest.java index f86045bfb25..33cbe402113 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CancelAllWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CancelAllWsActionTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; import org.sonar.db.DbTester; -import org.sonar.server.computation.CeQueue; +import org.sonar.server.computation.queue.CeQueue; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsActionTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CancelWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CancelWsActionTest.java index d0fdefe6f6d..8f1cf22e2f3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CancelWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CancelWsActionTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; import org.sonar.db.DbTester; -import org.sonar.server.computation.CeQueue; +import org.sonar.server.computation.queue.CeQueue; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsActionTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CeWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CeWsTest.java index c88e206cff9..bdcd11bbf05 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CeWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/CeWsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.computation.ws; import org.junit.Test; import org.mockito.Mockito; import org.sonar.api.server.ws.WebService; -import org.sonar.server.computation.ReportSubmitter; +import org.sonar.server.computation.queue.report.ReportSubmitter; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitWsActionTest.java index d9294215382..bd1d9cfc9f5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitWsActionTest.java @@ -24,8 +24,8 @@ import org.junit.Test; import org.mockito.Matchers; import org.sonar.core.util.Protobuf; import org.sonar.db.ce.CeTaskTypes; -import org.sonar.server.computation.CeTask; -import org.sonar.server.computation.ReportSubmitter; +import org.sonar.server.computation.queue.CeTask; +import org.sonar.server.computation.queue.report.ReportSubmitter; import org.sonar.server.plugins.MimeTypes; import org.sonar.server.ws.TestResponse; import org.sonar.server.ws.WsActionTester; -- 2.39.5