Revert collect(Collectors.toList())

12 files changed, 18 insertions, 18 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/path/Path.java b/vespajlib/src/main/java/com/yahoo/path/Path.java
index 5a835b1059f..737a27c57d8 100644
--- a/vespajlib/src/main/java/com/yahoo/path/Path.java
+++ b/vespajlib/src/main/java/com/yahoo/path/Path.java
@@ -55,7 +55,7 @@ public final class Path {
      * Add path elements by splitting based on delimiter and appending to elements.
      */
     private static List<String> elementsOf(String path, String delimiter) {
-        return Arrays.stream(path.split(delimiter)).filter(e -> !"".equals(e)).toList();
+        return Arrays.stream(path.split(delimiter)).filter(e -> !"".equals(e)).collect(Collectors.toList());
     }
 
     /**
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
index 36693280183..dfbcb06c365 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
@@ -100,7 +100,7 @@ public class TensorType {
         else if (dimensionList.stream().noneMatch(d -> d.isIndexed()))
             mappedSubtype = this;
         else
-            mappedSubtype = new TensorType(valueType, dimensions.stream().filter(d -> ! d.isIndexed()).toList());
+            mappedSubtype = new TensorType(valueType, dimensions.stream().filter(d -> ! d.isIndexed()).collect(Collectors.toList()));
     }
 
     static public Value combinedValueType(TensorType ... types) {
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java
index 2aee7baa0cc..7218375de89 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java
@@ -23,7 +23,7 @@ public class Diag<NAMETYPE extends Name> extends CompositeTensorFunction<NAMETYP
 
     public Diag(TensorType type) {
         this.type = type;
-        this.diagFunction = ScalarFunctions.equal(dimensionNames().toList());
+        this.diagFunction = ScalarFunctions.equal(dimensionNames().collect(Collectors.toList()));
     }
 
     @Override
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java
index ae65dc929bd..7053eeb0a1c 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java
@@ -24,7 +24,7 @@ public class Range<NAMETYPE extends Name> extends CompositeTensorFunction<NAMETY
 
     public Range(TensorType type) {
         this.type = type;
-        this.rangeFunction = ScalarFunctions.sum(dimensionNames().toList());
+        this.rangeFunction = ScalarFunctions.sum(dimensionNames().collect(Collectors.toList()));
     }
 
     @Override
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java
index 95987d9b886..1048e5ab10e 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java
@@ -294,7 +294,7 @@ public class ReduceJoin<NAMETYPE extends Name> extends CompositeTensorFunction<N
         if (reducingDimensions.isEmpty()) {
             reducingDimensions = dimensionsInCommon((IndexedTensor)a, (IndexedTensor)b).dimensions().stream()
                     .map(TensorType.Dimension::name)
-                    .toList();
+                    .collect(Collectors.toList());
         }
         if (reducingDimensions.size() != 1) {
             return false;
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
index a9a6df6ed4d..39bddc3a3cd 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
@@ -116,7 +116,7 @@ public class Slice<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETY
     }
 
     private List<String> findDimensions(List<TensorType.Dimension> dims, Predicate<TensorType.Dimension> pred) {
-        return dims.stream().filter(pred).map(TensorType.Dimension::name).toList();
+        return dims.stream().filter(pred).map(TensorType.Dimension::name).collect(Collectors.toList());
     }
 
     private TensorType resultType(TensorType argumentType) {
@@ -138,7 +138,7 @@ public class Slice<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETY
             }
         }
         else { // general slicing
-            peekDimensions = subspaceAddress.stream().map(d -> d.dimension().get()).toList();
+            peekDimensions = subspaceAddress.stream().map(d -> d.dimension().get()).collect(Collectors.toList());
         }
         try {
             return TypeResolver.peek(argumentType, peekDimensions);
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
index a7afc1efc6d..b683519988c 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
@@ -124,7 +124,7 @@ public class JsonFormat {
 
     private static void encodeBlocks(MixedTensor tensor, Cursor cursor) {
         var mappedDimensions = tensor.type().dimensions().stream().filter(d -> d.isMapped())
-                .map(d -> TensorType.Dimension.mapped(d.name())).toList();
+                .map(d -> TensorType.Dimension.mapped(d.name())).collect(Collectors.toList());
         if (mappedDimensions.size() < 1) {
             throw new IllegalArgumentException("Should be ensured by caller");
         }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java
index c18e9f179d6..2a55ac658b1 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java
@@ -43,7 +43,7 @@ class MixedBinaryFormat implements BinaryFormat {
     }
 
     private void encodeSparseDimensions(GrowableByteBuffer buffer, MixedTensor tensor) {
-        List<TensorType.Dimension> sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).toList();
+        List<TensorType.Dimension> sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList());
         buffer.putInt1_4Bytes(sparseDimensions.size());
         for (TensorType.Dimension dimension : sparseDimensions) {
             buffer.putUtf8String(dimension.name());
@@ -51,7 +51,7 @@ class MixedBinaryFormat implements BinaryFormat {
     }
 
     private void encodeDenseDimensions(GrowableByteBuffer buffer, MixedTensor tensor) {
-        List<TensorType.Dimension> denseDimensions = tensor.type().dimensions().stream().filter(d -> d.isIndexed()).toList();
+        List<TensorType.Dimension> denseDimensions = tensor.type().dimensions().stream().filter(d -> d.isIndexed()).collect(Collectors.toList());
         buffer.putInt1_4Bytes(denseDimensions.size());
         for (TensorType.Dimension dimension : denseDimensions) {
             buffer.putUtf8String(dimension.name());
@@ -71,7 +71,7 @@ class MixedBinaryFormat implements BinaryFormat {
     }
 
     private void encodeCells(GrowableByteBuffer buffer, MixedTensor tensor, Consumer<Double> consumer) {
-        List<TensorType.Dimension> sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).toList();
+        List<TensorType.Dimension> sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList());
         long denseSubspaceSize = tensor.denseSubspaceSize();
         if (sparseDimensions.size() > 0) {
             buffer.putInt1_4Bytes((int)(tensor.size() / denseSubspaceSize));  // XXX: Size truncation
@@ -137,7 +137,7 @@ class MixedBinaryFormat implements BinaryFormat {
     }
 
     private void decodeCells(GrowableByteBuffer buffer, MixedTensor.BoundBuilder builder, TensorType type, Supplier<Double> supplier) {
-        List<TensorType.Dimension> sparseDimensions = type.dimensions().stream().filter(d -> !d.isIndexed()).toList();
+        List<TensorType.Dimension> sparseDimensions = type.dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList());
         TensorType sparseType = MixedTensor.createPartialType(type.valueType(), sparseDimensions);
         long denseSubspaceSize = builder.denseSubspaceSize();
 
diff --git a/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java b/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java
index 7b9de25954d..25e6222486c 100644
--- a/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java
+++ b/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java
@@ -96,7 +96,7 @@ public final class NestedTransaction implements AutoCloseable {
 
     @Override
     public String toString() {
-        return String.join(",", transactions.stream().map(Object::toString).toList());
+        return String.join(",", transactions.stream().map(Object::toString).collect(Collectors.toList()));
     }
 
     private List<Transaction> organizeTransactions(List<ConstrainedTransaction> transactions) {
@@ -166,7 +166,7 @@ public final class NestedTransaction implements AutoCloseable {
 
     private List<OrderingConstraint> findAllOrderingConstraintsFrom(Class<? extends Transaction> transactionType,
                                                                     List<OrderingConstraint> constraints) {
-        return constraints.stream().filter(c -> c.before().equals(transactionType)).toList();
+        return constraints.stream().filter(c -> c.before().equals(transactionType)).collect(Collectors.toList());
     }
 
     private static class ConstrainedTransaction {
diff --git a/vespajlib/src/test/java/com/yahoo/slime/SlimeStreamTest.java b/vespajlib/src/test/java/com/yahoo/slime/SlimeStreamTest.java
index cb1eafe3de2..333fdeb4903 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/SlimeStreamTest.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/SlimeStreamTest.java
@@ -12,7 +12,7 @@ public class SlimeStreamTest {
     @Test
     public void test_empty_array() {
         var inspector = new Slime().setArray();
-        var items = SlimeStream.fromArray(inspector, Inspector::asString).toList();
+        var items = SlimeStream.fromArray(inspector, Inspector::asString).collect(Collectors.toList());
         assertEquals(List.of(), items);
     }
 
@@ -21,7 +21,7 @@ public class SlimeStreamTest {
         var inspector = new Slime().setArray();
         inspector.addString("foo");
         inspector.addString("bar");
-        var items = SlimeStream.fromArray(inspector, Inspector::asString).toList();
+        var items = SlimeStream.fromArray(inspector, Inspector::asString).collect(Collectors.toList());
         assertEquals(List.of("foo", "bar"), items);
     }
 }
diff --git a/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java b/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java
index 95a0ef4319e..28930b67264 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java
@@ -107,7 +107,7 @@ public class SlimeUtilsTest {
         assertEquals(0, SlimeUtils.entriesStream(inspector.field("object")).count());
 
         assertEquals(List.of(1L, 2L, 4L, 3L, 0L),
-                     SlimeUtils.entriesStream(inspector.field("list")).map(Inspector::asLong).toList());
+                     SlimeUtils.entriesStream(inspector.field("list")).map(Inspector::asLong).collect(Collectors.toList()));
     }
 
 }
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java
index a2386c97a84..013615e4594 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java
@@ -26,7 +26,7 @@ public class TensorFunctionBenchmark {
         Tensor queryVector = vectors(1, 300, dimensionType).get(0);
         if (extraSpace) {
             queryVector = queryVector.multiply(unitVector("j"));
-            modelVectors = modelVectors.stream().map(t -> t.multiply(unitVector("k"))).toList();
+            modelVectors = modelVectors.stream().map(t -> t.multiply(unitVector("k"))).collect(Collectors.toList());
         }
         dotProduct(queryVector, modelVectors, Math.max(iterations/10, 10)); // warmup
         System.gc();