From 928db3e6f50859904fbecd299c49b01dbd63bf2c Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Tue, 28 Oct 2014 16:59:58 +0100 Subject: [PATCH] SONAR-5694 - add project uuid to the analysis report activity --- .../org/sonar/server/computation/AnalysisReportLog.java | 1 + .../server/computation/AnalysisReportLogMediumTest.java | 1 + .../org/sonar/core/computation/db/AnalysisReportDto.java | 8 ++++++++ 3 files changed, 10 insertions(+) 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 858bdc9398c..0bc51ca4404 100644 --- 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 bf98168e8b2..e8863d54143 100644 --- 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 dd54bb2cb47..a058966a2e2 100644 --- 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 { return Strings.nullToEmpty(project.name()); } + public String getProjectUuid() { + if (project == null) { + return getProjectKey(); + } + + return Strings.nullToEmpty(project.uuid()); + } + public Long getSnapshotId() { return snapshotId; } -- 2.39.5