Some nitty simplification of Stream usage

Co-Authored-By: IntelliJ

Author: jjaderberg

algo-params/similarity-params/src/main/java/org/neo4j/gds/similarity/knn/KnnSampler.java

@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.function.LongPredicate;
-import java.util.stream.Collectors;
 
 public interface KnnSampler {
 
@@ -45,7 +44,7 @@ enum SamplerType {
         private static final List<String> VALUES = Arrays
             .stream(SamplerType.values())
             .map(SamplerType::name)
-            .collect(Collectors.toList());
+            .toList();
 
         public static SamplerType parse(Object input) {
             if (input instanceof String) {

algo/src/main/java/org/neo4j/gds/embeddings/graphsage/GraphSageModelTrainer.java

@@ -154,8 +154,7 @@ public ModelTrainResult train(Graph graph, HugeObjectArray<double[]> features) {
                         layers,
                         weights,
                         epochLocalSeed
-                    ))
-                    .collect(Collectors.toList());
+                    )).toList();
 
                 batchTaskSampler = () -> IntStream
                     .range(0, parameters.batchesPerIteration(graph.nodeCount()))

algo/src/main/java/org/neo4j/gds/scaleproperties/ScaleProperties.java

@@ -80,7 +80,7 @@ public ScalePropertiesResult compute() {
         progressTracker.beginSubTask("Prepare scalers");
         var scalers = params.nodeProperties().stream()
             .map(this::prepareScalers)
-            .collect(Collectors.toList());
+            .toList();
         progressTracker.endSubTask("Prepare scalers");
 
         var scalerStatistics = IntStream

algo/src/test/java/org/neo4j/gds/allshortestpaths/IntMinPriorityQueueTest.java

@@ -125,7 +125,7 @@ void testAddAndPop() {
                 .keySet()
                 .stream()
                 .sorted()
-                .collect(Collectors.toList());
+                .toList();
 
         for (Double weight : weightGroups) {
             final Set<Integer> allowedIds = byWeight.get(weight);

algo/src/test/java/org/neo4j/gds/paths/bellmanford/BellmanFordMultipleNegativeCyclesTest.java

@@ -28,8 +28,7 @@
 import org.neo4j.gds.extension.GdlGraph;
 import org.neo4j.gds.extension.Inject;
 import org.neo4j.gds.extension.TestGraph;
-
-import java.util.stream.Collectors;
+import org.neo4j.gds.paths.PathResult;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -88,14 +87,14 @@ void shouldReturnNegativeCycles() {
                 .negativeCycles()
                 .pathSet()
                 .stream()
-                .collect(Collectors.toList());
+                .toList();
 
-            var negativeCyclesNodes = negativeCycles.stream().map(v -> v.nodeIds()).collect(Collectors.toList());
+            var negativeCyclesNodes = negativeCycles.stream().map(PathResult::nodeIds).toList();
             assertThat(negativeCyclesNodes).containsExactlyInAnyOrder(
                 new long[]{a[1], a[3], a[4], a[1]},
                 new long[]{a[2], a[5], a[6], a[2]}
             );
-            var negativeCyclesWeights = negativeCycles.stream().map(v -> v.costs()).collect(Collectors.toList());
+            var negativeCyclesWeights = negativeCycles.stream().map(PathResult::costs).toList();
             assertThat(negativeCyclesWeights).containsExactlyInAnyOrder(
                 new double[]{0, -1, -3, -1},
                 new double[]{0, -100, -95, -89}

algo/src/test/java/org/neo4j/gds/similarity/nodesim/ComponentNodesTest.java

@@ -39,7 +39,6 @@
 import java.util.TreeSet;
 import java.util.function.LongPredicate;
 import java.util.function.LongUnaryOperator;
-import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -86,7 +85,7 @@ void shouldDetermineIndexUpperBound() {
         }
         assertThat(idxUpperBoundPerComponent.get(7)).isEqualTo(-1L);
         int previousUpperBound = -1;
-        for (long key : componentPerIdxUpperBound.keySet().stream().sorted().collect(Collectors.toList())) {
+        for (long key : componentPerIdxUpperBound.keySet().stream().sorted().toList()) {
             switch ((int) (key - previousUpperBound)) {
                 case 1: assertThat(componentPerIdxUpperBound.get(key)).isEqualTo(4);break;
                 case 2: assertThat(componentPerIdxUpperBound.get(key)).isEqualTo(5);break;

algo/src/test/java/org/neo4j/gds/similarity/nodesim/TopKMapTest.java

@@ -28,7 +28,6 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -53,7 +52,7 @@ void shouldLimitTopK() {
         input.add(new SimilarityResult(0, 4, 20.0));
         input.add(new SimilarityResult(0, 5, 25.0));
         input.add(new SimilarityResult(0, 6, 30.0));
-        input.addAll(input.stream().map(SimilarityResult::reverse).collect(Collectors.toList()));
+        input.addAll(input.stream().map(SimilarityResult::reverse).toList());
 
         BitSet bitSet = new BitSet();
         bitSet.set(0, input.size());
@@ -62,7 +61,7 @@ void shouldLimitTopK() {
 
         input.forEach(sim -> topKMap.put(sim.node1, sim.node2, sim.similarity));
 
-        List<SimilarityResult> actual = topKMap.stream().collect(Collectors.toList());
+        List<SimilarityResult> actual = topKMap.stream().toList();
 
         assertEquals(expected, actual);
     }
@@ -89,7 +88,7 @@ void shouldLimitTopK3() {
 
         input.forEach(sim -> topKMap.put(sim.node1, sim.node2, sim.similarity));
 
-        List<SimilarityResult> actual = topKMap.stream().collect(Collectors.toList());
+        List<SimilarityResult> actual = topKMap.stream().toList();
 
         assertEquals(expected, actual);
     }
@@ -116,7 +115,7 @@ void shouldLimitTopK3Ascending() {
 
         input.forEach(sim -> topKMap.put(sim.node1, sim.node2, sim.similarity));
 
-        List<SimilarityResult> actual = topKMap.stream().collect(Collectors.toList());
+        List<SimilarityResult> actual = topKMap.stream().toList();
 
         assertEquals(expected, actual);
     }
@@ -148,7 +147,7 @@ void shouldKeepFirstWhenValuesAreIdentical(Comparator<SimilarityResult> comparat
 
         input.forEach(sim -> topKMap.put(sim.node1, sim.node2, sim.similarity));
 
-        List<SimilarityResult> actual = topKMap.stream().collect(Collectors.toList());
+        List<SimilarityResult> actual = topKMap.stream().toList();
 
         assertEquals(expected, actual);
     }

algo/src/test/java/org/neo4j/gds/traversal/RandomWalkTest.java

@@ -54,7 +54,6 @@
 import java.util.Optional;
 import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
@@ -101,7 +100,7 @@ void testWithDefaultConfig() {
             TerminationFlag.RUNNING_TRUE
         );
 
-        List<long[]> result = randomWalk.compute().collect(Collectors.toList());
+        List<long[]> result = randomWalk.compute().toList();
 
         int expectedNumberOfWalks = walkParameters.walksPerNode() * 3;
         assertEquals(expectedNumberOfWalks, result.size());
@@ -133,7 +132,7 @@ void shouldBeDeterministic() {
             ProgressTracker.NULL_TRACKER,
             DefaultPool.INSTANCE,
             TerminationFlag.RUNNING_TRUE
-        ).compute().collect(Collectors.toList());
+        ).compute().toList();
 
         var secondResult = RandomWalk.create(
             graph,
@@ -145,7 +144,7 @@ void shouldBeDeterministic() {
             ProgressTracker.NULL_TRACKER,
             DefaultPool.INSTANCE,
             TerminationFlag.RUNNING_TRUE
-        ).compute().collect(Collectors.toList());
+        ).compute().toList();
 
         var firstResultAsSet = new TreeSet<long[]>(Arrays::compare);
         firstResultAsSet.addAll(firstResult);
@@ -174,7 +173,7 @@ void testSampleFromMultipleRelationshipTypes() {
         );
 
         int expectedNumberOfWalks = walkParameters.walksPerNode() * 3;
-        List<long[]> result = randomWalk.compute().collect(Collectors.toList());
+        List<long[]> result = randomWalk.compute().toList();
         assertEquals(expectedNumberOfWalks, result.size());
         long nodeZero = graph.toMappedNodeId("a");
         long[] walkForNodeZero = result
@@ -381,8 +380,9 @@ void parallelWeighted() {
             DefaultPool.INSTANCE,
             TerminationFlag.RUNNING_TRUE
         );
+        var actual = randomWalk.compute().toList();
 
-        assertThat(randomWalk.compute().collect(Collectors.toList()))
+        assertThat(actual)
             .matches(walks -> walks.size() <= nodeCount * walksPerNode)
             .allMatch(walk -> walk.length <= walkLength);
     }
@@ -411,8 +411,9 @@ void testWithConfiguredOffsetStartNodes() {
             DefaultPool.INSTANCE,
             TerminationFlag.RUNNING_TRUE
         );
+        var actual = randomWalk.compute().toList();
 
-        assertThat(randomWalk.compute().collect(Collectors.toList()))
+        assertThat(actual)
             .matches(walks -> walks.size() == 2)
             .anyMatch(walk -> walk[0] == aInternalId)
             .anyMatch(walk -> walk[0] == bInternalId);

applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/GraphWriteNodePropertiesConfig.java

@@ -56,7 +56,7 @@ default Collection<NodeLabel> validNodeLabels(GraphStore graphStore) {
         List<String> nodePropertiesRequestedByUser = nodeProperties()
             .stream()
             .map(UserInputWriteProperties.PropertySpec::nodeProperty)
-            .collect(Collectors.toList());
+            .toList();
 
         return nodeLabelIdentifiers(graphStore)
             .stream()

applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/StreamRelationshipsApplication.java

@@ -24,15 +24,14 @@
 import org.neo4j.gds.api.GraphStore;
 import org.neo4j.gds.core.concurrency.ParallelUtil;
 
-import java.util.stream.Collectors;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
 
 public class StreamRelationshipsApplication {
     Stream<TopologyResult> compute(GraphStore graphStore, GraphStreamRelationshipsConfig configuration) {
         var relationshipTypesAndGraphs = configuration.relationshipTypeIdentifiers(graphStore).stream()
             .map(relationshipType -> Tuples.pair(relationshipType.name(), graphStore.getGraph(relationshipType)))
-            .collect(Collectors.toList());
+            .toList();
 
         return ParallelUtil.parallelStream(
             LongStream.range(0, graphStore.nodeCount()),