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

8 files changed, 20 insertions, 26 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/collections/CollectionUtil.java b/vespajlib/src/main/java/com/yahoo/collections/CollectionUtil.java
index 7f70256233e..1f215f9d90e 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/CollectionUtil.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/CollectionUtil.java
@@ -51,8 +51,7 @@ public class CollectionUtil {
      * Returns true if the contents of the two given collections are equal, ignoring order.
      */
     public static boolean equalContentsIgnoreOrder(Collection<?> c1, Collection<?> c2) {
-        return c1.size() == c2.size() &&
-                c1.containsAll(c2);
+        return c1.size() == c2.size() && c1.containsAll(c2);
     }
 
     /**
diff --git a/vespajlib/src/main/java/com/yahoo/system/CommandLineParser.java b/vespajlib/src/main/java/com/yahoo/system/CommandLineParser.java
index 704fe9d56c3..12b435111e3 100644
--- a/vespajlib/src/main/java/com/yahoo/system/CommandLineParser.java
+++ b/vespajlib/src/main/java/com/yahoo/system/CommandLineParser.java
@@ -39,12 +39,12 @@ public class CommandLineParser {
     }
 
     public CommandLineParser(String[] cmds) {
-        inputStrings = Arrays.asList(cmds);
+        inputStrings = List.of(cmds);
     }
 
     public CommandLineParser(String progname, String[] cmds) {
         this.progname=progname;
-        inputStrings = Arrays.asList(cmds);
+        inputStrings = List.of(cmds);
     }
 
     /**
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
index f5ec63ab4e9..d225d6f4641 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
@@ -23,7 +23,6 @@ import com.yahoo.tensor.functions.Expand;
 import com.yahoo.tensor.impl.Label;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -169,7 +168,7 @@ public interface Tensor {
 
     /** Aggregates cells over a set of dimensions, or over all dimensions if no dimensions are specified */
     default Tensor reduce(Reduce.Aggregator aggregator, String ... dimensions) {
-        return new Reduce<>(new ConstantTensor<>(this), aggregator, Arrays.asList(dimensions)).evaluate();
+        return new Reduce<>(new ConstantTensor<>(this), aggregator, List.of(dimensions)).evaluate();
     }
     /** Aggregates cells over a set of dimensions, or over all dimensions if no dimensions are specified */
     default Tensor reduce(Reduce.Aggregator aggregator, List<String> dimensions) {
diff --git a/vespajlib/src/test/java/com/yahoo/collections/CollectionComparatorTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/CollectionComparatorTestCase.java
index 54101c7f251..a2420ed3fe5 100644
--- a/vespajlib/src/test/java/com/yahoo/collections/CollectionComparatorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/collections/CollectionComparatorTestCase.java
@@ -3,7 +3,6 @@ package com.yahoo.collections;
 
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -14,16 +13,16 @@ import static org.junit.Assert.assertEquals;
 public class CollectionComparatorTestCase {
     @Test
     public void arrayLength() {
-        List<String> shortArr = Arrays.asList("x", "y");
-        List<String> longArr = Arrays.asList("a", "b", "c", "d", "e");
+        List<String> shortArr = List.of("x", "y");
+        List<String> longArr = List.of("a", "b", "c", "d", "e");
 
         assertEquals(-1, CollectionComparator.compare(shortArr, longArr));
     }
 
     @Test
     public void compareArrays() {
-        List<String> one = Arrays.asList("b", "c", "d", "d", "e");
-        List<String> two = Arrays.asList("a", "b", "c", "d", "e");
+        List<String> one = List.of("b", "c", "d", "d", "e");
+        List<String> two = List.of("a", "b", "c", "d", "e");
 
         assertEquals(1, CollectionComparator.compare(one, two));
         assertEquals(-1, CollectionComparator.compare(two, one));
@@ -31,8 +30,8 @@ public class CollectionComparatorTestCase {
 
     @Test
     public void compareEqualArrays() {
-        List<String> one = Arrays.asList("a", "b", "c", "d", "e");
-        List<String> two = Arrays.asList("a", "b", "c", "d", "e");
+        List<String> one = List.of("a", "b", "c", "d", "e");
+        List<String> two = List.of("a", "b", "c", "d", "e");
 
         assertEquals(0, CollectionComparator.compare(one, two));
         assertEquals(0, CollectionComparator.compare(two, one));
diff --git a/vespajlib/src/test/java/com/yahoo/collections/CollectionUtilTest.java b/vespajlib/src/test/java/com/yahoo/collections/CollectionUtilTest.java
index 7cef3423aeb..fd24bfb4f40 100644
--- a/vespajlib/src/test/java/com/yahoo/collections/CollectionUtilTest.java
+++ b/vespajlib/src/test/java/com/yahoo/collections/CollectionUtilTest.java
@@ -27,7 +27,7 @@ public class CollectionUtilTest {
     @Test
     public void testMkString() {
         assertEquals("1, 2, 3, 4",
-                CollectionUtil.mkString(Arrays.asList(1, 2, 3, 4), ", "));
+                CollectionUtil.mkString(List.of(1, 2, 3, 4), ", "));
     }
 
     @Test
@@ -35,16 +35,14 @@ public class CollectionUtilTest {
         List<Integer> l2Copy = new ArrayList<>();
         l2Copy.addAll(l2);
         shuffle();
-        assertTrue(CollectionUtil.equalContentsIgnoreOrder(
-                l2, l2Copy));
-        assertFalse(CollectionUtil.equalContentsIgnoreOrder(
-                l1, l2));
+        assertTrue(CollectionUtil.equalContentsIgnoreOrder(l2, l2Copy));
+        assertFalse(CollectionUtil.equalContentsIgnoreOrder(l1, l2));
     }
 
     @Test
     public void testSymmetricDifference() {
         assertTrue(CollectionUtil.equalContentsIgnoreOrder(
-                Arrays.asList(1, 2, 3),
+                List.of(1, 2, 3),
                 CollectionUtil.symmetricDifference(l1, l2)));
     }
 }
diff --git a/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java
index 536e4d62502..adee795bb48 100644
--- a/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.collections;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.ListIterator;
 
 /**
@@ -22,9 +22,9 @@ public class ListenableArrayListTestCase {
         assertEquals(1,listener.invoked);
         list.add(0,"b");
         assertEquals(2,listener.invoked);
-        list.addAll(Arrays.asList(new String[]{"c", "d"}));
+        list.addAll(List.of(new String[]{"c", "d"}));
         assertEquals(3,listener.invoked);
-        list.addAll(1,Arrays.asList(new String[]{"e", "f"}));
+        list.addAll(1,List.of(new String[]{"e", "f"}));
         assertEquals(4,listener.invoked);
         list.set(0,"g");
         assertEquals(5,listener.invoked);
diff --git a/vespajlib/src/test/java/com/yahoo/net/UrlTokenizerTestCase.java b/vespajlib/src/test/java/com/yahoo/net/UrlTokenizerTestCase.java
index 385d58db86f..100507c6cc1 100644
--- a/vespajlib/src/test/java/com/yahoo/net/UrlTokenizerTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/net/UrlTokenizerTestCase.java
@@ -359,7 +359,7 @@ public class UrlTokenizerTestCase {
     }
 
     private static void assertTokenize(Url url, UrlToken... expected) {
-        Iterator<UrlToken> expectedIt = Arrays.asList(expected).iterator();
+        Iterator<UrlToken> expectedIt = List.of(expected).iterator();
         Iterator<UrlToken> actualIt = new UrlTokenizer(url).tokenize().iterator();
         while (expectedIt.hasNext()) {
             assertTrue(actualIt.hasNext());
@@ -373,7 +373,7 @@ public class UrlTokenizerTestCase {
         List<UrlToken> actual = new LinkedList<>();
         UrlTokenizer.addTokens(actual, UrlToken.Type.PATH, 0, img, true);
 
-        Iterator<String> expectedIt = Arrays.asList(expected).iterator();
+        Iterator<String> expectedIt = List.of(expected).iterator();
         Iterator<UrlToken> actualIt = actual.iterator();
         while (expectedIt.hasNext()) {
             assertTrue(actualIt.hasNext());
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TypeResolverTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TypeResolverTestCase.java
index 5d267d4d2f1..ce17a5d846d 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/TypeResolverTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/TypeResolverTestCase.java
@@ -3,7 +3,6 @@
 package com.yahoo.tensor;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
@@ -17,7 +16,7 @@ import static org.junit.Assert.assertTrue;
 public class TypeResolverTestCase {
 
     private static List<String> mkl(String ...values) {
-        return Arrays.asList(values);
+        return List.of(values);
     }
 
     @Test