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

6 files changed, 36 insertions, 43 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
index 68a8f964575..21771558f05 100755..100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
@@ -18,6 +18,8 @@ import com.yahoo.documentapi.messagebus.protocol.DocumentMessage;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import com.yahoo.documentapi.messagebus.protocol.VisitorInfoMessage;
 import com.yahoo.documentapi.messagebus.protocol.WrongDistributionReply;
+
+import java.util.List;
 import java.util.logging.Level;
 import com.yahoo.messagebus.DestinationSession;
 import com.yahoo.messagebus.DestinationSessionParams;
@@ -37,7 +39,6 @@ import com.yahoo.messagebus.routing.RoutingTable;
 import com.yahoo.vdslib.VisitorStatistics;
 import com.yahoo.vdslib.state.ClusterState;
 
-import java.util.Arrays;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -162,14 +163,13 @@ public class MessageBusVisitorSession implements VisitorSession {
         }
 
         VisitorControlHandler.CompletionCode toCompletionCode() {
-            switch (state) {
-                case COMPLETED: return VisitorControlHandler.CompletionCode.SUCCESS;
-                case ABORTED:   return VisitorControlHandler.CompletionCode.ABORTED;
-                case FAILED:    return VisitorControlHandler.CompletionCode.FAILURE;
-                case TIMED_OUT: return VisitorControlHandler.CompletionCode.TIMEOUT;
-                default:
-                    throw new IllegalStateException("Current state did not have a valid value: " + state);
-            }
+            return switch (state) {
+                case COMPLETED -> VisitorControlHandler.CompletionCode.SUCCESS;
+                case ABORTED -> VisitorControlHandler.CompletionCode.ABORTED;
+                case FAILED -> VisitorControlHandler.CompletionCode.FAILURE;
+                case TIMED_OUT -> VisitorControlHandler.CompletionCode.TIMEOUT;
+                default -> throw new IllegalStateException("Current state did not have a valid value: " + state);
+            };
         }
 
         public boolean failed() {
@@ -312,9 +312,7 @@ public class MessageBusVisitorSession implements VisitorSession {
         return sessionCounter.incrementAndGet();
     }
     private static String createSessionName() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("visitor-").append(getNextSessionId()).append('-').append(System.currentTimeMillis());
-        return sb.toString();
+        return "visitor-" + getNextSessionId() + '-' + System.currentTimeMillis();
     }
 
     private final VisitorParameters params;
@@ -647,7 +645,7 @@ public class MessageBusVisitorSession implements VisitorSession {
 
             msg.getTrace().setLevel(params.getTraceLevel());
             msg.setTimeRemaining(messageTimeoutMs);
-            msg.setBuckets(Arrays.asList(bucket.getSuperbucket(), bucket.getProgress()));
+            msg.setBuckets(List.of(bucket.getSuperbucket(), bucket.getProgress()));
             msg.setDocumentSelection(params.getDocumentSelection());
             msg.setBucketSpace(params.getBucketSpace());
             msg.setFromTimestamp(params.getFromTimestamp());
@@ -881,7 +879,7 @@ public class MessageBusVisitorSession implements VisitorSession {
         }
 
         try {
-            if (msg.getErrorMessage().length() > 0) {
+            if (!msg.getErrorMessage().isEmpty()) {
                 params.getControlHandler().onVisitorError(msg.getErrorMessage());
             }
             synchronized (progress.getToken()) {
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/Location.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/Location.java
index 4ca6fb03821..77ec8f175df 100755..100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/Location.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/Location.java
@@ -3,7 +3,6 @@ package com.yahoo.documentapi.messagebus.systemstate.rule;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Arrays;
 
 /**
  * @author Simon Thoresen Hult
@@ -25,7 +24,7 @@ public class Location {
      * @param loc The location string to parse.
      */
     public Location(String loc) {
-        items.addAll(Arrays.asList(loc.split("/")));
+        items.addAll(List.of(loc.split("/")));
         normalize();
     }
 
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerTestCase.java
index 0bbd3549869..a9d6a7a4cbf 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerTestCase.java
@@ -4,7 +4,6 @@ package com.yahoo.documentapi.messagebus.protocol;
 import com.yahoo.jrt.slobrok.api.Mirror;
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
@@ -55,7 +54,7 @@ public class LoadBalancerTestCase {
     public void testAdaptiveLoadBalancer() {
         LoadBalancer lb = new AdaptiveLoadBalancer("foo", new Random(1));
 
-        List<Mirror.Entry> entries = Arrays.asList(new Mirror.Entry("foo/0/default", "tcp/bar:1"),
+        List<Mirror.Entry> entries = List.of(new Mirror.Entry("foo/0/default", "tcp/bar:1"),
                 new Mirror.Entry("foo/1/default", "tcp/bar:2"),
                 new Mirror.Entry("foo/2/default", "tcp/bar:3"));
         List<LoadBalancer.NodeMetrics> weights = lb.getNodeWeights();
@@ -112,7 +111,7 @@ public class LoadBalancerTestCase {
 
     private void verifyLoadBalancerOneItemOnly(LoadBalancer lb) {
 
-        List<Mirror.Entry> entries = Arrays.asList(new Mirror.Entry("foo/0/default", "tcp/bar:1") );
+        List<Mirror.Entry> entries = List.of(new Mirror.Entry("foo/0/default", "tcp/bar:1") );
         List<LoadBalancer.NodeMetrics> weights = lb.getNodeWeights();
 
         assertEquals("foo/0/default" , lb.getRecipient(entries).entry.getName());
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
index 25bdeb60013..472ce00aac3 100755..100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
@@ -52,7 +52,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -116,12 +115,12 @@ public class PolicyTestCase {
         frame.setHop(new HopSpec("test", "[AND]")
                      .addRecipient("foo")
                      .addRecipient("bar"));
-        frame.assertSelect(Arrays.asList("foo", "bar"));
+        frame.assertSelect(List.of("foo", "bar"));
 
         frame.setHop(new HopSpec("test", "[AND:baz]")
                      .addRecipient("foo")
                      .addRecipient("bar"));
-        frame.assertSelect(Arrays.asList("baz")); // param precedes recipients
+        frame.assertSelect(List.of("baz")); // param precedes recipients
 
         frame.setHop(new HopSpec("test", "[AND:foo]"));
         frame.assertMergeOneReply("foo");
@@ -414,10 +413,10 @@ public class PolicyTestCase {
         PolicyTestFrame frame = createFrameWithTwoRoutes();
 
         frame.setMessage(createRemove("id:ns:testdoc::1"));
-        frame.assertSelect(Arrays.asList("testdoc-route"));
+        frame.assertSelect(List.of("testdoc-route"));
 
         frame.setMessage(createRemove("id:ns:other::1"));
-        frame.assertSelect(Arrays.asList("other-route"));
+        frame.assertSelect(List.of("other-route"));
         frame.destroy();
     }
 
@@ -426,10 +425,10 @@ public class PolicyTestCase {
         PolicyTestFrame frame = createFrameWithTwoRoutes();
 
         frame.setMessage(createGet("id:ns:testdoc::1"));
-        frame.assertSelect(Arrays.asList("testdoc-route"));
+        frame.assertSelect(List.of("testdoc-route"));
 
         frame.setMessage(createGet("id:ns:other::1"));
-        frame.assertSelect(Arrays.asList("other-route"));
+        frame.assertSelect(List.of("other-route"));
         frame.destroy();
     }
 
@@ -586,19 +585,19 @@ public class PolicyTestCase {
                                          "route[1].feed \"myfeed\"\n]").addRecipient("foo").addRecipient("bar"));
 
         frame.setMessage(new GetDocumentMessage(new DocumentId("id:ns:testdoc::"), "fieldSet"));
-        frame.assertSelect(Arrays.asList("foo"));
+        frame.assertSelect(List.of("foo"));
 
         Message put = new PutDocumentMessage(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
                                                           new DocumentId("id:ns:testdoc::"))));
         frame.setMessage(put);
-        frame.assertSelect(Arrays.asList("foo"));
+        frame.assertSelect(List.of("foo"));
 
         frame.setMessage(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::")));
-        frame.assertSelect(Arrays.asList("foo"));
+        frame.assertSelect(List.of("foo"));
 
         frame.setMessage(new UpdateDocumentMessage(new DocumentUpdate(manager.getDocumentType("testdoc"),
                                                                       new DocumentId("id:ns:testdoc::"))));
-        frame.assertSelect(Arrays.asList("foo"));
+        frame.assertSelect(List.of("foo"));
 
         frame.setMessage(put);
         frame.assertMergeOneReply("foo");
@@ -619,13 +618,13 @@ public class PolicyTestCase {
                 "route[1].feed \"myfeed\"\n]").addRecipient("foo").addRecipient("bar"));
 
         frame.setMessage(new GetDocumentMessage(new DocumentId("id:ns:testdoc::"), "fieldSet"));
-        frame.assertSelect(Arrays.asList("foo"));
+        frame.assertSelect(List.of("foo"));
 
         Document doc = new Document(manager.getDocumentType("testdoc"), new DocumentId("id:ns:testdoc::"));
         doc.setFieldValue("intfield", 3000);
         Message put = new PutDocumentMessage(new DocumentPut(doc));
         frame.setMessage(put);
-        frame.assertSelect(Arrays.asList("foo"));
+        frame.assertSelect(List.of("foo"));
 
         frame.setMessage(put);
         frame.assertMergeOneReply("foo");
@@ -653,7 +652,7 @@ public class PolicyTestCase {
 
         frame.setMessage(new UpdateDocumentMessage(new DocumentUpdate(manager.getDocumentType("testdoc"),
                                                                       new DocumentId("id:ns:testdoc::"))));
-        frame.assertSelect(Arrays.asList("docproc/cluster.foo"));
+        frame.assertSelect(List.of("docproc/cluster.foo"));
 
         frame.destroy();
     }
@@ -667,7 +666,7 @@ public class PolicyTestCase {
         assertTrue(frame.waitSlobrok("docproc/cluster.default/*/chain.default", 1));
         frame.setHop(new HopSpec("test", "[LoadBalancer:cluster=docproc/cluster.default;session=chain.default]"));
 
-        assertSelect(frame, 1, Arrays.asList(frame.getNetwork().getConnectionSpec() + "/chain.default"));
+        assertSelect(frame, 1, List.of(frame.getNetwork().getConnectionSpec() + "/chain.default"));
         frame.destroy();
     }
 
@@ -685,16 +684,16 @@ public class PolicyTestCase {
                 .addRecipient("docproc/cluster.default/3/chain.default")
                 .addRecipient("docproc/cluster.default/6/chain.default")
                 .addRecipient("docproc/cluster.default/9/chain.default"));
-        assertSelect(frame, 32, Arrays.asList("docproc/cluster.default/3/chain.default",
+        assertSelect(frame, 32, List.of("docproc/cluster.default/3/chain.default",
                                               "docproc/cluster.default/6/chain.default",
                                               "docproc/cluster.default/9/chain.default"));
         frame.getNetwork().unregisterSession("6/chain.default");
         assertTrue(frame.waitSlobrok("docproc/cluster.default/*/chain.default", 9));
-        assertSelect(frame, 32, Arrays.asList("docproc/cluster.default/3/chain.default",
+        assertSelect(frame, 32, List.of("docproc/cluster.default/3/chain.default",
                                               "docproc/cluster.default/9/chain.default"));
         frame.getNetwork().unregisterSession("3/chain.default");
         assertTrue(frame.waitSlobrok("docproc/cluster.default/*/chain.default", 8));
-        assertSelect(frame, 32, Arrays.asList("docproc/cluster.default/9/chain.default"));
+        assertSelect(frame, 32, List.of("docproc/cluster.default/9/chain.default"));
         frame.getNetwork().unregisterSession("9/chain.default");
         assertTrue(frame.waitSlobrok("docproc/cluster.default/*/chain.default", 7));
         assertSelect(frame, 32, new ArrayList<>());
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java
index f51f285723f..8e2fcdcd946 100755..100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java
@@ -28,7 +28,6 @@ import com.yahoo.messagebus.test.SimpleProtocol;
 import com.yahoo.messagebus.test.SimpleReply;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -219,7 +218,7 @@ public class PolicyTestFrame {
      * @param recipient The expected recipient.
      */
     public void assertMergeOneReply(String recipient) {
-        assertSelect(Arrays.asList(recipient));
+        assertSelect(List.of(recipient));
 
         Map<String, Integer> replies = new HashMap<>();
         replies.put(recipient, ErrorCode.NONE);
@@ -237,7 +236,7 @@ public class PolicyTestFrame {
      * @param recipientTwo The second expected recipient.
      */
     public void assertMergeTwoReplies(String recipientOne, String recipientTwo) {
-        assertSelect(Arrays.asList(recipientOne, recipientTwo));
+        assertSelect(List.of(recipientOne, recipientTwo));
 
         Map<String, Integer> replies = new HashMap<>();
         replies.put(recipientOne, ErrorCode.NONE);
@@ -254,7 +253,7 @@ public class PolicyTestFrame {
 
         replies.put(recipientOne, ErrorCode.TRANSIENT_ERROR);
         replies.put(recipientTwo, ErrorCode.TRANSIENT_ERROR);
-        assertMerge(replies, Arrays.asList(ErrorCode.TRANSIENT_ERROR, ErrorCode.TRANSIENT_ERROR), List.of(recipientOne, recipientTwo));
+        assertMerge(replies, List.of(ErrorCode.TRANSIENT_ERROR, ErrorCode.TRANSIENT_ERROR), List.of(recipientOne, recipientTwo));
 
         replies.put(recipientOne, ErrorCode.NONE);
         replies.put(recipientTwo, DocumentProtocol.ERROR_MESSAGE_IGNORED);
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PriorityTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PriorityTestCase.java
index 681c47209cb..bca2922ab2c 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PriorityTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PriorityTestCase.java
@@ -8,7 +8,6 @@ import org.junit.Test;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -26,7 +25,7 @@ public class PriorityTestCase {
         String path = "test/crosslanguagefiles/5.1-Priority.txt";
         BufferedReader in = new BufferedReader(new FileReader(path));
 
-        List<Priority> expected = new LinkedList<Priority>(Arrays.asList(Priority.values()));
+        List<Priority> expected = new LinkedList<Priority>(List.of(Priority.values()));
         String str;
         while ((str = in.readLine()) != null) {
             String arr[] = str.split(":", 2);