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

21 files changed, 43 insertions, 58 deletions

diff --git a/container-core/src/main/java/com/yahoo/component/chain/ChainedComponent.java b/container-core/src/main/java/com/yahoo/component/chain/ChainedComponent.java
index d98e7e9c730..2c2ee5226a6 100644
--- a/container-core/src/main/java/com/yahoo/component/chain/ChainedComponent.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/ChainedComponent.java
@@ -11,7 +11,6 @@ import com.yahoo.component.chain.dependencies.Provides;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -69,7 +68,7 @@ public abstract class ChainedComponent extends AbstractComponent {
     // TODO: move to vespajlib.
     private static List<String> allOf(List<String> symbols, String... otherSymbols) {
         List<String> result = new ArrayList<>(symbols);
-        result.addAll(Arrays.asList(otherSymbols));
+        result.addAll(List.of(otherSymbols));
         return result;
     }
 
@@ -87,7 +86,7 @@ public abstract class ChainedComponent extends AbstractComponent {
             Annotation annotation = component.getClass().getAnnotation(annotationClass);
             if (annotation != null) {
                 Object values = annotationClass.getMethod("value").invoke(annotation);
-                return Arrays.asList((String[])values);
+                return List.of((String[])values);
             }
             return List.of();
 
diff --git a/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java
index fef23f3cc27..c0bc01be27c 100644
--- a/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java
+++ b/container-core/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java
@@ -3,7 +3,6 @@ package com.yahoo.component.chain.dependencies.ordering;
 
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -50,7 +49,7 @@ public class ChainBuilder<T extends ChainedComponent> {
     }
 
     private Set<String> set(String... s) {
-        return new HashSet<>(Arrays.asList(s));
+        return new HashSet<>(List.of(s));
     }
 
     public PhaseNameProvider addPhase(Phase phase) {
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
index 98b4d0f4d63..5db57250bdf 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
@@ -23,7 +23,6 @@ import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.lang.reflect.WildcardType;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -369,7 +368,7 @@ public class ComponentGraph {
     public static boolean isBindingAnnotation(Annotation annotation) {
         LinkedList<Class<?>> queue = new LinkedList<>();
         queue.add(annotation.getClass());
-        queue.addAll(Arrays.asList(annotation.getClass().getInterfaces()));
+        queue.addAll(List.of(annotation.getClass().getInterfaces()));
 
         while (!queue.isEmpty()) {
             Class<?> clazz = queue.removeFirst();
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
index 4500a5636f4..dcc024ef2b1 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
@@ -199,7 +199,7 @@ public class ComponentNode extends Node {
     @Override
     public boolean equals(Object other) {
         if (other instanceof ComponentNode that) {
-            return super.equals(that) && equalEdges(Arrays.asList(this.arguments), Arrays.asList(that.arguments)) && this.usedConfigs().equals(that.usedConfigs());
+            return super.equals(that) && equalEdges(List.of(this.arguments), List.of(that.arguments)) && this.usedConfigs().equals(that.usedConfigs());
         } else {
             return false;
         }
@@ -225,7 +225,7 @@ public class ComponentNode extends Node {
         List<Pair<Type, List<Annotation>>> ret = new ArrayList<>();
 
         for (int i = 0; i < types.length; i++) {
-            ret.add(new Pair<>(types[i], Arrays.asList(annotations[i])));
+            ret.add(new Pair<>(types[i], List.of(annotations[i])));
         }
         return ret;
     }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
index ebd5c38e3a3..81ec0919441 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
@@ -31,7 +31,6 @@ import java.io.PrintStream;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -373,7 +372,7 @@ public class StateHandler extends AbstractRequestHandler implements CapabilityRe
 
     private boolean isPrometheusRequest(String query) {
         if (query == null) return false;
-        return Arrays.asList(query.split("&")).contains("format=prometheus");
+        return List.of(query.split("&")).contains("format=prometheus");
     }
 
     private String prometheusSanitizedName(String name) {
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/CookieHelper.java b/container-core/src/main/java/com/yahoo/jdisc/http/CookieHelper.java
index 3f32ca97a1c..1c9e6572d63 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/CookieHelper.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/CookieHelper.java
@@ -3,7 +3,6 @@ package com.yahoo.jdisc.http;
 
 import com.yahoo.jdisc.HeaderFields;
 
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -31,7 +30,7 @@ public class CookieHelper {
     public static void encodeSetCookieHeader(HeaderFields headers, List<Cookie> cookies) {
         headers.remove(HttpHeaders.Names.SET_COOKIE);
         for (Cookie cookie : cookies) {
-            headers.add(HttpHeaders.Names.SET_COOKIE, Cookie.toSetCookieHeaders(Arrays.asList(cookie)));
+            headers.add(HttpHeaders.Names.SET_COOKIE, Cookie.toSetCookieHeaders(List.of(cookie)));
         }
     }
 }
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java
index f96bb8b30ae..5070ef75c4d 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java
@@ -9,7 +9,6 @@ import com.yahoo.jdisc.http.HttpResponse;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -158,7 +157,7 @@ public class DiscFilterResponse {
 
     public void setCookie(String name, String value) {
         Cookie cookie = new Cookie(name, value);
-        setCookies(Arrays.asList(cookie));
+        setCookies(List.of(cookie));
     }
 
  }
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java
index 22874d2f987..dc8eb7daa7a 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java
@@ -9,7 +9,6 @@ import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.http.HttpRequest;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -42,7 +41,7 @@ public final class SecurityRequestFilterChain extends AbstractResource implement
     }
 
     public static RequestFilter newInstance(SecurityRequestFilter... filters) {
-        return newInstance(Arrays.asList(filters));
+        return newInstance(List.of(filters));
     }
 
     public static RequestFilter newInstance(List<? extends SecurityRequestFilter> filters) {
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java
index f3e722fbd61..16565cb5010 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java
@@ -8,7 +8,6 @@ import com.yahoo.jdisc.http.HttpRequest;
 
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -43,7 +42,7 @@ public class SecurityResponseFilterChain extends AbstractResource implements Res
     }
 
     public static ResponseFilter newInstance(SecurityResponseFilter... filters) {
-        return newInstance(Arrays.asList(filters));
+        return newInstance(List.of(filters));
     }
 
     public static ResponseFilter newInstance(List<? extends SecurityResponseFilter> filters) {
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/RequestFilterChain.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/RequestFilterChain.java
index 2f50b5e319b..d6666060dbc 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/RequestFilterChain.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/RequestFilterChain.java
@@ -8,7 +8,6 @@ import com.yahoo.jdisc.http.HttpRequest;
 import com.yahoo.jdisc.http.filter.RequestFilter;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -40,7 +39,7 @@ public final class RequestFilterChain extends AbstractResource implements Reques
     }
 
     public static RequestFilter newInstance(RequestFilter... filters) {
-        return newInstance(Arrays.asList(filters));
+        return newInstance(List.of(filters));
     }
 
     public static RequestFilter newInstance(List<? extends RequestFilter> filters) {
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseFilterChain.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseFilterChain.java
index 02d94a7529e..5145c7210f1 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseFilterChain.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseFilterChain.java
@@ -8,7 +8,6 @@ import com.yahoo.jdisc.application.ResourcePool;
 import com.yahoo.jdisc.http.filter.ResponseFilter;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -39,7 +38,7 @@ public final class ResponseFilterChain extends AbstractResource implements Respo
     }
 
     public static ResponseFilter newInstance(ResponseFilter... filters) {
-        return newInstance(Arrays.asList(filters));
+        return newInstance(List.of(filters));
     }
 
     public static ResponseFilter newInstance(List<? extends ResponseFilter> filters) {
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlers.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlers.java
index caa942b6a5c..23efec5f98d 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlers.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlers.java
@@ -3,7 +3,8 @@ package com.yahoo.jdisc.http.server.jetty;
 
 import com.yahoo.jdisc.handler.CompletionHandler;
 
-import java.util.Arrays;
+import java.util.List;
+
 
 /**
  * @author Simon Thoresen Hult
@@ -33,7 +34,7 @@ public class CompletionHandlers {
     }
 
     public static CompletionHandler wrap(CompletionHandler... handlers) {
-        return wrap(Arrays.asList(handlers));
+        return wrap(List.of(handlers));
     }
 
     public static CompletionHandler wrap(final Iterable<CompletionHandler> handlers) {
diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/Point.java b/container-core/src/main/java/com/yahoo/metrics/simple/Point.java
index 5c7abe03596..4a1ae80fc69 100644
--- a/container-core/src/main/java/com/yahoo/metrics/simple/Point.java
+++ b/container-core/src/main/java/com/yahoo/metrics/simple/Point.java
@@ -74,13 +74,11 @@ public final class Point implements Context {
     @Override
     public String toString() {
         final int maxLen = 3;
-        StringBuilder builder = new StringBuilder();
-        builder.append("Point [location=")
-                .append(Arrays.asList(location).subList(0, Math.min(location.length, maxLen)))
-                .append(", dimensions=")
-                .append(Arrays.asList(dimensions).subList(0, Math.min(dimensions.length, maxLen)))
-                .append("]");
-        return builder.toString();
+        return "Point [location=" +
+                List.of(location).subList(0, Math.min(location.length, maxLen)) +
+                ", dimensions=" +
+                List.of(dimensions).subList(0, Math.min(dimensions.length, maxLen)) +
+                "]";
     }
 
     /**
diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
index cd22dc80a4c..b17e4229c4c 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
@@ -12,9 +12,9 @@ import com.yahoo.processing.Processor;
 import com.yahoo.processing.execution.chain.ChainRegistry;
 import com.yahoo.processing.rendering.Renderer;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
@@ -38,12 +38,12 @@ public class ProcessingTestDriver extends RequestHandlerTestDriver {
     @SafeVarargs
     @SuppressWarnings("varargs")
     public ProcessingTestDriver(Chain<Processor> ... chains) {
-        this(Arrays.asList(chains), new ComponentRegistry<>());
+        this(List.of(chains), new ComponentRegistry<>());
     }
     @SafeVarargs
     @SuppressWarnings("varargs")
     public ProcessingTestDriver(String binding, Chain<Processor> ... chains) {
-        this(binding, Arrays.asList(chains), new ComponentRegistry<>());
+        this(binding, List.of(chains), new ComponentRegistry<>());
     }
     public ProcessingTestDriver(Collection<Chain<Processor>> chains, ComponentRegistry<Renderer> renderers) {
         this(createProcessingHandler(chains, renderers, AccessLog.voidAccessLog()));
diff --git a/container-core/src/main/java/com/yahoo/processing/request/CompoundName.java b/container-core/src/main/java/com/yahoo/processing/request/CompoundName.java
index cb4743cd83e..b4536a1c56b 100644
--- a/container-core/src/main/java/com/yahoo/processing/request/CompoundName.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/CompoundName.java
@@ -173,7 +173,7 @@ public final class CompoundName {
         if (isEmpty()) return fromComponents(nameParts);
 
         List<String> newCompounds = new ArrayList<>(nameParts.length + compounds.size());
-        newCompounds.addAll(Arrays.asList(nameParts));
+        newCompounds.addAll(List.of(nameParts));
         newCompounds.addAll(this.compounds);
         return new CompoundName(newCompounds);
     }
@@ -204,7 +204,7 @@ public final class CompoundName {
             throw new IllegalArgumentException("Asked for the first " + n + " components but '" +
                                                this + "' only have " + compounds.size() + " components.");
         if (compounds.size() == n) return this;
-        if (compounds.size() == 0) return empty;
+        if (compounds.isEmpty()) return empty;
         if (compounds.size() - 1 == n) return first;
         return first.first(n);
     }
@@ -316,7 +316,7 @@ public final class CompoundName {
         for (String compound : compounds) all += compound.length();
         StringBuilder b = new StringBuilder(all);
         for (String compound : compounds) b.append(compound).append(".");
-        return b.length()==0 ? "" : b.substring(0, b.length()-1);
+        return b.isEmpty() ? "" : b.substring(0, b.length()-1);
     }
 
     /**
diff --git a/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java
index 7e5cc5187ba..207e18084ab 100644
--- a/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java
+++ b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java
@@ -11,7 +11,6 @@ import com.yahoo.component.chain.dependencies.Provides;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -97,7 +96,7 @@ public class ChainBuilderTest {
 
         depHandler.addComponent(first);
         depHandler.addComponent(second);
-        assertEquals(depHandler.orderNodes().components(), Arrays.asList(first, second));
+        assertEquals(depHandler.orderNodes().components(), List.of(first, second));
 
     }
 
@@ -113,7 +112,7 @@ public class ChainBuilderTest {
         chainBuilder.addComponent(c);
         chainBuilder.addComponent(a2);
 
-        assertEquals(Arrays.asList(a1, c, a2), chainBuilder.orderNodes().components());
+        assertEquals(List.of(a1, c, a2), chainBuilder.orderNodes().components());
     }
 
     private ChainBuilder newChainBuilder() {
@@ -121,7 +120,7 @@ public class ChainBuilderTest {
     }
 
     private Set<String> set(String... strings) {
-        return new HashSet<>(Arrays.asList(strings));
+        return new HashSet<>(List.of(strings));
     }
 
     @Before("phase1")
diff --git a/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java
index f1dd1ff03c0..126e96c7543 100644
--- a/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java
+++ b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.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.component.chain.dependencies.ordering;
 
-import java.util.Arrays;
 
 import com.yahoo.component.chain.ChainedComponent;
 
@@ -11,6 +10,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import com.yahoo.component.ComponentId;
 
+import java.util.List;
+
 
 /**
  * Test for OrderedReadyNodes.
@@ -20,14 +21,14 @@ import com.yahoo.component.ComponentId;
 @SuppressWarnings("rawtypes")
 public class OrderedReadyNodesTest {
 
-    class ComponentA extends ChainedComponent {
+    static class ComponentA extends ChainedComponent {
         public ComponentA(ComponentId id) {
             super(id);
         }
 
         @Override
         public Dependencies getDependencies() {
-            return new Dependencies(Arrays.asList(getId().getName()), null, null);
+            return new Dependencies(List.of(getId().getName()), null, null);
         }
     }
 
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
index ab20c86ded6..6f5af2f308b 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
@@ -8,7 +8,6 @@ import org.junit.jupiter.api.Test;
 
 import java.net.InetSocketAddress;
 import java.net.URI;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -96,11 +95,11 @@ public class HttpRequestTestCase {
         request.setConnectionTimeout(1, TimeUnit.SECONDS);
         assertEquals(Long.valueOf(1000), request.getConnectionTimeout(TimeUnit.MILLISECONDS));
 
-        assertEquals(Arrays.asList("bar", "baz"), request.parameters().get("foo"));
+        assertEquals(List.of("bar", "baz"), request.parameters().get("foo"));
         assertEquals(List.of("69"), request.parameters().get("cox"));
-        request.parameters().put("cox", Arrays.asList("6", "9"));
-        assertEquals(Arrays.asList("bar", "baz"), request.parameters().get("foo"));
-        assertEquals(Arrays.asList("6", "9"), request.parameters().get("cox"));
+        request.parameters().put("cox", List.of("6", "9"));
+        assertEquals(List.of("bar", "baz"), request.parameters().get("foo"));
+        assertEquals(List.of("6", "9"), request.parameters().get("cox"));
 
         assertEquals(1L, request.getConnectedAt(TimeUnit.MILLISECONDS));
     }
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java
index c948251daad..c521462c896 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java
@@ -4,7 +4,6 @@ package com.yahoo.jdisc.http;
 import com.yahoo.jdisc.Response;
 import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -88,11 +87,11 @@ public class HttpResponseTestCase {
     @Test
     void requireThatMultipleCookieHeadersCanBeEncoded() throws Exception {
         final HttpResponse response = newResponse(69);
-        final List<Cookie> cookies = Arrays.asList(new Cookie("foo", "bar"), new Cookie("baz", "cox"));
+        final List<Cookie> cookies = List.of(new Cookie("foo", "bar"), new Cookie("baz", "cox"));
         response.encodeSetCookieHeader(cookies);
         final List<String> headers = response.headers().get(HttpHeaders.Names.SET_COOKIE);
         assertEquals(2, headers.size());
-        assertEquals(Cookie.toSetCookieHeaders(Arrays.asList(new Cookie("foo", "bar"), new Cookie("baz", "cox"))),
+        assertEquals(Cookie.toSetCookieHeaders(List.of(new Cookie("foo", "bar"), new Cookie("baz", "cox"))),
                 headers);
     }
 
@@ -107,7 +106,7 @@ public class HttpResponseTestCase {
     @Test
     void requireThatMultipleCookieHeadersCanBeDecoded() throws Exception {
         final HttpResponse response = newResponse(69);
-        final List<Cookie> cookies = Arrays.asList(new Cookie("foo", "bar"), new Cookie("baz", "cox"));
+        final List<Cookie> cookies = List.of(new Cookie("foo", "bar"), new Cookie("baz", "cox"));
         response.encodeSetCookieHeader(cookies);
         assertEquals(cookies, response.decodeSetCookieHeader());
     }
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
index 6460dee8365..9a3005c0971 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
@@ -12,7 +12,6 @@ import org.junit.jupiter.api.Test;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -306,7 +305,7 @@ public class DiscFilterRequestTest {
         URI uri = URI.create("http://example.yahoo.com/test");
         HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
         httpReq.headers().add("key1", "value1");
-        httpReq.headers().add("key2", Arrays.asList("value1", "value2"));
+        httpReq.headers().add("key2", List.of("value1", "value2"));
 
         DiscFilterRequest request = new DiscFilterRequest(httpReq);
         HeaderFields headers = request.getUntreatedHeaders();
diff --git a/container-core/src/test/java/com/yahoo/processing/test/documentation/Federator.java b/container-core/src/test/java/com/yahoo/processing/test/documentation/Federator.java
index 101f5d31648..c7892ddbc1e 100644
--- a/container-core/src/test/java/com/yahoo/processing/test/documentation/Federator.java
+++ b/container-core/src/test/java/com/yahoo/processing/test/documentation/Federator.java
@@ -10,7 +10,6 @@ import com.yahoo.processing.execution.Execution;
 import com.yahoo.processing.response.FutureResponse;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -23,7 +22,7 @@ public class Federator extends Processor {
     @SafeVarargs
     @SuppressWarnings("varargs")
     public Federator(Chain<? extends Processor> ... chains) {
-        this.chains = Arrays.asList(chains);
+        this.chains = List.of(chains);
     }
 
     @SuppressWarnings("unchecked")