diff options
Diffstat (limited to 'sonar-core/src')
4 files changed, 4 insertions, 15 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/tracking/FilteringBaseInputWrapper.java b/sonar-core/src/main/java/org/sonar/core/issue/tracking/FilteringBaseInputWrapper.java index 49f2b5cac90..9eb0f09ef4b 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/tracking/FilteringBaseInputWrapper.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/tracking/FilteringBaseInputWrapper.java @@ -22,8 +22,7 @@ package org.sonar.core.issue.tracking; import java.util.Collection; import java.util.List; import java.util.function.Predicate; - -import static org.sonar.core.util.stream.MoreCollectors.toList; +import java.util.stream.Collectors; class FilteringBaseInputWrapper<BASE extends Trackable> implements Input<BASE> { private final Input<BASE> baseInput; @@ -34,7 +33,7 @@ class FilteringBaseInputWrapper<BASE extends Trackable> implements Input<BASE> { Collection<BASE> baseIssues = baseInput.getIssues(); this.nonClosedIssues = baseIssues.stream() .filter(baseInputFilter) - .collect(toList(baseIssues.size())); + .collect(Collectors.toList()); } @Override diff --git a/sonar-core/src/main/java/org/sonar/core/issue/tracking/Tracker.java b/sonar-core/src/main/java/org/sonar/core/issue/tracking/Tracker.java index 9bbba94870b..a525f660fef 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/tracking/Tracker.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/tracking/Tracker.java @@ -21,12 +21,11 @@ package org.sonar.core.issue.tracking; import java.util.Collection; import java.util.List; +import java.util.stream.Collectors; import java.util.stream.Stream; import org.sonar.api.issue.Issue; import org.sonar.api.scanner.ScannerSide; -import static org.sonar.core.util.stream.MoreCollectors.toList; - @ScannerSide public class Tracker<RAW extends Trackable, BASE extends Trackable> extends AbstractTracker<RAW, BASE> { @@ -97,6 +96,6 @@ public class Tracker<RAW extends Trackable, BASE extends Trackable> extends Abst Collection<BASE> nonClosedIssues = nonClosedTracking.getBaseInput().getIssues(); Collection<BASE> closeIssues = closedTracking.getBaseInput().getIssues(); return Stream.concat(nonClosedIssues.stream(), closeIssues.stream()) - .collect(toList(nonClosedIssues.size() + closeIssues.size())); + .collect(Collectors.toList()); } } diff --git a/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java b/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java index d20e48a809a..a7d736e292e 100644 --- a/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java +++ b/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java @@ -60,10 +60,6 @@ public final class MoreCollectors { return ImmutableList.toImmutableList(); } - public static <T> Collector<T, ?, List<T>> toList(int expectedSize) { - return Collectors.toList(); - } - public static <T> Collector<T, ?, Set<T>> toSet() { return Collectors.toSet(); } diff --git a/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java b/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java index 2314dfb8210..e880fd4facc 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java @@ -93,11 +93,6 @@ public class MoreCollectorsTest { } @Test - public void toList_with_size_parallel_stream() { - assertThat(HUGE_LIST.parallelStream().collect(toList(HUGE_LIST.size()))).isEqualTo(HUGE_LIST); - } - - @Test public void toSet_builds_an_ImmutableSet() { Set<Integer> res = Stream.of(1, 2, 3, 4, 5).collect(toImmutableSet()); assertThat(res).isInstanceOf(ImmutableSet.class) |