From c3e6d15ace5c06b0ffa03238158895631e83e8a1 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 30 Jul 2018 15:41:11 +0200 Subject: [PATCH] Fix Quality flaw in CE ComponentTreeBuilder --- .../projectanalysis/component/ComponentTreeBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilder.java index de1daa2c153..427bb87bd52 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilder.java @@ -21,13 +21,13 @@ package org.sonar.ce.task.projectanalysis.component; import java.util.List; import java.util.function.Function; -import java.util.stream.Collectors; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.core.util.stream.MoreCollectors; import org.sonar.db.component.SnapshotDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Component.FileStatus; -import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.server.project.Project; import static com.google.common.base.MoreObjects.firstNonNull; @@ -88,7 +88,7 @@ public class ComponentTreeBuilder { .stream() .map(scannerComponentSupplier::apply) .map(c -> buildComponent(c, parentModule, projectScmPath)) - .collect(Collectors.toList()); + .collect(MoreCollectors.toList(component.getChildRefCount())); } private ComponentImpl buildComponent(ScannerReport.Component component, ScannerReport.Component closestModule, -- 2.39.5