From f27d48d7f54a7e58dca71bd08211adbbc09a42d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Mon, 28 Sep 2015 11:01:36 +0200 Subject: [PATCH] SONAR-6831 move remaining classes out of package computation ComputeEngineProcessingModule will be moved in a separate commit which will refactor CE's modules --- .../ComputeEngineProcessingModule.java | 1 + ...ReportComputeEngineContainerPopulator.java | 4 ++-- .../ComputationTempFolderProvider.java | 2 +- .../computation/filesystem/package-info.java | 24 +++++++++++++++++++ .../{ => property}/CePropertyDefinitions.java | 2 +- .../computation/property/package-info.java | 24 +++++++++++++++++++ .../computation/queue/CeQueueCleaner.java | 2 +- .../{ => queue}/PurgeCeActivities.java | 2 +- .../report/CleanReportQueueListener.java | 1 - .../{ => queue/report}/ReportFiles.java | 2 +- .../queue/report/ReportSubmitter.java | 1 - .../queue/report/ReportTaskProcessor.java | 2 +- .../{ => step}/ComputationStepExecutor.java | 4 +--- .../computation/step/ExtractReportStep.java | 2 +- .../platformlevel/PlatformLevel1.java | 2 +- .../platformlevel/PlatformLevel4.java | 2 +- .../platformlevel/PlatformLevelStartup.java | 2 +- .../CePropertyDefinitionsTest.java | 1 + .../computation/PurgeCeActivitiesTest.java | 1 + .../server/computation/ReportFilesTest.java | 1 + .../computation/queue/CeQueueCleanerTest.java | 4 +--- .../queue/CeQueueInitializerTest.java | 5 +--- .../report/CleanReportQueueListenerTest.java | 1 - .../queue/report/ReportSubmitterTest.java | 1 - 24 files changed, 67 insertions(+), 26 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => filesystem}/ComputationTempFolderProvider.java (98%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => property}/CePropertyDefinitions.java (97%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/property/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue}/PurgeCeActivities.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => queue/report}/ReportFiles.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => step}/ComputationStepExecutor.java (90%) 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 3cd9c0684dd..eb30f047a16 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 @@ -25,6 +25,7 @@ import org.sonar.server.computation.queue.CeProcessingSchedulerExecutorServiceIm import org.sonar.server.computation.queue.CeProcessingSchedulerImpl; import org.sonar.server.computation.queue.CeWorkerRunnableImpl; import org.sonar.server.computation.queue.report.ReportTaskProcessor; +import org.sonar.server.computation.step.ComputationStepExecutor; public class ComputeEngineProcessingModule extends Module { @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 bea46557942..654f601a5c4 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 @@ -24,8 +24,8 @@ import java.util.List; import org.sonar.core.issue.tracking.Tracker; import org.sonar.core.platform.ContainerPopulator; import org.sonar.server.computation.queue.CeTask; -import org.sonar.server.computation.ComputationStepExecutor; -import org.sonar.server.computation.ComputationTempFolderProvider; +import org.sonar.server.computation.step.ComputationStepExecutor; +import org.sonar.server.computation.filesystem.ComputationTempFolderProvider; import org.sonar.server.computation.analysis.ReportAnalysisMetadataHolder; import org.sonar.server.computation.batch.BatchReportDirectoryHolderImpl; import org.sonar.server.computation.batch.BatchReportReaderImpl; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationTempFolderProvider.java b/server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/ComputationTempFolderProvider.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/ComputationTempFolderProvider.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/ComputationTempFolderProvider.java index d74d9c9d444..bb70b96b23e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationTempFolderProvider.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/ComputationTempFolderProvider.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.filesystem; import java.io.File; import java.io.IOException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/package-info.java new file mode 100644 index 00000000000..6b9cc1ea66e --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/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.filesystem; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CePropertyDefinitions.java b/server/sonar-server/src/main/java/org/sonar/server/computation/property/CePropertyDefinitions.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CePropertyDefinitions.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/property/CePropertyDefinitions.java index 6ccf89f31fd..5d6c195edd2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/CePropertyDefinitions.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/property/CePropertyDefinitions.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.property; import java.util.List; import org.sonar.api.CoreProperties; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/property/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/property/package-info.java new file mode 100644 index 00000000000..c991dbdbeb3 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/property/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.property; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueCleaner.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueCleaner.java index 6ac6a8928e4..8864d422654 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueCleaner.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueCleaner.java @@ -29,7 +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; +import org.sonar.server.computation.queue.report.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/PurgeCeActivities.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/PurgeCeActivities.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/PurgeCeActivities.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/PurgeCeActivities.java index e7856aab540..e92f7d15ef3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/PurgeCeActivities.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/PurgeCeActivities.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.Calendar; import org.sonar.api.platform.Server; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/CleanReportQueueListener.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/CleanReportQueueListener.java index 7a0b38cc8dd..91978629339 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/CleanReportQueueListener.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/CleanReportQueueListener.java @@ -20,7 +20,6 @@ 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ReportFiles.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportFiles.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/ReportFiles.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportFiles.java index 13ad4bd9fc5..d1a2dac8db1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ReportFiles.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportFiles.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.File; import java.io.InputStream; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportSubmitter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportSubmitter.java index f8489f639bd..5f5387742ca 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportSubmitter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportSubmitter.java @@ -30,7 +30,6 @@ 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportTaskProcessor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportTaskProcessor.java index 21b64ed186d..ed4693f6d42 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportTaskProcessor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/ReportTaskProcessor.java @@ -20,7 +20,7 @@ package org.sonar.server.computation.queue.report; import org.sonar.core.platform.ComponentContainer; -import org.sonar.server.computation.ComputationStepExecutor; +import org.sonar.server.computation.step.ComputationStepExecutor; import org.sonar.server.computation.container.ComputeEngineContainer; import org.sonar.server.computation.container.ContainerFactory; import org.sonar.server.computation.queue.CeTask; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationStepExecutor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStepExecutor.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/ComputationStepExecutor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStepExecutor.java index 8fb79cce6e4..66dfe3a5df0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationStepExecutor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStepExecutor.java @@ -17,13 +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.step; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.core.util.logs.Profiler; -import org.sonar.server.computation.step.ComputationStep; -import org.sonar.server.computation.step.ComputationSteps; public final class ComputationStepExecutor { private static final Logger LOGGER = Loggers.get(ComputationStepExecutor.class); 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 878ee5aeaa5..fad6a3223f7 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 @@ -27,7 +27,7 @@ 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.queue.CeTask; -import org.sonar.server.computation.ReportFiles; +import org.sonar.server.computation.queue.report.ReportFiles; import org.sonar.server.computation.batch.MutableBatchReportDirectoryHolder; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java index 1c755e96f51..1418ce274b3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java @@ -33,7 +33,7 @@ import org.sonar.db.purge.PurgeProfiler; import org.sonar.db.semaphore.SemaphoresImpl; import org.sonar.db.version.DatabaseVersion; import org.sonar.db.version.MigrationStepModule; -import org.sonar.server.computation.CePropertyDefinitions; +import org.sonar.server.computation.property.CePropertyDefinitions; import org.sonar.server.db.DbClient; import org.sonar.server.db.EmbeddedDatabaseFactory; import org.sonar.server.issue.index.IssueIndex; 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 efacdd7b99b..fee9b478218 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 @@ -67,7 +67,7 @@ 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.queue.report.ReportFiles; import org.sonar.server.computation.queue.report.ReportSubmitter; import org.sonar.server.computation.dbcleaner.IndexPurgeListener; import org.sonar.server.computation.dbcleaner.ProjectCleaner; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java index 5f94331b0b9..2d8da8594b2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java @@ -19,7 +19,7 @@ */ package org.sonar.server.platform.platformlevel; -import org.sonar.server.computation.PurgeCeActivities; +import org.sonar.server.computation.queue.PurgeCeActivities; import org.sonar.server.issue.filter.RegisterIssueFilters; import org.sonar.server.platform.ServerLifecycleNotifier; import org.sonar.server.qualitygate.RegisterQualityGates; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/CePropertyDefinitionsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/CePropertyDefinitionsTest.java index 1d2deab9ae0..9814b1dff91 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/CePropertyDefinitionsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/CePropertyDefinitionsTest.java @@ -20,6 +20,7 @@ package org.sonar.server.computation; import org.junit.Test; +import org.sonar.server.computation.property.CePropertyDefinitions; import org.sonar.test.TestUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/PurgeCeActivitiesTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/PurgeCeActivitiesTest.java index a79936137e3..b31ae60d2a6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/PurgeCeActivitiesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/PurgeCeActivitiesTest.java @@ -26,6 +26,7 @@ import org.sonar.api.utils.internal.TestSystem2; import org.sonar.db.DbTester; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeQueueDto; +import org.sonar.server.computation.queue.PurgeCeActivities; 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/ReportFilesTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ReportFilesTest.java index b8a8a5a4613..c02db55ae09 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ReportFilesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ReportFilesTest.java @@ -29,6 +29,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.sonar.api.config.Settings; import org.sonar.process.ProcessProperties; +import org.sonar.server.computation.queue.report.ReportFiles; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueCleanerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueCleanerTest.java index 2aecacba19c..bcf86e35074 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueCleanerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueCleanerTest.java @@ -31,9 +31,7 @@ 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 org.sonar.server.computation.queue.report.ReportFiles; 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/queue/CeQueueInitializerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueInitializerTest.java index 79c30700f12..9c09fe0610b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueInitializerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/CeQueueInitializerTest.java @@ -31,12 +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.report.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/queue/report/CleanReportQueueListenerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/CleanReportQueueListenerTest.java index 6bd893f4677..83e3d34b396 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/CleanReportQueueListenerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/CleanReportQueueListenerTest.java @@ -22,7 +22,6 @@ 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; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/ReportSubmitterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/ReportSubmitterTest.java index 14a43069951..3ccd758453b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/ReportSubmitterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/ReportSubmitterTest.java @@ -29,7 +29,6 @@ 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; -- 2.39.5