From 6120d7c333e7a2d12daf8b8dc78eb3df0440c809 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 26 Jul 2018 16:21:18 +0200 Subject: [PATCH] SONAR-11077 fix Quality flaws in ReportSubmitter --- .../main/java/org/sonar/server/ce/queue/ReportSubmitter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java b/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java index 45e6510e2c2..29e95c41779 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import javax.annotation.Nullable; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; @@ -35,6 +34,7 @@ import org.sonar.ce.queue.CeTaskSubmit; import org.sonar.ce.task.CeTask; import org.sonar.core.component.ComponentKeys; import org.sonar.core.util.UuidFactory; +import org.sonar.core.util.stream.MoreCollectors; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.ce.CeTaskCharacteristicDto; @@ -172,7 +172,8 @@ public class ReportSubmitter { private CeTask submitReport(DbSession dbSession, InputStream reportInput, ComponentDto project, Map characteristicsMap) { CeTaskSubmit.Builder submit = queue.prepareSubmit(); List characteristics = characteristicsMap.entrySet().stream() - .map(e -> toDto(submit.getUuid(), e.getKey(), e.getValue())).collect(Collectors.toList()); + .map(e -> toDto(submit.getUuid(), e.getKey(), e.getValue())) + .collect(MoreCollectors.toList(characteristicsMap.size())); // the report file must be saved before submitting the task dbClient.ceTaskInputDao().insert(dbSession, submit.getUuid(), reportInput); -- 2.39.5