From ffcece8c7b623560d59410a07421a620edd3a1b9 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 16 Mar 2015 18:31:25 +0100 Subject: [PATCH] SONAR-6261 Add step into steps pico --- .../server/computation/step/ComputationSteps.java | 1 + .../server/computation/step/PersistEventsStep.java | 10 +++++----- .../org/sonar/server/platform/ServerComponents.java | 2 ++ .../server/computation/step/ComputationStepsTest.java | 8 +++++--- 4 files changed, 13 insertions(+), 8 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 32c5a202112..4ad3a7b5fb3 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 @@ -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 459750d09c6..c23ea3fe6d7 100644 --- 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 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 af08b5877dd..6542ea824c6 100644 --- 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 e10a1481099..696ce5e6555 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,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 -- 2.39.5