SONAR-6276 SONAR-6288 Feed events and version in analysis report and …

…drop ability to create custom event on batch side
SonarSource · Mar 17, 2015 · 874614a · 874614a
1 parent 7485c34
commit 874614a
Show file tree

Hide file tree

Showing 32 changed files with 502 additions and 930 deletions.
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
@@ -66,20 +66,20 @@ private void recursivelyProcessComponent(DbSession session, ComputationContext c
     processEvents(session, component, context.getReportMetadata().getAnalysisDate());
     createVersionEvent(session, component, context.getReportMetadata().getAnalysisDate());
 
-    for (Integer childRef : component.getChildRefsList()) {
+    for (Integer childRef : component.getChildRefList()) {
       recursivelyProcessComponent(session, context, childRef);
     }
   }
 
   private void processEvents(DbSession session, BatchReport.Component component, Long analysisDate) {
-    List<BatchReport.Event> events = component.getEventsList();
+    List<BatchReport.Event> events = component.getEventList();
     if (!events.isEmpty()) {
-      for (BatchReport.Event event : component.getEventsList()) {
+      for (BatchReport.Event event : component.getEventList()) {
         dbClient.eventDao().insert(session, createBaseEvent(component, analysisDate)
-            .setName(event.getName())
-            .setCategory(convertCategory(event.getCategory()))
-            .setDescription(event.hasDescription() ? event.getDescription() : null)
-            .setData(event.hasEventData() ? event.getEventData() : null)
+          .setName(event.getName())
+          .setCategory(convertCategory(event.getCategory()))
+          .setDescription(event.hasDescription() ? event.getDescription() : null)
+          .setData(event.hasEventData() ? event.getEventData() : null)
           );
       }
     }
@@ -89,13 +89,13 @@ private void createVersionEvent(DbSession session, BatchReport.Component compone
     if (component.hasVersion()) {
       deletePreviousEventsHavingSameVersion(session, component);
       dbClient.eventDao().insert(session, createBaseEvent(component, analysisDate)
-          .setName(component.getVersion())
-          .setCategory(EventDto.CATEGORY_VERSION)
+        .setName(component.getVersion())
+        .setCategory(EventDto.CATEGORY_VERSION)
         );
     }
   }
 
-  private void deletePreviousEventsHavingSameVersion(DbSession session, BatchReport.Component component){
+  private void deletePreviousEventsHavingSameVersion(DbSession session, BatchReport.Component component) {
     for (EventDto dto : dbClient.eventDao().selectByComponentUuid(session, component.getUuid())) {
       if (dto.getCategory().equals(EventDto.CATEGORY_VERSION) && dto.getName().equals(component.getVersion())) {
         dbClient.eventDao().delete(session, dto.getId());

diff --git a/...r/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java b/...r/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java
@@ -121,17 +121,17 @@ public void persist_report_events() throws Exception {
       .setType(Constants.ComponentType.PROJECT)
       .setUuid("ABCD")
       .setSnapshotId(1000L)
-      .addEvents(BatchReport.Event.newBuilder()
-          .setName("Red (was Orange)")
-          .setCategory(Constants.EventCategory.ALERT)
-          .setDescription("Open issues > 0")
-          .build()
+      .addEvent(BatchReport.Event.newBuilder()
+        .setName("Red (was Orange)")
+        .setCategory(Constants.EventCategory.ALERT)
+        .setDescription("Open issues > 0")
+        .build()
       )
-      .addEvents(BatchReport.Event.newBuilder()
-          .setName("Changes in 'Default' (Java)")
-          .setCategory(Constants.EventCategory.PROFILE)
-          .setEventData("from=2014-10-12T08:36:25+0000;key=java-default;to=2014-10-12T10:36:25+0000")
-          .build()
+      .addEvent(BatchReport.Event.newBuilder()
+        .setName("Changes in 'Default' (Java)")
+        .setCategory(Constants.EventCategory.PROFILE)
+        .setEventData("from=2014-10-12T08:36:25+0000;key=java-default;to=2014-10-12T10:36:25+0000")
+        .build()
       )
       .build());