SONAR-6261 Add step into steps pico

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 32c5a202112bff95bfc4e4af46cb2e5f99b4416c..4ad3a7b5fb3611a4ef48403ff25f0e29a1e57431 100644 (file)
--- 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
@@ -43,6 +43,7 @@ public class ComputationSteps {
       IndexComponentsStep.class,
       PurgeDatastoresStep.class,
       PersistComponentLinksStep.class,
+      PersistEventsStep.class,
 
       // ES indexing is done after all db changes
       ApplyPermissionsStep.class,

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java
index 459750d09c632154068732a592e40a9028e61731..c23ea3fe6d774898c66fd95ffcd34c94324722dc 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java
@@ -64,7 +64,7 @@ public class PersistEventsStep implements ComputationStep {
     BatchReportReader reportReader = context.getReportReader();
     BatchReport.Component component = reportReader.readComponent(componentRef);
     processEvents(session, component, context.getReportMetadata().getAnalysisDate());
-    createVersionEvent(session, component, context.getReportMetadata().getAnalysisDate());
+    saveVersionEvent(session, component, context.getReportMetadata().getAnalysisDate());
 
     for (Integer childRef : component.getChildRefList()) {
       recursivelyProcessComponent(session, context, childRef);
@@ -75,7 +75,7 @@ public class PersistEventsStep implements ComputationStep {
     List<BatchReport.Event> events = component.getEventList();
     if (!events.isEmpty()) {
       for (BatchReport.Event event : component.getEventList()) {
-        dbClient.eventDao().insert(session, createBaseEvent(component, analysisDate)
+        dbClient.eventDao().insert(session, newBaseEvent(component, analysisDate)
           .setName(event.getName())
           .setCategory(convertCategory(event.getCategory()))
           .setDescription(event.hasDescription() ? event.getDescription() : null)
@@ -85,10 +85,10 @@ public class PersistEventsStep implements ComputationStep {
     }
   }
 
-  private void createVersionEvent(DbSession session, BatchReport.Component component, Long analysisDate) {
+  private void saveVersionEvent(DbSession session, BatchReport.Component component, Long analysisDate) {
     if (component.hasVersion()) {
       deletePreviousEventsHavingSameVersion(session, component);
-      dbClient.eventDao().insert(session, createBaseEvent(component, analysisDate)
+      dbClient.eventDao().insert(session, newBaseEvent(component, analysisDate)
         .setName(component.getVersion())
         .setCategory(EventDto.CATEGORY_VERSION)
         );
@@ -103,7 +103,7 @@ public class PersistEventsStep implements ComputationStep {
     }
   }
 
-  private EventDto createBaseEvent(BatchReport.Component component, Long analysisDate) {
+  private EventDto newBaseEvent(BatchReport.Component component, Long analysisDate) {
     return new EventDto()
       .setComponentUuid(component.getUuid())
       .setSnapshotId(component.getSnapshotId())

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
index af08b5877dd4e6f9a875569bc1dc715c1b5cedfc..6542ea824c637d920bbef8c1f33bc3d684a8a967 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
@@ -113,6 +113,7 @@ import org.sonar.server.duplication.ws.DuplicationsWs;
 import org.sonar.server.es.EsClient;
 import org.sonar.server.es.IndexCreator;
 import org.sonar.server.es.IndexDefinitions;
+import org.sonar.server.event.db.EventDao;
 import org.sonar.server.issue.*;
 import org.sonar.server.issue.actionplan.ActionPlanService;
 import org.sonar.server.issue.actionplan.ActionPlanWs;
@@ -282,6 +283,7 @@ class ServerComponents {
       ComponentLinkDao.class,
       SnapshotDao.class,
 
+      EventDao.class,
       ActivityDao.class,
       AnalysisReportDao.class
       ));

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 e10a14810996a1b5bccb88a26329aa371a16cb3c..696ce5e65554525c810cd18d5555fcf5b2cd0135 100644 (file)
--- 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,11 +43,13 @@ public class ComputationStepsTest {
       mock(PurgeDatastoresStep.class),
       mock(SendIssueNotificationsStep.class),
       mock(IndexComponentsStep.class),
-      mock(PersistComponentLinksStep.class));
+      mock(PersistComponentLinksStep.class),
+      mock(PersistEventsStep.class)
+      );
 
-    assertThat(registry.orderedSteps()).hasSize(12);
+    assertThat(registry.orderedSteps()).hasSize(13);
     assertThat(registry.orderedSteps().get(0)).isInstanceOf(ParseReportStep.class);
-    assertThat(registry.orderedSteps().get(11)).isInstanceOf(SendIssueNotificationsStep.class);
+    assertThat(registry.orderedSteps().get(12)).isInstanceOf(SendIssueNotificationsStep.class);
   }
 
   @Test