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

9 files changed, 35 insertions, 42 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/RPCMessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/RPCMessageBus.java
index 86504d3ad35..d4cec5de323 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/RPCMessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/RPCMessageBus.java
@@ -5,7 +5,6 @@ import com.yahoo.messagebus.network.Identity;
 import com.yahoo.messagebus.network.rpc.RPCNetwork;
 import com.yahoo.messagebus.network.rpc.RPCNetworkParams;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -76,7 +75,7 @@ public class RPCMessageBus extends NetworkMessageBus {
      *                 destination sessions to be routed to.
      */
     public RPCMessageBus(Protocol protocol, String configId) {
-        this(Arrays.asList(protocol), new RPCNetworkParams().setIdentity(new Identity(configId)), null);
+        this(List.of(protocol), new RPCNetworkParams().setIdentity(new Identity(configId)), null);
     }
 
     /**
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/test/CustomPolicyFactory.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/test/CustomPolicyFactory.java
index 2e568598a94..10a7089fd20 100755..100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/routing/test/CustomPolicyFactory.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/test/CustomPolicyFactory.java
@@ -6,7 +6,6 @@ import com.yahoo.messagebus.routing.RoutingPolicy;
 import com.yahoo.messagebus.test.SimpleProtocol;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -26,7 +25,7 @@ public class CustomPolicyFactory implements SimpleProtocol.PolicyFactory {
     }
 
     public CustomPolicyFactory(boolean selectOnRetry, int consumableError) {
-        this(selectOnRetry, Arrays.asList(consumableError));
+        this(selectOnRetry, List.of(consumableError));
     }
 
     public CustomPolicyFactory(boolean selectOnRetry, List<Integer> consumableErrors) {
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java
index 5a3d96991bb..4d51d265cc0 100755..100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java
@@ -9,7 +9,8 @@ import com.yahoo.messagebus.test.SimpleMessage;
 import com.yahoo.messagebus.test.SimpleProtocol;
 import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
+
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -33,9 +34,9 @@ public class ErrorTestCase {
     @Test
     void requireThatErrorIsPropagated() throws Exception {
         RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME);
-        table.addHop("itr", "test/itr/session", Arrays.asList("test/itr/session"));
-        table.addHop("dst", "test/dst/session", Arrays.asList("test/dst/session"));
-        table.addRoute("test", Arrays.asList("itr", "dst"));
+        table.addHop("itr", "test/itr/session", List.of("test/itr/session"));
+        table.addHop("dst", "test/dst/session", List.of("test/dst/session"));
+        table.addRoute("test", List.of("itr", "dst"));
 
         Slobrok slobrok = new Slobrok();
         TestServer src = new TestServer("test/src", table, slobrok, null);
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java
index 7d46add79c9..0aeeba68080 100755..100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java
@@ -12,8 +12,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.net.UnknownHostException;
-import java.util.Arrays;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -31,9 +30,9 @@ public class TraceTripTestCase {
     @BeforeEach
     public void setUp() throws ListenFailedException {
         RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME)
-                                 .addHop("pxy", "test/pxy/session", Arrays.asList("test/pxy/session"))
-                                 .addHop("dst", "test/dst/session", Arrays.asList("test/dst/session"))
-                                 .addRoute("test", Arrays.asList("pxy", "dst"));
+                                 .addHop("pxy", "test/pxy/session", List.of("test/pxy/session"))
+                                 .addHop("dst", "test/dst/session", List.of("test/dst/session"))
+                                 .addRoute("test", List.of("pxy", "dst"));
 
         slobrok = new Slobrok();
         src = new TestServer("test/src", table, slobrok, null);
@@ -82,7 +81,7 @@ public class TraceTripTestCase {
     }
 
     private static class Proxy implements MessageHandler, ReplyHandler {
-        private IntermediateSession session;
+        private final IntermediateSession session;
 
         public Proxy(MessageBus bus) {
             session = bus.createIntermediateSession("session", true, this, this);
@@ -102,7 +101,7 @@ public class TraceTripTestCase {
     }
 
     private static class Server implements MessageHandler {
-        private DestinationSession session;
+        private final DestinationSession session;
 
         public Server(MessageBus bus) {
             session = bus.createDestinationSession("session", true, this);
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java
index 6612421e437..f62e586d1e2 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java
@@ -16,7 +16,6 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -36,7 +35,7 @@ public class BasicNetworkTestCase {
         RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME);
         table.addHop("pxy", "test/pxy/session", List.of("test/pxy/session"));
         table.addHop("dst", "test/dst/session", List.of("test/dst/session"));
-        table.addRoute("test", Arrays.asList("pxy", "dst"));
+        table.addRoute("test", List.of("pxy", "dst"));
         slobrok = new Slobrok();
         src = new TestServer("test/src", table, slobrok, null);
         pxy = new TestServer("test/pxy", table, slobrok, null);
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java
index 061416b9eed..c30b4e2aa03 100755..100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java
@@ -26,7 +26,6 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.net.UnknownHostException;
-import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -87,7 +86,7 @@ public class SendAdapterTestCase {
 
     @Test
     void requireThatMessagesCanBeSentAcrossAllSupportedVersions() {
-        List<Version> versions = Arrays.asList(
+        List<Version> versions = List.of(
                 new Version(6, 149),
                 new Version(9, 999)
         );
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java
index 37d0bbd4c92..ded431cd258 100755..100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java
@@ -15,7 +15,6 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -62,8 +61,8 @@ public class RoutingContextTestCase {
         SimpleProtocol protocol = new SimpleProtocol();
         protocol.addPolicyFactory("Custom", new CustomPolicyFactory(
                 false,
-                Arrays.asList("foo", "bar", "baz/cox"),
-                Arrays.asList("foo", "bar")));
+                List.of("foo", "bar", "baz/cox"),
+                List.of("foo", "bar")));
         srcServer.mb.putProtocol(protocol);
         srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME)
                 .addRoute(new RouteSpec("myroute").addHop("myhop"))
@@ -83,8 +82,8 @@ public class RoutingContextTestCase {
         SimpleProtocol protocol = new SimpleProtocol();
         protocol.addPolicyFactory("Custom", new CustomPolicyFactory(
                 false,
-                Arrays.asList("foo", "foo/bar", "foo/bar0/baz", "foo/bar1/baz", "foo/bar/baz/cox"),
-                Arrays.asList("foo/bar0/baz", "foo/bar1/baz")));
+                List.of("foo", "foo/bar", "foo/bar0/baz", "foo/bar1/baz", "foo/bar/baz/cox"),
+                List.of("foo/bar0/baz", "foo/bar1/baz")));
         srcServer.mb.putProtocol(protocol);
         srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME)
                 .addRoute(new RouteSpec("myroute").addHop("myhop"))
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingSpecTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingSpecTestCase.java
index 96250e77d06..992c3e99e87 100755..100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingSpecTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingSpecTestCase.java
@@ -6,7 +6,6 @@ import com.yahoo.messagebus.ConfigHandler;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -71,17 +70,17 @@ public class RoutingSpecTestCase {
     @Test
     void testApplicationSpec() {
         assertApplicationSpec(List.of("foo"),
-                              Arrays.asList("foo",
+                              List.of("foo",
                         "*"));
         assertApplicationSpec(List.of("foo/bar"),
-                              Arrays.asList("foo/bar",
+                              List.of("foo/bar",
                         "foo/*",
                         "*/bar",
                         "*/*"));
-        assertApplicationSpec(Arrays.asList("foo/0/baz",
+        assertApplicationSpec(List.of("foo/0/baz",
                         "foo/1/baz",
                         "foo/2/baz"),
-                Arrays.asList("foo/0/baz",
+                List.of("foo/0/baz",
                         "foo/1/baz",
                         "foo/2/baz",
                         "foo/0/*",
@@ -259,7 +258,7 @@ public class RoutingSpecTestCase {
                 new ApplicationSpec()
                         .addService("mytable", "bar")
                         .addService("mytable", "baz"),
-                Arrays.asList("Routing table 'mytable' is defined 2 times.",
+                List.of("Routing table 'mytable' is defined 2 times.",
                         "For hop 'hop2' in routing table 'mytable'; Failed to parse empty string.",
                         "For hop 'hop3' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.",
                         "For hop 1 in route 'route2' in routing table 'mytable'; Failed to parse empty string.",
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java
index 5eac60f4eb2..ac8e1d74191 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
 import java.util.logging.Level;
@@ -270,7 +269,7 @@ public class RoutingTestCase {
         dstSession.acknowledge(msg);
         assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60));
         assertFalse(reply.hasErrors());
-        assertTrace(Arrays.asList("[APP_TRANSIENT_ERROR @ localhost]: err1",
+        assertTrace(List.of("[APP_TRANSIENT_ERROR @ localhost]: err1",
                         "-[APP_TRANSIENT_ERROR @ localhost]: err1",
                         "[APP_TRANSIENT_ERROR @ localhost]: err2",
                         "-[APP_TRANSIENT_ERROR @ localhost]: err2"),
@@ -298,7 +297,7 @@ public class RoutingTestCase {
         dstSession.acknowledge(msg);
         assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60));
         assertFalse(reply.hasErrors());
-        assertTrace(Arrays.asList("Source session accepted a 3 byte message. 1 message(s) now pending.",
+        assertTrace(List.of("Source session accepted a 3 byte message. 1 message(s) now pending.",
                         "Running routing policy 'Custom'.",
                         "Selecting [" + dstSessName + "].",
                         "Component '" + dstSessName + "' selected by policy 'Custom'.",
@@ -371,7 +370,7 @@ public class RoutingTestCase {
         dstSession.acknowledge(msg);
         assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60));
         assertFalse(reply.hasErrors());
-        assertTrace(Arrays.asList("Selecting [" + dstSessName + "].",
+        assertTrace(List.of("Selecting [" + dstSessName + "].",
                         "[APP_TRANSIENT_ERROR @ localhost]",
                         "-[APP_TRANSIENT_ERROR @ localhost]",
                         "Merged [" + dstSessName + "].",
@@ -397,7 +396,7 @@ public class RoutingTestCase {
         dstSession.acknowledge(msg);
         assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60));
         assertFalse(reply.hasErrors());
-        assertTrace(Arrays.asList("Selecting [" + dstSessName + "].",
+        assertTrace(List.of("Selecting [" + dstSessName + "].",
                         "[APP_TRANSIENT_ERROR @ localhost]",
                         "-[APP_TRANSIENT_ERROR @ localhost]",
                         "Merged [" + dstSessName + "].",
@@ -421,7 +420,7 @@ public class RoutingTestCase {
         assertNotNull(reply);
         assertEquals(1, reply.getNumErrors());
         assertEquals(ErrorCode.NO_ADDRESS_FOR_SERVICE, reply.getError(0).getCode());
-        assertTrace(Arrays.asList("Selecting [" + dstSessName + ", dst/unknown].",
+        assertTrace(List.of("Selecting [" + dstSessName + ", dst/unknown].",
                         "[NO_ADDRESS_FOR_SERVICE @ localhost]",
                         "Sending reply",
                         "Merged [" + dstSessName + ", dst/unknown]."),
@@ -439,7 +438,7 @@ public class RoutingTestCase {
         assertNotNull(reply);
         assertEquals(1, reply.getNumErrors());
         assertEquals(ErrorCode.NO_ADDRESS_FOR_SERVICE, reply.getError(0).getCode());
-        assertTrace(Arrays.asList("Selecting [dst/unknown].",
+        assertTrace(List.of("Selecting [dst/unknown].",
                         "[NO_ADDRESS_FOR_SERVICE @ localhost]",
                         "Merged [dst/unknown]."),
                 reply.getTrace());
@@ -479,7 +478,7 @@ public class RoutingTestCase {
         Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60);
         assertNotNull(reply);
         assertFalse(reply.hasErrors());
-        assertTrace(Arrays.asList("[NO_ADDRESS_FOR_SERVICE @ localhost]",
+        assertTrace(List.of("[NO_ADDRESS_FOR_SERVICE @ localhost]",
                         "-[NO_ADDRESS_FOR_SERVICE @ localhost]",
                         "Sending message",
                         "-Sending message"),
@@ -537,7 +536,7 @@ public class RoutingTestCase {
                                                                         CustomPolicyFactory.parseRoutes(param),
                                                                         0));
         protocol.addPolicyFactory("SetReply", param -> new SetReplyPolicy(false,
-                                                                  Arrays.asList(ErrorCode.APP_TRANSIENT_ERROR, ErrorCode.APP_FATAL_ERROR),
+                                                                  List.of(ErrorCode.APP_TRANSIENT_ERROR, ErrorCode.APP_FATAL_ERROR),
                                                                   param));
         srcServer.mb.putProtocol(protocol);
         assertTrue(srcSession
@@ -550,7 +549,7 @@ public class RoutingTestCase {
         assertEquals(1, reply.getNumErrors());
         assertEquals(ErrorCode.APP_FATAL_ERROR, reply.getError(0).getCode());
         assertEquals("foo", reply.getError(0).getMessage());
-        assertTrace(Arrays.asList("Resolving '[SetReply:foo]'.",
+        assertTrace(List.of("Resolving '[SetReply:foo]'.",
                         "Resolving '" + dstSessName + "'.",
                         "Resender resending message.",
                         "Resolving '" + dstSessName + "'.",
@@ -722,7 +721,7 @@ public class RoutingTestCase {
         SimpleProtocol protocol = new SimpleProtocol();
         protocol.addPolicyFactory("Custom", new CustomPolicyFactory(false));
         protocol.addPolicyFactory("SetReply", param -> new SetReplyPolicy(false,
-                                                                  Arrays.asList(ErrorCode.APP_TRANSIENT_ERROR,
+                                                                  List.of(ErrorCode.APP_TRANSIENT_ERROR,
                                                                                 ErrorCode.APP_TRANSIENT_ERROR,
                                                                                 ErrorCode.APP_FATAL_ERROR),
                                                                   param));
@@ -870,7 +869,7 @@ public class RoutingTestCase {
         Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60);
         assertNotNull(reply);
         assertFalse(reply.hasErrors());
-        assertTrace(Arrays.asList(expectedTrace), reply.getTrace());
+        assertTrace(List.of(expectedTrace), reply.getTrace());
     }
 
     public static void assertTrace(List<String> expected, Trace trace) {