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

6 files changed, 22 insertions, 22 deletions

diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java
index 6403bbb24ac..17388f65656 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java
@@ -7,7 +7,8 @@ import com.yahoo.document.datatypes.*;
 import com.yahoo.vespa.indexinglanguage.SimpleTestAdapter;
 import org.junit.Test;
 
-import java.util.Arrays;
+
+import java.util.List;
 
 import static org.junit.Assert.*;
 
@@ -25,7 +26,7 @@ public class CatTestCase {
         assertEquals(2, exp.size());
         assertSame(foo, exp.get(0));
         assertSame(bar, exp.get(1));
-        assertEquals(Arrays.asList(foo, bar), exp.asList());
+        assertEquals(List.of(foo, bar), exp.asList());
     }
 
     @Test
@@ -33,11 +34,11 @@ public class CatTestCase {
         Expression foo = new AttributeExpression("foo");
         Expression bar = new AttributeExpression("bar");
         Expression exp = new CatExpression(foo, bar);
-        assertFalse(exp.equals(new Object()));
-        assertFalse(exp.equals(new StatementExpression(foo, bar)));
-        assertFalse(exp.equals(new CatExpression()));
-        assertFalse(exp.equals(new CatExpression(foo)));
-        assertFalse(exp.equals(new CatExpression(bar, foo)));
+        assertNotEquals(exp, new Object());
+        assertNotEquals(exp, new StatementExpression(foo, bar));
+        assertNotEquals(exp, new CatExpression());
+        assertNotEquals(exp, new CatExpression(foo));
+        assertNotEquals(exp, new CatExpression(bar, foo));
         assertEquals(exp, new CatExpression(foo, bar));
         assertEquals(exp.hashCode(), new CatExpression(foo, bar).hashCode());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java
index 287398de030..c45b16beadb 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java
@@ -10,7 +10,6 @@ import com.yahoo.document.serialization.XmlStream;
 import com.yahoo.vespa.indexinglanguage.SimpleTestAdapter;
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static com.yahoo.vespa.indexinglanguage.expressions.ExpressionAssert.assertVerify;
@@ -174,12 +173,12 @@ public class IfThenTestCase {
 
     @Test
     public void requireThatNumericValuesSupportNumericCompareTo() {
-        List<NumericFieldValue> sixes = Arrays.asList(new ByteFieldValue((byte)6),
+        List<NumericFieldValue> sixes = List.of(new ByteFieldValue((byte)6),
                                                       new DoubleFieldValue(6.0),
                                                       new FloatFieldValue(6.0f),
                                                       new IntegerFieldValue(6),
                                                       new LongFieldValue(6L));
-        List<NumericFieldValue> nines = Arrays.asList(new ByteFieldValue((byte)9),
+        List<NumericFieldValue> nines = List.of(new ByteFieldValue((byte)9),
                                                       new DoubleFieldValue(9.0),
                                                       new FloatFieldValue(9.0f),
                                                       new IntegerFieldValue(9),
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptTestCase.java
index df7f99d22d2..c6fb7c1db8c 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptTestCase.java
@@ -8,7 +8,8 @@ import com.yahoo.document.datatypes.StringFieldValue;
 import com.yahoo.vespa.indexinglanguage.SimpleTestAdapter;
 import org.junit.Test;
 
-import java.util.Arrays;
+
+import java.util.List;
 
 import static com.yahoo.vespa.indexinglanguage.expressions.ExpressionAssert.assertVerify;
 import static com.yahoo.vespa.indexinglanguage.expressions.ExpressionAssert.assertVerifyThrows;
@@ -32,7 +33,7 @@ public class ScriptTestCase {
         assertEquals(2, exp.size());
         assertSame(foo, exp.get(0));
         assertSame(bar, exp.get(1));
-        assertEquals(Arrays.asList(foo, bar), exp.asList());
+        assertEquals(List.of(foo, bar), exp.asList());
     }
 
     @Test
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java
index 2c10606850c..23392c00110 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java
@@ -8,7 +8,6 @@ import com.yahoo.document.datatypes.StringFieldValue;
 import com.yahoo.vespa.indexinglanguage.SimpleTestAdapter;
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -66,11 +65,11 @@ public class SelectInputTestCase {
 
     @Test
     public void requireThatSelectedExpressionIsRun() {
-        assertSelect(Arrays.asList("foo", "bar"), List.of("foo"), "foo");
-        assertSelect(Arrays.asList("foo", "bar"), List.of("bar"), "bar");
-        assertSelect(Arrays.asList("foo", "bar"), List.of("foo", "bar"), "foo");
-        assertSelect(Arrays.asList("foo", "bar"), List.of("bar", "baz"), "bar");
-        assertSelect(Arrays.asList("foo", "bar"), List.of("baz", "cox"), null);
+        assertSelect(List.of("foo", "bar"), List.of("foo"), "foo");
+        assertSelect(List.of("foo", "bar"), List.of("bar"), "bar");
+        assertSelect(List.of("foo", "bar"), List.of("foo", "bar"), "foo");
+        assertSelect(List.of("foo", "bar"), List.of("bar", "baz"), "bar");
+        assertSelect(List.of("foo", "bar"), List.of("baz", "cox"), null);
     }
 
     private static void assertVerify(FieldTypeAdapter adapter, DataType value, Expression exp) {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java
index 7e5b17dbc37..3612e3bd9fc 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java
@@ -7,7 +7,8 @@ import com.yahoo.document.datatypes.IntegerFieldValue;
 import com.yahoo.vespa.indexinglanguage.SimpleTestAdapter;
 import org.junit.Test;
 
-import java.util.Arrays;
+
+import java.util.List;
 
 import static com.yahoo.vespa.indexinglanguage.expressions.ExpressionAssert.assertVerify;
 import static com.yahoo.vespa.indexinglanguage.expressions.ExpressionAssert.assertVerifyThrows;
@@ -31,7 +32,7 @@ public class StatementTestCase {
         assertEquals(2, exp.size());
         assertSame(foo, exp.get(0));
         assertSame(bar, exp.get(1));
-        assertEquals(Arrays.asList(foo, bar), exp.asList());
+        assertEquals(List.of(foo, bar), exp.asList());
     }
 
     @Test
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/IdentifierTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/IdentifierTestCase.java
index 300ae330e11..4ac5c840536 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/IdentifierTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/IdentifierTestCase.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.indexinglanguage.parser;
 
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -15,7 +14,7 @@ public class IdentifierTestCase {
 
     @Test
     public void requireThatThereAreNoReservedWords() throws ParseException {
-        List<String> tokens = Arrays.asList("attribute",
+        List<String> tokens = List.of("attribute",
                                             "base64decode",
                                             "base64encode",
                                             "clear_state",