SONAR-6253 Rename some steps

6 files changed, 28 insertions, 14 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java
index e4c0b273fa8..b391f9fd64c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java
@@ -44,9 +44,9 @@ public class ComputationSteps {
       PersistNumberOfDaysSinceLastCommitStep.class,
       PersistMeasuresStep.class,
       PersistIssuesStep.class,
-      PersistComponentLinksStep.class,
+      PersistProjectLinksStep.class,
       PersistEventsStep.class,
-      PersistDuplicationMeasuresStep.class,
+      PersistDuplicationsStep.class,
       PersistFileSourcesStep.class,
       PersistTestsStep.class,
       PersistFileDependenciesStep.class,
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java
index 3f9f538dadf..582a469e45c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java
@@ -37,11 +37,14 @@ import org.sonar.server.db.DbClient;
 
 import java.util.List;
 
-public class PersistDuplicationMeasuresStep implements ComputationStep {
+/**
+ * Persist duplications into
+ */
+public class PersistDuplicationsStep implements ComputationStep {
 
   private final DbClient dbClient;
 
-  public PersistDuplicationMeasuresStep(DbClient dbClient) {
+  public PersistDuplicationsStep(DbClient dbClient) {
     this.dbClient = dbClient;
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentLinksStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
index fbd0e7b53ce..e94a1aad53d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentLinksStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
@@ -43,7 +43,10 @@ import java.util.Set;
 
 import static com.google.common.collect.Sets.newHashSet;
 
-public class PersistComponentLinksStep implements ComputationStep {
+/**
+ * Persist project and module links
+ */
+public class PersistProjectLinksStep implements ComputationStep {
 
   private final DbClient dbClient;
   private final I18n i18n;
@@ -56,7 +59,7 @@ public class PersistComponentLinksStep implements ComputationStep {
     Constants.ComponentLinkType.ISSUE, ComponentLinkDto.TYPE_ISSUE_TRACKER
     );
 
-  public PersistComponentLinksStep(DbClient dbClient, I18n i18n) {
+  public PersistProjectLinksStep(DbClient dbClient, I18n i18n) {
     this.dbClient = dbClient;
     this.i18n = i18n;
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java
index 493e4e153b1..020036506d1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java
@@ -43,10 +43,10 @@ public class ComputationStepsTest {
       mock(PurgeDatastoresStep.class),
       mock(SendIssueNotificationsStep.class),
       mock(IndexComponentsStep.class),
-      mock(PersistComponentLinksStep.class),
+      mock(PersistProjectLinksStep.class),
       mock(PersistMeasuresStep.class),
       mock(PersistEventsStep.class),
-      mock(PersistDuplicationMeasuresStep.class),
+      mock(PersistDuplicationsStep.class),
       mock(PersistNumberOfDaysSinceLastCommitStep.class),
       mock(PersistFileSourcesStep.class),
       mock(PersistFileDependenciesStep.class),
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentLinksStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentLinksStepTest.java
index 12f5cb13451..6677e55b24a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentLinksStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentLinksStepTest.java
@@ -20,7 +20,11 @@
 
 package org.sonar.server.computation.step;
 
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.i18n.I18n;
@@ -59,7 +63,7 @@ public class PersistComponentLinksStepTest extends BaseStepTest {
 
   I18n i18n;
 
-  PersistComponentLinksStep step;
+  PersistProjectLinksStep step;
 
   @Before
   public void setup() {
@@ -74,7 +78,7 @@ public class PersistComponentLinksStepTest extends BaseStepTest {
     when(i18n.message(Locale.ENGLISH, "project_links.ci", null)).thenReturn("Continuous integration");
     when(i18n.message(Locale.ENGLISH, "project_links.issue", null)).thenReturn("Issues");
 
-    step = new PersistComponentLinksStep(dbClient, i18n);
+    step = new PersistProjectLinksStep(dbClient, i18n);
   }
 
   @Override
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationMeasuresStepTest.java
index b1c5871de2b..aa88b178334 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationMeasuresStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationMeasuresStepTest.java
@@ -20,7 +20,11 @@
 
 package org.sonar.server.computation.step;
 
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.measures.CoreMetrics;
@@ -61,7 +65,7 @@ public class
 
   DbClient dbClient;
 
-  PersistDuplicationMeasuresStep sut;
+  PersistDuplicationsStep sut;
 
   @Before
   public void setup() throws Exception {
@@ -71,7 +75,7 @@ public class
 
     reportDir = temp.newFolder();
 
-    sut = new PersistDuplicationMeasuresStep(dbClient);
+    sut = new PersistDuplicationsStep(dbClient);
   }
 
   @Override