Fix incorrect package names in Compute Engine

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 a9c82ce0d4734708267fbfadc6ad56c7a3c4a27b..22346b5606e53355e638672a7b3d4c5f8cb9ee71 100644 (file)
--- 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 7a8d50da4b2d4198e455e7bf9416add907882d01..c3a4c4cf8e1dc02021c05737ee72790fecce9c5a 100644 (file)
--- 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 68e13d07db27c12123c3bd8bc2c320f797c92de2..4981695d79899d34e4d26c50a20b18fc0a61dc28 100644 (file)
--- 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 5313c8eca0419ba6be73f748f3ca948563141ce0..464d99bbc3b1b5f5b413a3ba2fc4a0993cba8dd8 100644 (file)
--- 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 156d007e63f731d92533add34a2235d666344e88..0e22976da0ac9b1268055f40d1c9f3125a87712e 100644 (file)
--- 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 a79b6e9ac772479069e671ff6fcc3f7039452685..bf0174258d7ae0e4edcddb63907076bc6b28c641 100644 (file)
--- 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 cd741fedf9c8f6750659096f5ae1303a5632d134..6aeb440576358b8ff99cf690113b4c572181e95a 100644 (file)
--- 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<String> uuids = Arrays.asList(uuid);
+    List<String> 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 48f95265bc6d769d9d5d3ba6bf4b5faae0fa387b..1381d2f13d80c0aced450f490da7139c54c7e1ef 100644 (file)
--- 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 58058f364aba4447a09db0fddde05b4f711610f5..c26b334075fc72e9237cdf610833dbb5f1967805 100644 (file)
--- 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 227967e2abe9f8a47feb472890336d23966c22a8..1ec445635c870e8e0c405f32d80da2ec602321d6 100644 (file)
--- 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 71c26a744ea167941f25730428b9a238161aca11..43a8737eacaf1231b12b728fd6bfd9fbe96cfbfb 100644 (file)
--- 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 cc06b85c8318a9127ff8536cd42370a0ee5323f4..fc6322dd676354a8ba3eb376881667b436690a05 100644 (file)
--- 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 898c26a5e6d5bc7ab4d657e0706a50cdb58d6139..75ddd9b1b9703ec03956a5f5ea694ada5a518a41 100644 (file)
--- 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 593dc88ad12d6889b6c391ab9acc2ee69977df98..ad143c433cb0f3c7e611700bbce9f6ddb038c42d 100644 (file)
--- 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 8797e4a6cf4af0927ab224296f00bafa0a495254..65aa7555c48f664c5cda808a620550c48d4b0d3f 100644 (file)
--- 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 b9d348919805b17dc5320934f904b45ff6c918c0..044bbde9ade6616dddfd846dd754248deb2f5a59 100644 (file)
--- 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 a3ca1a7fd1e54fbf1e3d347b6ca0c70ecdb4a396..0e90a86093637d2973a31c3960cfc7ce6a9bbdc1 100644 (file)
--- 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;