Replace all usages of Arrays.asList with List.of where possible.

55 files changed, 130 insertions, 148 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java
index 3c152f00c66..f911b695853 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java
@@ -1,8 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
+import java.util.List;
 
 /**
  * This class represents a timestamp-formatter function in a {@link GroupingExpression}. It evaluates to a string on the
@@ -23,14 +22,12 @@ public class DateFunction extends FunctionNode {
     }
 
     private DateFunction(String label, Integer level, GroupingExpression exp) {
-        super("time.date", label, level, Arrays.asList(exp));
+        super("time.date", label, level, List.of(exp));
     }
 
     @Override
     public DateFunction copy() {
-        return new DateFunction(getLabel(),
-                                getLevelOrNull(),
-                                getArg(0).copy());
+        return new DateFunction(getLabel(), getLevelOrNull(), getArg(0).copy());
     }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java
index c9639b4ea71..654e969221b 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java
@@ -1,8 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
+import java.util.List;
 
 /**
  * This class represents a day-of-month timestamp-function in a {@link GroupingExpression}. It evaluates to a long that
@@ -23,14 +22,12 @@ public class DayOfMonthFunction extends FunctionNode {
     }
 
     private DayOfMonthFunction(String label, Integer level, GroupingExpression exp) {
-        super("time.dayofmonth", label, level, Arrays.asList(exp));
+        super("time.dayofmonth", label, level, List.of(exp));
     }
 
     @Override
     public DayOfMonthFunction copy() {
-        return new DayOfMonthFunction(getLabel(),
-                                      getLevelOrNull(),
-                                      getArg(0).copy());
+        return new DayOfMonthFunction(getLabel(), getLevelOrNull(), getArg(0).copy());
     }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java
index 644f16a4d17..7b91ab34115 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a day-of-week timestamp-function in a {@link GroupingExpression}. It evaluates to a long that
@@ -22,14 +22,12 @@ public class DayOfWeekFunction extends FunctionNode {
     }
 
     private DayOfWeekFunction(String label, Integer level, GroupingExpression exp) {
-        super("time.dayofweek", label, level, Arrays.asList(exp));
+        super("time.dayofweek", label, level, List.of(exp));
     }
 
     @Override
     public DayOfWeekFunction copy() {
-        return new DayOfWeekFunction(getLabel(),
-                                      getLevelOrNull(),
-                                      getArg(0).copy());
+        return new DayOfWeekFunction(getLabel(), getLevelOrNull(), getArg(0).copy());
     }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java
index f45a7724794..9f7ff969e49 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a day-of-year timestamp-function in a {@link GroupingExpression}. It evaluates to a long that
@@ -22,14 +22,12 @@ public class DayOfYearFunction extends FunctionNode {
     }
 
     private DayOfYearFunction(String label, Integer level, GroupingExpression exp) {
-        super("time.dayofyear", label, level, Arrays.asList(exp));
+        super("time.dayofyear", label, level, List.of(exp));
     }
 
     @Override
     public DayOfYearFunction copy() {
-        return new DayOfYearFunction(getLabel(),
-                                     getLevelOrNull(),
-                                     getArg(0).copy());
+        return new DayOfYearFunction(getLabel(), getLevelOrNull(), getArg(0).copy());
     }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DebugWaitFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DebugWaitFunction.java
index 482d6fe93ce..1477d125847 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DebugWaitFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DebugWaitFunction.java
@@ -1,8 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
+import java.util.List;
 
 /**
  * This class represents debug_wait function in a {@link GroupingExpression}. For each hit evaluated,
@@ -25,7 +24,7 @@ public class DebugWaitFunction extends FunctionNode {
     }
 
     private DebugWaitFunction(String label, Integer level, GroupingExpression arg1, DoubleValue arg2, BooleanValue arg3) {
-        super("debugwait", label, level, Arrays.asList(arg1, arg2, arg3));
+        super("debugwait", label, level, List.of(arg1, arg2, arg3));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java
index 04f6d155699..6e0b721a584 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java
@@ -1,7 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+
+import java.util.List;
 
 /**
  * This class represents a fixed-width bucket-function in a {@link GroupingExpression}. It maps the input into the given
@@ -23,7 +24,7 @@ public class FixedWidthFunction extends FunctionNode {
     }
 
     private FixedWidthFunction(String label, Integer level, GroupingExpression exp, ConstantValue width) {
-        super("fixedwidth", label, level, Arrays.asList(exp, width));
+        super("fixedwidth", label, level, List.of(exp, width));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java b/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java
index c1d86ed3059..d2be51c074b 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java
@@ -66,12 +66,12 @@ public abstract class FunctionNode extends GroupingExpression implements Iterabl
 
     @SuppressWarnings("unchecked")
     protected static <T> List<T> asList(T arg1, T... argN) {
-        return asList(Arrays.asList(arg1), Arrays.asList(argN));
+        return asList(List.of(arg1), List.of(argN));
     }
 
     @SuppressWarnings("unchecked")
     protected static <T> List<T> asList(T arg1, T arg2, T... argN) {
-        return asList(Arrays.asList(arg1, arg2), Arrays.asList(argN));
+        return asList(List.of(arg1, arg2), List.of(argN));
     }
 
     protected static <T> List<T> asList(List<T> foo, List<T> bar) {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java
index b65e1bc2405..95dcf608a95 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents an hour-of-day timestamp-function in a {@link GroupingExpression}. It evaluates to a long that
@@ -22,7 +22,7 @@ public class HourOfDayFunction extends FunctionNode {
     }
 
     private HourOfDayFunction(String label, Integer level, GroupingExpression exp) {
-        super("time.hourofday", label, level, Arrays.asList(exp));
+        super("time.hourofday", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java
index 70f3515371b..8b6ffc53680 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathACosFunction extends FunctionNode {
     }
 
     private MathACosFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.acos", label, level, Arrays.asList(exp));
+        super("math.acos", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java
index 6b31e1cfaff..34570aedc58 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathACosHFunction extends FunctionNode {
     }
 
     private MathACosHFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.acosh", label, level, Arrays.asList(exp));
+        super("math.acosh", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java
index cbb99536af1..1fb0b89d0aa 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathASinFunction extends FunctionNode {
     }
 
     private MathASinFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.asin", label, level, Arrays.asList(exp));
+        super("math.asin", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java
index 9e159abe90f..e0d290c59dc 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathASinHFunction extends FunctionNode {
     }
 
     private MathASinHFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.asinh", label, level, Arrays.asList(exp));
+        super("math.asinh", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java
index a7302769853..50c40a2ad26 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathATanFunction extends FunctionNode {
     }
 
     private MathATanFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.atan", label, level, Arrays.asList(exp));
+        super("math.atan", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java
index f33b8883a79..c8b34e36aaa 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathATanHFunction extends FunctionNode {
     }
 
     private MathATanHFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.atanh", label, level, Arrays.asList(exp));
+        super("math.atanh", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java
index 5e4ad8fb20f..ccec1752823 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathCbrtFunction extends FunctionNode {
     }
 
     private MathCbrtFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.cbrt", label, level, Arrays.asList(exp));
+        super("math.cbrt", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java
index bbf303e0bce..56aaa16c2ae 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathCosFunction extends FunctionNode {
     }
 
     private MathCosFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.cos", label, level, Arrays.asList(exp));
+        super("math.cos", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java
index da92164aec5..8d21435ca52 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathCosHFunction extends FunctionNode {
     }
 
     private MathCosHFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.cosh", label, level, Arrays.asList(exp));
+        super("math.cosh", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java
index 124b4fdaf40..625c6358081 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathExpFunction extends FunctionNode {
     }
 
     private MathExpFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.exp", label, level, Arrays.asList(exp));
+        super("math.exp", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFloorFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFloorFunction.java
index cab480e8ff6..4c775a86b19 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFloorFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFloorFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * Represents the math.floor(expression) function
@@ -21,7 +21,7 @@ public class MathFloorFunction extends FunctionNode {
     }
 
     private MathFloorFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.floor", label, level, Arrays.asList(exp));
+        super("math.floor", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java
index ec2cb62b062..d76c464a6de 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java
@@ -42,29 +42,28 @@ public abstract class MathFunctions {
         }
     }
     public static FunctionNode newInstance(Function type, GroupingExpression x, GroupingExpression y) {
-        switch (type) {
-            case EXP: return new MathExpFunction(x);
-            case POW: return new MathPowFunction(x, y);
-            case LOG: return new MathLogFunction(x);
-            case LOG1P: return new MathLog1pFunction(x);
-            case LOG10: return new MathLog10Function(x);
-            case SIN: return new MathSinFunction(x);
-            case ASIN: return new MathASinFunction(x);
-            case COS: return new MathCosFunction(x);
-            case ACOS: return new MathACosFunction(x);
-            case TAN: return new MathTanFunction(x);
-            case ATAN: return new MathATanFunction(x);
-            case SQRT: return new MathSqrtFunction(x);
-            case SINH: return new MathSinHFunction(x);
-            case ASINH: return new MathASinHFunction(x);
-            case COSH: return new MathCosHFunction(x);
-            case ACOSH: return new MathACosHFunction(x);
-            case TANH: return new MathTanHFunction(x);
-            case ATANH: return new MathATanHFunction(x);
-            case CBRT: return new MathCbrtFunction(x);
-            case HYPOT: return new MathHypotFunction(x, y);
-            case FLOOR: return new MathFloorFunction(x);
-        }
-        return null;
+        return switch (type) {
+            case EXP -> new MathExpFunction(x);
+            case POW -> new MathPowFunction(x, y);
+            case LOG -> new MathLogFunction(x);
+            case LOG1P -> new MathLog1pFunction(x);
+            case LOG10 -> new MathLog10Function(x);
+            case SIN -> new MathSinFunction(x);
+            case ASIN -> new MathASinFunction(x);
+            case COS -> new MathCosFunction(x);
+            case ACOS -> new MathACosFunction(x);
+            case TAN -> new MathTanFunction(x);
+            case ATAN -> new MathATanFunction(x);
+            case SQRT -> new MathSqrtFunction(x);
+            case SINH -> new MathSinHFunction(x);
+            case ASINH -> new MathASinHFunction(x);
+            case COSH -> new MathCosHFunction(x);
+            case ACOSH -> new MathACosHFunction(x);
+            case TANH -> new MathTanHFunction(x);
+            case ATANH -> new MathATanHFunction(x);
+            case CBRT -> new MathCbrtFunction(x);
+            case HYPOT -> new MathHypotFunction(x, y);
+            case FLOOR -> new MathFloorFunction(x);
+        };
     }
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java
index 9f7cef456cf..fd9e8d6271a 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -20,7 +20,7 @@ public class MathHypotFunction extends FunctionNode {
     }
 
     private MathHypotFunction(String label, Integer level, GroupingExpression x, GroupingExpression y) {
-        super("math.hypot", label, level, Arrays.asList(x, y));
+        super("math.hypot", label, level, List.of(x, y));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java
index 8f4a6444bfb..0f05a1909b1 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathLog10Function extends FunctionNode {
     }
 
     private MathLog10Function(String label, Integer level, GroupingExpression exp) {
-        super("math.log10", label, level, Arrays.asList(exp));
+        super("math.log10", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java
index 35fcbd3f1a6..500edd9f90b 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathLog1pFunction extends FunctionNode {
     }
 
     private MathLog1pFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.log1p", label, level, Arrays.asList(exp));
+        super("math.log1p", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java
index 5b06998b004..642c3230b3f 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathLogFunction extends FunctionNode {
     }
 
     private MathLogFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.log", label, level, Arrays.asList(exp));
+        super("math.log", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java
index 6f4972c9af0..7dd398f7008 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -20,7 +20,7 @@ public class MathPowFunction extends FunctionNode {
     }
 
     private MathPowFunction(String label, Integer level, GroupingExpression x, GroupingExpression y) {
-        super("math.pow", label, level, Arrays.asList(x, y));
+        super("math.pow", label, level, List.of(x, y));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java
index 8d21fb8e0df..64051cb96e8 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathSinFunction extends FunctionNode {
     }
 
     private MathSinFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.sin", label, level, Arrays.asList(exp));
+        super("math.sin", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java
index c9d30a0adec..21295278756 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathSinHFunction extends FunctionNode {
     }
 
     private MathSinHFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.sinh", label, level, Arrays.asList(exp));
+        super("math.sinh", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java
index 268ddaaaf2d..411a3fe30fa 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathSqrtFunction extends FunctionNode {
     }
 
     private MathSqrtFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.sqrt", label, level, Arrays.asList(exp));
+        super("math.sqrt", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java
index 79267e0ae17..f2a18010258 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathTanFunction extends FunctionNode {
     }
 
     private MathTanFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.tan", label, level, Arrays.asList(exp));
+        super("math.tan", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java
index e1a83c0b630..5833f0bf887 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class MathTanHFunction extends FunctionNode {
     }
 
     private MathTanHFunction(String label, Integer level, GroupingExpression exp) {
-        super("math.tanh", label, level, Arrays.asList(exp));
+        super("math.tanh", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java b/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java
index 720e071aebf..57604677b82 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents an md5-function in a {@link GroupingExpression}. It evaluates to a long that equals the md5 of
@@ -22,7 +22,7 @@ public class Md5Function extends FunctionNode {
     }
 
     private Md5Function(String label, Integer level, GroupingExpression exp, LongValue numBits) {
-        super("md5", label, level, Arrays.asList(exp, numBits));
+        super("md5", label, level, List.of(exp, numBits));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java
index 73484de9e47..67ddd560ab9 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a minute-of-hour timestamp-function in a {@link GroupingExpression}. It evaluates to a long
@@ -22,7 +22,7 @@ public class MinuteOfHourFunction extends FunctionNode {
     }
 
     private MinuteOfHourFunction(String label, Integer level, GroupingExpression exp) {
-        super("time.minuteofhour", label, level, Arrays.asList(exp));
+        super("time.minuteofhour", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java
index e8dace1e3bf..f9b4aef23f5 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a month-of-year timestamp-function in a {@link GroupingExpression}. It evaluates to a long that
@@ -22,7 +22,7 @@ public class MonthOfYearFunction extends FunctionNode {
     }
 
     private MonthOfYearFunction(String label, Integer level, GroupingExpression exp) {
-        super("time.monthofyear", label, level, Arrays.asList(exp));
+        super("time.monthofyear", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java
index 9f8a8de0266..785d29301e4 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a negate-function in a {@link GroupingExpression}. It evaluates to a number that equals the
@@ -22,7 +22,7 @@ public class NegFunction extends FunctionNode {
     }
 
     private NegFunction(String label, Integer level, GroupingExpression exp) {
-        super("neg", label, level, Arrays.asList(exp));
+        super("neg", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/NormalizeSubjectFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/NormalizeSubjectFunction.java
index 1b3f48052a4..c843959249d 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/NormalizeSubjectFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/NormalizeSubjectFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  */
@@ -17,7 +17,7 @@ public class NormalizeSubjectFunction extends FunctionNode {
     }
 
     private NormalizeSubjectFunction(String label, Integer level, GroupingExpression exp) {
-        super("normalizesubject", label, level, Arrays.asList(exp));
+        super("normalizesubject", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java
index 483f2494ea9..819dd3601c4 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a reverse-function in a {@link GroupingExpression}. It evaluates to a list that equals the list
@@ -22,7 +22,7 @@ public class ReverseFunction extends FunctionNode {
     }
 
     private ReverseFunction(String label, Integer level, GroupingExpression exp) {
-        super("reverse", label, level, Arrays.asList(exp));
+        super("reverse", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java
index a4ef16d50d3..fdcbeefe647 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a second-of-minute timestamp-function in a {@link GroupingExpression}. It evaluates to a long
@@ -22,7 +22,7 @@ public class SecondOfMinuteFunction extends FunctionNode {
     }
 
     private SecondOfMinuteFunction(String label, Integer level, GroupingExpression exp) {
-        super("time.secondofminute", label, level, Arrays.asList(exp));
+        super("time.secondofminute", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
index 418d1513973..33b910a1119 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a size-function in a {@link GroupingExpression}. It evaluates to a number that equals the
@@ -22,7 +22,7 @@ public class SizeFunction extends FunctionNode {
     }
 
     private SizeFunction(String label, Integer level, GroupingExpression exp) {
-        super("size", label, level, Arrays.asList(exp));
+        super("size", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java
index 03b9479afda..0acee311b11 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a sort-function in a {@link GroupingExpression}. It evaluates to a list that equals the list
@@ -22,7 +22,7 @@ public class SortFunction  extends FunctionNode {
     }
 
     private SortFunction(String label, Integer level, GroupingExpression exp) {
-        super("sort", label, level, Arrays.asList(exp));
+        super("sort", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java
index 28b0f021b26..21679b01170 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a strcat-function in a {@link GroupingExpression}. It evaluates to a long that equals the
@@ -22,7 +22,7 @@ public class StrLenFunction extends FunctionNode {
     }
 
     private StrLenFunction(String label, Integer level, GroupingExpression exp) {
-        super("strlen", label, level, Arrays.asList(exp));
+        super("strlen", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java
index 906e7ec18cb..6d05dd69a92 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a todouble-function in a {@link GroupingExpression}. It converts the result of the argument to
@@ -22,7 +22,7 @@ public class ToDoubleFunction extends FunctionNode {
     }
 
     private ToDoubleFunction(String label, Integer level, GroupingExpression exp) {
-        super("todouble", label, level, Arrays.asList(exp));
+        super("todouble", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java
index 4c7db38442d..d92cd2814aa 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a tolong-function in a {@link GroupingExpression}. It converts the result of the argument to a
@@ -22,7 +22,7 @@ public class ToLongFunction extends FunctionNode {
     }
 
     private ToLongFunction(String label, Integer level, GroupingExpression exp) {
-        super("tolong", label, level, Arrays.asList(exp));
+        super("tolong", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java
index 9c0a581fb87..99cf3400bdc 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a toraw-function in a {@link GroupingExpression}. It
@@ -23,7 +23,7 @@ public class ToRawFunction extends FunctionNode {
     }
 
     private ToRawFunction(String label, Integer level, GroupingExpression exp) {
-        super("toraw", label, level, Arrays.asList(exp));
+        super("toraw", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java
index 0fb891bdce0..b58765c57f0 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a tolong-function in a {@link GroupingExpression}. It converts the result of the argument to a
@@ -22,7 +22,7 @@ public class ToStringFunction extends FunctionNode {
     }
 
     private ToStringFunction(String label, Integer level, GroupingExpression exp) {
-        super("tostring", label, level, Arrays.asList(exp));
+        super("tostring", label, level, List.of(exp));
     }
 
     @Override
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 c5e469f1379..98cb68fbb8c 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
@@ -1,7 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -23,7 +22,7 @@ public class UcaFunction extends FunctionNode {
      * @param locale  The locale to used for sorting.
      */
     public UcaFunction(GroupingExpression exp, String locale) {
-        this(null, null, Arrays.asList(exp, new StringValue(locale)));
+        this(null, null, List.of(exp, new StringValue(locale)));
     }
 
     /**
@@ -34,7 +33,7 @@ public class UcaFunction extends FunctionNode {
      * @param strength The strength level to use.
      */
     public UcaFunction(GroupingExpression exp, String locale, String strength) {
-        this(null, null, Arrays.asList(exp, new StringValue(locale), new StringValue(strength)));
+        this(null, null, List.of(exp, new StringValue(locale), new StringValue(strength)));
         if ( ! validStrength(strength))
             throw new IllegalArgumentException("Not a valid UCA strength: " + 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 2e0bf25b894..f03bf681e90 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
@@ -1,7 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -21,7 +20,7 @@ public class XorBitFunction extends FunctionNode {
      * @param numBits The number of bits of the expression value to xor.
      */
     public XorBitFunction(GroupingExpression exp, int numBits) {
-        this(null, null, Arrays.asList(exp, new LongValue(numBits)));
+        this(null, null, List.of(exp, new LongValue(numBits)));
     }
 
     private XorBitFunction(String label, Integer level, List<GroupingExpression> exp) {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java
index 150b54855f3..528a6253ab0 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * This class represents a year timestamp-function in a {@link GroupingExpression}. It evaluates to a long that equals
@@ -22,7 +22,7 @@ public class YearFunction extends FunctionNode {
     }
 
     private YearFunction(String label, Integer level, GroupingExpression exp) {
-        super("time.year", label, level, Arrays.asList(exp));
+        super("time.year", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java
index 29216e20825..e954e2c24fc 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -19,7 +19,7 @@ public class ZCurveXFunction extends FunctionNode {
     }
 
     private ZCurveXFunction(String label, Integer level, GroupingExpression exp) {
-        super("zcurve.x", label, level, Arrays.asList(exp));
+        super("zcurve.x", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java
index 4803f145487..edbc9417a6b 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
-import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author baldersheim
@@ -18,7 +18,7 @@ public class ZCurveYFunction extends FunctionNode {
     }
 
     private ZCurveYFunction(String label, Integer level, GroupingExpression exp) {
-        super("zcurve.y", label, level, Arrays.asList(exp));
+        super("zcurve.y", label, level, List.of(exp));
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java
index 6504949e174..22bc97b9ca1 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java
@@ -22,7 +22,6 @@ import com.yahoo.search.result.ErrorMessage;
 import com.yahoo.search.searchchain.Execution;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -98,7 +97,7 @@ public class PageTemplateSearcher extends Searcher {
      * @param resolvers the resolvers to use, in addition to the default resolvers
      */
     public PageTemplateSearcher(PageTemplateRegistry templateRegistry, Resolver... resolvers) {
-        this(templateRegistry, Arrays.asList(resolvers));
+        this(templateRegistry, List.of(resolvers));
     }
 
     private PageTemplateSearcher(PageTemplateRegistry templateRegistry, List<Resolver> resolvers) {
@@ -138,7 +137,7 @@ public class PageTemplateSearcher extends Searcher {
         if (pageIds == null) {
             String pageIdString = query.properties().getString(pageIdName,"").trim();
             if (!pageIdString.isEmpty())
-                pageIds = Arrays.asList(pageIdString.split(" "));
+                pageIds = List.of(pageIdString.split(" "));
         }
 
         // If none set, just return the default or null if none
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
index d8cfaab7cba..3ee195bdf55 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
@@ -85,7 +85,7 @@ public class PageTemplateXMLReader {
 
     private List<File> sortFiles(File dir) {
         ArrayList<File> files = new ArrayList<>();
-        files.addAll(Arrays.asList(dir.listFiles()));
+        files.addAll(List.of(dir.listFiles()));
         Collections.sort(files);
         return files;
     }
diff --git a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
index 93df7fdfb18..c897afe144c 100644
--- a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
+++ b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
@@ -55,7 +55,6 @@ import com.yahoo.slime.SlimeUtils;
 import com.yahoo.slime.Type;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -147,7 +146,7 @@ public class SelectParser implements Parser {
     private final Normalizer normalizer;
     private IndexFacts.Session indexFactsSession;
 
-    private static final List<String> FUNCTION_CALLS = Arrays.asList(WAND, WEIGHTED_SET, DOT_PRODUCT, GEO_LOCATION, NEAREST_NEIGHBOR, PREDICATE, RANK, WEAK_AND);
+    private static final List<String> FUNCTION_CALLS = List.of(WAND, WEIGHTED_SET, DOT_PRODUCT, GEO_LOCATION, NEAREST_NEIGHBOR, PREDICATE, RANK, WEAK_AND);
 
     public SelectParser(ParserEnvironment environment) {
         indexFacts = environment.getIndexFacts();
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileXMLReader.java b/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileXMLReader.java
index f2eb76f2367..abb0129eed0 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileXMLReader.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileXMLReader.java
@@ -18,7 +18,6 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -68,7 +67,7 @@ public class QueryProfileXMLReader {
 
     private List<File> sortFiles(File dir) {
         ArrayList<File> files = new ArrayList<>();
-        files.addAll(Arrays.asList(dir.listFiles()));
+        files.addAll(List.of(dir.listFiles()));
         Collections.sort(files);
         return files;
     }
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
index c8c9f7241d2..7971bc0a30e 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
@@ -7,7 +7,6 @@ import com.yahoo.prelude.query.TaggableItem;
 import com.yahoo.search.query.textserialize.serializer.DispatchForm;
 import com.yahoo.search.query.textserialize.serializer.ItemIdMapper;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -116,7 +115,7 @@ public class ItemInitializer {
         Item connectedItem = taggableItem.getConnectedItem();
         if (connectedItem != null) {
             form.setProperty("connectivity",
-                    Arrays.asList(itemIdMapper.getId(connectedItem), taggableItem.getConnectivity()));
+                    List.of(itemIdMapper.getId(connectedItem), taggableItem.getConnectivity()));
         }
 
         if (taggableItem.hasExplicitSignificance()) {
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/SearchChain.java b/container-search/src/main/java/com/yahoo/search/searchchain/SearchChain.java
index 27d7430a0d9..9698735fb52 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/SearchChain.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/SearchChain.java
@@ -6,7 +6,6 @@ import com.yahoo.component.chain.Chain;
 import com.yahoo.component.chain.Phase;
 import com.yahoo.search.Searcher;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -33,7 +32,7 @@ public class SearchChain extends Chain<Searcher> {
     }
 
     public SearchChain(ComponentId id, Searcher... searchers) {
-        this(id, Arrays.asList(searchers));
+        this(id, List.of(searchers));
     }
 
     public SearchChain(ComponentId id, Collection<Searcher> searchers) {