Revert collect(Collectors.toList())

26 files changed, 27 insertions, 28 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java b/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
index bc57a50b3fc..bd13c04e8b5 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
@@ -234,7 +234,7 @@ public class SearchPath {
                 return Collections.emptyList();
             }
             int end = Math.min(to, max);
-            return IntStream.range(from, end).boxed().toList();
+            return IntStream.range(from, end).boxed().collect(Collectors.toList());
         }
 
         @Override
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
index 3e6e092ea70..906268c5904 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
@@ -38,7 +38,7 @@ public class SearchGroupsImpl implements SearchGroups {
 
     public long medianDocumentsPerGroup() {
         if (isEmpty()) return 0;
-        var activeDocuments = groups().stream().map(Group::activeDocuments).toList();
+        var activeDocuments = groups().stream().map(Group::activeDocuments).collect(Collectors.toList());
         return (long) Quantiles.median().compute(activeDocuments);
     }
 }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java b/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
index d85a4c25413..89c45fde6ae 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
@@ -32,8 +32,7 @@ class FederationResult {
         this.targetResults = targetResults;
 
         if (targetResults.stream().anyMatch(TargetResult::isMandatory))
-            targetsToWaitFor = targetResults.stream().filter(TargetResult::isMandatory)
-                    .collect(Collectors.toCollection(ArrayList::new));
+            targetsToWaitFor = targetResults.stream().filter(TargetResult::isMandatory).collect(Collectors.toList());
         else
             targetsToWaitFor = new ArrayList<>(targetResults);
     }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java
index 2a14607011c..418251cdd56 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java
@@ -32,7 +32,7 @@ public class AddFunction extends FunctionNode {
     public AddFunction copy() {
         return new AddFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
index 0ac09a39516..d01c7fe70f4 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
@@ -32,7 +32,7 @@ public class AndFunction extends FunctionNode {
     public AndFunction copy() {
         return new AndFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java
index fdb502b47f4..7095e411dd6 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java
@@ -32,7 +32,7 @@ public class AvgFunction extends FunctionNode {
     public AvgFunction copy() {
         return new AvgFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java
index 32c86a29d48..e0f08e81e15 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java
@@ -32,7 +32,7 @@ public class CatFunction extends FunctionNode {
     public CatFunction copy() {
         return new CatFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java
index 94608e8fad5..72916b3f9c3 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java
@@ -33,7 +33,7 @@ public class DivFunction extends FunctionNode {
     public DivFunction copy() {
         return new DivFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java
index 9f3c68c9c85..fd91f0a2d57 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java
@@ -35,7 +35,7 @@ public class DoublePredefined extends PredefinedFunction {
                                     args().stream().skip(1)
                                                    .map(DoubleBucket.class::cast)
                                                    .map(arg -> arg.copy())
-                                                   .toList());
+                                                   .collect(Collectors.toList()));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java
index e62688612a8..4f4bca2b3af 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java
@@ -37,7 +37,7 @@ public class LongPredefined extends PredefinedFunction {
                                         .skip(1)
                                         .map(LongBucket.class::cast)
                                         .map(arg -> arg.copy())
-                                        .toList());
+                                        .collect(Collectors.toList()));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java
index fcf6b417ba5..1ff55366365 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java
@@ -31,7 +31,7 @@ public class MaxFunction extends FunctionNode {
     public MaxFunction copy() {
         return new MaxFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java
index cf61b29a026..5b287affa1e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java
@@ -31,7 +31,7 @@ public class MinFunction extends FunctionNode {
     public MinFunction copy() {
         return new MinFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java
index 2c422fd6222..7de1b047589 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java
@@ -32,7 +32,7 @@ public class ModFunction extends FunctionNode {
     public ModFunction copy() {
         return new ModFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
index f53c3a945aa..f0142bbb666 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
@@ -31,7 +31,7 @@ public class MulFunction extends FunctionNode {
     public MulFunction copy() {
         return new MulFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java
index e6cb81b43c3..731f0b3b23b 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java
@@ -32,7 +32,7 @@ public class OrFunction extends FunctionNode {
     public OrFunction copy() {
         return new OrFunction(getLabel(),
                               getLevelOrNull(),
-                              args().stream().map(arg -> arg.copy()).toList());
+                              args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/RawPredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/RawPredefined.java
index 205a04e1a30..ff9cc2f681a 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/RawPredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/RawPredefined.java
@@ -36,7 +36,7 @@ public class RawPredefined extends PredefinedFunction {
                                        .skip(1)
                                        .map(RawBucket.class::cast)
                                        .map(arg -> arg.copy())
-                                       .toList());
+                                       .collect(Collectors.toList()));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java
index c651a344de5..31f378b009c 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java
@@ -32,7 +32,7 @@ public class StrCatFunction extends FunctionNode {
     public StrCatFunction copy() {
         return new StrCatFunction(getLabel(),
                                   getLevelOrNull(),
-                                  args().stream().map(arg -> arg.copy()).toList());
+                                  args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java
index 38d190f9b53..2b333bfb216 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java
@@ -36,7 +36,7 @@ public class StringPredefined extends PredefinedFunction {
                                           .skip(1)
                                           .map(StringBucket.class::cast)
                                           .map(arg -> arg.copy())
-                                          .toList());
+                                          .collect(Collectors.toList()));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java
index 2477e75567f..a2e6c04c4b0 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java
@@ -32,7 +32,7 @@ public class SubFunction extends FunctionNode {
     public SubFunction copy() {
         return new SubFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java
index 2fdcf8168fd..3917c2b7389 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java
@@ -49,7 +49,7 @@ public class UcaFunction extends FunctionNode {
     public UcaFunction copy() {
         return new UcaFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     private boolean validStrength(String strength) {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
index 437c0daa8ac..d408b6c3a37 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
@@ -32,7 +32,7 @@ public class XorBitFunction extends FunctionNode {
     public XorBitFunction copy() {
         return new XorBitFunction(getLabel(),
                                   getLevelOrNull(),
-                                  args().stream().map(arg -> arg.copy()).toList());
+                                  args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java
index 715bbe26600..30d74ce2f0e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java
@@ -32,7 +32,7 @@ public class XorFunction extends FunctionNode {
     public XorFunction copy() {
         return new XorFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).toList());
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
index 09a399ed5bb..9699e9a7448 100644
--- a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
+++ b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
@@ -477,7 +477,7 @@ public class HitGroup extends Hit implements DataList<Hit>, Cloneable, Iterable<
         if (getQuery().errors().isEmpty()) return null;
 
         // Move errors from the query into this
-        List<ErrorMessage> queryErrors = getQuery().errors().stream().map(this::toSearchError).toList();
+        List<ErrorMessage> queryErrors = getQuery().errors().stream().map(this::toSearchError).collect(Collectors.toList());
         getQuery().errors().clear(); // TODO: Remove this line (not promised, can be done at any time)
         return new DefaultErrorHit(getSource(), queryErrors);
     }
diff --git a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java
index 3d56dd99e30..7bd66445512 100644
--- a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java
+++ b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java
@@ -122,7 +122,7 @@ public class SchemaInfo {
         }
 
         private static List<Schema> keep(Set<String> names, Collection<Schema> schemas) {
-            return schemas.stream().filter(schema -> names.contains(schema.name())).toList();
+            return schemas.stream().filter(schema -> names.contains(schema.name())).collect(Collectors.toList());
         }
 
         /**
diff --git a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java
index 6947a93a833..ed1d25a0b35 100644
--- a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java
+++ b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java
@@ -19,7 +19,7 @@ import java.util.stream.Collectors;
 class SchemaInfoConfigurer {
 
     static List<Schema> toSchemas(SchemaInfoConfig schemaInfoConfig) {
-        return schemaInfoConfig.schema().stream().map(config -> toSchema(config)).toList();
+        return schemaInfoConfig.schema().stream().map(config -> toSchema(config)).collect(Collectors.toList());
     }
 
     static Schema toSchema(SchemaInfoConfig.Schema schemaInfoConfig) {
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index 9a75d994919..bd9bffea118 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -145,8 +145,8 @@ public class QueryTestCase {
     @Test
     void testCloneWithConnectivity() {
         List<String> l = List.of("a", "b", "c", "a");
-        printIt(l.stream().filter(i -> isA(i)).toList());
-        printIt(l.stream().filter(i -> !isA(i)).toList());
+        printIt(l.stream().filter(i -> isA(i)).collect(Collectors.toList()));
+        printIt(l.stream().filter(i -> !isA(i)).collect(Collectors.toList()));
 
         Query q = new Query();
         WordItem a = new WordItem("a");