SONAR-17352 Refactor component keys to not include branch suffix

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/IssueSnippetsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/IssueSnippetsAction.java
index 48dda725e2ee69d3baa71a7506771563901e1333..6d4887c46b9a6cb4f3b57286073e144c7fdee49d 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/IssueSnippetsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/ws/IssueSnippetsAction.java
@@ -100,8 +100,12 @@ public class IssueSnippetsAction implements SourcesWsAction {
         Map<String, ComponentDto> componentsByUuid = dbClient.componentDao().selectByUuids(dbSession, linesPerComponent.keySet())
           .stream().collect(Collectors.toMap(ComponentDto::uuid, c -> c));
 
+        Set<String> branchUuids = componentsByUuid.values().stream()
+          .map(ComponentDto::branchUuid)
+          .collect(Collectors.toSet());
+
         Map<String, BranchDto> branches = dbClient.branchDao()
-          .selectByUuids(dbSession, componentsByUuid.keySet())
+          .selectByUuids(dbSession, branchUuids)
           .stream()
           .collect(Collectors.toMap(BranchDto::getUuid, b -> b));