From 444d5b4d5dcd12123e5b993c92bf61bdd8097872 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 21 Jun 2018 15:26:30 +0200 Subject: [PATCH] move classes around to prepare creation of sonar-ce-task module --- .../build.gradle | 1 - .../ProjectAnalysisTaskModule.java | 4 +--- .../PostProjectAnalysisTasksExecutor.java | 22 +++++++++--------- .../batch/BatchReportDirectoryHolder.java | 2 +- .../container/ContainerFactory.java | 2 +- .../container/ContainerFactoryImpl.java | 2 +- ...ProjectAnalysisTaskContainerPopulator.java | 6 ++--- .../PopulateFileSourceLineCount.java | 2 +- .../filemove/ScoreMatrixDumperImpl.java | 2 +- .../purge}/IndexPurgeListener.java | 0 .../purge}/ProjectCleaner.java | 0 .../{step => purge}/PurgeDatastoresStep.java | 2 +- .../projectanalysis/purge}/package-info.java | 0 .../step/ExtractReportStep.java | 2 +- .../LoadReportAnalysisMetadataHolderStep.java | 3 +-- .../step/PersistScannerContextStep.java | 2 +- .../step/PublishTaskResultStep.java | 2 +- .../step/ReportComputationSteps.java | 1 + .../taskprocessor/ReportTaskProcessor.java | 4 ++-- .../PostProjectAnalysisTasksExecutorTest.java | 2 +- ...ectAnalysisTaskContainerPopulatorTest.java | 2 +- .../PopulateFileSourceLineCountTest.java | 2 +- .../ProjectAnalysisDataChangesImplTest.java | 2 +- .../filemove/ScoreMatrixDumperImplTest.java | 2 +- .../purge}/IndexPurgeListenerTest.java | 0 .../purge}/ProjectCleanerTest.java | 0 .../PurgeDatastoresStepTest.java | 3 ++- .../step/ExtractReportStepTest.java | 2 +- ...dReportAnalysisMetadataHolderStepTest.java | 2 +- .../step/PersistScannerContextStepTest.java | 2 +- .../org/sonar/ce/CeConfigurationModule.java | 4 ++-- ...sFailureNotificationExecutionListener.java | 4 ++-- .../org/sonar/ce/queue/InternalCeQueue.java | 2 ++ .../sonar/ce/queue/InternalCeQueueImpl.java | 2 ++ .../CeLoggingWorkerExecutionListener.java | 20 ++++++++-------- .../CeTaskProcessorRepository.java | 3 +-- .../CeTaskProcessorRepositoryImpl.java | 3 +-- .../org/sonar/ce/taskprocessor/CeWorker.java | 4 ++-- .../sonar/ce/taskprocessor/CeWorkerImpl.java | 4 ++-- ...lureNotificationExecutionListenerTest.java | 4 ++-- .../ce/queue/InternalCeQueueImplTest.java | 2 ++ ...skLoggingWorkerExecutionListenerTest.java} | 18 +++++++-------- .../CeTaskProcessorRepositoryImplTest.java | 4 ++-- .../CeTaskProcessorRepositoryRule.java | 4 ++-- .../ce/taskprocessor/CeWorkerImplTest.java | 2 +- .../src/main/java/org/sonar/ce/CeModule.java | 6 ++--- .../org/sonar/ce/log/CeProcessLogging.java | 2 +- .../main/java/org/sonar/ce/queue/CeQueue.java | 1 + .../java/org/sonar/ce/queue/CeQueueImpl.java | 1 + .../ce/taskprocessor/CeTaskProcessor.java | 4 ++-- .../ReportTaskProcessorDeclaration.java | 4 ++-- .../queue/ReportSubmitter.java | 4 ++-- .../ce/queue}/package-info.java | 2 +- .../org/sonar/server/ce/ws/SubmitAction.java | 4 ++-- .../queue => server/computation}/CeTask.java | 2 +- .../computation}/CeTaskResult.java | 5 +--- .../computation/log/CeTaskLogging.java} | 8 +++---- .../computation/log}/package-info.java | 2 +- .../DefaultOrganizationLoader.java | 2 +- .../organization/package-info.java | 23 +++++++++++++++++++ .../computation}/settings/SettingsLoader.java | 2 +- .../{queue => settings}/package-info.java | 2 +- .../task/container/TaskContainer.java | 2 +- .../MutableTaskResultHolder.java | 2 +- .../MutableTaskResultHolderImpl.java | 2 +- .../taskprocessor/TaskResultHolder.java | 2 +- .../org/sonar/ce/queue/CeQueueImplTest.java | 1 + .../ReportTaskProcessorDeclarationTest.java | 2 +- .../queue/ReportSubmitterTest.java | 2 +- .../sonar/server/ce/ws/CancelActionTest.java | 2 +- .../java/org/sonar/server/ce/ws/CeWsTest.java | 2 +- .../sonar/server/ce/ws/SubmitActionTest.java | 4 ++-- .../server/ce/ws/TaskTypesActionTest.java | 4 ++-- .../computation}/CeTaskTest.java | 2 +- .../computation/log/CeTaskLoggingTest.java} | 10 ++++---- .../DefaultOrganizationLoaderTest.java | 2 +- .../settings/SettingsLoaderTest.java | 2 +- .../MutableTaskResultHolderImplTest.java | 2 +- 78 files changed, 150 insertions(+), 125 deletions(-) rename server/{sonar-server/src/main/java/org/sonar/server/computation/dbcleaner => sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge}/IndexPurgeListener.java (100%) rename server/{sonar-server/src/main/java/org/sonar/server/computation/dbcleaner => sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge}/ProjectCleaner.java (100%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/{step => purge}/PurgeDatastoresStep.java (98%) rename server/{sonar-server/src/main/java/org/sonar/server/computation/dbcleaner => sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge}/package-info.java (100%) rename server/{sonar-server/src/test/java/org/sonar/server/computation/dbcleaner => sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge}/IndexPurgeListenerTest.java (100%) rename server/{sonar-server/src/test/java/org/sonar/server/computation/dbcleaner => sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge}/ProjectCleanerTest.java (100%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/{step => purge}/PurgeDatastoresStepTest.java (98%) rename server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/{CeLoggingWorkerExecutionListenerTest.java => CeTaskLoggingWorkerExecutionListenerTest.java} (77%) rename server/sonar-server/src/main/java/org/sonar/server/{computation => ce}/queue/ReportSubmitter.java (99%) rename server/sonar-server/src/main/java/org/sonar/{ce/organization => server/ce/queue}/package-info.java (96%) rename server/sonar-server/src/main/java/org/sonar/{ce/queue => server/computation}/CeTask.java (99%) rename server/sonar-server/src/main/java/org/sonar/{ce/queue => server/computation}/CeTaskResult.java (89%) rename server/sonar-server/src/main/java/org/sonar/{ce/log/CeLogging.java => server/computation/log/CeTaskLogging.java} (85%) rename server/sonar-server/src/main/java/org/sonar/{ce/settings => server/computation/log}/package-info.java (95%) rename server/sonar-server/src/main/java/org/sonar/{ce => server/computation}/organization/DefaultOrganizationLoader.java (96%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/organization/package-info.java rename server/sonar-server/src/main/java/org/sonar/{ce => server/computation}/settings/SettingsLoader.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{queue => settings}/package-info.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/{computation => ce}/queue/ReportSubmitterTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/{ce/queue => server/computation}/CeTaskTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/{ce/log/CeLoggingTest.java => server/computation/log/CeTaskLoggingTest.java} (89%) rename server/sonar-server/src/test/java/org/sonar/{ce => server/computation}/organization/DefaultOrganizationLoaderTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/{ce => server/computation}/settings/SettingsLoaderTest.java (97%) diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle index 4e829cef927..5644d921ad0 100644 --- a/server/sonar-ce-task-projectanalysis/build.gradle +++ b/server/sonar-ce-task-projectanalysis/build.gradle @@ -32,7 +32,6 @@ configurations { dependencies { // please keep the list grouped by configuration and ordered by name -// compile 'org.picocontainer:picocontainer' compile 'org.slf4j:jul-to-slf4j' compile 'org.slf4j:slf4j-api' diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/ProjectAnalysisTaskModule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/ProjectAnalysisTaskModule.java index e6252cf2743..cdaf4160067 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/ProjectAnalysisTaskModule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/ProjectAnalysisTaskModule.java @@ -21,10 +21,8 @@ package org.sonar.ce.task.projectanalysis; import org.sonar.ce.task.projectanalysis.container.ContainerFactoryImpl; import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor; -import org.sonar.server.computation.queue.ReportSubmitter; +import org.sonar.server.ce.queue.ReportSubmitter; import org.sonar.core.platform.Module; -import org.sonar.ce.task.projectanalysis.container.ContainerFactoryImpl; -import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor; import org.sonar.server.computation.task.step.ComputationStepExecutor; public class ProjectAnalysisTaskModule extends Module { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java index b25d685d67b..ceebf5dc91e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java @@ -64,7 +64,7 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor private static final Logger LOG = Loggers.get(PostProjectAnalysisTasksExecutor.class); - private final org.sonar.ce.queue.CeTask ceTask; + private final org.sonar.server.computation.CeTask ceTask; private final AnalysisMetadataHolder analysisMetadataHolder; private final QualityGateHolder qualityGateHolder; private final QualityGateStatusHolder qualityGateStatusHolder; @@ -75,18 +75,18 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor /** * Constructor used by Pico when there is no {@link PostProjectAnalysisTask} in the container. */ - public PostProjectAnalysisTasksExecutor(org.sonar.ce.queue.CeTask ceTask, - AnalysisMetadataHolder analysisMetadataHolder, - QualityGateHolder qualityGateHolder, QualityGateStatusHolder qualityGateStatusHolder, - BatchReportReader reportReader, System2 system2) { + public PostProjectAnalysisTasksExecutor(org.sonar.server.computation.CeTask ceTask, + AnalysisMetadataHolder analysisMetadataHolder, + QualityGateHolder qualityGateHolder, QualityGateStatusHolder qualityGateStatusHolder, + BatchReportReader reportReader, System2 system2) { this(ceTask, analysisMetadataHolder, qualityGateHolder, qualityGateStatusHolder, reportReader, system2, null); } - public PostProjectAnalysisTasksExecutor(org.sonar.ce.queue.CeTask ceTask, - AnalysisMetadataHolder analysisMetadataHolder, - QualityGateHolder qualityGateHolder, QualityGateStatusHolder qualityGateStatusHolder, - BatchReportReader reportReader, System2 system2, - @Nullable PostProjectAnalysisTask[] postProjectAnalysisTasks) { + public PostProjectAnalysisTasksExecutor(org.sonar.server.computation.CeTask ceTask, + AnalysisMetadataHolder analysisMetadataHolder, + QualityGateHolder qualityGateHolder, QualityGateStatusHolder qualityGateStatusHolder, + BatchReportReader reportReader, System2 system2, + @Nullable PostProjectAnalysisTask[] postProjectAnalysisTasks) { this.analysisMetadataHolder = analysisMetadataHolder; this.qualityGateHolder = qualityGateHolder; this.qualityGateStatusHolder = qualityGateStatusHolder; @@ -147,7 +147,7 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor } } - private static Project createProject(org.sonar.ce.queue.CeTask ceTask) { + private static Project createProject(org.sonar.server.computation.CeTask ceTask) { return new ProjectImpl( ceTask.getComponentUuid(), ceTask.getComponentKey(), diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolder.java index 7f4314761d3..44fd4958a83 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolder.java @@ -20,7 +20,7 @@ package org.sonar.ce.task.projectanalysis.batch; import java.io.File; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; public interface BatchReportDirectoryHolder { /** diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactory.java index b7fdb7fc19f..edfdec24ec6 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactory.java @@ -20,7 +20,7 @@ package org.sonar.ce.task.projectanalysis.container; import javax.annotation.Nullable; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.core.platform.ComponentContainer; import org.sonar.plugin.ce.ReportAnalysisComponentProvider; import org.sonar.server.computation.task.container.TaskContainer; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactoryImpl.java index b0d032a4bfb..b12e44dac98 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactoryImpl.java @@ -20,7 +20,7 @@ package org.sonar.ce.task.projectanalysis.container; import javax.annotation.Nullable; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.core.platform.ComponentContainer; import org.sonar.plugin.ce.ReportAnalysisComponentProvider; import org.sonar.server.computation.task.container.TaskContainer; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java index 96835c017d6..e2e143df05e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java @@ -22,9 +22,9 @@ package org.sonar.ce.task.projectanalysis.container; import java.util.Arrays; import java.util.List; import javax.annotation.Nullable; -import org.sonar.ce.organization.DefaultOrganizationLoader; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.settings.SettingsLoader; +import org.sonar.server.computation.organization.DefaultOrganizationLoader; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.settings.SettingsLoader; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderImpl; import org.sonar.ce.task.projectanalysis.api.posttask.PostProjectAnalysisTasksExecutor; import org.sonar.ce.task.projectanalysis.batch.BatchReportDirectoryHolderImpl; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java index 7a5cde02d4e..ce24294946e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java @@ -21,7 +21,7 @@ package org.sonar.ce.task.projectanalysis.dbmigration; import com.google.common.collect.Iterables; import java.sql.SQLException; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.db.Database; import org.sonar.db.source.FileSourceDto; import org.sonar.server.platform.db.migration.step.DataChange; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java index 9e0355635ff..a14629e59d0 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java @@ -26,7 +26,7 @@ import java.nio.file.Path; import org.sonar.api.config.Configuration; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/IndexPurgeListener.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListener.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/IndexPurgeListener.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListener.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectCleaner.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleaner.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectCleaner.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleaner.java diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStep.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStep.java index 511f782cc93..380730f9eb7 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStep.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.ce.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.purge; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/package-info.java diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStep.java index 6be254e1ae6..339aa1b1c96 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStep.java @@ -27,7 +27,7 @@ import java.util.Optional; import org.sonar.api.utils.MessageException; import org.sonar.api.utils.TempFolder; import org.sonar.api.utils.ZipUtils; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.ce.CeTaskInputDao; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java index 9312df812d9..ace3f49bc34 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java @@ -27,7 +27,7 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; import org.sonar.api.utils.MessageException; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.ce.task.projectanalysis.component.BranchLoader; import org.sonar.core.component.ComponentKeys; import org.sonar.core.platform.PluginRepository; @@ -44,7 +44,6 @@ import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; import org.sonar.ce.task.projectanalysis.analysis.Organization; import org.sonar.ce.task.projectanalysis.analysis.ScannerPlugin; import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; -import org.sonar.ce.task.projectanalysis.component.BranchLoader; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.organization.OrganizationFlags; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.java index b70c23ec334..18af9f117b3 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.java @@ -19,7 +19,7 @@ */ package org.sonar.ce.task.projectanalysis.step; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; import org.sonar.db.DbSession; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStep.java index 6ab10894c89..9f009138959 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStep.java @@ -21,7 +21,7 @@ package org.sonar.ce.task.projectanalysis.step; import java.util.Optional; import javax.annotation.concurrent.Immutable; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTaskResult; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.computation.taskprocessor.MutableTaskResultHolder; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.java index 27c367d9e18..ed7f10a69ac 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.java @@ -21,6 +21,7 @@ package org.sonar.ce.task.projectanalysis.step; import java.util.Arrays; import java.util.List; +import org.sonar.ce.task.projectanalysis.purge.PurgeDatastoresStep; import org.sonar.server.computation.task.container.TaskContainer; import org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStep; import org.sonar.server.computation.task.step.ComputationStep; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/ReportTaskProcessor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/ReportTaskProcessor.java index dd1f14fb43c..8ea6b797784 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/ReportTaskProcessor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/ReportTaskProcessor.java @@ -22,8 +22,8 @@ package org.sonar.ce.task.projectanalysis.taskprocessor; import java.util.Collections; import java.util.Set; import javax.annotation.CheckForNull; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import org.sonar.ce.task.projectanalysis.container.ContainerFactory; import org.sonar.ce.taskprocessor.CeTaskProcessor; import org.sonar.core.platform.ComponentContainer; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java index 225bf1f698b..c714a7c47ac 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java @@ -38,7 +38,7 @@ import org.mockito.InOrder; import org.sonar.api.ce.posttask.PostProjectAnalysisTask; import org.sonar.api.ce.posttask.Project; import org.sonar.api.utils.System2; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.ce.task.projectanalysis.analysis.Organization; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java index dee5e944cbf..3ad2f042bf4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java @@ -31,7 +31,7 @@ import javax.annotation.Nullable; import org.junit.Test; import org.picocontainer.DefaultPicoContainer; import org.picocontainer.PicoContainer; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.ce.task.projectanalysis.step.PersistComponentsStep; import org.sonar.core.platform.ComponentContainer; import org.sonar.plugin.ce.ReportAnalysisComponentProvider; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java index 5e6a85cb16a..88f24bffb4c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.sonar.api.utils.System2; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.db.DbTester; import org.sonar.db.source.FileSourceDto; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java index c4bab8b1656..afa25e58896 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.db.Database; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java index 9fdc10d1baa..5bbba7bf6d9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java @@ -35,7 +35,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.sonar.api.config.Configuration; import org.sonar.api.config.internal.MapSettings; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.ce.task.projectanalysis.filemove.ScoreMatrix.ScoreFile; import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/IndexPurgeListenerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListenerTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/IndexPurgeListenerTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListenerTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleanerTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleanerTest.java diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.java index 5283a486253..911a160e2a6 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.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.ce.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.purge; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; @@ -37,6 +37,7 @@ import org.sonar.ce.task.projectanalysis.component.MutableDisabledComponentsHold import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.ce.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.step.BaseStepTest; import org.sonar.db.DbClient; import org.sonar.db.purge.IdUuidPair; import org.sonar.server.computation.dbcleaner.ProjectCleaner; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStepTest.java index 6c08d9cb6a7..d2b6857f196 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStepTest.java @@ -32,7 +32,7 @@ import org.sonar.api.utils.ZipUtils; import org.sonar.api.utils.internal.JUnitTempFolder; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.ce.task.projectanalysis.batch.BatchReportDirectoryHolderImpl; import org.sonar.ce.task.projectanalysis.batch.MutableBatchReportDirectoryHolder; import org.sonar.db.DbTester; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java index 95abfba20be..4a50e63a217 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java @@ -34,7 +34,7 @@ import org.junit.runner.RunWith; import org.sonar.api.Plugin; import org.sonar.api.utils.MessageException; import org.sonar.api.utils.System2; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; import org.sonar.ce.task.projectanalysis.analysis.Organization; import org.sonar.ce.task.projectanalysis.analysis.ScannerPlugin; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepTest.java index 7b3ef398053..5ef9b400825 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepTest.java @@ -24,7 +24,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; import org.sonar.core.util.CloseableIterator; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/CeConfigurationModule.java b/server/sonar-ce/src/main/java/org/sonar/ce/CeConfigurationModule.java index c708076d72a..e2a6de90f34 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/CeConfigurationModule.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/CeConfigurationModule.java @@ -20,7 +20,7 @@ package org.sonar.ce; import org.sonar.ce.configuration.CeConfigurationImpl; -import org.sonar.ce.log.CeLogging; +import org.sonar.server.computation.log.CeTaskLogging; import org.sonar.ce.monitoring.CeDatabaseMBeanImpl; import org.sonar.core.platform.Module; import org.sonar.process.systeminfo.JvmPropertiesSection; @@ -32,7 +32,7 @@ public class CeConfigurationModule extends Module { protected void configureModule() { add( CeConfigurationImpl.class, - CeLogging.class, + CeTaskLogging.class, CeDatabaseMBeanImpl.class, new JvmStateSection("Compute Engine JVM State"), new JvmPropertiesSection("Compute Engine JVM Properties"), diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListener.java b/server/sonar-ce/src/main/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListener.java index 387ab0fd67e..9c5cbea5aaa 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListener.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListener.java @@ -23,8 +23,8 @@ import javax.annotation.Nullable; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.System2; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import org.sonar.ce.taskprocessor.CeWorker; import org.sonar.db.DbClient; import org.sonar.db.DbSession; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java index 1b11906750b..012ecd6dc3c 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java @@ -23,6 +23,8 @@ import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; import org.sonar.db.ce.CeActivityDto.Status; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; /** * Queue of pending Compute Engine tasks. Both producer and consumer actions diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java index 76ed4abf0a6..4117f810407 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java @@ -40,6 +40,8 @@ import org.sonar.db.DbSession; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeQueueDao; import org.sonar.db.ce.CeQueueDto; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import org.sonar.server.computation.task.step.TypedException; import org.sonar.server.organization.DefaultOrganizationProvider; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListener.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListener.java index 3d7f8bb3ca5..34630cd54bd 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListener.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListener.java @@ -20,29 +20,29 @@ package org.sonar.ce.taskprocessor; import javax.annotation.Nullable; -import org.sonar.ce.log.CeLogging; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.log.CeTaskLogging; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import org.sonar.db.ce.CeActivityDto; /** - * {@link CeWorker.ExecutionListener} responsible of calling {@link CeLogging#initForTask(CeTask)} and - * {@link CeLogging#clearForTask()}. + * {@link CeWorker.ExecutionListener} responsible of calling {@link CeTaskLogging#initForTask(CeTask)} and + * {@link CeTaskLogging#clearForTask()}. */ public class CeLoggingWorkerExecutionListener implements CeWorker.ExecutionListener { - private final CeLogging ceLogging; + private final CeTaskLogging ceTaskLogging; - public CeLoggingWorkerExecutionListener(CeLogging ceLogging) { - this.ceLogging = ceLogging; + public CeLoggingWorkerExecutionListener(CeTaskLogging ceTaskLogging) { + this.ceTaskLogging = ceTaskLogging; } @Override public void onStart(CeTask ceTask) { - ceLogging.initForTask(ceTask); + ceTaskLogging.initForTask(ceTask); } @Override public void onEnd(CeTask ceTask, CeActivityDto.Status status, @Nullable CeTaskResult taskResult, @Nullable Throwable error) { - ceLogging.clearForTask(); + ceTaskLogging.clearForTask(); } } diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepository.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepository.java index 7663c105af7..cadfd400e4e 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepository.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepository.java @@ -20,8 +20,7 @@ package org.sonar.ce.taskprocessor; import java.util.Optional; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.taskprocessor.CeTaskProcessor; +import org.sonar.server.computation.CeTask; public interface CeTaskProcessorRepository { diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImpl.java index d4a44abd843..99e2aeb845e 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImpl.java @@ -29,8 +29,7 @@ import java.util.Collection; import java.util.Map; import java.util.Optional; import javax.annotation.Nonnull; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.taskprocessor.CeTaskProcessor; +import org.sonar.server.computation.CeTask; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorker.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorker.java index c7309fd5309..c257ecef19e 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorker.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorker.java @@ -22,8 +22,8 @@ package org.sonar.ce.taskprocessor; import java.util.concurrent.Callable; import javax.annotation.Nullable; import org.sonar.ce.queue.CeQueue; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import org.sonar.db.ce.CeActivityDto; /** diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java index bf308183aee..2ed412a6a12 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java @@ -28,8 +28,8 @@ import javax.annotation.Nullable; import org.sonar.api.utils.MessageException; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import org.sonar.ce.queue.InternalCeQueue; import org.sonar.core.util.logs.Profiler; import org.sonar.db.ce.CeActivityDto; diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java index 749b93e7b3d..574e2fdf133 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java @@ -29,8 +29,8 @@ import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import org.sonar.api.notifications.Notification; import org.sonar.api.utils.System2; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.RowNotFoundException; diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java index 1aab3f25bfc..15f76d2f131 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java @@ -44,6 +44,8 @@ import org.sonar.db.ce.CeTaskTypes; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; import org.sonar.db.organization.OrganizationDto; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import org.sonar.server.computation.task.step.TypedException; import org.sonar.server.organization.DefaultOrganization; import org.sonar.server.organization.DefaultOrganizationProvider; diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListenerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskLoggingWorkerExecutionListenerTest.java similarity index 77% rename from server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListenerTest.java rename to server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskLoggingWorkerExecutionListenerTest.java index 4c2e81aaf58..fc80542b72f 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListenerTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskLoggingWorkerExecutionListenerTest.java @@ -22,17 +22,17 @@ package org.sonar.ce.taskprocessor; import java.util.Random; import org.junit.Test; import org.mockito.Mockito; -import org.sonar.ce.log.CeLogging; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.log.CeTaskLogging; +import org.sonar.server.computation.CeTask; import org.sonar.db.ce.CeActivityDto; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -public class CeLoggingWorkerExecutionListenerTest { - private CeLogging ceLogging = Mockito.spy(CeLogging.class); - private CeLoggingWorkerExecutionListener underTest = new CeLoggingWorkerExecutionListener(ceLogging); +public class CeTaskLoggingWorkerExecutionListenerTest { + private CeTaskLogging ceTaskLogging = Mockito.spy(CeTaskLogging.class); + private CeLoggingWorkerExecutionListener underTest = new CeLoggingWorkerExecutionListener(ceTaskLogging); @Test public void onStart_calls_initForTask_with_method_argument() { @@ -40,8 +40,8 @@ public class CeLoggingWorkerExecutionListenerTest { underTest.onStart(ceTask); - verify(ceLogging).initForTask(ceTask); - verifyNoMoreInteractions(ceLogging); + verify(ceTaskLogging).initForTask(ceTask); + verifyNoMoreInteractions(ceTaskLogging); } @Test @@ -50,7 +50,7 @@ public class CeLoggingWorkerExecutionListenerTest { CeActivityDto.Status.values()[new Random().nextInt(CeActivityDto.Status.values().length)], null, null); - verify(ceLogging).clearForTask(); - verifyNoMoreInteractions(ceLogging); + verify(ceTaskLogging).clearForTask(); + verifyNoMoreInteractions(ceTaskLogging); } } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImplTest.java index adef629f7d5..d5691e1bb08 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImplTest.java @@ -24,8 +24,8 @@ import java.util.Set; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryRule.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryRule.java index ef548c02ff4..075c5deae31 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryRule.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryRule.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import org.junit.rules.ExternalResource; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java index 365340a59a8..bd39488a6bf 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java @@ -35,7 +35,7 @@ import org.mockito.Mockito; import org.sonar.api.utils.MessageException; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.ce.queue.InternalCeQueue; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeTaskTypes; diff --git a/server/sonar-server/src/main/java/org/sonar/ce/CeModule.java b/server/sonar-server/src/main/java/org/sonar/ce/CeModule.java index f1256f01b8b..6b9e1c58a5a 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/CeModule.java +++ b/server/sonar-server/src/main/java/org/sonar/ce/CeModule.java @@ -20,16 +20,16 @@ package org.sonar.ce; import org.sonar.ce.http.CeHttpClientImpl; -import org.sonar.ce.log.CeLogging; +import org.sonar.server.computation.log.CeTaskLogging; import org.sonar.ce.queue.CeQueueImpl; import org.sonar.ce.taskprocessor.ReportTaskProcessorDeclaration; import org.sonar.core.platform.Module; -import org.sonar.server.computation.queue.ReportSubmitter; +import org.sonar.server.ce.queue.ReportSubmitter; public class CeModule extends Module { @Override protected void configureModule() { - add(CeLogging.class, + add(CeTaskLogging.class, CeHttpClientImpl.class, // Queue diff --git a/server/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java b/server/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java index aba706cadc5..0779ba4c04c 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java +++ b/server/sonar-server/src/main/java/org/sonar/ce/log/CeProcessLogging.java @@ -25,7 +25,7 @@ import org.sonar.process.logging.LogDomain; import org.sonar.process.logging.LogLevelConfig; import org.sonar.server.app.ServerProcessLogging; -import static org.sonar.ce.log.CeLogging.MDC_CE_TASK_UUID; +import static org.sonar.server.computation.log.CeTaskLogging.MDC_CE_TASK_UUID; /** * Configure logback for the Compute Engine process. Logs are written to file "ce.log" in SQ's log directory. diff --git a/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueue.java b/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueue.java index b4982b9e41d..86cff2af7bf 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueue.java +++ b/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueue.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Optional; import org.sonar.db.DbSession; import org.sonar.db.ce.CeQueueDto; +import org.sonar.server.computation.CeTask; /** * Queue of pending Compute Engine tasks. Both producer and consumer actions diff --git a/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java b/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java index c7966317717..3b8dd3832c4 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java @@ -41,6 +41,7 @@ import org.sonar.db.DbSession; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeQueueDto; import org.sonar.db.component.ComponentDto; +import org.sonar.server.computation.CeTask; import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.property.InternalProperties; diff --git a/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessor.java b/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessor.java index f7378ad2adc..215a97aaa0a 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessor.java +++ b/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessor.java @@ -23,8 +23,8 @@ import java.util.Set; import javax.annotation.CheckForNull; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; /** * This interface is used to provide the processing code for {@link CeTask}s of one or more type to be called by the diff --git a/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclaration.java b/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclaration.java index 8c14ac2a97f..d25b24d865f 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclaration.java +++ b/server/sonar-server/src/main/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclaration.java @@ -21,8 +21,8 @@ package org.sonar.ce.taskprocessor; import java.util.Collections; import java.util.Set; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import org.sonar.db.ce.CeTaskTypes; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java b/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java rename to server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java index 728124dfab6..bee5e24269b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/ReportSubmitter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ce/queue/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.queue; +package org.sonar.server.ce.queue; import com.google.common.base.Optional; import java.io.InputStream; @@ -31,7 +31,7 @@ import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; import org.sonar.api.server.ServerSide; import org.sonar.ce.queue.CeQueue; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.ce.queue.CeTaskSubmit; import org.sonar.core.component.ComponentKeys; import org.sonar.core.util.UuidFactory; diff --git a/server/sonar-server/src/main/java/org/sonar/ce/organization/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/ce/queue/package-info.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/ce/organization/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/ce/queue/package-info.java index 126c08b7ffa..33274785b6a 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/organization/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ce/queue/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.ce.organization; +package org.sonar.server.ce.queue; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/SubmitAction.java b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/SubmitAction.java index 102565e3b14..e869d82cc8c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/SubmitAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/SubmitAction.java @@ -27,8 +27,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.ce.queue.CeTask; -import org.sonar.server.computation.queue.ReportSubmitter; +import org.sonar.server.computation.CeTask; +import org.sonar.server.ce.queue.ReportSubmitter; import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.ws.WsUtils; import org.sonarqube.ws.Ce; diff --git a/server/sonar-server/src/main/java/org/sonar/ce/queue/CeTask.java b/server/sonar-server/src/main/java/org/sonar/server/computation/CeTask.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/ce/queue/CeTask.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/CeTask.java index 008972bbbc9..f0d4f06ddcf 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/queue/CeTask.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/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.ce.queue; +package org.sonar.server.computation; import com.google.common.base.MoreObjects; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/ce/queue/CeTaskResult.java b/server/sonar-server/src/main/java/org/sonar/server/computation/CeTaskResult.java similarity index 89% rename from server/sonar-server/src/main/java/org/sonar/ce/queue/CeTaskResult.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/CeTaskResult.java index cb4b485f29a..73dcb927513 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/queue/CeTaskResult.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/CeTaskResult.java @@ -17,15 +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.ce.queue; +package org.sonar.server.computation; import java.util.Optional; -import org.sonar.ce.taskprocessor.CeTaskProcessor; /** * Represents the result of the processing of a {@link CeTask}. - * - * @see {@link CeTaskProcessor#process(CeTask)} */ @FunctionalInterface public interface CeTaskResult { diff --git a/server/sonar-server/src/main/java/org/sonar/ce/log/CeLogging.java b/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeTaskLogging.java similarity index 85% rename from server/sonar-server/src/main/java/org/sonar/ce/log/CeLogging.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/log/CeTaskLogging.java index b6569cdaf91..8f1dbba3ced 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/log/CeLogging.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeTaskLogging.java @@ -17,14 +17,14 @@ * 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.ce.log; +package org.sonar.server.computation.log; import org.slf4j.MDC; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; -public class CeLogging { +public class CeTaskLogging { - static final String MDC_CE_TASK_UUID = "ceTaskUuid"; + public static final String MDC_CE_TASK_UUID = "ceTaskUuid"; public void initForTask(CeTask task) { MDC.put(MDC_CE_TASK_UUID, task.getUuid()); diff --git a/server/sonar-server/src/main/java/org/sonar/ce/settings/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/log/package-info.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/ce/settings/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/log/package-info.java index 3fe1981783e..1088bac9be7 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/settings/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/log/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.ce.settings; +package org.sonar.server.computation.log; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/ce/organization/DefaultOrganizationLoader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/organization/DefaultOrganizationLoader.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/ce/organization/DefaultOrganizationLoader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/organization/DefaultOrganizationLoader.java index fc107196ca9..8c36d2227a3 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/organization/DefaultOrganizationLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/organization/DefaultOrganizationLoader.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.ce.organization; +package org.sonar.server.computation.organization; import org.picocontainer.Startable; import org.sonar.api.ce.ComputeEngineSide; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/organization/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/organization/package-info.java new file mode 100644 index 00000000000..8e76145cb54 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/organization/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program 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. + * + * This program 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.organization; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/settings/SettingsLoader.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/settings/SettingsLoader.java index 6fbfe71a206..7ccf1e50b7f 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/settings/SettingsLoader.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.ce.settings; +package org.sonar.server.computation.settings; import org.picocontainer.Startable; import org.sonar.api.ce.ComputeEngineSide; 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/settings/package-info.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/queue/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/settings/package-info.java index 02090e8428a..dc49a51c135 100644 --- 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/settings/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.queue; +package org.sonar.server.computation.settings; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java index a0e388506da..ba9a14b28c0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java @@ -20,7 +20,7 @@ package org.sonar.server.computation.task.container; import org.picocontainer.PicoContainer; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.core.platform.ComponentContainer; import org.sonar.core.platform.ContainerPopulator; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java index 628e722b303..5e4409b1b73 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java @@ -19,7 +19,7 @@ */ package org.sonar.server.computation.taskprocessor; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTaskResult; public interface MutableTaskResultHolder extends TaskResultHolder { /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java index 38ecbcb93c1..6fe1e53913e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java @@ -20,7 +20,7 @@ package org.sonar.server.computation.taskprocessor; import javax.annotation.CheckForNull; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTaskResult; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java index 906e4d28741..b4c3e978150 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java @@ -19,7 +19,7 @@ */ package org.sonar.server.computation.taskprocessor; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTaskResult; public interface TaskResultHolder { /** diff --git a/server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java b/server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java index bd8352216f4..bceb8f980dd 100644 --- a/server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java @@ -40,6 +40,7 @@ import org.sonar.db.ce.CeQueueDto; import org.sonar.db.ce.CeTaskTypes; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; +import org.sonar.server.computation.CeTask; import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.organization.TestDefaultOrganizationProvider; diff --git a/server/sonar-server/src/test/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclarationTest.java b/server/sonar-server/src/test/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclarationTest.java index eb80dde6589..4c496ce8480 100644 --- a/server/sonar-server/src/test/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclarationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/ce/taskprocessor/ReportTaskProcessorDeclarationTest.java @@ -22,7 +22,7 @@ package org.sonar.ce.taskprocessor; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; 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/queue/ReportSubmitterTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java index 94693054919..5eec218d72f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/queue/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.queue; +package org.sonar.server.ce.queue; import java.util.HashMap; import java.util.List; diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java index 541edc1d049..b3b5561a9a3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java @@ -26,7 +26,7 @@ import org.junit.rules.ExpectedException; import org.sonar.api.web.UserRole; import org.sonar.ce.queue.CeQueue; import org.sonar.ce.queue.CeQueueImpl; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.ce.queue.CeTaskSubmit; import org.sonar.core.util.UuidFactoryFast; import org.sonar.db.DbTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java index 4fc3633bc2b..d5cead2759d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.ce.ws; import org.junit.Test; import org.mockito.Mockito; import org.sonar.api.server.ws.WebService; -import org.sonar.server.computation.queue.ReportSubmitter; +import org.sonar.server.ce.queue.ReportSubmitter; import org.sonar.server.organization.DefaultOrganizationProvider; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java index 32540048c7d..6073f05a9cb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/SubmitActionTest.java @@ -29,9 +29,9 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.MockitoAnnotations; -import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.CeTask; import org.sonar.db.ce.CeTaskTypes; -import org.sonar.server.computation.queue.ReportSubmitter; +import org.sonar.server.ce.queue.ReportSubmitter; import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.organization.TestDefaultOrganizationProvider; import org.sonar.server.ws.TestResponse; diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java index c7f683d6cd9..627e25d28b0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskTypesActionTest.java @@ -22,8 +22,8 @@ package org.sonar.server.ce.ws; import com.google.common.collect.ImmutableSet; import java.util.Set; import org.junit.Test; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTask; +import org.sonar.server.computation.CeTaskResult; import org.sonar.ce.taskprocessor.CeTaskProcessor; import org.sonar.server.ws.WsActionTester; diff --git a/server/sonar-server/src/test/java/org/sonar/ce/queue/CeTaskTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/CeTaskTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/ce/queue/CeTaskTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/CeTaskTest.java index 97d20e21601..b42261f5eb7 100644 --- a/server/sonar-server/src/test/java/org/sonar/ce/queue/CeTaskTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/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.ce.queue; +package org.sonar.server.computation; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/log/CeTaskLoggingTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/log/CeTaskLoggingTest.java index 842160a92eb..5193eb1efd8 100644 --- a/server/sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/log/CeTaskLoggingTest.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.ce.log; +package org.sonar.server.computation.log; import ch.qos.logback.core.joran.spi.JoranException; import org.junit.After; @@ -26,20 +26,20 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; import org.slf4j.MDC; -import org.sonar.ce.queue.CeTask; import org.sonar.process.logging.LogbackHelper; +import org.sonar.server.computation.CeTask; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import static org.sonar.ce.log.CeLogging.MDC_CE_TASK_UUID; +import static org.sonar.server.computation.log.CeTaskLogging.MDC_CE_TASK_UUID; -public class CeLoggingTest { +public class CeTaskLoggingTest { @Rule public ExpectedException expectedException = ExpectedException.none(); private LogbackHelper helper = new LogbackHelper(); - private CeLogging underTest = new CeLogging(); + private CeTaskLogging underTest = new CeTaskLogging(); @After public void resetLogback() throws JoranException { diff --git a/server/sonar-server/src/test/java/org/sonar/ce/organization/DefaultOrganizationLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/organization/DefaultOrganizationLoaderTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/ce/organization/DefaultOrganizationLoaderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/organization/DefaultOrganizationLoaderTest.java index b7a48ef6db0..1cdd4fa8b57 100644 --- a/server/sonar-server/src/test/java/org/sonar/ce/organization/DefaultOrganizationLoaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/organization/DefaultOrganizationLoaderTest.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.ce.organization; +package org.sonar.server.computation.organization; import org.junit.Test; import org.sonar.server.organization.DefaultOrganizationCache; diff --git a/server/sonar-server/src/test/java/org/sonar/ce/settings/SettingsLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/settings/SettingsLoaderTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/ce/settings/SettingsLoaderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/settings/SettingsLoaderTest.java index f04123a90ec..f0c5cf58ef9 100644 --- a/server/sonar-server/src/test/java/org/sonar/ce/settings/SettingsLoaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/settings/SettingsLoaderTest.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.ce.settings; +package org.sonar.server.computation.settings; import org.junit.Test; import org.sonar.server.setting.ThreadLocalSettings; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java index 277ae458f7a..f81de440ad6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java @@ -23,7 +23,7 @@ import org.assertj.core.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.ce.queue.CeTaskResult; +import org.sonar.server.computation.CeTaskResult; import static org.mockito.Mockito.mock; -- 2.39.5