SONAR-5694 - add project uuid to the analysis report activity

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportLog.java b/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportLog.java
index 858bdc9398c3760c95a776ec9520bc1becf3da88..0bc51ca440409d3bd2d3342eeaa453fbc2411158 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportLog.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportLog.java
@@ -43,6 +43,7 @@ public class AnalysisReportLog implements ActivityLog {
       .put("id", String.valueOf(report.getId()))
       .put("projectKey", report.getProjectKey())
       .put("projectName", report.getProjectName())
+      .put("projectUuid", report.getProjectUuid())
       .put("status", String.valueOf(report.getStatus()))
       .put("submittedAt", DateUtils.formatDateTimeNullSafe(report.getCreatedAt()))
       .put("startedAt", DateUtils.formatDateTimeNullSafe(report.getStartedAt()))

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportLogMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportLogMediumTest.java
index bf98168e8b281d5adf3c168d14f14d7c6dee4859..e8863d54143470a0e4416c75e67e6163206e9855 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportLogMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportLogMediumTest.java
@@ -85,6 +85,7 @@ public class AnalysisReportLogMediumTest {
     assertThat(details.get("id")).isEqualTo(String.valueOf(report.getId()));
     assertThat(details.get("projectKey")).isEqualTo(report.getProjectKey());
     assertThat(details.get("projectName")).isEqualTo(report.getProjectName());
+    assertThat(details.get("projectUuid")).isEqualTo(report.getProjectUuid());
     assertThat(details.get("status")).isEqualTo("FAILED");
     assertThat(details.get("submittedAt")).isEqualTo("2014-10-15T00:00:00+0200");
     assertThat(details.get("startedAt")).isEqualTo("2014-10-17T00:00:00+0200");

diff --git a/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportDto.java b/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportDto.java
index dd54bb2cb47d3ef8647ea422e3f642d60dd75035..a058966a2e2c7adec2ab6392eb50a19f035e8996 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportDto.java
@@ -122,6 +122,14 @@ public class AnalysisReportDto extends Dto<String> {
     return Strings.nullToEmpty(project.name());
   }
 
+  public String getProjectUuid() {
+    if (project == null) {
+      return getProjectKey();
+    }
+
+    return Strings.nullToEmpty(project.uuid());
+  }
+
   public Long getSnapshotId() {
     return snapshotId;
   }