From c8cb65a2b1b3d7f1603b77a9ef46087b5940c398 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 20 Jul 2018 23:39:03 +0200 Subject: [PATCH] Fix incorrect package names in Compute Engine --- .../ProjectAnalysisTaskContainerPopulator.java | 2 +- .../projectanalysis/purge/IndexPurgeListener.java | 2 +- .../task/projectanalysis/purge/ProjectCleaner.java | 2 +- .../projectanalysis/purge/PurgeDatastoresStep.java | 1 - .../step/PublishTaskResultStep.java | 2 +- .../taskprocessor/ReportTaskProcessor.java | 2 +- .../purge/IndexPurgeListenerTest.java | 14 +++++++------- .../projectanalysis/purge/ProjectCleanerTest.java | 2 +- .../purge/PurgeDatastoresStepTest.java | 1 - .../step/PublishTaskResultStepTest.java | 4 ++-- .../org/sonar/ce/task/setting/package-info.java | 2 +- .../taskprocessor/MutableTaskResultHolder.java | 2 +- .../taskprocessor/MutableTaskResultHolderImpl.java | 2 +- .../ce/task/taskprocessor/TaskResultHolder.java | 2 +- .../MutableTaskResultHolderImplTest.java | 2 +- .../java/org/sonar/ce/CeTaskCommonsModule.java | 4 ++-- .../org/sonar/ce/notification/package-info.java | 2 +- 17 files changed, 23 insertions(+), 25 deletions(-) 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 a9c82ce0d47..22346b5606e 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 @@ -123,7 +123,7 @@ import org.sonar.ce.task.projectanalysis.webhook.WebhookPostTask; import org.sonar.ce.task.setting.SettingsLoader; import org.sonar.ce.task.step.ComputationStepExecutor; import org.sonar.ce.task.step.ComputationSteps; -import org.sonar.ce.taskprocessor.MutableTaskResultHolderImpl; +import org.sonar.ce.task.taskprocessor.MutableTaskResultHolderImpl; import org.sonar.core.issue.tracking.Tracker; import org.sonar.core.platform.ContainerPopulator; import org.sonar.server.view.index.ViewIndex; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListener.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListener.java index 7a8d50da4b2..c3a4c4cf8e1 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListener.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListener.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.dbcleaner; +package org.sonar.ce.task.projectanalysis.purge; import java.util.Collection; import java.util.List; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleaner.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleaner.java index 68e13d07db2..4981695d798 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleaner.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleaner.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.dbcleaner; +package org.sonar.ce.task.projectanalysis.purge; import java.util.Collection; import org.sonar.api.CoreProperties; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStep.java index 5313c8eca04..464d99bbc3b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStep.java @@ -19,7 +19,6 @@ */ package org.sonar.ce.task.projectanalysis.purge; -import org.sonar.ce.task.dbcleaner.ProjectCleaner; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; import org.sonar.ce.task.projectanalysis.component.DbIdsRepository; 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 156d007e63f..0e22976da0a 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 @@ -24,7 +24,7 @@ import javax.annotation.concurrent.Immutable; import org.sonar.ce.task.CeTaskResult; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.ce.task.step.ComputationStep; -import org.sonar.ce.taskprocessor.MutableTaskResultHolder; +import org.sonar.ce.task.taskprocessor.MutableTaskResultHolder; public class PublishTaskResultStep implements ComputationStep { private final MutableTaskResultHolder taskResultHolder; 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 a79b6e9ac77..bf0174258d7 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 @@ -28,7 +28,7 @@ import org.sonar.ce.task.container.TaskContainer; import org.sonar.ce.task.projectanalysis.container.ContainerFactory; import org.sonar.ce.task.step.ComputationStepExecutor; import org.sonar.ce.task.taskprocessor.CeTaskProcessor; -import org.sonar.ce.taskprocessor.TaskResultHolder; +import org.sonar.ce.task.taskprocessor.TaskResultHolder; import org.sonar.core.platform.ComponentContainer; import org.sonar.db.ce.CeTaskTypes; import org.sonar.ce.task.projectanalysis.container.ReportAnalysisComponentProvider; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListenerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListenerTest.java index cd741fedf9c..6aeb4405763 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListenerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/IndexPurgeListenerTest.java @@ -17,9 +17,8 @@ * 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.dbcleaner; +package org.sonar.ce.task.projectanalysis.purge; -import java.util.Arrays; import java.util.List; import org.junit.Test; import org.sonar.server.component.index.ComponentIndexer; @@ -27,22 +26,23 @@ import org.sonar.server.issue.index.IssueIndexer; import org.sonar.server.test.index.TestIndexer; import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; public class IndexPurgeListenerTest { - TestIndexer testIndexer = mock(TestIndexer.class); - IssueIndexer issueIndexer = mock(IssueIndexer.class); - ComponentIndexer componentIndexer = mock(ComponentIndexer.class); + private TestIndexer testIndexer = mock(TestIndexer.class); + private IssueIndexer issueIndexer = mock(IssueIndexer.class); + private ComponentIndexer componentIndexer = mock(ComponentIndexer.class); - IndexPurgeListener underTest = new IndexPurgeListener(testIndexer, issueIndexer, componentIndexer); + private IndexPurgeListener underTest = new IndexPurgeListener(testIndexer, issueIndexer, componentIndexer); @Test public void test_onComponentDisabling() { String uuid = "123456"; String projectUuid = "P789"; - List uuids = Arrays.asList(uuid); + List uuids = singletonList(uuid); underTest.onComponentsDisabling(projectUuid, uuids); verify(testIndexer).deleteByFile(uuid); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleanerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleanerTest.java index 48f95265bc6..1381d2f13d8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleanerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/ProjectCleanerTest.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.dbcleaner; +package org.sonar.ce.task.projectanalysis.purge; import org.junit.Before; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.java index 58058f364ab..c26b334075f 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/purge/PurgeDatastoresStepTest.java @@ -30,7 +30,6 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.sonar.api.config.internal.MapSettings; -import org.sonar.ce.task.dbcleaner.ProjectCleaner; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; import org.sonar.ce.task.projectanalysis.component.MutableDbIdsRepositoryRule; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStepTest.java index 227967e2abe..1ec445635c8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStepTest.java @@ -22,8 +22,8 @@ package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; -import org.sonar.ce.taskprocessor.MutableTaskResultHolder; -import org.sonar.ce.taskprocessor.MutableTaskResultHolderImpl; +import org.sonar.ce.task.taskprocessor.MutableTaskResultHolder; +import org.sonar.ce.task.taskprocessor.MutableTaskResultHolderImpl; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task/src/main/java/org/sonar/ce/task/setting/package-info.java b/server/sonar-ce-task/src/main/java/org/sonar/ce/task/setting/package-info.java index 71c26a744ea..43a8737eaca 100644 --- a/server/sonar-ce-task/src/main/java/org/sonar/ce/task/setting/package-info.java +++ b/server/sonar-ce-task/src/main/java/org/sonar/ce/task/setting/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.ce.task.settings; +package org.sonar.ce.task.setting; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolder.java b/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolder.java index cc06b85c831..fc6322dd676 100644 --- a/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolder.java +++ b/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolder.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.taskprocessor; +package org.sonar.ce.task.taskprocessor; import org.sonar.ce.task.CeTaskResult; diff --git a/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolderImpl.java b/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolderImpl.java index 898c26a5e6d..75ddd9b1b97 100644 --- a/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolderImpl.java +++ b/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolderImpl.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.taskprocessor; +package org.sonar.ce.task.taskprocessor; import javax.annotation.CheckForNull; import org.sonar.ce.task.CeTaskResult; diff --git a/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/TaskResultHolder.java b/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/TaskResultHolder.java index 593dc88ad12..ad143c433cb 100644 --- a/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/TaskResultHolder.java +++ b/server/sonar-ce-task/src/main/java/org/sonar/ce/task/taskprocessor/TaskResultHolder.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.taskprocessor; +package org.sonar.ce.task.taskprocessor; import org.sonar.ce.task.CeTaskResult; diff --git a/server/sonar-ce-task/src/test/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolderImplTest.java b/server/sonar-ce-task/src/test/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolderImplTest.java index 8797e4a6cf4..65aa7555c48 100644 --- a/server/sonar-ce-task/src/test/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolderImplTest.java +++ b/server/sonar-ce-task/src/test/java/org/sonar/ce/task/taskprocessor/MutableTaskResultHolderImplTest.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.taskprocessor; +package org.sonar.ce.task.taskprocessor; import org.assertj.core.api.Assertions; import org.junit.Rule; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/CeTaskCommonsModule.java b/server/sonar-ce/src/main/java/org/sonar/ce/CeTaskCommonsModule.java index b9d34891980..044bbde9ade 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/CeTaskCommonsModule.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/CeTaskCommonsModule.java @@ -19,8 +19,8 @@ */ package org.sonar.ce; -import org.sonar.ce.task.dbcleaner.IndexPurgeListener; -import org.sonar.ce.task.dbcleaner.ProjectCleaner; +import org.sonar.ce.task.projectanalysis.purge.IndexPurgeListener; +import org.sonar.ce.task.projectanalysis.purge.ProjectCleaner; import org.sonar.core.platform.Module; import org.sonar.db.purge.period.DefaultPeriodCleaner; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/notification/package-info.java b/server/sonar-ce/src/main/java/org/sonar/ce/notification/package-info.java index a3ca1a7fd1e..0e90a860936 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/notification/package-info.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/notification/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.ce.task.projectanalysis.notification; +package org.sonar.ce.notification; import javax.annotation.ParametersAreNonnullByDefault; -- 2.39.5