SONAR-10770 Store the referenced key of the project in the event

Not the key of the technicalprojectcopy

diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ProjectViewAttributes.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ProjectViewAttributes.java
index eba39ad82db348f52a4d9b095363307bb18d557a..ffa1bc8223ea688285e89a54611fe055c22c9c8b 100644 (file)
--- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ProjectViewAttributes.java
+++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ProjectViewAttributes.java
@@ -28,12 +28,14 @@ import static java.util.Objects.requireNonNull;
 @Immutable
 public class ProjectViewAttributes {
   private final String projectUuid;
+  private final String originalKey;
   @CheckForNull
   private final Long analysisDate;
   private final String branchName;
 
-  public ProjectViewAttributes(String projectUuid, @Nullable Long analysisDate, @Nullable String branchName) {
+  public ProjectViewAttributes(String projectUuid, String originalKey, @Nullable Long analysisDate, @Nullable String branchName) {
     this.projectUuid = requireNonNull(projectUuid, "projectUuid can't be null");
+    this.originalKey = requireNonNull(originalKey, "projectKey can't be null");;
     this.analysisDate = analysisDate;
     this.branchName = branchName;
   }
@@ -52,6 +54,10 @@ public class ProjectViewAttributes {
     return branchName;
   }
 
+  public String getOriginalKey() {
+    return originalKey;
+  }
+
   @Override
   public String toString() {
     return "ProjectViewAttributes{" +

diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepTest.java
index 91687b6db455e6b518126dadee7961bd491c9b5f..6f1ed74f08fc67a828612de6ad65a79e85e11845 100644 (file)
--- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepTest.java
+++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepTest.java
@@ -470,7 +470,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest {
       .setUuid(PROJECT_VIEW_1_UUID)
       .setName(PROJECT_VIEW_1_NAME)
       .setDescription("project view description is not persisted")
-      .setProjectViewAttributes(new ProjectViewAttributes(project.uuid(), analysisDate, project.getBranch()));
+      .setProjectViewAttributes(new ProjectViewAttributes(project.uuid(), project.getDbKey(), analysisDate, project.getBranch()));
   }
 
   private void persistComponents(ComponentDto... componentDtos) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java
index cb7b984ae7cd50e3f641d174c646b032d85a0634..24546c88df6607236138db37a6ae17954d120dc5 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchAction.java
@@ -31,7 +31,6 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.server.ws.WebService.Param;
 import org.sonar.api.web.UserRole;
-import org.sonar.core.util.stream.MoreCollectors;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.component.ComponentDto;
@@ -46,6 +45,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static org.sonar.api.utils.DateUtils.parseEndingDateOrDateTime;
 import static org.sonar.api.utils.DateUtils.parseStartingDateOrDateTime;
 import static org.sonar.core.util.Protobuf.setNullable;
+import static org.sonar.core.util.stream.MoreCollectors.toList;
 import static org.sonar.db.component.SnapshotQuery.SORT_FIELD.BY_DATE;
 import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.DESC;
 import static org.sonar.server.projectanalysis.ws.EventCategory.OTHER;
@@ -166,7 +166,7 @@ public class SearchAction implements ProjectAnalysesWsAction {
   }
 
   private void addEvents(SearchData.Builder data) {
-    List<String> analyses = data.getAnalyses().stream().map(SnapshotDto::getUuid).collect(MoreCollectors.toList());
+    List<String> analyses = data.getAnalyses().stream().map(SnapshotDto::getUuid).collect(toList());
     data.setEvents(dbClient.eventDao().selectByAnalysisUuids(data.getDbSession(), analyses));
     data.setComponentChanges(dbClient.eventComponentChangeDao().selectByAnalysisUuids(data.getDbSession(), analyses));
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java
index 1e8b0c4c2e3a4821f7081711ddaf091820ae6a82..d2fff1cb99ff8a825f5360d2ba4478b54b5dd9f5 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/projectanalysis/ws/SearchResponseBuilder.java
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.core.util.stream.MoreCollectors;
 import org.sonar.db.component.SnapshotDto;
 import org.sonar.db.event.EventComponentChangeDto;
 import org.sonar.db.event.EventDto;
@@ -44,6 +43,7 @@ import static java.lang.String.format;
 import static java.util.stream.Collectors.toList;
 import static org.sonar.api.utils.DateUtils.formatDateTime;
 import static org.sonar.core.util.Protobuf.setNullable;
+import static org.sonar.core.util.stream.MoreCollectors.index;
 import static org.sonar.server.projectanalysis.ws.EventCategory.fromLabel;
 
 class SearchResponseBuilder {
@@ -148,7 +148,7 @@ class SearchResponseBuilder {
     }
 
     ListMultimap<String, EventComponentChangeDto> componentChangeByKey = eventComponentChangeDtos.stream()
-      .collect(MoreCollectors.index(EventComponentChangeDto::getComponentKey));
+      .collect(index(EventComponentChangeDto::getComponentKey));
 
     try {
       wsDefinitionChange.addAllProjects(