Sonar: Fix java:S6204 (use Stream.toList) (#1149)

kiwiproject · Jun 3, 2024 · e4d91ae · e4d91ae
1 parent 71537f8
commit e4d91ae
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 64 deletions.
diff --git a/src/test/java/org/kiwiproject/collect/KiwiListsTest.java b/src/test/java/org/kiwiproject/collect/KiwiListsTest.java
@@ -1,6 +1,5 @@
 package org.kiwiproject.collect;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -121,7 +120,7 @@ void shouldThrow_WhenNullList() {
 
         @Test
         void shouldReturnSortedList_WhenHasItems() {
-            var someIntegers = IntStream.iterate(1, n -> n + 1).limit(100).boxed().collect(toList());
+            var someIntegers = IntStream.iterate(1, n -> n + 1).limit(100).boxed().toList();
 
             var randomIntegers = newArrayList(someIntegers);
             Collections.shuffle(randomIntegers);
@@ -159,7 +158,7 @@ void shouldThrow_WhenNullComparator() {
 
         @Test
         void shouldReturnSortedList_WhenHasItems() {
-            var someIntegers = IntStream.iterate(1, n -> n + 1).limit(100).boxed().collect(toList());
+            var someIntegers = IntStream.iterate(1, n -> n + 1).limit(100).boxed().toList();
             var reverseIntegers = newArrayList(someIntegers);
             Collections.reverse(reverseIntegers);
 

diff --git a/src/test/java/org/kiwiproject/collect/KiwiMapsTest.java b/src/test/java/org/kiwiproject/collect/KiwiMapsTest.java
@@ -1,6 +1,5 @@
 package org.kiwiproject.collect;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -100,7 +99,7 @@ void testNewLinkedHashMap() {
         List<String> expectedKeys = Arrays.stream(items)
                 .filter(obj -> obj instanceof String)
                 .map(String.class::cast)
-                .collect(toList());
+                .toList();
         assertThat(linkedHashMap.keySet()).containsExactlyElementsOf(expectedKeys);
     }
 
@@ -127,7 +126,7 @@ void testNewTreeMap() {
                 .filter(obj -> obj instanceof String)
                 .map(String.class::cast)
                 .sorted()
-                .collect(toList());
+                .toList();
         assertThat(treeMap.keySet()).containsExactlyElementsOf(expectedKeys);
     }
 
@@ -147,7 +146,7 @@ void testNewTreeMap_StringKeys_To_ObjectValues() {
         List<String> transformed = treeMap.entrySet()
                 .stream()
                 .map(entry -> entry.getKey() + entry.getValue())
-                .collect(toList());
+                .toList();
 
         assertThat(transformed).containsExactly("bar84", "baz126", "foo42");
     }
@@ -313,7 +312,7 @@ void shouldCreateUnmodifiableLinkedHashMap() {
         List<String> expectedKeys = Arrays.stream(items)
                 .filter(obj -> obj instanceof String)
                 .map(String.class::cast)
-                .collect(toList());
+                .toList();
         assertThat(unmodifiableLinkedHashMap.keySet()).containsExactlyElementsOf(expectedKeys);
 
         //noinspection DataFlowIssue
@@ -343,7 +342,7 @@ void shouldCreateUnmodifiableTreeMap() {
                 .filter(obj -> obj instanceof String)
                 .map(String.class::cast)
                 .sorted()
-                .collect(toList());
+                .toList();
         assertThat(unmodifiableTreeMap.keySet()).containsExactlyElementsOf(expectedKeys);
 
         //noinspection DataFlowIssue

diff --git a/src/test/java/org/kiwiproject/config/EndpointConfigurationTest.java b/src/test/java/org/kiwiproject/config/EndpointConfigurationTest.java
@@ -1,7 +1,6 @@
 package org.kiwiproject.config;
 
 import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
@@ -233,7 +232,7 @@ void shouldRoundRobinManyDomains() {
 
                 var domainNumbers = Stream.iterate(1, value -> value + 1)
                         .limit(numberOfDomains)
-                        .collect(toList());
+                        .toList();
                 var cyclingIterable = Iterables.cycle(domainNumbers);
 
                 StreamSupport.stream(cyclingIterable.spliterator(), /* parallel */ false)

diff --git a/src/test/java/org/kiwiproject/config/SecureEndpointsConfigurationTest.java b/src/test/java/org/kiwiproject/config/SecureEndpointsConfigurationTest.java
@@ -1,6 +1,5 @@
 package org.kiwiproject.config;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.tuple;
@@ -330,7 +329,7 @@ private SecureEndpointsConfiguration newSecureEndpointsConfigurationWithEndpoint
     }
 
     private SecureEndpointsConfiguration newSecureEndpointsConfiguration(IntStream tagStream) {
-        var endpointConfigs = tagStream.mapToObj(this::newHttpEndpointConfiguration).collect(toList());
+        var endpointConfigs = tagStream.mapToObj(this::newHttpEndpointConfiguration).toList();
 
         var config = newSecureEndpointsConfigurationWithNoEndpoints();
         config.setEndpoints(endpointConfigs);

diff --git a/src/test/java/org/kiwiproject/dropwizard/jdbi3/Jdbi3BuildersTest.java b/src/test/java/org/kiwiproject/dropwizard/jdbi3/Jdbi3BuildersTest.java
@@ -1,6 +1,5 @@
 package org.kiwiproject.dropwizard.jdbi3;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.kiwiproject.collect.KiwiLists.first;
@@ -125,7 +124,7 @@ private void verifyAndAssertWhenBuildingManagedDataSource(String healthCheckName
                 .map(lifeCycle -> (JettyManaged) lifeCycle)
                 .map(JettyManaged::getManaged)
                 .map(Managed::getClass)
-                .collect(toList());
+                .toList();
         assertThat(managedClasses).hasSize(1);
         var firstManagedClass = first(managedClasses);
         assertThat(firstManagedClass.getInterfaces()).contains(ManagedDataSource.class);
@@ -243,7 +242,7 @@ private void verifyAndAssertWhenGivenAManagedDataSource(ManagedDataSource manage
                 .stream()
                 .map(lifeCycle -> (JettyManaged) lifeCycle)
                 .map(JettyManaged::getManaged)
-                .collect(toList());
+                .toList();
         assertThat(managedObjects).containsExactly(managedDataSource);
 
         assertThat(healthCheckRegistry.getHealthCheck(healthCheckName)).isInstanceOf(JdbiHealthCheck.class);

diff --git a/src/test/java/org/kiwiproject/io/TimeBasedDirectoryCleanerTest.java b/src/test/java/org/kiwiproject/io/TimeBasedDirectoryCleanerTest.java
@@ -1,7 +1,6 @@
 package org.kiwiproject.io;
 
 import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -333,7 +332,7 @@ void testUpdateFileDeletionMetadata_WhenExceedInMemoryDeleteErrorCapacity() {
 
         var filesNotDeleted = IntStream.rangeClosed(1, 501)
                 .mapToObj(value -> newFailedFileDeleteResult(temporaryPath.resolve("folder" + value).toString()))
-                .collect(toList());
+                .toList();
 
         cleaner.updateFileDeletionMetadata(600, filesNotDeleted);
 

diff --git a/src/test/java/org/kiwiproject/io/TimeBasedDirectoryCleanerTestHelper.java b/src/test/java/org/kiwiproject/io/TimeBasedDirectoryCleanerTestHelper.java
@@ -1,7 +1,5 @@
 package org.kiwiproject.io;
 
-import static java.util.stream.Collectors.toList;
-
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -51,7 +49,7 @@ private void newFileInFolder(Path folder, int value) {
 
     public List<File> filesInTempFolder() throws IOException {
         try (var paths = Files.list(cleanerPath)) {
-            return paths.map(Path::toFile).collect(toList());
+            return paths.map(Path::toFile).toList();
         }
     }
 }
diff --git a/src/test/java/org/kiwiproject/jaxrs/KiwiGenericTypesTest.java b/src/test/java/org/kiwiproject/jaxrs/KiwiGenericTypesTest.java
@@ -1,7 +1,6 @@
 package org.kiwiproject.jaxrs;
 
 import static java.util.Comparator.comparing;
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.kiwiproject.collect.KiwiLists.third;
@@ -112,7 +111,7 @@ void shouldSupportListOfStringObjectMaps() {
 
         var sortedCars = cars.stream()
                 .sorted(comparing(car -> car.get("model").toString()))
-                .collect(toList());
+                .toList();
 
         assertThat(sortedCars).hasSize(3);
 

diff --git a/src/test/java/org/kiwiproject/regex/MatchSpliteratorTest.java b/src/test/java/org/kiwiproject/regex/MatchSpliteratorTest.java
@@ -1,6 +1,5 @@
 package org.kiwiproject.regex;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.tuple;
@@ -49,7 +48,7 @@ void shouldCreateMatchResultStream() {
             var matcher = Pattern.compile("the|(lazy cat)", Pattern.CASE_INSENSITIVE).matcher(input);
             var matchSpliterator = new MatchSpliterator(matcher);
 
-            var matchResults = matchSpliterator.stream().collect(toList());
+            var matchResults = matchSpliterator.stream().toList();
             assertThat(matchResults)
                     .extracting(MatchResult::group, MatchResult::start)
                     .containsExactly(
@@ -66,7 +65,7 @@ class StreamFromRegex {
         @Test
         void shouldCreateMatchResultStream_FromStringRegularExpression() {
             var input = "The quick brown fox jumped over the fence and the lazy brown dog";
-            var matchResults = MatchSpliterator.stream("the", input).collect(toList());
+            var matchResults = MatchSpliterator.stream("the", input).toList();
 
             assertThat(matchResults)
                     .extracting(MatchResult::group, MatchResult::start)
@@ -91,7 +90,7 @@ class StreamFromPattern {
         void shouldCreateMatchResultStream_FromPattern() {
             var input = "The quick brown fox jumped over the fence and the lazy brown dog and the lazy cat";
             var pattern = Pattern.compile("the|(lazy cat)", Pattern.CASE_INSENSITIVE);
-            var matchResults = MatchSpliterator.stream(pattern, input).collect(toList());
+            var matchResults = MatchSpliterator.stream(pattern, input).toList();
 
             assertThat(matchResults)
                     .extracting(MatchResult::group, MatchResult::start)

diff --git a/src/test/java/org/kiwiproject/retry/InMemoryAppender.java b/src/test/java/org/kiwiproject/retry/InMemoryAppender.java
@@ -1,7 +1,6 @@
 package org.kiwiproject.retry;
 
 import static java.util.Comparator.comparing;
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
@@ -49,13 +48,13 @@ synchronized void clearEvents() {
     }
 
     List<ILoggingEvent> getOrderedEvents() {
-        return getOrderedEventStream().collect(toList());
+        return getOrderedEventStream().toList();
     }
 
     List<String> getOrderedEventMessages() {
         return getOrderedEventStream()
                 .map(ILoggingEvent::getFormattedMessage)
-                .collect(toList());
+                .toList();
     }
 
     private Stream<ILoggingEvent> getOrderedEventStream() {

diff --git a/src/test/java/org/kiwiproject/spring/data/AbstractPagingQueryIntegrationTest.java b/src/test/java/org/kiwiproject/spring/data/AbstractPagingQueryIntegrationTest.java
@@ -2,7 +2,6 @@
 
 import static java.util.Comparator.comparing;
 import static java.util.Comparator.comparingDouble;
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.kiwiproject.base.KiwiStrings.f;
 import static org.kiwiproject.spring.data.OrderTestData.ORDER_COLLECTION;
@@ -119,12 +118,12 @@ void shouldAggregatePage(SoftAssertions softly) {
                 .sorted(comparing(Order::getCustomerId))
                 .map(Order::getCustomerId)
                 .limit(limit)
-                .collect(toList());
+                .toList();
 
         var aggregatedCustomerIds = aggregatePage.getContent()
                 .stream()
                 .map(Order::getCustomerId)
-                .collect(toList());
+                .toList();
 
         softly.assertThat(aggregatedCustomerIds).isEqualTo(expectedCustomerIds);
     }
@@ -202,7 +201,7 @@ void shouldAggregatePage_WithMatchOperation(SoftAssertions softly) {
                 .filter(orderFilter)
                 .sorted(comparing(Order::getCustomerId).thenComparing(comparingDouble(Order::getAmount).reversed()))
                 .limit(limit)
-                .collect(toList());
+                .toList();
 
         softly.assertThat(aggregatePage.getContent()).isEqualTo(expectedOrders);
     }

diff --git a/src/test/java/org/kiwiproject/spring/data/KiwiMongoIndexesTest.java b/src/test/java/org/kiwiproject/spring/data/KiwiMongoIndexesTest.java
@@ -1,6 +1,5 @@
 package org.kiwiproject.spring.data;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.kiwiproject.spring.util.MongoTestHelpers.newMongoTemplate;
@@ -69,7 +68,7 @@ private void assertIndices(Sort.Direction direction) {
             var indexFields = indexInfos.stream()
                     .map(IndexInfo::getIndexFields)
                     .flatMap(Collection::stream)
-                    .collect(toList());
+                    .toList();
 
             assertThat(indexFields)
                     .extracting("key", "direction")

diff --git a/src/test/java/org/kiwiproject/spring/data/KiwiPagingTest.java b/src/test/java/org/kiwiproject/spring/data/KiwiPagingTest.java
@@ -1,6 +1,5 @@
 package org.kiwiproject.spring.data;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -337,7 +336,7 @@ private static List<Object> createTestSortDirectionFieldPairList() {
     private static void assertSortChain(Sort sortChain) {
         assertThat(sortChain).isNotNull();
 
-        var sortOrders = Streams.stream(sortChain.iterator()).collect(toList());
+        var sortOrders = Streams.stream(sortChain.iterator()).toList();
 
         assertThat(sortOrders)
                 .extracting("property", "direction")