diff options
310 files changed, 1042 insertions, 1224 deletions
diff --git a/abi-check-plugin/src/main/java/com/yahoo/abicheck/classtree/ClassFileTree.java b/abi-check-plugin/src/main/java/com/yahoo/abicheck/classtree/ClassFileTree.java index 32571b4a1c6..4cb73cc3533 100644 --- a/abi-check-plugin/src/main/java/com/yahoo/abicheck/classtree/ClassFileTree.java +++ b/abi-check-plugin/src/main/java/com/yahoo/abicheck/classtree/ClassFileTree.java @@ -4,12 +4,12 @@ package com.yahoo.abicheck.classtree; import java.io.IOException; import java.io.InputStream; import java.util.ArrayDeque; -import java.util.Arrays; import java.util.Collection; import java.util.Deque; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.jar.JarEntry; @@ -24,7 +24,7 @@ public abstract class ClassFileTree implements AutoCloseable { while (jarEntries.hasMoreElements()) { JarEntry entry = jarEntries.nextElement(); if (!entry.isDirectory() && entry.getName().endsWith(".class")) { - Deque<String> parts = new ArrayDeque<>(Arrays.asList(entry.getName().split("/"))); + Deque<String> parts = new ArrayDeque<>(List.of(entry.getName().split("/"))); String className = parts.removeLast(); Package pkg = rootPackages .computeIfAbsent(parts.removeFirst(), name -> new Package(null, name)); diff --git a/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java b/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java index d592a2ce1e3..1631eac866f 100644 --- a/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java +++ b/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java @@ -5,17 +5,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import com.yahoo.abicheck.collector.Util; -import java.util.Arrays; import org.junit.jupiter.api.Test; import org.objectweb.asm.Opcodes; +import java.util.List; + public class AccessConversionTest { @Test public void testClassFlags() { // ACC_SUPER should be ignored assertEquals( - Arrays.asList("public", "abstract"), + List.of("public", "abstract"), Util.convertAccess( Opcodes.ACC_PUBLIC | Opcodes.ACC_SUPER | Opcodes.ACC_ABSTRACT, Util.classFlags)); @@ -25,7 +26,7 @@ public class AccessConversionTest { public void testMethodFlags() { // ACC_DEPRECATED should be ignored assertEquals( - Arrays.asList("protected", "varargs"), + List.of("protected", "varargs"), Util.convertAccess( Opcodes.ACC_PROTECTED | Opcodes.ACC_VARARGS | Opcodes.ACC_DEPRECATED, Util.methodFlags)); @@ -34,7 +35,7 @@ public class AccessConversionTest { @Test public void testFieldFlags() { assertEquals( - Arrays.asList("private", "volatile"), + List.of("private", "volatile"), Util.convertAccess( Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE, Util.fieldFlags)); diff --git a/abi-check-plugin/src/test/java/com/yahoo/abicheck/ClassFileTreeTest.java b/abi-check-plugin/src/test/java/com/yahoo/abicheck/ClassFileTreeTest.java index 3f90ba01848..1667a6b87d0 100644 --- a/abi-check-plugin/src/test/java/com/yahoo/abicheck/ClassFileTreeTest.java +++ b/abi-check-plugin/src/test/java/com/yahoo/abicheck/ClassFileTreeTest.java @@ -12,8 +12,8 @@ import com.google.common.collect.Iterables; import com.yahoo.abicheck.classtree.ClassFileTree; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarFile; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ public class ClassFileTreeTest { JarEntry dirJarEntry = new JarEntry("com/yahoo/"); InputStream jarEntryStream = mock(InputStream.class); when(jarFile.entries()) - .thenReturn(Collections.enumeration(Arrays.asList(dirJarEntry, classJarEntry))); + .thenReturn(Collections.enumeration(List.of(dirJarEntry, classJarEntry))); when(jarFile.getInputStream(classJarEntry)).thenReturn(jarEntryStream); try (ClassFileTree cft = ClassFileTree.fromJar(jarFile)) { diff --git a/abi-check-plugin/src/test/java/com/yahoo/abicheck/mojo/AbiCheckTest.java b/abi-check-plugin/src/test/java/com/yahoo/abicheck/mojo/AbiCheckTest.java index 8782e6a6c03..9bc330ad130 100644 --- a/abi-check-plugin/src/test/java/com/yahoo/abicheck/mojo/AbiCheckTest.java +++ b/abi-check-plugin/src/test/java/com/yahoo/abicheck/mojo/AbiCheckTest.java @@ -12,7 +12,6 @@ import com.yahoo.abicheck.Public; import com.yahoo.abicheck.classtree.ClassFileTree; import com.yahoo.abicheck.signature.JavaClassSignature; import java.io.IOException; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Set; @@ -32,7 +31,7 @@ public class AbiCheckTest { ClassFileTree.ClassFile subPkgClass = mock(ClassFileTree.ClassFile.class); when(rootPkg.getSubPackages()).thenReturn(Set.of(subPkg)); - when(rootPkg.getClassFiles()).thenReturn(Arrays.asList(rootPkgClass, rootPkgInfoClass)); + when(rootPkg.getClassFiles()).thenReturn(List.of(rootPkgClass, rootPkgInfoClass)); when(subPkg.getClassFiles()).thenReturn(Set.of(subPkgClass)); when(rootPkgInfoClass.getName()).thenReturn("package-info.class"); diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/bundle/AnalyzeBundle.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/bundle/AnalyzeBundle.java index 74780cdaa25..e8c0e7a4800 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/bundle/AnalyzeBundle.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/bundle/AnalyzeBundle.java @@ -7,7 +7,6 @@ import com.yahoo.container.plugin.util.JarFiles; import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Optional; @@ -56,7 +55,7 @@ public class AnalyzeBundle { var manifest = getOsgiManifest(jarFile); if (manifest == null) return List.of(); return getMainAttributeValue(manifest, "X-JDisc-Non-PublicApi-Export-Package") - .map(s -> Arrays.asList(s.split(","))) + .map(s -> List.of(s.split(","))) .orElseGet(ArrayList::new); } diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java index 6b8f3f6ba12..5546d3c4f32 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java @@ -14,8 +14,8 @@ import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; -import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Optional; import java.util.Set; @@ -55,9 +55,9 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector { @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { Analyze.getClassName(Type.getReturnType(desc)).ifPresent(imports::add); - Arrays.asList(Type.getArgumentTypes(desc)).forEach(argType -> Analyze.getClassName(argType).ifPresent(imports::add)); + List.of(Type.getArgumentTypes(desc)).forEach(argType -> Analyze.getClassName(argType).ifPresent(imports::add)); if (exceptions != null) { - Arrays.asList(exceptions).forEach(ex -> Analyze.internalNameToClassName(ex).ifPresent(imports::add)); + List.of(exceptions).forEach(ex -> Analyze.internalNameToClassName(ex).ifPresent(imports::add)); } AnalyzeSignatureVisitor.analyzeMethod(signature, this); @@ -83,7 +83,7 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector { } addImportWithInternalName(superName); - Arrays.asList(interfaces).forEach(this::addImportWithInternalName); + List.of(interfaces).forEach(this::addImportWithInternalName); AnalyzeSignatureVisitor.analyzeClass(signature, this); } diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java index 788fa346a37..d7991810024 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java @@ -9,8 +9,8 @@ import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; -import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Set; /** @@ -70,7 +70,7 @@ class AnalyzeMethodVisitor extends MethodVisitor implements ImportCollector { @Override public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) { addImportWithInternalName(owner); - Arrays.asList(Type.getArgumentTypes(desc)).forEach(this::addImport); + List.of(Type.getArgumentTypes(desc)).forEach(this::addImport); addImport(Type.getReturnType(desc)); } @@ -112,7 +112,7 @@ class AnalyzeMethodVisitor extends MethodVisitor implements ImportCollector { addImport((Type) arg); } else if (arg instanceof Handle) { addImportWithInternalName(((Handle) arg).getOwner()); - Arrays.asList(Type.getArgumentTypes(desc)).forEach(this::addImport); + List.of(Type.getArgumentTypes(desc)).forEach(this::addImport); } else if ( ! (arg instanceof Number) && ! (arg instanceof String)) { throw new AssertionError("Unexpected type " + arg.getClass() + " with value '" + arg + "'"); } diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java index adcbdb68553..74acf3dffa1 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java @@ -16,9 +16,9 @@ import org.codehaus.plexus.component.annotations.Requirement; import java.io.FileNotFoundException; import java.io.IOException; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; +import java.util.List; import java.util.Properties; import java.util.regex.Pattern; @@ -145,7 +145,7 @@ public class GenerateSourcesMojo extends AbstractMojo { if (parts.length <= 3) { return mavenVersion; } else { - return stringJoin(Arrays.asList(parts).subList(0, 3), "."); + return stringJoin(List.of(parts).subList(0, 3), "."); } } } diff --git a/client/src/test/java/ai/vespa/client/dsl/QTest.java b/client/src/test/java/ai/vespa/client/dsl/QTest.java index 7673d0ff717..75e74c8919a 100644 --- a/client/src/test/java/ai/vespa/client/dsl/QTest.java +++ b/client/src/test/java/ai/vespa/client/dsl/QTest.java @@ -3,7 +3,6 @@ package ai.vespa.client.dsl; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -224,9 +223,9 @@ class QTest { String q = Q.select("*") .from("sd1") .where(Q.wand("f1", stringIntMap("a", 1, "b", 2, "c", 3))) - .and(Q.wand("f2", Arrays.asList(Arrays.asList(1, 1), Arrays.asList(2, 2)))) + .and(Q.wand("f2", List.of(List.of(1, 1), List.of(2, 2)))) .and( - Q.wand("f3", Arrays.asList(Arrays.asList(1, 1), Arrays.asList(2, 2))) + Q.wand("f3", List.of(List.of(1, 1), List.of(2, 2))) .annotate(A.a("scoreThreshold", 0.13)) ) .build(); @@ -421,7 +420,7 @@ class QTest { { String q1 = Q.p("f1").containsPhrase("p1", "p2", "p3") .build(); - String q2 = Q.p("f1").containsPhrase(Arrays.asList("p1", "p2", "p3")) + String q2 = Q.p("f1").containsPhrase(List.of("p1", "p2", "p3")) .build(); assertEquals(q1, "yql=select * from sources * where f1 contains phrase(\"p1\", \"p2\", \"p3\")"); assertEquals(q2, "yql=select * from sources * where f1 contains phrase(\"p1\", \"p2\", \"p3\")"); @@ -429,7 +428,7 @@ class QTest { { String q1 = Q.p("f1").containsNear("p1", "p2", "p3") .build(); - String q2 = Q.p("f1").containsNear(Arrays.asList("p1", "p2", "p3")) + String q2 = Q.p("f1").containsNear(List.of("p1", "p2", "p3")) .build(); assertEquals(q1, "yql=select * from sources * where f1 contains near(\"p1\", \"p2\", \"p3\")"); assertEquals(q2, "yql=select * from sources * where f1 contains near(\"p1\", \"p2\", \"p3\")"); @@ -437,7 +436,7 @@ class QTest { { String q1 = Q.p("f1").containsOnear("p1", "p2", "p3") .build(); - String q2 = Q.p("f1").containsOnear(Arrays.asList("p1", "p2", "p3")) + String q2 = Q.p("f1").containsOnear(List.of("p1", "p2", "p3")) .build(); assertEquals(q1, "yql=select * from sources * where f1 contains onear(\"p1\", \"p2\", \"p3\")"); assertEquals(q2, "yql=select * from sources * where f1 contains onear(\"p1\", \"p2\", \"p3\")"); @@ -445,7 +444,7 @@ class QTest { { String q1 = Q.p("f1").containsEquiv("p1", "p2", "p3") .build(); - String q2 = Q.p("f1").containsEquiv(Arrays.asList("p1", "p2", "p3")) + String q2 = Q.p("f1").containsEquiv(List.of("p1", "p2", "p3")) .build(); assertEquals(q1, "yql=select * from sources * where f1 contains equiv(\"p1\", \"p2\", \"p3\")"); assertEquals(q2, "yql=select * from sources * where f1 contains equiv(\"p1\", \"p2\", \"p3\")"); @@ -586,7 +585,7 @@ class QTest { @Test void arbitrary_annotations() { - Annotation a = A.a("a1", "v1", "a2", 2, "a3", stringObjMap("k", "v", "k2", 1), "a4", 4D, "a5", Arrays.asList(1, 2, 3)); + Annotation a = A.a("a1", "v1", "a2", 2, "a3", stringObjMap("k", "v", "k2", 1), "a4", 4D, "a5", List.of(1, 2, 3)); assertEquals(a.toString(), "{\"a1\":\"v1\",\"a2\":2,\"a3\":{\"k\":\"v\",\"k2\":1},\"a4\":4.0,\"a5\":[1,2,3]}"); } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundle.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundle.java index d99d46c11ce..de56272d0e8 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundle.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateBundle.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.clustercontroller.core; import com.yahoo.vdslib.state.ClusterState; -import java.util.Arrays; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; @@ -137,7 +137,7 @@ public class ClusterStateBundle { } public Builder bucketSpaces(String... bucketSpaces) { - return bucketSpaces(new TreeSet<>(Arrays.asList(bucketSpaces))); + return bucketSpaces(new TreeSet<>(List.of(bucketSpaces))); } public Builder explicitDerivedStates(Map<String, AnnotatedClusterState> derivedStates) { diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java index ee0506070b5..3b26e3b6965 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java @@ -28,7 +28,6 @@ import org.junit.jupiter.api.AfterEach; import java.io.IOException; import java.time.Duration; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -221,7 +220,7 @@ public abstract class FleetControllerTest implements Waiter { } static Set<Integer> asIntSet(Integer... idx) { - return new HashSet<>(Arrays.asList(idx)); + return new HashSet<>(List.of(idx)); } static Set<ConfiguredNode> asConfiguredNodes(Set<Integer> indices) { diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java index cab67c0b498..17f58ff40f0 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MaintenanceWhenPendingGlobalMergesTest.java @@ -5,7 +5,9 @@ import com.yahoo.document.FixedBucketSpaces; import com.yahoo.vdslib.state.ClusterState; import org.junit.jupiter.api.Test; + import java.util.Arrays; +import java.util.List; import static com.yahoo.vespa.clustercontroller.core.NodeStateReason.MAY_HAVE_MERGES_PENDING; import static com.yahoo.vespa.clustercontroller.core.NodeStateReason.NODE_TOO_UNSTABLE; @@ -110,8 +112,8 @@ public class MaintenanceWhenPendingGlobalMergesTest { @Test void node_with_pending_merges_only_set_to_maintenance_if_eligible() { Fixture f = new Fixture(); - Arrays.asList(1, 2, 3).forEach(idx -> when(f.mockPendingChecker.mayHaveMergesPending(globalSpace(), idx)).thenReturn(true)); - Arrays.asList(1, 2, 4).forEach(idx -> when(f.mockTransitionConstraint.maintenanceTransitionAllowed(idx)).thenReturn(false)); + List.of(1, 2, 3).forEach(idx -> when(f.mockPendingChecker.mayHaveMergesPending(globalSpace(), idx)).thenReturn(true)); + List.of(1, 2, 4).forEach(idx -> when(f.mockTransitionConstraint.maintenanceTransitionAllowed(idx)).thenReturn(false)); AnnotatedClusterState derived = f.deriver.derivedFrom(stateFromString("distributor:5 storage:5"), defaultSpace()); assertThat(derived, equalTo(AnnotatedClusterStateBuilder.ofState("distributor:5 storage:5 .3.s:m") .reason(MAY_HAVE_MERGES_PENDING, 3).build())); diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/Bundle.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/Bundle.java index 990e11cae15..6dbf0e4bbac 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/Bundle.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/Bundle.java @@ -56,7 +56,7 @@ public class Bundle { if (!bundleDir.isDirectory()) { return new ArrayList<>(); } - return Arrays.asList(bundleDir.listFiles((dir, name) -> name.endsWith(".jar"))); + return List.of(bundleDir.listFiles((dir, name) -> name.endsWith(".jar"))); } public List<DefEntry> getDefEntries() { diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index 7d8f827bf31..28bf8e10a93 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -55,7 +55,6 @@ import java.io.StringReader; import java.nio.file.Files; import java.security.MessageDigest; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -435,11 +434,11 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { File sdDir = applicationFile(appDir, SEARCH_DEFINITIONS_DIR.getRelative()); if (sdDir.isDirectory()) - schemaFiles.addAll(Arrays.asList(sdDir.listFiles((dir, name) -> validSchemaFilename(name)))); + schemaFiles.addAll(List.of(sdDir.listFiles((dir, name) -> validSchemaFilename(name)))); sdDir = applicationFile(appDir, SCHEMAS_DIR.getRelative()); if (sdDir.isDirectory()) - schemaFiles.addAll(Arrays.asList(sdDir.listFiles((dir, name) -> validSchemaFilename(name)))); + schemaFiles.addAll(List.of(sdDir.listFiles((dir, name) -> validSchemaFilename(name)))); return schemaFiles; } diff --git a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java index 39c2890c30c..27041f8db39 100644 --- a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java +++ b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceBuilderTest.java @@ -12,8 +12,8 @@ import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; import static com.yahoo.foo.StructtypesConfig.Simple.Gender.Enum.FEMALE; @@ -176,7 +176,7 @@ public class ConfigInstanceBuilderTest { doublearr(123.0). stringarr("bar"). enumarr(Enumarr.VALUES). - refarr(Arrays.asList(":parent:", ":parent", "parent:")). // test collection based setter + refarr(List.of(":parent:", ":parent", "parent:")). // test collection based setter fileArr("bin"). intMap("one", 1). intMap("two", 2). diff --git a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java index c50656eac12..2ac679aa9ab 100644 --- a/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java +++ b/config-lib/src/test/java/com/yahoo/config/ConfigInstanceEqualsTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.io.File; -import java.util.Arrays; +import java.util.List; import java.util.Optional; import static com.yahoo.test.FunctionTestConfig.BasicStruct; @@ -136,7 +136,7 @@ public class ConfigInstanceEqualsTest { doublearr(123.0). stringarr("bar"). enumarr(Enumarr.VALUES). - refarr(Arrays.asList(":parent:", ":parent", "parent:")). // test collection based setter + refarr(List.of(":parent:", ":parent", "parent:")). // test collection based setter fileArr("bin"). urlArr(new UrlReference("http://docs.vespa.ai")). modelArr(ModelReference.unresolved(Optional.empty(), diff --git a/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java b/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java index a9151692bb5..f8d16fa7ac3 100644 --- a/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java +++ b/config-lib/src/test/java/com/yahoo/config/NodeVectorTest.java @@ -3,7 +3,6 @@ package com.yahoo.config; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -73,7 +72,7 @@ public class NodeVectorTest { assertTrue(v.contains(val)); assertFalse(v.contains(barNode())); assertTrue(v.contains(val)); - assertFalse(v.containsAll(Arrays.asList(val, barNode()))); + assertFalse(v.containsAll(List.of(val, barNode()))); } @Test @@ -114,7 +113,7 @@ public class NodeVectorTest { private static class TestNodeVector extends LeafNodeVector<String, StringNode> { TestNodeVector(String... values) { - super(Arrays.asList(values), new StringNode()); + super(List.of(values), new StringNode()); } } diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/Notifications.java b/config-model-api/src/main/java/com/yahoo/config/application/api/Notifications.java index ac8900ab67b..08fb4d75183 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/Notifications.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/Notifications.java @@ -4,7 +4,6 @@ package com.yahoo.config.application.api; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Objects; @@ -107,7 +106,7 @@ public class Notifications { private final List<When> includes; When(When... includes) { - this.includes = Arrays.asList(includes); + this.includes = List.of(includes); } public static String toValue(When when) { diff --git a/config-model-api/src/test/java/com/yahoo/config/model/api/HostInfoTest.java b/config-model-api/src/test/java/com/yahoo/config/model/api/HostInfoTest.java index 6bd94d0aa74..7e4b0a07952 100644 --- a/config-model-api/src/test/java/com/yahoo/config/model/api/HostInfoTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/model/api/HostInfoTest.java @@ -2,7 +2,8 @@ package com.yahoo.config.model.api; import org.junit.Test; -import java.util.Arrays; + +import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -10,10 +11,10 @@ import static org.junit.Assert.assertNotEquals; public class HostInfoTest { @Test public void testEquals() { - HostInfo a = new HostInfo("foo.yahoo.com", Arrays.asList(new ServiceInfo("foo", "bar", null, null, "config-id", "host-name"))); - HostInfo b = new HostInfo("foo.yahoo.com", Arrays.asList(new ServiceInfo("foo", "bar", null, null, "config-id", "host-name"))); - HostInfo c = new HostInfo("foo.yahoo.com", Arrays.asList(new ServiceInfo("foo", "baz", null, null, "config-id", "host-name"))); - HostInfo d = new HostInfo("foo.yahoo.com", Arrays.asList(new ServiceInfo("bar", "baz", null, null, "config-id", "host-name"))); + HostInfo a = new HostInfo("foo.yahoo.com", List.of(new ServiceInfo("foo", "bar", null, null, "config-id", "host-name"))); + HostInfo b = new HostInfo("foo.yahoo.com", List.of(new ServiceInfo("foo", "bar", null, null, "config-id", "host-name"))); + HostInfo c = new HostInfo("foo.yahoo.com", List.of(new ServiceInfo("foo", "baz", null, null, "config-id", "host-name"))); + HostInfo d = new HostInfo("foo.yahoo.com", List.of(new ServiceInfo("bar", "baz", null, null, "config-id", "host-name"))); HostInfo e = new HostInfo("bar.yahoo.com", null); assertEquals(a, b); assertNotEquals(a, c); diff --git a/config-model-api/src/test/java/com/yahoo/config/model/api/PortInfoTest.java b/config-model-api/src/test/java/com/yahoo/config/model/api/PortInfoTest.java index 08e00e5c771..3ee9217e67f 100644 --- a/config-model-api/src/test/java/com/yahoo/config/model/api/PortInfoTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/model/api/PortInfoTest.java @@ -3,7 +3,7 @@ package com.yahoo.config.model.api; import org.junit.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -11,10 +11,10 @@ import static org.junit.Assert.assertNotEquals; public class PortInfoTest { @Test public void testEquals() { - PortInfo a = new PortInfo(1234, Arrays.asList("foo")); - PortInfo b = new PortInfo(1234, Arrays.asList("foo")); - PortInfo c = new PortInfo(1234, Arrays.asList("foo", "bar")); - PortInfo d = new PortInfo(12345, Arrays.asList("foo")); + PortInfo a = new PortInfo(1234, List.of("foo")); + PortInfo b = new PortInfo(1234, List.of("foo")); + PortInfo c = new PortInfo(1234, List.of("foo", "bar")); + PortInfo d = new PortInfo(12345, List.of("foo")); assertEquals(a, b); assertNotEquals(a, c); assertNotEquals(a, d); diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java index 2034a537b7c..3ec968e545a 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java @@ -21,6 +21,7 @@ import com.yahoo.vespa.config.protocol.JRTServerConfigRequestV3; import java.util.Arrays; import java.util.Iterator; +import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -180,7 +181,7 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher { String ret; System.out.println(proxyServer.getMode()); if (proxyServer.getMode().requiresConfigSource()) { - proxyServer.updateSourceConnections(Arrays.asList(sources.split(","))); + proxyServer.updateSourceConnections(List.of(sources.split(","))); ret = "Updated config sources to: " + sources; } else { ret = "Cannot update sources when in '" + proxyServer.getMode().name() + "' mode"; diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java index 65737d116c5..3d42967802f 100755..100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.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.config.subscription; -import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; @@ -49,7 +48,7 @@ public class ConfigSourceSet implements ConfigSource { * @param addresses Connection endpoints on the format "tcp/host:port". */ public ConfigSourceSet(String[] addresses) { - this(Arrays.asList(addresses)); + this(List.of(addresses)); } /** diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java index d33e1b422e0..03f791e5536 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java @@ -14,7 +14,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; -import java.util.Arrays; +import java.util.List; import java.util.jar.JarFile; import java.util.zip.ZipEntry; @@ -56,7 +56,7 @@ public class JarConfigSubscription<T extends ConfigInstance> extends ConfigSubsc throw new IllegalArgumentException("Config '" + key.getName() + "' not found in '" + jarName + "!/" + path + "'."); T config; try { - ConfigPayload payload = new CfgConfigPayloadBuilder().deserialize(Arrays.asList(IOUtils.readAll(new InputStreamReader(jarFile.getInputStream(zipEntry), StandardCharsets.UTF_8)).split("\n"))); + ConfigPayload payload = new CfgConfigPayloadBuilder().deserialize(List.of(IOUtils.readAll(new InputStreamReader(jarFile.getInputStream(zipEntry), StandardCharsets.UTF_8)).split("\n"))); config = payload.toInstance(configClass, key.getConfigId()); } catch (UnsupportedEncodingException e) { throw new IllegalStateException(e); diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java index dd08c1fe29c..d4e4e075e23 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java @@ -8,7 +8,8 @@ import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.ConfigPayload; import com.yahoo.vespa.config.PayloadChecksums; -import java.util.Arrays; +import java.util.List; + /** * Subscription used when config id is raw:... @@ -34,7 +35,7 @@ public class RawConfigSubscription<T extends ConfigInstance> extends ConfigSubsc } if (payload == null) { payload = inputPayload; - ConfigPayload configPayload = new CfgConfigPayloadBuilder().deserialize(Arrays.asList(payload.split("\n"))); + ConfigPayload configPayload = new CfgConfigPayloadBuilder().deserialize(List.of(payload.split("\n"))); setConfig(0L, false, configPayload.toInstance(configClass, key.getConfigId()), PayloadChecksums.empty()); return true; } diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java index f640f5c1294..2545b82b3dd 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.config; import com.yahoo.yolean.Exceptions; import java.util.ArrayList; -import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -567,7 +566,7 @@ public class ConfigDefinition { public void addEnumDef(String id, String valsCommaSep, String defVal) { String[] valArr = valsCommaSep.split(","); - addEnumDef(id, Arrays.asList(valArr), defVal); + addEnumDef(id, List.of(valArr), defVal); } public void addStringDef(String id, String defVal) { diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java index c8e86c97661..8e8a48580d8 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java @@ -4,7 +4,8 @@ package com.yahoo.vespa.config; import com.yahoo.config.codegen.CNode; import com.yahoo.config.codegen.LeafCNode; -import java.util.Arrays; +import java.util.List; + /** * Builds a ConfigDefinition from a tree of CNodes. @@ -183,9 +184,9 @@ public class ConfigDefinitionBuilder { private static void addNode(ConfigDefinition def, LeafCNode.EnumLeaf leaf) { if (leaf.getDefaultValue() != null) { - def.addEnumDef(leaf.getName(), Arrays.asList(leaf.getLegalValues()), leaf.getDefaultValue().getValue()); + def.addEnumDef(leaf.getName(), List.of(leaf.getLegalValues()), leaf.getDefaultValue().getValue()); } else { - def.addEnumDef(leaf.getName(), Arrays.asList(leaf.getLegalValues()), null); + def.addEnumDef(leaf.getName(), List.of(leaf.getLegalValues()), null); } } diff --git a/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java b/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java index 6a0f8ea1cdc..4c61c995491 100644 --- a/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java +++ b/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java @@ -28,7 +28,6 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -139,7 +138,7 @@ public class LoadTester { if (!name.endsWith(".def")) continue; String contents = IOUtils.readFile(f); ConfigDefinitionKey key = ConfigUtils.createConfigDefinitionKeyFromDefFile(f); - ret.put(key, new Tuple2<>(ConfigUtils.getDefMd5(Arrays.asList(contents.split("\n"))), contents.split("\n"))); + ret.put(key, new Tuple2<>(ConfigUtils.getDefMd5(List.of(contents.split("\n"))), contents.split("\n"))); } System.out.println("# Read " + ret.size() + " def files from " + defDir.getPath()); return ret; diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/DefContent.java b/config/src/main/java/com/yahoo/vespa/config/protocol/DefContent.java index 6b3c1f0040d..a4c4dfde8f0 100644 --- a/config/src/main/java/com/yahoo/vespa/config/protocol/DefContent.java +++ b/config/src/main/java/com/yahoo/vespa/config/protocol/DefContent.java @@ -7,7 +7,6 @@ import com.yahoo.slime.*; import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -47,7 +46,7 @@ public class DefContent { } public static DefContent fromArray(String[] schema) { - return fromList(Arrays.asList(schema)); + return fromList(List.of(schema)); } /** diff --git a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java index 851ef28155d..29582fedc44 100644 --- a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java @@ -8,7 +8,6 @@ import com.yahoo.foo.SimpletypesConfig; import com.yahoo.vespa.config.ConfigPayload; import org.junit.Test; -import java.util.Arrays; import java.util.List; import static com.yahoo.test.json.JsonTestHelper.assertJsonEquals; @@ -216,7 +215,7 @@ public class CfgConfigPayloadBuilderTest { @Test public void test_config_with_comments() { CfgConfigPayloadBuilderTest.assertDeserializedConfigEqualsJson( - Arrays.asList( + List.of( "fielda b\n", "#fielda c\n", "#fieldb c\n", @@ -230,7 +229,7 @@ public class CfgConfigPayloadBuilderTest { @Test public void testConvertingMaps() { - List<String> payload = Arrays.asList( + List<String> payload = List.of( "intmap{\"foo\"} 1337", "complexmap{\"key\"}.foo 1337", "nestedmap{\"key1\"}.foo{\"key2\"}.bar 1337" diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java index d737a2d5930..3327e94c32b 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java @@ -11,7 +11,6 @@ import com.yahoo.vespa.config.ConfigTransformer; import org.junit.Test; import java.io.File; -import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -55,7 +54,7 @@ public class ConfigInstancePayloadTest { doublearr(123.0). stringarr("bar"). enumarr(Enumarr.VALUES). - refarr(Arrays.asList(":parent:", ":parent", "parent:")). // test collection based setter + refarr(List.of(":parent:", ":parent", "parent:")). // test collection based setter fileArr("bin"). pathArr(FileReference.mockFileReferenceForUnitTesting(new File("pom.xml"))). intMap("one", 1). diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceTest.java index 1c6ca46eb04..bbd4ae7e797 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceTest.java @@ -49,15 +49,15 @@ public class ConfigInstanceTest { @Ignore public void testRetainOldValuesOnConfigUpdates() { AppConfig config = new AppConfig(new AppConfig.Builder()); - //config.setConfig(Arrays.asList("message \"one\"", "times 333"), "", 0L); + //config.setConfig(List.of("message \"one\"", "times 333"), "", 0L); assertEquals("one", config.message()); assertEquals(333, config.times()); - //config.setConfig(Arrays.asList("message \"two\""), "", 0L); + //config.setConfig(List.of("message \"two\""), "", 0L); assertEquals("two", config.message()); assertEquals("config.times retains previously set value", 333, config.times()); - //config.setConfig(Arrays.asList("times 666"), "", 0L); + //config.setConfig(List.of("times 666"), "", 0L); assertEquals("config.message retains previously set value", "two", config.message()); assertEquals(666, config.times()); } diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java index 58c8a740bdb..6b392db5906 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.config.ConfigPayloadBuilder; import org.junit.Test; import java.io.File; -import java.util.Arrays; +import java.util.List; import static org.junit.Assert.assertEquals; import static com.yahoo.foo.FunctionTestConfig.*; @@ -97,7 +97,7 @@ public class ConfigInstanceUtilTest { doublearr(123.0). stringarr("bar"). enumarr(Enumarr.VALUES). - refarr(Arrays.asList(":parent:", ":parent", "parent:")). // test collection based setter + refarr(List.of(":parent:", ":parent", "parent:")). // test collection based setter fileArr("bin"). basicStruct(b -> b. diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigBuilderMergeTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigBuilderMergeTest.java index ff2b2bbaf5f..021178d88b1 100644 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigBuilderMergeTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigBuilderMergeTest.java @@ -8,7 +8,8 @@ import com.yahoo.foo.StructtypesConfig; import com.yahoo.foo.MaptypesConfig; import org.junit.Test; -import java.util.Arrays; + +import java.util.List; import static com.yahoo.foo.MaptypesConfig.Innermap; import static org.hamcrest.CoreMatchers.is; @@ -44,7 +45,7 @@ public class ConfigBuilderMergeTest { StructtypesConfig.Simple.Builder simpleBuilder = new StructtypesConfig.Simple.Builder(); simpleBuilder.name(name); simpleBuilder.gender(StructtypesConfig.Simple.Gender.Enum.valueOf(gender)); - simpleBuilder.emails(Arrays.asList(emails)); + simpleBuilder.emails(List.of(emails)); builder.simple(simpleBuilder); return builder; } diff --git a/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java b/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java index 9223c39055b..06e3297d2fe 100644 --- a/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java @@ -8,7 +8,6 @@ import com.yahoo.vespa.config.protocol.VespaVersion; import com.yahoo.vespa.config.util.ConfigUtils; import org.junit.Test; -import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -29,7 +28,7 @@ import static org.junit.Assert.assertNull; public class RawConfigTest { private static final ConfigKey<?> key = new ConfigKey<>("foo", "id", "bar"); - private static final List<String> defContent = Arrays.asList("version=1", "anInt int"); + private static final List<String> defContent = List.of("version=1", "anInt int"); private static final String defMd5 = ConfigUtils.getDefMd5FromRequest("", defContent); private static final PayloadChecksums payloadChecksums = PayloadChecksums.from("012345", ""); private static final Payload payload = Payload.from(new Utf8String("anInt 1"), CompressionInfo.uncompressed()); diff --git a/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java b/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java index a3a5727e30c..fe6e328020f 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java @@ -99,7 +99,7 @@ public class BuilderGenerator { } String uninitializedList = (scalarsWithoutDefault.size() > 0) - ? "Arrays.asList(\n" + indentCode(INDENTATION, String.join(",\n", scalarsWithoutDefault) + "\n)") + ? "List.of(\n" + indentCode(INDENTATION, String.join(",\n", scalarsWithoutDefault) + "\n)") : ""; return "private Set<String> " + INTERNAL_PREFIX + "uninitialized = new HashSet<String>(" + uninitializedList + ");"; diff --git a/configgen/src/test/resources/allfeatures.reference b/configgen/src/test/resources/allfeatures.reference index b17655e317d..d068853b167 100644 --- a/configgen/src/test/resources/allfeatures.reference +++ b/configgen/src/test/resources/allfeatures.reference @@ -101,7 +101,7 @@ public final class AllfeaturesConfig extends ConfigInstance { } public static final class Builder implements ConfigInstance.Builder { - private Set<String> __uninitialized = new HashSet<String>(Arrays.asList( + private Set<String> __uninitialized = new HashSet<String>(List.of( "boolVal", "intVal", "longVal", @@ -1730,7 +1730,7 @@ public final class AllfeaturesConfig extends ConfigInstance { public final static class MyArray extends InnerNode { public static final class Builder implements ConfigBuilder { - private Set<String> __uninitialized = new HashSet<String>(Arrays.asList( + private Set<String> __uninitialized = new HashSet<String>(List.of( "refVal" )); @@ -2040,7 +2040,7 @@ public final class AllfeaturesConfig extends ConfigInstance { public final static class MyMap extends InnerNode { public static final class Builder implements ConfigBuilder { - private Set<String> __uninitialized = new HashSet<String>(Arrays.asList( + private Set<String> __uninitialized = new HashSet<String>(List.of( "refVal" )); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java index f0228f40ad2..a634519dd0a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java @@ -24,7 +24,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; @@ -109,7 +108,7 @@ public class ZooKeeperDeployer { void initialize() { curator.create(sessionPath); - for (String subPath : Arrays.asList(DEFCONFIGS_ZK_SUBPATH, + for (String subPath : List.of(DEFCONFIGS_ZK_SUBPATH, USER_DEFCONFIGS_ZK_SUBPATH, USERAPP_ZK_SUBPATH, ZKApplicationPackage.fileRegistryNode)) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java index 546277c4aba..ac483ea20c9 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java @@ -64,7 +64,6 @@ import java.time.Clock; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -851,7 +850,7 @@ public class SessionRepository { File[] sdFiles = sdDir.listFiles(); if (sdFiles != null) { Files.createDirectories(schemasDir.toPath()); - Arrays.asList(sdFiles).forEach(file -> Exceptions.uncheck( + List.of(sdFiles).forEach(file -> Exceptions.uncheck( () -> Files.move(file.toPath(), schemasDir.toPath().resolve(file.toPath().getFileName()), StandardCopyOption.REPLACE_EXISTING))); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java index 4d23c4c6ffa..64417536f8b 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java @@ -56,7 +56,7 @@ public class ModelFactoryRegistryTest { TestFactory b = new TestFactory(new Version(5, 58, 1)); TestFactory c = new TestFactory(new Version(5, 48, 44)); TestFactory d = new TestFactory(new Version(5, 18, 44)); - ModelFactoryRegistry registry = new ModelFactoryRegistry(Arrays.asList(a, b, c, d)); + ModelFactoryRegistry registry = new ModelFactoryRegistry(List.of(a, b, c, d)); assertEquals(4, registry.getFactories().size()); assertTrue(registry.getFactories().contains(a)); assertTrue(registry.getFactories().contains(b)); @@ -70,23 +70,9 @@ public class ModelFactoryRegistryTest { registry.getFactory(new Version(3, 2, 1)); } - private static class TestFactory implements ModelFactory { + private record TestFactory(Version version) implements ModelFactory { - private final Version version; - - TestFactory(Version version) { - this.version = version; - } - - @Override - public Version version() { - return version; - } - - @Override - public Model createModel(ModelContext modelContext) { - return null; - } + @Override public Model createModel(ModelContext modelContext) { return null; } @Override public ModelCreateResult createAndValidateModel(ModelContext modelContext, ValidationParameters validationParameters) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java index 28c95ba33c8..74b08b83791 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java @@ -21,7 +21,6 @@ import org.xml.sax.SAXException; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -88,7 +87,7 @@ public class SuperModelRequestHandlerTest { assertTrue(controller.getHandler().getSuperModel().applicationModels().keySet().containsAll(List.of(foo, bar, baz))); controller.removeApplication(bar); assertEquals(2, controller.getHandler().getSuperModel().applicationModels().size()); - assertEquals(Arrays.asList(foo, baz), new ArrayList<>(controller.getHandler().getSuperModel().applicationModels().keySet())); + assertEquals(List.of(foo, baz), new ArrayList<>(controller.getHandler().getSuperModel().applicationModels().keySet())); assertEquals(gen + 5, controller.getHandler().getGeneration()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java index ddcee892594..28090b42e75 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.config.server.application; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -52,7 +51,7 @@ public class ApplicationMapperTest { @Test (expected = VersionDoesNotExistException.class) public void testGetForVersionThrows() { - applicationMapper.register(appId, ApplicationVersions.fromList(Arrays.asList(applications.get(0), applications.get(2)))); + applicationMapper.register(appId, ApplicationVersions.fromList(List.of(applications.get(0), applications.get(2)))); applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(1)), Instant.now()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationVersionsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationVersionsTest.java index 9345b45bab4..23a425b99e2 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationVersionsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationVersionsTest.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.config.server.application; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -46,7 +45,7 @@ public class ApplicationVersionsTest { @Test (expected = VersionDoesNotExistException.class) public void testGetForVersionOrLatestThrows() { - applicationVersions = ApplicationVersions.fromList(Arrays.asList(applications.get(0), applications.get(2))); + applicationVersions = ApplicationVersions.fromList(List.of(applications.get(0), applications.get(2))); applicationVersions.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java index 93c41f1b087..b735c69f247 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java @@ -18,7 +18,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.zip.GZIPOutputStream; @@ -104,7 +103,7 @@ public class CompressedApplicationInputStreamTest { try (CompressedApplicationInputStream unpacked = streamFromTarGz(gzFile)) { outApp = unpacked.decompress(); } - List<File> files = Arrays.asList(Objects.requireNonNull(outApp.listFiles())); + List<File> files = List.of(Objects.requireNonNull(outApp.listFiles())); assertEquals(5, files.size()); assertTrue(files.contains(new File(outApp, "services.xml"))); assertTrue(files.contains(new File(outApp, "hosts.xml"))); @@ -121,13 +120,13 @@ public class CompressedApplicationInputStreamTest { assertEquals(1, ext.listFiles().length); assertEquals(new File(ext, "foo").getAbsolutePath(), ext.listFiles()[0].getAbsolutePath()); - files = Arrays.asList(ext.listFiles()); + files = List.of(ext.listFiles()); File foo = files.get(files.indexOf(new File(ext, "foo"))); assertTrue(foo.isDirectory()); assertEquals(1, foo.listFiles().length); assertEquals(new File(foo, "bar").getAbsolutePath(), foo.listFiles()[0].getAbsolutePath()); - files = Arrays.asList(foo.listFiles()); + files = List.of(foo.listFiles()); File bar = files.get(files.indexOf(new File(foo, "bar"))); assertTrue(bar.isDirectory()); assertEquals(1, bar.listFiles().length); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java index 0fe39fd0224..a5ce29b6494 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java @@ -17,7 +17,6 @@ import org.junit.rules.TemporaryFolder; import java.net.URI; import java.time.Duration; -import java.util.Arrays; import java.util.List; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; @@ -101,7 +100,7 @@ public class ConfigConvergenceCheckerTest { } { // Model with two hosts on different generations - MockModel model = new MockModel(Arrays.asList( + MockModel model = new MockModel(List.of( MockModel.createContainerHost(service.getHost(), service.getPort()), MockModel.createContainerHost(service2.getHost(), service2.getPort())) ); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/FileDistributionStatusTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/FileDistributionStatusTest.java index 4a2f422252b..30e1373b7f6 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/FileDistributionStatusTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/FileDistributionStatusTest.java @@ -17,7 +17,6 @@ import org.junit.rules.TemporaryFolder; import java.io.IOException; import java.time.Duration; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -119,7 +118,7 @@ public class FileDistributionStatusTest { fileReferenceStatuses2.put("1234", 1.0); HostStatus localhost2 = statusFinished("localhost2", Status.FINISHED, fileReferenceStatuses2); - FileDistributionStatus status = new MockStatus(new HashSet<>(Arrays.asList(localhost, localhost2))); + FileDistributionStatus status = new MockStatus(new HashSet<>(List.of(localhost, localhost2))); application = createApplication("localhost", "localhost2"); HttpResponse response = getStatus(status, application); assertResponse(200, @@ -156,7 +155,7 @@ public class FileDistributionStatusTest { } private Application createApplication(String... hostname) { - return createApplication(Arrays.asList(hostname)); + return createApplication(List.of(hostname)); } private Application createApplication(List<String> hostnames) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java index 1a6669e93b2..f57148dd8d0 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java @@ -21,8 +21,9 @@ import org.mockito.ArgumentCaptor; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.URI; -import java.util.Arrays; import java.util.Collections; +import java.util.List; +import java.util.Set; import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERCONTROLLER_CONTAINER; import static com.yahoo.vespa.config.server.application.MockModel.createServiceInfo; @@ -119,9 +120,9 @@ public class HttpProxyTest { "state http external query"); ServiceInfo serviceNoStatePort = createServiceInfo(hostname, "storagenode", "storagenode", ClusterSpec.Type.content, 1234, "rpc"); - HostInfo hostInfo = new HostInfo(hostname, Arrays.asList(container, serviceNoStatePort)); + HostInfo hostInfo = new HostInfo(hostname, List.of(container, serviceNoStatePort)); - return new MockModel(Collections.singleton(hostInfo)); + return new MockModel(Set.of(hostInfo)); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java index 4025c88de32..4ba507bf5d9 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java @@ -40,7 +40,7 @@ public class MockModel implements Model { ClusterSpec.Type.container, statePort, "state"); ServiceInfo serviceNoStatePort = createServiceInfo(hostname, "logserver", "logserver", ClusterSpec.Type.admin, 1234, "logtp"); - return new HostInfo(hostname, Arrays.asList(container, serviceNoStatePort)); + return new HostInfo(hostname, List.of(container, serviceNoStatePort)); } static MockModel createConfigProxies(List<String> hostnames, int rpcPort) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java index 14d49f9d9d6..a613dc91211 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java @@ -42,7 +42,6 @@ import java.io.File; import java.io.IOException; import java.time.Clock; import java.time.Duration; -import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.Set; @@ -306,7 +305,7 @@ public class TenantApplicationsTest { } private ModelFactoryRegistry createRegistry() { - return new ModelFactoryRegistry(Arrays.asList(new TestModelFactory(vespaVersion), + return new ModelFactoryRegistry(List.of(new TestModelFactory(vespaVersion), new TestModelFactory(new Version(3, 2, 1)))); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java index 13192499603..ee694c984fb 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java @@ -8,8 +8,8 @@ import com.yahoo.jdisc.http.HttpRequest; import org.junit.Test; import java.io.IOException; -import java.util.Arrays; import java.util.Collection; +import java.util.List; import static com.yahoo.jdisc.Response.Status.BAD_REQUEST; import static com.yahoo.jdisc.Response.Status.NOT_FOUND; @@ -92,11 +92,7 @@ public abstract class ContentHandlerTestBase extends SessionHandlerTest { protected abstract HttpResponse doRequest(HttpRequest.Method method, String path); private String generateResultArray(String... files) { - Collection<String> output = Collections2.transform(Arrays.asList(files), input -> "\"" + baseUrl + input + "\""); - StringBuilder sb = new StringBuilder(); - sb.append("["); - sb.append(Joiner.on(",").join(output)); - sb.append("]"); - return sb.toString(); + Collection<String> output = Collections2.transform(List.of(files), input -> "\"" + baseUrl + input + "\""); + return "[" + Joiner.on(",").join(output) + "]"; } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java index 515ecf0005e..9ef1f42f247 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java @@ -46,7 +46,6 @@ import org.mockito.Mock; import org.xml.sax.SAXException; import java.io.IOException; import java.time.Clock; -import java.util.Arrays; import java.util.List; import java.util.Set; @@ -174,7 +173,7 @@ public class TenantRepositoryTest { @Test public void testTenantWatching() throws Exception { TenantName newTenant = TenantName.from("newTenant"); - List<TenantName> expectedTenants = Arrays.asList(TenantName.defaultName(), newTenant); + List<TenantName> expectedTenants = List.of(TenantName.defaultName(), newTenant); try { tenantRepository.addTenant(newTenant); // Poll for the watcher to pick up the tenant from zk, and add it 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") diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java index 5528085c5b8..bb3f4e0f5b0 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java @@ -14,7 +14,6 @@ import com.yahoo.messagebus.shared.ServerSession; import com.yahoo.messagebus.shared.SharedMessageBus; import com.yahoo.messagebus.test.SimpleProtocol; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -83,7 +82,7 @@ public class ServerTestDriver { if (reply == null) { return null; } - List<Integer> lst = new LinkedList<>(Arrays.asList(errCodes)); + List<Integer> lst = new LinkedList<>(List.of(errCodes)); for (int i = 0, len = reply.getNumErrors(); i < len; ++i) { Error err = reply.getError(i); System.out.println(err); diff --git a/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java b/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java index 58b9ebb108e..cd60d4a30ea 100644 --- a/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java +++ b/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java @@ -28,7 +28,6 @@ import org.junit.Test; import java.net.URI; import java.nio.ByteBuffer; -import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -245,13 +244,13 @@ public class MbusServerTestCase { public void requireThatResponseErrorCodeDoesNotDuplicateReplyError() { assertError(Collections.<Integer>emptyList(), Response.Status.OK); - assertError(Arrays.asList(ErrorCode.APP_FATAL_ERROR), + assertError(List.of(ErrorCode.APP_FATAL_ERROR), Response.Status.BAD_REQUEST); - assertError(Arrays.asList(ErrorCode.FATAL_ERROR), + assertError(List.of(ErrorCode.FATAL_ERROR), Response.Status.BAD_REQUEST, ErrorCode.FATAL_ERROR); - assertError(Arrays.asList(ErrorCode.TRANSIENT_ERROR, ErrorCode.APP_FATAL_ERROR), + assertError(List.of(ErrorCode.TRANSIENT_ERROR, ErrorCode.APP_FATAL_ERROR), Response.Status.BAD_REQUEST, ErrorCode.TRANSIENT_ERROR); - assertError(Arrays.asList(ErrorCode.FATAL_ERROR, ErrorCode.TRANSIENT_ERROR), + assertError(List.of(ErrorCode.FATAL_ERROR, ErrorCode.TRANSIENT_ERROR), Response.Status.BAD_REQUEST, ErrorCode.FATAL_ERROR, ErrorCode.TRANSIENT_ERROR); } diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java b/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java index ef453492a5d..e2e0ea90632 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java @@ -14,7 +14,6 @@ import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchchain.PhaseNames; -import java.util.Arrays; import java.util.List; import java.util.Map; @@ -46,7 +45,7 @@ public class SemanticSearcher extends Searcher { } public SemanticSearcher(RuleBase ... ruleBases) { - this(Arrays.asList(ruleBases)); + this(List.of(ruleBases)); } @Inject diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java index 3c152f00c66..f911b695853 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java @@ -1,8 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; -import java.util.stream.Collectors; +import java.util.List; /** * This class represents a timestamp-formatter function in a {@link GroupingExpression}. It evaluates to a string on the @@ -23,14 +22,12 @@ public class DateFunction extends FunctionNode { } private DateFunction(String label, Integer level, GroupingExpression exp) { - super("time.date", label, level, Arrays.asList(exp)); + super("time.date", label, level, List.of(exp)); } @Override public DateFunction copy() { - return new DateFunction(getLabel(), - getLevelOrNull(), - getArg(0).copy()); + return new DateFunction(getLabel(), getLevelOrNull(), getArg(0).copy()); } } diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java index c9639b4ea71..654e969221b 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java @@ -1,8 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; -import java.util.stream.Collectors; +import java.util.List; /** * This class represents a day-of-month timestamp-function in a {@link GroupingExpression}. It evaluates to a long that @@ -23,14 +22,12 @@ public class DayOfMonthFunction extends FunctionNode { } private DayOfMonthFunction(String label, Integer level, GroupingExpression exp) { - super("time.dayofmonth", label, level, Arrays.asList(exp)); + super("time.dayofmonth", label, level, List.of(exp)); } @Override public DayOfMonthFunction copy() { - return new DayOfMonthFunction(getLabel(), - getLevelOrNull(), - getArg(0).copy()); + return new DayOfMonthFunction(getLabel(), getLevelOrNull(), getArg(0).copy()); } } diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java index 644f16a4d17..7b91ab34115 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a day-of-week timestamp-function in a {@link GroupingExpression}. It evaluates to a long that @@ -22,14 +22,12 @@ public class DayOfWeekFunction extends FunctionNode { } private DayOfWeekFunction(String label, Integer level, GroupingExpression exp) { - super("time.dayofweek", label, level, Arrays.asList(exp)); + super("time.dayofweek", label, level, List.of(exp)); } @Override public DayOfWeekFunction copy() { - return new DayOfWeekFunction(getLabel(), - getLevelOrNull(), - getArg(0).copy()); + return new DayOfWeekFunction(getLabel(), getLevelOrNull(), getArg(0).copy()); } } diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java index f45a7724794..9f7ff969e49 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a day-of-year timestamp-function in a {@link GroupingExpression}. It evaluates to a long that @@ -22,14 +22,12 @@ public class DayOfYearFunction extends FunctionNode { } private DayOfYearFunction(String label, Integer level, GroupingExpression exp) { - super("time.dayofyear", label, level, Arrays.asList(exp)); + super("time.dayofyear", label, level, List.of(exp)); } @Override public DayOfYearFunction copy() { - return new DayOfYearFunction(getLabel(), - getLevelOrNull(), - getArg(0).copy()); + return new DayOfYearFunction(getLabel(), getLevelOrNull(), getArg(0).copy()); } } diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DebugWaitFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DebugWaitFunction.java index 482d6fe93ce..1477d125847 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/DebugWaitFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DebugWaitFunction.java @@ -1,8 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; -import java.util.stream.Collectors; +import java.util.List; /** * This class represents debug_wait function in a {@link GroupingExpression}. For each hit evaluated, @@ -25,7 +24,7 @@ public class DebugWaitFunction extends FunctionNode { } private DebugWaitFunction(String label, Integer level, GroupingExpression arg1, DoubleValue arg2, BooleanValue arg3) { - super("debugwait", label, level, Arrays.asList(arg1, arg2, arg3)); + super("debugwait", label, level, List.of(arg1, arg2, arg3)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java index 04f6d155699..6e0b721a584 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java @@ -1,7 +1,8 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; + +import java.util.List; /** * This class represents a fixed-width bucket-function in a {@link GroupingExpression}. It maps the input into the given @@ -23,7 +24,7 @@ public class FixedWidthFunction extends FunctionNode { } private FixedWidthFunction(String label, Integer level, GroupingExpression exp, ConstantValue width) { - super("fixedwidth", label, level, Arrays.asList(exp, width)); + super("fixedwidth", label, level, List.of(exp, width)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java b/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java index c1d86ed3059..d2be51c074b 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java @@ -66,12 +66,12 @@ public abstract class FunctionNode extends GroupingExpression implements Iterabl @SuppressWarnings("unchecked") protected static <T> List<T> asList(T arg1, T... argN) { - return asList(Arrays.asList(arg1), Arrays.asList(argN)); + return asList(List.of(arg1), List.of(argN)); } @SuppressWarnings("unchecked") protected static <T> List<T> asList(T arg1, T arg2, T... argN) { - return asList(Arrays.asList(arg1, arg2), Arrays.asList(argN)); + return asList(List.of(arg1, arg2), List.of(argN)); } protected static <T> List<T> asList(List<T> foo, List<T> bar) { diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java index b65e1bc2405..95dcf608a95 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents an hour-of-day timestamp-function in a {@link GroupingExpression}. It evaluates to a long that @@ -22,7 +22,7 @@ public class HourOfDayFunction extends FunctionNode { } private HourOfDayFunction(String label, Integer level, GroupingExpression exp) { - super("time.hourofday", label, level, Arrays.asList(exp)); + super("time.hourofday", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java index 70f3515371b..8b6ffc53680 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathACosFunction extends FunctionNode { } private MathACosFunction(String label, Integer level, GroupingExpression exp) { - super("math.acos", label, level, Arrays.asList(exp)); + super("math.acos", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java index 6b31e1cfaff..34570aedc58 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathACosHFunction extends FunctionNode { } private MathACosHFunction(String label, Integer level, GroupingExpression exp) { - super("math.acosh", label, level, Arrays.asList(exp)); + super("math.acosh", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java index cbb99536af1..1fb0b89d0aa 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathASinFunction extends FunctionNode { } private MathASinFunction(String label, Integer level, GroupingExpression exp) { - super("math.asin", label, level, Arrays.asList(exp)); + super("math.asin", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java index 9e159abe90f..e0d290c59dc 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathASinHFunction extends FunctionNode { } private MathASinHFunction(String label, Integer level, GroupingExpression exp) { - super("math.asinh", label, level, Arrays.asList(exp)); + super("math.asinh", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java index a7302769853..50c40a2ad26 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathATanFunction extends FunctionNode { } private MathATanFunction(String label, Integer level, GroupingExpression exp) { - super("math.atan", label, level, Arrays.asList(exp)); + super("math.atan", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java index f33b8883a79..c8b34e36aaa 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathATanHFunction extends FunctionNode { } private MathATanHFunction(String label, Integer level, GroupingExpression exp) { - super("math.atanh", label, level, Arrays.asList(exp)); + super("math.atanh", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java index 5e4ad8fb20f..ccec1752823 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathCbrtFunction extends FunctionNode { } private MathCbrtFunction(String label, Integer level, GroupingExpression exp) { - super("math.cbrt", label, level, Arrays.asList(exp)); + super("math.cbrt", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java index bbf303e0bce..56aaa16c2ae 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathCosFunction extends FunctionNode { } private MathCosFunction(String label, Integer level, GroupingExpression exp) { - super("math.cos", label, level, Arrays.asList(exp)); + super("math.cos", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java index da92164aec5..8d21435ca52 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathCosHFunction extends FunctionNode { } private MathCosHFunction(String label, Integer level, GroupingExpression exp) { - super("math.cosh", label, level, Arrays.asList(exp)); + super("math.cosh", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java index 124b4fdaf40..625c6358081 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathExpFunction extends FunctionNode { } private MathExpFunction(String label, Integer level, GroupingExpression exp) { - super("math.exp", label, level, Arrays.asList(exp)); + super("math.exp", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFloorFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFloorFunction.java index cab480e8ff6..4c775a86b19 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFloorFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFloorFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * Represents the math.floor(expression) function @@ -21,7 +21,7 @@ public class MathFloorFunction extends FunctionNode { } private MathFloorFunction(String label, Integer level, GroupingExpression exp) { - super("math.floor", label, level, Arrays.asList(exp)); + super("math.floor", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java index ec2cb62b062..d76c464a6de 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java @@ -42,29 +42,28 @@ public abstract class MathFunctions { } } public static FunctionNode newInstance(Function type, GroupingExpression x, GroupingExpression y) { - switch (type) { - case EXP: return new MathExpFunction(x); - case POW: return new MathPowFunction(x, y); - case LOG: return new MathLogFunction(x); - case LOG1P: return new MathLog1pFunction(x); - case LOG10: return new MathLog10Function(x); - case SIN: return new MathSinFunction(x); - case ASIN: return new MathASinFunction(x); - case COS: return new MathCosFunction(x); - case ACOS: return new MathACosFunction(x); - case TAN: return new MathTanFunction(x); - case ATAN: return new MathATanFunction(x); - case SQRT: return new MathSqrtFunction(x); - case SINH: return new MathSinHFunction(x); - case ASINH: return new MathASinHFunction(x); - case COSH: return new MathCosHFunction(x); - case ACOSH: return new MathACosHFunction(x); - case TANH: return new MathTanHFunction(x); - case ATANH: return new MathATanHFunction(x); - case CBRT: return new MathCbrtFunction(x); - case HYPOT: return new MathHypotFunction(x, y); - case FLOOR: return new MathFloorFunction(x); - } - return null; + return switch (type) { + case EXP -> new MathExpFunction(x); + case POW -> new MathPowFunction(x, y); + case LOG -> new MathLogFunction(x); + case LOG1P -> new MathLog1pFunction(x); + case LOG10 -> new MathLog10Function(x); + case SIN -> new MathSinFunction(x); + case ASIN -> new MathASinFunction(x); + case COS -> new MathCosFunction(x); + case ACOS -> new MathACosFunction(x); + case TAN -> new MathTanFunction(x); + case ATAN -> new MathATanFunction(x); + case SQRT -> new MathSqrtFunction(x); + case SINH -> new MathSinHFunction(x); + case ASINH -> new MathASinHFunction(x); + case COSH -> new MathCosHFunction(x); + case ACOSH -> new MathACosHFunction(x); + case TANH -> new MathTanHFunction(x); + case ATANH -> new MathATanHFunction(x); + case CBRT -> new MathCbrtFunction(x); + case HYPOT -> new MathHypotFunction(x, y); + case FLOOR -> new MathFloorFunction(x); + }; } } diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java index 9f7cef456cf..fd9e8d6271a 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -20,7 +20,7 @@ public class MathHypotFunction extends FunctionNode { } private MathHypotFunction(String label, Integer level, GroupingExpression x, GroupingExpression y) { - super("math.hypot", label, level, Arrays.asList(x, y)); + super("math.hypot", label, level, List.of(x, y)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java index 8f4a6444bfb..0f05a1909b1 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathLog10Function extends FunctionNode { } private MathLog10Function(String label, Integer level, GroupingExpression exp) { - super("math.log10", label, level, Arrays.asList(exp)); + super("math.log10", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java index 35fcbd3f1a6..500edd9f90b 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathLog1pFunction extends FunctionNode { } private MathLog1pFunction(String label, Integer level, GroupingExpression exp) { - super("math.log1p", label, level, Arrays.asList(exp)); + super("math.log1p", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java index 5b06998b004..642c3230b3f 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathLogFunction extends FunctionNode { } private MathLogFunction(String label, Integer level, GroupingExpression exp) { - super("math.log", label, level, Arrays.asList(exp)); + super("math.log", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java index 6f4972c9af0..7dd398f7008 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -20,7 +20,7 @@ public class MathPowFunction extends FunctionNode { } private MathPowFunction(String label, Integer level, GroupingExpression x, GroupingExpression y) { - super("math.pow", label, level, Arrays.asList(x, y)); + super("math.pow", label, level, List.of(x, y)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java index 8d21fb8e0df..64051cb96e8 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathSinFunction extends FunctionNode { } private MathSinFunction(String label, Integer level, GroupingExpression exp) { - super("math.sin", label, level, Arrays.asList(exp)); + super("math.sin", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java index c9d30a0adec..21295278756 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathSinHFunction extends FunctionNode { } private MathSinHFunction(String label, Integer level, GroupingExpression exp) { - super("math.sinh", label, level, Arrays.asList(exp)); + super("math.sinh", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java index 268ddaaaf2d..411a3fe30fa 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathSqrtFunction extends FunctionNode { } private MathSqrtFunction(String label, Integer level, GroupingExpression exp) { - super("math.sqrt", label, level, Arrays.asList(exp)); + super("math.sqrt", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java index 79267e0ae17..f2a18010258 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathTanFunction extends FunctionNode { } private MathTanFunction(String label, Integer level, GroupingExpression exp) { - super("math.tan", label, level, Arrays.asList(exp)); + super("math.tan", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java index e1a83c0b630..5833f0bf887 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class MathTanHFunction extends FunctionNode { } private MathTanHFunction(String label, Integer level, GroupingExpression exp) { - super("math.tanh", label, level, Arrays.asList(exp)); + super("math.tanh", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java b/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java index 720e071aebf..57604677b82 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents an md5-function in a {@link GroupingExpression}. It evaluates to a long that equals the md5 of @@ -22,7 +22,7 @@ public class Md5Function extends FunctionNode { } private Md5Function(String label, Integer level, GroupingExpression exp, LongValue numBits) { - super("md5", label, level, Arrays.asList(exp, numBits)); + super("md5", label, level, List.of(exp, numBits)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java index 73484de9e47..67ddd560ab9 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a minute-of-hour timestamp-function in a {@link GroupingExpression}. It evaluates to a long @@ -22,7 +22,7 @@ public class MinuteOfHourFunction extends FunctionNode { } private MinuteOfHourFunction(String label, Integer level, GroupingExpression exp) { - super("time.minuteofhour", label, level, Arrays.asList(exp)); + super("time.minuteofhour", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java index e8dace1e3bf..f9b4aef23f5 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a month-of-year timestamp-function in a {@link GroupingExpression}. It evaluates to a long that @@ -22,7 +22,7 @@ public class MonthOfYearFunction extends FunctionNode { } private MonthOfYearFunction(String label, Integer level, GroupingExpression exp) { - super("time.monthofyear", label, level, Arrays.asList(exp)); + super("time.monthofyear", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java index 9f8a8de0266..785d29301e4 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a negate-function in a {@link GroupingExpression}. It evaluates to a number that equals the @@ -22,7 +22,7 @@ public class NegFunction extends FunctionNode { } private NegFunction(String label, Integer level, GroupingExpression exp) { - super("neg", label, level, Arrays.asList(exp)); + super("neg", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/NormalizeSubjectFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/NormalizeSubjectFunction.java index 1b3f48052a4..c843959249d 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/NormalizeSubjectFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/NormalizeSubjectFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** */ @@ -17,7 +17,7 @@ public class NormalizeSubjectFunction extends FunctionNode { } private NormalizeSubjectFunction(String label, Integer level, GroupingExpression exp) { - super("normalizesubject", label, level, Arrays.asList(exp)); + super("normalizesubject", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java index 483f2494ea9..819dd3601c4 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a reverse-function in a {@link GroupingExpression}. It evaluates to a list that equals the list @@ -22,7 +22,7 @@ public class ReverseFunction extends FunctionNode { } private ReverseFunction(String label, Integer level, GroupingExpression exp) { - super("reverse", label, level, Arrays.asList(exp)); + super("reverse", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java index a4ef16d50d3..fdcbeefe647 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a second-of-minute timestamp-function in a {@link GroupingExpression}. It evaluates to a long @@ -22,7 +22,7 @@ public class SecondOfMinuteFunction extends FunctionNode { } private SecondOfMinuteFunction(String label, Integer level, GroupingExpression exp) { - super("time.secondofminute", label, level, Arrays.asList(exp)); + super("time.secondofminute", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java index 418d1513973..33b910a1119 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a size-function in a {@link GroupingExpression}. It evaluates to a number that equals the @@ -22,7 +22,7 @@ public class SizeFunction extends FunctionNode { } private SizeFunction(String label, Integer level, GroupingExpression exp) { - super("size", label, level, Arrays.asList(exp)); + super("size", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java index 03b9479afda..0acee311b11 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a sort-function in a {@link GroupingExpression}. It evaluates to a list that equals the list @@ -22,7 +22,7 @@ public class SortFunction extends FunctionNode { } private SortFunction(String label, Integer level, GroupingExpression exp) { - super("sort", label, level, Arrays.asList(exp)); + super("sort", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java index 28b0f021b26..21679b01170 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a strcat-function in a {@link GroupingExpression}. It evaluates to a long that equals the @@ -22,7 +22,7 @@ public class StrLenFunction extends FunctionNode { } private StrLenFunction(String label, Integer level, GroupingExpression exp) { - super("strlen", label, level, Arrays.asList(exp)); + super("strlen", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java index 906e7ec18cb..6d05dd69a92 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a todouble-function in a {@link GroupingExpression}. It converts the result of the argument to @@ -22,7 +22,7 @@ public class ToDoubleFunction extends FunctionNode { } private ToDoubleFunction(String label, Integer level, GroupingExpression exp) { - super("todouble", label, level, Arrays.asList(exp)); + super("todouble", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java index 4c7db38442d..d92cd2814aa 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a tolong-function in a {@link GroupingExpression}. It converts the result of the argument to a @@ -22,7 +22,7 @@ public class ToLongFunction extends FunctionNode { } private ToLongFunction(String label, Integer level, GroupingExpression exp) { - super("tolong", label, level, Arrays.asList(exp)); + super("tolong", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java index 9c0a581fb87..99cf3400bdc 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a toraw-function in a {@link GroupingExpression}. It @@ -23,7 +23,7 @@ public class ToRawFunction extends FunctionNode { } private ToRawFunction(String label, Integer level, GroupingExpression exp) { - super("toraw", label, level, Arrays.asList(exp)); + super("toraw", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java index 0fb891bdce0..b58765c57f0 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a tolong-function in a {@link GroupingExpression}. It converts the result of the argument to a @@ -22,7 +22,7 @@ public class ToStringFunction extends FunctionNode { } private ToStringFunction(String label, Integer level, GroupingExpression exp) { - super("tostring", label, level, Arrays.asList(exp)); + super("tostring", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java index c5e469f1379..98cb68fbb8c 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.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.search.grouping.request; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -23,7 +22,7 @@ public class UcaFunction extends FunctionNode { * @param locale The locale to used for sorting. */ public UcaFunction(GroupingExpression exp, String locale) { - this(null, null, Arrays.asList(exp, new StringValue(locale))); + this(null, null, List.of(exp, new StringValue(locale))); } /** @@ -34,7 +33,7 @@ public class UcaFunction extends FunctionNode { * @param strength The strength level to use. */ public UcaFunction(GroupingExpression exp, String locale, String strength) { - this(null, null, Arrays.asList(exp, new StringValue(locale), new StringValue(strength))); + this(null, null, List.of(exp, new StringValue(locale), new StringValue(strength))); if ( ! validStrength(strength)) throw new IllegalArgumentException("Not a valid UCA strength: " + strength); } diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java index 2e0bf25b894..f03bf681e90 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.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.search.grouping.request; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -21,7 +20,7 @@ public class XorBitFunction extends FunctionNode { * @param numBits The number of bits of the expression value to xor. */ public XorBitFunction(GroupingExpression exp, int numBits) { - this(null, null, Arrays.asList(exp, new LongValue(numBits))); + this(null, null, List.of(exp, new LongValue(numBits))); } private XorBitFunction(String label, Integer level, List<GroupingExpression> exp) { diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java index 150b54855f3..528a6253ab0 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * This class represents a year timestamp-function in a {@link GroupingExpression}. It evaluates to a long that equals @@ -22,7 +22,7 @@ public class YearFunction extends FunctionNode { } private YearFunction(String label, Integer level, GroupingExpression exp) { - super("time.year", label, level, Arrays.asList(exp)); + super("time.year", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java index 29216e20825..e954e2c24fc 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -19,7 +19,7 @@ public class ZCurveXFunction extends FunctionNode { } private ZCurveXFunction(String label, Integer level, GroupingExpression exp) { - super("zcurve.x", label, level, Arrays.asList(exp)); + super("zcurve.x", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java index 4803f145487..edbc9417a6b 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import java.util.Arrays; +import java.util.List; /** * @author baldersheim @@ -18,7 +18,7 @@ public class ZCurveYFunction extends FunctionNode { } private ZCurveYFunction(String label, Integer level, GroupingExpression exp) { - super("zcurve.y", label, level, Arrays.asList(exp)); + super("zcurve.y", label, level, List.of(exp)); } @Override diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java index 6504949e174..22bc97b9ca1 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java @@ -22,7 +22,6 @@ import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.searchchain.Execution; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -98,7 +97,7 @@ public class PageTemplateSearcher extends Searcher { * @param resolvers the resolvers to use, in addition to the default resolvers */ public PageTemplateSearcher(PageTemplateRegistry templateRegistry, Resolver... resolvers) { - this(templateRegistry, Arrays.asList(resolvers)); + this(templateRegistry, List.of(resolvers)); } private PageTemplateSearcher(PageTemplateRegistry templateRegistry, List<Resolver> resolvers) { @@ -138,7 +137,7 @@ public class PageTemplateSearcher extends Searcher { if (pageIds == null) { String pageIdString = query.properties().getString(pageIdName,"").trim(); if (!pageIdString.isEmpty()) - pageIds = Arrays.asList(pageIdString.split(" ")); + pageIds = List.of(pageIdString.split(" ")); } // If none set, just return the default or null if none diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java index d8cfaab7cba..3ee195bdf55 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java @@ -85,7 +85,7 @@ public class PageTemplateXMLReader { private List<File> sortFiles(File dir) { ArrayList<File> files = new ArrayList<>(); - files.addAll(Arrays.asList(dir.listFiles())); + files.addAll(List.of(dir.listFiles())); Collections.sort(files); return files; } diff --git a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java index 93df7fdfb18..c897afe144c 100644 --- a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java +++ b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java @@ -55,7 +55,6 @@ import com.yahoo.slime.SlimeUtils; import com.yahoo.slime.Type; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -147,7 +146,7 @@ public class SelectParser implements Parser { private final Normalizer normalizer; private IndexFacts.Session indexFactsSession; - private static final List<String> FUNCTION_CALLS = Arrays.asList(WAND, WEIGHTED_SET, DOT_PRODUCT, GEO_LOCATION, NEAREST_NEIGHBOR, PREDICATE, RANK, WEAK_AND); + private static final List<String> FUNCTION_CALLS = List.of(WAND, WEIGHTED_SET, DOT_PRODUCT, GEO_LOCATION, NEAREST_NEIGHBOR, PREDICATE, RANK, WEAK_AND); public SelectParser(ParserEnvironment environment) { indexFacts = environment.getIndexFacts(); diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileXMLReader.java b/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileXMLReader.java index f2eb76f2367..abb0129eed0 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileXMLReader.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileXMLReader.java @@ -18,7 +18,6 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -68,7 +67,7 @@ public class QueryProfileXMLReader { private List<File> sortFiles(File dir) { ArrayList<File> files = new ArrayList<>(); - files.addAll(Arrays.asList(dir.listFiles())); + files.addAll(List.of(dir.listFiles())); Collections.sort(files); return files; } diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java index c8c9f7241d2..7971bc0a30e 100644 --- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java +++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java @@ -7,7 +7,6 @@ import com.yahoo.prelude.query.TaggableItem; import com.yahoo.search.query.textserialize.serializer.DispatchForm; import com.yahoo.search.query.textserialize.serializer.ItemIdMapper; -import java.util.Arrays; import java.util.List; import java.util.Map; @@ -116,7 +115,7 @@ public class ItemInitializer { Item connectedItem = taggableItem.getConnectedItem(); if (connectedItem != null) { form.setProperty("connectivity", - Arrays.asList(itemIdMapper.getId(connectedItem), taggableItem.getConnectivity())); + List.of(itemIdMapper.getId(connectedItem), taggableItem.getConnectivity())); } if (taggableItem.hasExplicitSignificance()) { diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/SearchChain.java b/container-search/src/main/java/com/yahoo/search/searchchain/SearchChain.java index 27d7430a0d9..9698735fb52 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/SearchChain.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/SearchChain.java @@ -6,7 +6,6 @@ import com.yahoo.component.chain.Chain; import com.yahoo.component.chain.Phase; import com.yahoo.search.Searcher; -import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -33,7 +32,7 @@ public class SearchChain extends Chain<Searcher> { } public SearchChain(ComponentId id, Searcher... searchers) { - this(id, Arrays.asList(searchers)); + this(id, List.of(searchers)); } public SearchChain(ComponentId id, Collection<Searcher> searchers) { diff --git a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java index f8fe0c92020..d2d5d124297 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.query; import static org.junit.jupiter.api.Assertions.*; import java.nio.ByteBuffer; -import java.util.Arrays; +import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; import java.util.regex.PatternSyntaxException; @@ -211,7 +211,7 @@ public class ItemsCommonStuffTestCase { w.setConnectivity(v, 1.0); String expected = "puppy"; String expected2 = "kvalp"; - EquivItem e = new EquivItem(w, Arrays.asList(expected, expected2)); + EquivItem e = new EquivItem(w, List.of(expected, expected2)); assertEquals(1.0, e.getConnectivity(), 1e-9); assertSame(v, e.getConnectedItem()); assertEquals(expected, ((WordItem) e.getItem(1)).getWord()); diff --git a/container-search/src/test/java/com/yahoo/prelude/query/textualrepresentation/test/TextualQueryRepresentationTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/textualrepresentation/test/TextualQueryRepresentationTestCase.java index f5dc598485a..475b8ddc02a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/textualrepresentation/test/TextualQueryRepresentationTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/textualrepresentation/test/TextualQueryRepresentationTestCase.java @@ -5,9 +5,9 @@ import java.io.BufferedReader; import java.io.FileReader; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import com.yahoo.prelude.query.Item; @@ -29,7 +29,7 @@ public class TextualQueryRepresentationTestCase { example; } - private class MockItem extends Item { + private static class MockItem extends Item { private final String name; @Override @@ -71,7 +71,7 @@ public class TextualQueryRepresentationTestCase { Map<Integer, Object> exampleMap = new HashMap<>(); exampleMap.put(1, "one"); exampleMap.put(2, "two"); - exampleMap.put(3, Arrays.asList('x', 'y', 'z')); + exampleMap.put(3, List.of('x', 'y', 'z')); discloser.addProperty("01", null); discloser.addProperty("02", "a string."); @@ -79,9 +79,9 @@ public class TextualQueryRepresentationTestCase { discloser.addProperty("04", true); discloser.addProperty("05", ExampleEnum.example); discloser.addProperty("06", new int[]{1, 2, 3}); - discloser.addProperty("07", Arrays.asList('x', 'y', 'z')); + discloser.addProperty("07", List.of('x', 'y', 'z')); discloser.addProperty("08", new ArrayList()); - discloser.addProperty("09", new HashSet(Arrays.asList(1, 2, 3))); + discloser.addProperty("09", new HashSet(List.of(1, 2, 3))); discloser.addProperty("10", exampleMap); discloser.setValue("example-value: \"12\""); diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java index 4ce1cd5a10d..4b7c7e592cf 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.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.prelude.searcher.test; -import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -286,7 +285,7 @@ public class BlendingSearcherTestCase { assertEquals(1, cr.getConcreteHitCount()); com.yahoo.search.result.ErrorHit errorHit = cr.hits().getErrorHit(); Iterator errorIterator = errorHit.errorIterator(); - List<String> errorList = Arrays.asList("Source 'a': No backends in service. Try later", + List<String> errorList = List.of("Source 'a': No backends in service. Try later", "Source 'b': 2: Request too large"); String a = errorIterator.next().toString(); assertTrue(errorList.contains(a), a); diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java index c59dbc3421e..152056dfb72 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Optional; @@ -203,10 +202,10 @@ public class InterleavedSearchInvokerTest { } private static final double DELTA = 0.000000000001; - private static final List<Double> A5 = Arrays.asList(11.0,8.5,7.5,3.0,2.0); - private static final List<Double> B5 = Arrays.asList(9.0,8.0,7.0,6.0,1.0); - private static final List<Double> A5Aux = Arrays.asList(-1.0,11.0,8.5,7.5,-7.0,3.0,2.0); - private static final List<Double> B5Aux = Arrays.asList(9.0,8.0,-3.0,7.0,6.0,1.0, -1.0); + private static final List<Double> A5 = List.of(11.0,8.5,7.5,3.0,2.0); + private static final List<Double> B5 = List.of(9.0,8.0,7.0,6.0,1.0); + private static final List<Double> A5Aux = List.of(-1.0,11.0,8.5,7.5,-7.0,3.0,2.0); + private static final List<Double> B5Aux = List.of(9.0,8.0,-3.0,7.0,6.0,1.0, -1.0); private void validateThatTopKProbabilityOverrideTakesEffect(Double topKProbability, int expectedK, Group group) throws IOException { try (InterleavedSearchInvoker invoker = createInterLeavedTestInvoker(A5, B5, group)) { diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java index 5223eb0b06b..1b36c2b8151 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java @@ -12,7 +12,6 @@ import com.yahoo.search.result.ErrorMessage; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -46,7 +45,7 @@ public class SearchClusterTest { List<AtomicInteger> pingCounts; State(String clusterId, int nodesPergroup, String ... nodeNames) { - this(clusterId, nodesPergroup, Arrays.asList(nodeNames)); + this(clusterId, nodesPergroup, List.of(nodeNames)); } State(String clusterId, int nodesPerGroup, List<String> nodeNames) { diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTest.java b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTest.java index 4d3e3c18e0b..1ac6dcbe1b6 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTest.java +++ b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTest.java @@ -23,7 +23,6 @@ import com.yahoo.search.searchchain.model.federation.FederationOptions; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -339,7 +338,7 @@ public class FederationSearcherTest { @Override public Collection<FederationTarget<String>> getTargets(Query query, ChainRegistry<Searcher> searcherChainRegistry) { - return Arrays.asList(createTarget(1), createTarget(2)); + return List.of(createTarget(1), createTarget(2)); } private FederationTarget<String> createTarget(int number) { diff --git a/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java index f064180222c..3af2614b6fb 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java @@ -11,7 +11,6 @@ import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -33,7 +32,7 @@ public class GroupingRequestTestCase { } }; req.continuations().add(foo); - assertEquals(Arrays.asList(foo), req.continuations()); + assertEquals(List.of(foo), req.continuations()); req.continuations().clear(); assertTrue(req.continuations().isEmpty()); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java index 800faa4c0d1..19fd4234cfc 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java @@ -4,7 +4,6 @@ package com.yahoo.search.grouping.request; import org.junit.jupiter.api.Test; import java.text.ChoiceFormat; -import java.util.Arrays; import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -72,30 +71,30 @@ public class BucketResolverTestCase { @Test void testBucketType() { - checkPushFail(Arrays.asList((ConstantValue) new StringValue("a"), new LongValue(1L)), + checkPushFail(List.of((ConstantValue) new StringValue("a"), new LongValue(1L)), "Bucket type mismatch, expected 'StringValue' got 'LongValue'."); - checkPushFail(Arrays.asList((ConstantValue) new StringValue("a"), new DoubleValue(1.0)), + checkPushFail(List.of((ConstantValue) new StringValue("a"), new DoubleValue(1.0)), "Bucket type mismatch, expected 'StringValue' got 'DoubleValue'."); - checkPushFail(Arrays.asList((ConstantValue) new LongValue(1L), new StringValue("a")), + checkPushFail(List.of((ConstantValue) new LongValue(1L), new StringValue("a")), "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); - checkPushFail(Arrays.asList((ConstantValue) new LongValue(1L), new DoubleValue(1.0)), + checkPushFail(List.of((ConstantValue) new LongValue(1L), new DoubleValue(1.0)), "Bucket type mismatch, expected 'LongValue' got 'DoubleValue'."); - checkPushFail(Arrays.asList((ConstantValue) new DoubleValue(1.0), new StringValue("a")), + checkPushFail(List.of((ConstantValue) new DoubleValue(1.0), new StringValue("a")), "Bucket type mismatch, expected 'DoubleValue' got 'StringValue'."); - checkPushFail(Arrays.asList((ConstantValue) new DoubleValue(1.0), new LongValue(1L)), + checkPushFail(List.of((ConstantValue) new DoubleValue(1.0), new LongValue(1L)), "Bucket type mismatch, expected 'DoubleValue' got 'LongValue'."); - checkPushFail(Arrays.asList((ConstantValue) new InfiniteValue(new Infinite(true)), new InfiniteValue(new Infinite(false))), + checkPushFail(List.of((ConstantValue) new InfiniteValue(new Infinite(true)), new InfiniteValue(new Infinite(false))), "Bucket type mismatch, cannot both be infinity."); } @Test void testBucketOrder() { - checkPushFail(Arrays.asList((ConstantValue) new LongValue(2L), new LongValue(1L)), + checkPushFail(List.of((ConstantValue) new LongValue(2L), new LongValue(1L)), "Bucket to-value can not be less than from-value."); - checkPushFail(Arrays.asList((ConstantValue) new DoubleValue(2.0), new DoubleValue(1.0)), + checkPushFail(List.of((ConstantValue) new DoubleValue(2.0), new DoubleValue(1.0)), "Bucket to-value can not be less than from-value."); - checkPushFail(Arrays.asList((ConstantValue) new StringValue("b"), new StringValue("a")), + checkPushFail(List.of((ConstantValue) new StringValue("b"), new StringValue("a")), "Bucket to-value can not be less than from-value."); } diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java index 85f19e0b19a..daed437e93f 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java @@ -9,6 +9,7 @@ import static org.junit.jupiter.api.Assertions.*; * @author Einar M R Rosenvinge */ public class MathFunctionsTestCase { + private static final DoubleValue ZERO = new DoubleValue(0.0); @Test void testMathFunctions() { @@ -37,27 +38,27 @@ public class MathFunctionsTestCase { assertSame(MathFunctions.Function.create(19), MathFunctions.Function.HYPOT); assertSame(MathFunctions.Function.create(20), MathFunctions.Function.FLOOR); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.EXP, null, null) instanceof MathExpFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.POW, null, null) instanceof MathPowFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.LOG, null, null) instanceof MathLogFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.LOG1P, null, null) instanceof MathLog1pFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.LOG10, null, null) instanceof MathLog10Function); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.SIN, null, null) instanceof MathSinFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.ASIN, null, null) instanceof MathASinFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.COS, null, null) instanceof MathCosFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.ACOS, null, null) instanceof MathACosFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.TAN, null, null) instanceof MathTanFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.ATAN, null, null) instanceof MathATanFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.SQRT, null, null) instanceof MathSqrtFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.SINH, null, null) instanceof MathSinHFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.ASINH, null, null) instanceof MathASinHFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.COSH, null, null) instanceof MathCosHFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.ACOSH, null, null) instanceof MathACosHFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.TANH, null, null) instanceof MathTanHFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.ATANH, null, null) instanceof MathATanHFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.CBRT, null, null) instanceof MathCbrtFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.HYPOT, null, null) instanceof MathHypotFunction); - assertTrue(MathFunctions.newInstance(MathFunctions.Function.FLOOR, null, null) instanceof MathFloorFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.EXP, ZERO, ZERO) instanceof MathExpFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.POW, ZERO, ZERO) instanceof MathPowFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.LOG, ZERO, ZERO) instanceof MathLogFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.LOG1P, ZERO, ZERO) instanceof MathLog1pFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.LOG10, ZERO, ZERO) instanceof MathLog10Function); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.SIN, ZERO, ZERO) instanceof MathSinFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.ASIN, ZERO, ZERO) instanceof MathASinFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.COS, ZERO, ZERO) instanceof MathCosFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.ACOS, ZERO, ZERO) instanceof MathACosFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.TAN, ZERO, ZERO) instanceof MathTanFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.ATAN, ZERO, ZERO) instanceof MathATanFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.SQRT, ZERO, ZERO) instanceof MathSqrtFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.SINH, ZERO, ZERO) instanceof MathSinHFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.ASINH, ZERO, ZERO) instanceof MathASinHFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.COSH, ZERO, ZERO) instanceof MathCosHFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.ACOSH, ZERO, ZERO) instanceof MathACosHFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.TANH, ZERO, ZERO) instanceof MathTanHFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.ATANH, ZERO, ZERO) instanceof MathATanHFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.CBRT, ZERO, ZERO) instanceof MathCbrtFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.HYPOT, ZERO, ZERO) instanceof MathHypotFunction); + assertTrue(MathFunctions.newInstance(MathFunctions.Function.FLOOR, ZERO, ZERO) instanceof MathFloorFunction); } } diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java index babeebdf8c1..71ffc5e928d 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java @@ -4,7 +4,6 @@ package com.yahoo.search.grouping.request; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -42,8 +41,8 @@ public class RawBufferTestCase { @Test void requireThatToStringWorks() { - assertToString(Arrays.asList("a".getBytes()[0], "b".getBytes()[0]), "{97,98}"); - assertToString(Arrays.asList((byte) 2, (byte) 6), "{2,6}"); + assertToString(List.of("a".getBytes()[0], "b".getBytes()[0]), "{97,98}"); + assertToString(List.of((byte) 2, (byte) 6), "{2,6}"); } public void assertToString(List<Byte> data, String expected) { diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java index 0b6ab49867b..24049264d4b 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java @@ -3,7 +3,7 @@ package com.yahoo.search.grouping.request; import org.junit.jupiter.api.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -17,7 +17,7 @@ public class RequestTestCase { GroupingOperation op = new AllOperation() .setGroupBy(new AttributeValue("foo")) .addOrderBy(new CountAggregator()) - .addChildren(Arrays.asList(new AllOperation(), new EachOperation())) + .addChildren(List.of(new AllOperation(), new EachOperation())) .addChild(new EachOperation() .addOutput(new CountAggregator()) .addOutput(new MinAggregator(new AttributeValue("bar"))) diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java index 2471acfb115..4d03c4aff95 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java @@ -4,7 +4,6 @@ package com.yahoo.search.grouping.request.parser; import com.yahoo.search.grouping.request.GroupingOperation; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -51,7 +50,7 @@ public class GroupingParserBenchmarkTest { } private static List<String> getInputs() { - return Arrays.asList( + return List.of( " all(group(foo)each(output(max(bar))))", "all( group(foo)each(output(max(bar))))", "all(group( foo)each(output(max(bar))))", diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java index e78ebfbd5af..01963e94546 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java @@ -13,7 +13,6 @@ import com.yahoo.search.yql.YqlParser; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -29,7 +28,7 @@ public class GroupingParserTestCase { @Test void requireThatMathAllowsWhitespace() { - for (String op : Arrays.asList("+", " +", " + ", "+ ", + for (String op : List.of("+", " +", " + ", "+ ", "-", " -", " - ", "- ", "*", " *", " * ", "* ", "/", " /", " / ", "/ ", @@ -64,7 +63,7 @@ public class GroupingParserTestCase { @Test void requireThatTokenImagesAreNotReservedWords() { - List<String> images = Arrays.asList("acos", + List<String> images = List.of("acos", "acosh", "accuracy", "add", @@ -489,7 +488,7 @@ public class GroupingParserTestCase { @Test void testMisc() { - for (String fnc : Arrays.asList("time.date", + for (String fnc : List.of("time.date", "time.dayofmonth", "time.dayofweek", "time.dayofyear", @@ -634,7 +633,7 @@ public class GroupingParserTestCase { actual.add(operation.toString()); } if (expectedOperations.length > 0) { - assertEquals(Arrays.asList(expectedOperations), actual); + assertEquals(List.of(expectedOperations), actual); } // make sure that operation does not mutate through toString() -> fromString() @@ -656,7 +655,7 @@ public class GroupingParserTestCase { actual.add(step.getOperation().toString()); } if (expectedOperations.length > 0) { - assertEquals(Arrays.asList(expectedOperations), actual); + assertEquals(List.of(expectedOperations), actual); } } diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java index 9e8fcb0ea21..c17bc985aef 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java @@ -28,7 +28,6 @@ import com.yahoo.searchlib.aggregation.hll.SparseSketch; import com.yahoo.searchlib.expression.StringResultNode; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Queue; @@ -105,7 +104,7 @@ public class FlatteningSearcherTestCase { } private static Execution newExecution(Searcher... searchers) { - return new Execution(new SearchChain(new ComponentId("foo"), Arrays.asList(searchers)), + return new Execution(new SearchChain(new ComponentId("foo"), List.of(searchers)), Execution.Context.createContextStub()); } diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java index ef2ef9724a9..780066d0afe 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java @@ -35,7 +35,6 @@ import com.yahoo.searchlib.expression.StringResultNode; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -180,7 +179,7 @@ public class GroupingExecutorTestCase { .addChild(new com.yahoo.searchlib.aggregation.Group().setId(new StringResultNode("common")).addAggregationResult(new MinAggregationResult().setMin(new IntegerResultNode(6)).setTag(3))) ); Execution exec = newExecution(new GroupingExecutor(), - new ResultProvider(Arrays.asList( + new ResultProvider(List.of( new GroupingListHit(List.of(grpA), null, query), new GroupingListHit(List.of(grpB), null, query)))); Group grp = req.getResultGroup(exec.search(query)); @@ -213,7 +212,7 @@ public class GroupingExecutorTestCase { .addChild(new com.yahoo.searchlib.aggregation.Group().setId(new StringResultNode("unexpected")).addAggregationResult(new MaxAggregationResult().setMax(new IntegerResultNode(96)).setTag(3))) ); Execution exec = newExecution(new GroupingExecutor(), - new ResultProvider(Arrays.asList( + new ResultProvider(List.of( new GroupingListHit(List.of(grpExpected), null, query), new GroupingListHit(List.of(grpUnexpected), null, query)))); Group grp = req.getResultGroup(exec.search(query)); @@ -244,7 +243,7 @@ public class GroupingExecutorTestCase { .addAggregationResult(new HitsAggregationResult(1, "bar").addHit(new com.yahoo.searchlib.aggregation.FS4Hit())) )); Execution exec = newExecution(new GroupingExecutor(), - new ResultProvider(Arrays.asList( + new ResultProvider(List.of( new GroupingListHit(List.of(grp0), null, query), new GroupingListHit(List.of(grp1), null, query))), new FillRequestThrower()); @@ -284,7 +283,7 @@ public class GroupingExecutorTestCase { new HitsAggregationResult(1, "bar") .addHit(new com.yahoo.searchlib.aggregation.FS4Hit())))); Execution exec = newExecution(new GroupingExecutor(), - new ResultProvider(Arrays.asList( + new ResultProvider(List.of( new GroupingListHit(List.of(grp0), null, query), new GroupingListHit(List.of(grp1), null, query))), new FillErrorProvider()); @@ -310,7 +309,7 @@ public class GroupingExecutorTestCase { .addAggregationResult(new CountAggregationResult(2)) .addOrderBy(new AggregationRefNode(0), true))); Result res = newExecution(new GroupingExecutor(), - new ResultProvider(Arrays.asList( + new ResultProvider(List.of( new GroupingListHit(List.of(grp), null, query), new GroupingListHit(List.of(grp), null, query)))).search(query); @@ -339,7 +338,7 @@ public class GroupingExecutorTestCase { ErrorProvider err = new ErrorProvider(1); Execution exec = newExecution(new GroupingExecutor(), err, - new ResultProvider(Arrays.asList( + new ResultProvider(List.of( new GroupingListHit(List.of(grp0), null, query), new GroupingListHit(List.of(grp1), null, query)))); Result res = exec.search(query); @@ -350,7 +349,7 @@ public class GroupingExecutorTestCase { err = new ErrorProvider(0); exec = newExecution(new GroupingExecutor(), err, - new ResultProvider(Arrays.asList( + new ResultProvider(List.of( new GroupingListHit(List.of(grp0), null, query), new GroupingListHit(List.of(grp1), null, query)))); res = exec.search(query); @@ -389,9 +388,9 @@ public class GroupingExecutorTestCase { )); SummaryMapper sm = new SummaryMapper(); Execution exec = newExecution(new GroupingExecutor(), - new ResultProvider(Arrays.asList( - new GroupingListHit(Arrays.asList(pass0A, pass0B), null, query), - new GroupingListHit(Arrays.asList(pass1A, pass1B), null, query))), + new ResultProvider(List.of( + new GroupingListHit(List.of(pass0A, pass0B), null, query), + new GroupingListHit(List.of(pass1A, pass1B), null, query))), sm); exec.fill(exec.search(query), "default"); assertEquals(2, sm.hitsBySummary.size()); @@ -433,7 +432,7 @@ public class GroupingExecutorTestCase { new HitsAggregationResult(1, ExpressionConverter.DEFAULT_SUMMARY_NAME) .addHit(new com.yahoo.searchlib.aggregation.FS4Hit())))); Execution exec = newExecution(new GroupingExecutor(), - new ResultProvider(Arrays.asList( + new ResultProvider(List.of( new GroupingListHit(List.of(pass0), null, query), new GroupingListHit(List.of(pass1), null, query)))); Result res = exec.search(query); @@ -468,7 +467,7 @@ public class GroupingExecutorTestCase { QueryMapper qm = new QueryMapper(); Execution exec = newExecution(new GroupingExecutor(), - new ResultProvider(Arrays.asList(pass0, pass1)), + new ResultProvider(List.of(pass0, pass1)), qm); exec.fill(exec.search(queryA)); assertEquals(1, qm.hitsByQuery.size()); @@ -607,7 +606,7 @@ public class GroupingExecutorTestCase { } private static Execution newExecution(Searcher... searchers) { - return new Execution(new SearchChain(new ComponentId("foo"), Arrays.asList(searchers)), + return new Execution(new SearchChain(new ComponentId("foo"), List.of(searchers)), Execution.Context.createContextStub()); } diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java index 6230899ec49..7e049e44f4d 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java @@ -36,7 +36,6 @@ import com.yahoo.searchlib.expression.StringResultNode; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -916,10 +915,11 @@ public class ResultBuilderTestCase { assertOutput(test); } + private static void assertOutput(ResultTest test) { RequestBuilder reqBuilder = new RequestBuilder(REQUEST_ID); reqBuilder.setRootOperation(GroupingOperation.fromString(test.request)); - reqBuilder.addContinuations(Arrays.asList(test.continuation)); + reqBuilder.addContinuations(test.getContinuations()); reqBuilder.build(); assertEquals(reqBuilder.getRequestList().size(), test.result.size()); @@ -973,6 +973,9 @@ public class ResultBuilderTestCase { String expectedException; OutputWriter outputWriter; Continuation continuation; + List<Continuation> getContinuations() { + return continuation != null ? List.of(continuation) : List.of(); + } } private static interface OutputWriter { diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java index 1869e0e4bf0..78875b5b831 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java @@ -100,7 +100,7 @@ public class PageTemplateSearcherTestCase { { // Specifying two templates as a list, should override the page.id setting Query query = new Query("?query=foo&page.id=anySource&page.resolver=native.deterministic"); - query.properties().set("page.idList", Arrays.asList("oneSource", "threeSources")); + query.properties().set("page.idList", List.of("oneSource", "threeSources")); Result result = new Execution(chain, Execution.Context.createContextStub()).search(query); assertSources("source1 source2 source3", "source1 source2 source3", result); } @@ -172,11 +172,11 @@ public class PageTemplateSearcherTestCase { } private void assertSources(String expectedQuerySourceString,String expectedResultSourceString,Result result) { - Set<String> expectedQuerySources=new HashSet<>(Arrays.asList(expectedQuerySourceString.split(" "))); + Set<String> expectedQuerySources=new HashSet<>(List.of(expectedQuerySourceString.split(" "))); assertEquals(expectedQuerySources,result.getQuery().getModel().getSources()); - Set<String> expectedResultSources=new HashSet<>(Arrays.asList(expectedResultSourceString.split(" "))); - for (String sourceName : Arrays.asList("source1 source2 source3".split(" "))) { + Set<String> expectedResultSources=new HashSet<>(List.of(expectedResultSourceString.split(" "))); + for (String sourceName : List.of("source1 source2 source3".split(" "))) { if (expectedResultSources.contains(sourceName)) assertNotNull(result.hits().get(sourceName),"Result contains '" + sourceName + "'"); else @@ -189,7 +189,7 @@ public class PageTemplateSearcherTestCase { @Override public Result search(Query query,Execution execution) { Result result=new Result(query); - for (String sourceName : Arrays.asList("source1 source2 source3".split(" "))) + for (String sourceName : List.of("source1 source2 source3".split(" "))) if (query.getModel().getSources().isEmpty() || query.getModel().getSources().contains(sourceName)) result.hits().add(createSource(sourceName)); return result; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java index 20043f23256..58f1fa62fe6 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java @@ -20,7 +20,6 @@ import com.yahoo.search.searchchain.Execution; import com.yahoo.yolean.trace.TraceNode; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -125,7 +124,7 @@ public class QueryProfileTestCase { far.set("a.far", "a.far", null); CompiledQueryProfile cbarn = barn.compile(null); - assertSameObjects(cbarn, "a", Arrays.asList("mormor", "far", "barn")); + assertSameObjects(cbarn, "a", List.of("mormor", "far", "barn")); assertEquals("b.mor", cbarn.get("b.mor")); assertEquals("b.far", cbarn.get("b.far")); diff --git a/container-search/src/test/java/com/yahoo/search/query/properties/SubPropertiesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/properties/SubPropertiesTestCase.java index 467a0b0845c..266cb4daf67 100644 --- a/container-search/src/test/java/com/yahoo/search/query/properties/SubPropertiesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/properties/SubPropertiesTestCase.java @@ -4,8 +4,8 @@ package com.yahoo.search.query.properties; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import java.util.Arrays; import java.util.HashSet; +import java.util.List; import com.yahoo.processing.request.properties.PropertyMap; import org.junit.jupiter.api.Test; @@ -34,7 +34,7 @@ public class SubPropertiesTestCase { assertEquals("1", sub.get("e")); assertEquals(2, sub.get("f")); assertNull(sub.get("d")); - assertEquals(new HashSet<>(Arrays.asList("e", "f")), sub.listProperties("").keySet()); + assertEquals(new HashSet<>(List.of("e", "f")), sub.listProperties("").keySet()); } } diff --git a/container-search/src/test/java/com/yahoo/search/query/test/ModelTestCase.java b/container-search/src/test/java/com/yahoo/search/query/test/ModelTestCase.java index 2cd43257b12..89a62abddcc 100644 --- a/container-search/src/test/java/com/yahoo/search/query/test/ModelTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/test/ModelTestCase.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.Arrays; import java.util.LinkedHashSet; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -91,8 +91,8 @@ public class ModelTestCase { Model sr = new Model(q); sr.setRestrict("music, cheese,other"); sr.setSources("cluster1"); - assertEquals(sr.getSources(), new LinkedHashSet<>(Arrays.asList(new String[]{"cluster1"}))); - assertEquals(sr.getRestrict(), new LinkedHashSet<>(Arrays.asList(new String[]{"cheese", "music", "other"}))); + assertEquals(sr.getSources(), new LinkedHashSet<>(List.of(new String[]{"cluster1"}))); + assertEquals(sr.getRestrict(), new LinkedHashSet<>(List.of(new String[]{"cheese", "music", "other"}))); } @Test diff --git a/container-search/src/test/java/com/yahoo/search/query/test/RankFeaturesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/test/RankFeaturesTestCase.java index 732fdd7dcbb..7bfbeef4e23 100644 --- a/container-search/src/test/java/com/yahoo/search/query/test/RankFeaturesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/test/RankFeaturesTestCase.java @@ -36,7 +36,6 @@ public class RankFeaturesTestCase { } @Test - @SuppressWarnings("deprecation") void requireThatRankFeaturesUsingDoubleAndDoubleToStringEncodeTheSameWay() { RankFeatures withDouble = new RankFeatures(new Ranking(new Query())); withDouble.put("query(myDouble)", 3.8); @@ -68,20 +67,12 @@ public class RankFeaturesTestCase { TensorType type = new TensorType.Builder().mapped("x").mapped("y").mapped("z").build(); Tensor tensor1 = Tensor.from(type, "{ {x:a, y:b, z:c}:2.0, {x:a, y:b, z:c2}:3.0 }"); Tensor tensor2 = Tensor.from(type, "{ {x:a, y:b, z:c}:5.0 }"); - assertTensorEncodingAndDecoding(type, Arrays.asList( + assertTensorEncodingAndDecoding(type, List.of( new Entry("query(tensor1)", "tensor1", tensor1), new Entry("$tensor2", "tensor2", tensor2))); } - private static class Entry { - final String key; - final String normalizedKey; - final Tensor tensor; - Entry(String key, String normalizedKey, Tensor tensor) { - this.key = key; - this.normalizedKey = normalizedKey; - this.tensor = tensor; - } + private record Entry(String key, String normalizedKey, Tensor tensor) { } private static void assertTensorEncodingAndDecoding(TensorType type, List<Entry> entries) { @@ -97,7 +88,7 @@ public class RankFeaturesTestCase { } private static void assertTensorEncodingAndDecoding(TensorType type, String key, String normalizedKey, Tensor tensor) { - assertTensorEncodingAndDecoding(type, Arrays.asList(new Entry(key, normalizedKey, tensor))); + assertTensorEncodingAndDecoding(type, List.of(new Entry(key, normalizedKey, tensor))); } private static RankProperties createRankPropertiesWithTensors(List<Entry> entries) { diff --git a/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java index 5f8fbbd08df..42098051b82 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java @@ -9,7 +9,6 @@ import com.yahoo.search.result.Hit; import com.yahoo.search.result.HitGroup; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -165,14 +164,14 @@ public class HitGroupTestCase { Hit hit = new Hit("http://nalle.balle/1.html", 832); hit.setField("url", "http://nalle.balle/1.html"); hit.setField("clickurl", "javascript:openWindow('http://www.foo');"); - hit.setField("attributes", Arrays.asList("typevideo")); + hit.setField("attributes", List.of("typevideo")); hg.add(hit); } { Hit hit = new Hit("http://nalle.balle/2.html", 442); hit.setField("url", "http://nalle.balle/2.html"); hit.setField("clickurl", ""); - hit.setField("attributes", Arrays.asList("typevideo")); + hit.setField("attributes", List.of("typevideo")); hg.add(hit); } assertFalse(hg.isFillable()); @@ -187,7 +186,7 @@ public class HitGroupTestCase { Hit hit = new Hit("http://nalle.balle/1.html", 832); hit.setField("url", "http://nalle.balle/1.html"); hit.setField("clickurl", "javascript:openWindow('http://www.foo');"); - hit.setField("attributes", Arrays.asList("typevideo")); + hit.setField("attributes", List.of("typevideo")); hit.setFillable(); hg.add(hit); } @@ -195,7 +194,7 @@ public class HitGroupTestCase { Hit hit = new Hit("http://nalle.balle/2.html", 442); hit.setField("url", "http://nalle.balle/2.html"); hit.setField("clickurl", ""); - hit.setField("attributes", Arrays.asList("typevideo")); + hit.setField("attributes", List.of("typevideo")); hit.setFillable(); hg.add(hit); } @@ -211,14 +210,14 @@ public class HitGroupTestCase { Hit hit = new Hit("http://nalle.balle/1.html", 832); hit.setField("url", "http://nalle.balle/1.html"); hit.setField("clickurl", "javascript:openWindow('http://www.foo');"); - hit.setField("attributes", Arrays.asList("typevideo")); + hit.setField("attributes", List.of("typevideo")); hg.add(hit); } { Hit hit = new Hit("http://nalle.balle/2.html", 442); hit.setField("url", "http://nalle.balle/2.html"); hit.setField("clickurl", ""); - hit.setField("attributes", Arrays.asList("typevideo")); + hit.setField("attributes", List.of("typevideo")); hg.add(hit); } assertFalse(hg.isFillable()); diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/AsyncExecutionTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/AsyncExecutionTestCase.java index e8a85e38e80..1bf04eb44fb 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/AsyncExecutionTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/AsyncExecutionTestCase.java @@ -10,7 +10,6 @@ import com.yahoo.search.result.Hit; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; @@ -70,20 +69,20 @@ public class AsyncExecutionTestCase { void testWaitForAll() { Chain<Searcher> slowChain = new Chain<>( new ComponentId("slow"), - Arrays.asList(new Searcher[]{new WaitingSearcher("slow", 30000)} + List.of(new Searcher[]{new WaitingSearcher("slow", 30000)} ) ); Chain<Searcher> fastChain = new Chain<>( new ComponentId("fast"), - Arrays.asList(new Searcher[]{new SimpleSearcher()}) + List.of(new Searcher[]{new SimpleSearcher()}) ); FutureResult slowFuture = new AsyncExecution(slowChain, Execution.Context.createContextStub()).search(new Query("?hits=0")); FutureResult fastFuture = new AsyncExecution(fastChain, Execution.Context.createContextStub()).search(new Query("?hits=0")); fastFuture.get(); FutureResult [] reslist = new FutureResult[]{slowFuture, fastFuture}; - List<Result> results = AsyncExecution.waitForAll(Arrays.asList(reslist), 0); + List<Result> results = AsyncExecution.waitForAll(List.of(reslist), 0); //assertTrue(slowFuture.isCancelled()); assertTrue(fastFuture.isDone() && !fastFuture.isCancelled()); diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/DependencyConfigTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/DependencyConfigTestCase.java index 924aa7ae999..16e9adecdba 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/DependencyConfigTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/DependencyConfigTestCase.java @@ -3,7 +3,7 @@ package com.yahoo.search.searchchain.config.test; import java.io.File; import java.io.IOException; -import java.util.Arrays; +import java.util.List; import com.yahoo.component.chain.dependencies.After; @@ -72,8 +72,8 @@ public class DependencyConfigTestCase { void test() { Dependencies dependencies = registry.getSearcherRegistry().getComponent(Searcher1.class.getName()).getDependencies(); - assertTrue(dependencies.provides().containsAll(Arrays.asList("P", "P1", "P2", Searcher1.class.getSimpleName()))); - assertTrue(dependencies.before().containsAll(Arrays.asList("B", "B1", "B2"))); - assertTrue(dependencies.after().containsAll(Arrays.asList("A", "A1", "A2"))); + assertTrue(dependencies.provides().containsAll(List.of("P", "P1", "P2", Searcher1.class.getSimpleName()))); + assertTrue(dependencies.before().containsAll(List.of("B", "B1", "B2"))); + assertTrue(dependencies.after().containsAll(List.of("A", "A1", "A2"))); } } diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/SearchChainTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/SearchChainTestCase.java index 2f04b695774..87384a15979 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/SearchChainTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/SearchChainTestCase.java @@ -5,7 +5,6 @@ import static com.yahoo.search.searchchain.test.SimpleSearchChain.searchChain; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -40,7 +39,7 @@ public class SearchChainTestCase { assertEquals("test", searchChain.getId().getName()); assertEquals(Version.emptyVersion, searchChain.getId().getVersion()); assertEquals(new Version(), searchChain.getId().getVersion()); - assertEqualMembers(Arrays.asList("one", "two"), searcherNames(searchChain.searchers())); + assertEqualMembers(List.of("one", "two"), searcherNames(searchChain.searchers())); } public List<String> searcherNames(Collection<Searcher> searchers) { diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/SimpleSearchChain.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/SimpleSearchChain.java index de2fc46d803..833fd2c8657 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/SimpleSearchChain.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/SimpleSearchChain.java @@ -2,7 +2,6 @@ package com.yahoo.search.searchchain.test; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -38,7 +37,7 @@ public class SimpleSearchChain { @Override public Collection<ForkingSearcher.CommentedSearchChain> getSearchChainsForwarded(SearchChainRegistry registry) { - return Arrays.asList( + return List.of( new ForkingSearcher.CommentedSearchChain("Reason for forwarding to this search chain.", dummySearchChain()), new ForkingSearcher.CommentedSearchChain(null, dummySearchChain())); } diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java index 036c41aab66..fb77073f68e 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java @@ -15,7 +15,6 @@ import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -308,7 +307,7 @@ public class TraceTestCase { public Forker(boolean carryOverContext, boolean parallel, Searcher ... branches) { this.carryOverContext = carryOverContext; this.parallel = parallel; - this.branches = Arrays.asList(branches); + this.branches = List.of(branches); } @Override diff --git a/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java index 87bc602f072..20ca81234a6 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java @@ -27,7 +27,8 @@ import com.yahoo.search.query.QueryTree; import com.yahoo.search.query.parser.Parsable; import com.yahoo.search.query.parser.ParserEnvironment; -import java.util.Arrays; + +import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -383,7 +384,7 @@ public class VespaSerializerTestCase { private static void newGroupingRequest(Query query, GroupingOperation grouping, Continuation... continuations) { GroupingRequest request = GroupingRequest.newInstance(query); request.setRootOperation(grouping); - request.continuations().addAll(Arrays.asList(continuations)); + request.continuations().addAll(List.of(continuations)); } @Test diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java index 87d18c18db5..675acabe906 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java @@ -3,7 +3,6 @@ package com.yahoo.search.yql; import static org.junit.jupiter.api.Assertions.*; -import java.util.Arrays; import java.util.List; import com.yahoo.search.schema.DocumentSummary; @@ -48,9 +47,9 @@ public class YqlFieldAndSourceTestCase { DocumentSourceSearcher mockBackend = new DocumentSourceSearcher(); mockBackend.addResult(query, result); - mockBackend.addSummaryClassByCopy(DEFAULT_SUMMARY_CLASS, Arrays.asList(FIELD1, FIELD2)); - mockBackend.addSummaryClassByCopy(SORTABLE_ATTRIBUTES_SUMMARY_CLASS, Arrays.asList(FIELD2)); - mockBackend.addSummaryClassByCopy(THIRD_OPTION, Arrays.asList(FIELD3)); + mockBackend.addSummaryClassByCopy(DEFAULT_SUMMARY_CLASS, List.of(FIELD1, FIELD2)); + mockBackend.addSummaryClassByCopy(SORTABLE_ATTRIBUTES_SUMMARY_CLASS, List.of(FIELD2)); + mockBackend.addSummaryClassByCopy(THIRD_OPTION, List.of(FIELD3)); searchChain = new Chain<>(new FieldFiller(schemaInfo()), mockBackend); context = Execution.Context.createContextStub(); diff --git a/container-search/src/test/java/com/yahoo/text/interpretation/test/AnnotationTestCase.java b/container-search/src/test/java/com/yahoo/text/interpretation/test/AnnotationTestCase.java index dd2725f2d6e..3fa81e948a2 100644 --- a/container-search/src/test/java/com/yahoo/text/interpretation/test/AnnotationTestCase.java +++ b/container-search/src/test/java/com/yahoo/text/interpretation/test/AnnotationTestCase.java @@ -2,7 +2,6 @@ package com.yahoo.text.interpretation.test; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -50,7 +49,7 @@ public class AnnotationTestCase { } Set<AnnotationClass> annotationClasses = a.getClasses(0, 3); - Set<AnnotationClass> testClass = new HashSet<>(Arrays.asList( + Set<AnnotationClass> testClass = new HashSet<>(List.of( new AnnotationClass("token"), new AnnotationClass("state"))); assertEquals(testClass, annotationClasses); @@ -75,7 +74,7 @@ public class AnnotationTestCase { //This is bad about the API, getTokens may not necessairily return what a user thinks a token is //But it should still be tested a.annotate(0, 1, "n"); - Set<String> testSet = new HashSet<>(Arrays.asList("n", "york", "hotel")); + Set<String> testSet = new HashSet<>(List.of("n", "york", "hotel")); for (Span span :a.getTokens()) { assertTrue(testSet.remove(span.getText())); } @@ -118,7 +117,7 @@ public class AnnotationTestCase { //if a number is not found woe_id = annotations.getInteger("woe_id"); } - assertEquals(Arrays.asList("crab"), toppings); + assertEquals(List.of("crab"), toppings); assertEquals(2459115, woe_id); } diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java index 4750e64a784..312f2800e6c 100644 --- a/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java +++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java @@ -3,7 +3,6 @@ package com.yahoo.document.annotation; import com.yahoo.document.DataType; -import java.util.Arrays; import java.util.List; /** @@ -29,7 +28,7 @@ public final class AnnotationTypes { public static final AnnotationType PROXIMITY_BREAK = new AnnotationType("proximity_break", DataType.DOUBLE, 8); public static final AnnotationType SPECIAL_TOKEN = new AnnotationType("special_token", 9); - public static final List<AnnotationType> ALL_TYPES = Arrays.asList(TERM, TOKEN_TYPE, CANONICAL, NORMALIZED, READING, + public static final List<AnnotationType> ALL_TYPES = List.of(TERM, TOKEN_TYPE, CANONICAL, NORMALIZED, READING, STEM, TRANSFORMED, PROXIMITY_BREAK, SPECIAL_TOKEN); } diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java index 35d12f32906..42405bb6f06 100644 --- a/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java +++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java @@ -13,6 +13,7 @@ import com.yahoo.document.select.parser.ParseException; import com.yahoo.document.serialization.DocumentUpdateReader; import com.yahoo.document.serialization.VespaDocumentSerializer6; import java.util.ListIterator; +import java.util.Objects; /** * @author Thomas Gundersen @@ -48,8 +49,8 @@ public abstract class FieldPathUpdate { private DocumentSelector selector; private String originalFieldPath; private String whereClause; - private Type updType; - private DocumentType docType; + private final Type updType; + private final DocumentType docType; public FieldPathUpdate(Type updType, DocumentType docType, String fieldPath, String whereClause) { this.updType = updType; @@ -97,7 +98,7 @@ public abstract class FieldPathUpdate { public void setWhereClause(String whereClause) throws ParseException { this.whereClause = whereClause; selector = null; - if (whereClause != null && !whereClause.equals("")) { + if (whereClause != null && !whereClause.isEmpty()) { selector = new DocumentSelector(whereClause); } } @@ -135,15 +136,11 @@ public abstract class FieldPathUpdate { } public static FieldPathUpdate create(Type type, DocumentType docType, DocumentUpdateReader reader) { - switch (type) { - case ASSIGN: - return new AssignFieldPathUpdate(docType, reader); - case ADD: - return new AddFieldPathUpdate(docType, reader); - case REMOVE: - return new RemoveFieldPathUpdate(docType, reader); - } - throw new IllegalArgumentException("Field path update type '" + type + "' not supported."); + return switch (type) { + case ASSIGN -> new AssignFieldPathUpdate(docType, reader); + case ADD -> new AddFieldPathUpdate(docType, reader); + case REMOVE -> new RemoveFieldPathUpdate(docType, reader); + }; } @Override @@ -153,10 +150,10 @@ public abstract class FieldPathUpdate { FieldPathUpdate that = (FieldPathUpdate) o; - if (docType != null ? !docType.equals(that.docType) : that.docType != null) return false; - if (originalFieldPath != null ? !originalFieldPath.equals(that.originalFieldPath) : that.originalFieldPath != null) + if (!Objects.equals(docType, that.docType)) return false; + if (!Objects.equals(originalFieldPath, that.originalFieldPath)) return false; - if (whereClause != null ? !whereClause.equals(that.whereClause) : that.whereClause != null) return false; + if (!Objects.equals(whereClause, that.whereClause)) return false; return true; } diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java index aa043a25d78..e72d3720024 100644 --- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java +++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java @@ -20,7 +20,6 @@ import com.yahoo.document.MapDataType; import com.yahoo.document.PositionDataType; import com.yahoo.document.StructDataType; import com.yahoo.document.TensorDataType; -import com.yahoo.document.TestAndSetCondition; import com.yahoo.document.WeightedSetDataType; import com.yahoo.document.datatypes.Array; import com.yahoo.document.datatypes.BoolFieldValue; @@ -32,7 +31,6 @@ import com.yahoo.document.datatypes.StringFieldValue; import com.yahoo.document.datatypes.Struct; import com.yahoo.document.datatypes.TensorFieldValue; import com.yahoo.document.datatypes.WeightedSet; -import com.yahoo.document.fieldpathupdate.FieldPathUpdate; import com.yahoo.document.internal.GeoPosType; import com.yahoo.document.json.readers.DocumentParseInfo; import com.yahoo.document.json.readers.VespaJsonDocumentReader; @@ -64,7 +62,6 @@ import org.junit.Test; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; import java.util.Arrays; import java.util.Base64; import java.util.Collections; diff --git a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java index 63255f90919..b09d33a2fe4 100644 --- a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java +++ b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java @@ -32,7 +32,6 @@ import org.junit.Before; import org.junit.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -852,10 +851,10 @@ public class DocumentSelectorTestCase { @Test public void testThatSelectionIsConvertedToQueries() throws ParseException { - assertThatQueriesAreCreated("music.expire > now()", Arrays.asList("music"), Arrays.asList("expire:>now(0)")); - assertThatQueriesAreCreated("music.expire > now() - 300", Arrays.asList("music"), Arrays.asList("expire:>now(300)")); - assertThatQueriesAreCreated("music.expire > now() - 300 and video.expire > now() - 3600", Arrays.asList("music", "video"), Arrays.asList("expire:>now(300)", "expire:>now(3600)")); - assertThatQueriesAreCreated("music.expire > now() - 300 or video", Arrays.asList("music"), Arrays.asList("expire:>now(300)")); + assertThatQueriesAreCreated("music.expire > now()", List.of("music"), List.of("expire:>now(0)")); + assertThatQueriesAreCreated("music.expire > now() - 300", List.of("music"), List.of("expire:>now(300)")); + assertThatQueriesAreCreated("music.expire > now() - 300 and video.expire > now() - 3600", List.of("music", "video"), List.of("expire:>now(300)", "expire:>now(3600)")); + assertThatQueriesAreCreated("music.expire > now() - 300 or video", List.of("music"), List.of("expire:>now(300)")); assertVisitWithInvalidNowFails("music.field1 > now() - 300 and music.field2 > now() - 300", "Specifying multiple document types is not allowed"); assertVisitWithInvalidNowFails("music.field1 > now() - 300 and video.field1 > now() and music.field2 > now() - 300", "Specifying multiple document types is not allowed"); assertVisitWithInvalidNowFails("now() > music.field", "Left hand side of comparison must be a document field"); 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); diff --git a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java index cae11d66d13..625906fc6a2 100644 --- a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java +++ b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java @@ -66,7 +66,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -538,7 +537,7 @@ public class DocumentGenPluginTest { } private static DocumentTypeManager typeManagerFromSDs(String... files) { - var cfg = getDocumentConfig(Arrays.asList(files)); + var cfg = getDocumentConfig(List.of(files)); return new DocumentTypeManager(cfg); } diff --git a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java index 2442ffa7b1f..0007c4e0127 100644 --- a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java +++ b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java @@ -23,7 +23,7 @@ import java.nio.ByteBuffer; import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; -import java.util.Arrays; +import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -148,7 +148,7 @@ public class FileDownloaderTest { File barFile = new File(subdir, "really-long-filename-over-100-bytes-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); IOUtils.writeFile(barFile, "bar", false); - File tarFile = new FileReferenceCompressor(compressed, gzip).compress(tempPath.toFile(), Arrays.asList(fooFile, barFile), new File(tempPath.toFile(), filename)); + File tarFile = new FileReferenceCompressor(compressed, gzip).compress(tempPath.toFile(), List.of(fooFile, barFile), new File(tempPath.toFile(), filename)); byte[] tarredContent = IOUtils.readFileBytes(tarFile); receiveFile(fileReference, filename, compressed, tarredContent); Optional<File> downloadedFile = getFile(fileReference); diff --git a/flags/src/main/java/com/yahoo/vespa/flags/OrderedFlagSource.java b/flags/src/main/java/com/yahoo/vespa/flags/OrderedFlagSource.java index 4f191c06022..a5d88010a24 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/OrderedFlagSource.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/OrderedFlagSource.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.vespa.flags; -import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -18,7 +17,7 @@ public class OrderedFlagSource implements FlagSource { * @param sources Flag sources in descending priority order. */ public OrderedFlagSource(FlagSource... sources) { - this.sources = Arrays.asList(sources); + this.sources = List.of(sources); } @Override diff --git a/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java index 57a7615421d..173387b8fc3 100644 --- a/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java +++ b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java @@ -22,7 +22,6 @@ import java.io.UncheckedIOException; import java.net.URI; import java.time.Duration; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.function.Function; @@ -83,7 +82,7 @@ public interface HttpClient extends Closeable { /** Sets query parameters without a value, like {@code ?debug&recursive}. */ default RequestBuilder emptyParameters(String... keys) { - return emptyParameters(Arrays.asList(keys)); + return emptyParameters(List.of(keys)); } /** Sets query parameters without a value, like {@code ?debug&recursive}. */ @@ -91,7 +90,7 @@ public interface HttpClient extends Closeable { /** Sets the parameter key/values for the request. Number of arguments must be even. Null values are omitted. */ default RequestBuilder parameters(String... pairs) { - return parameters(Arrays.asList(pairs)); + return parameters(List.of(pairs)); } /** Sets the parameter key/values for the request. Number of arguments must be even. Pairs with {@code null} values are omitted. */ diff --git a/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandlerTest.java b/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandlerTest.java index c843b77e359..0f4477b49cd 100644 --- a/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandlerTest.java +++ b/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandlerTest.java @@ -8,7 +8,7 @@ import javax.net.ssl.SSLException; import java.io.IOException; import java.net.ConnectException; import java.time.Duration; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -105,7 +105,7 @@ public class DelayedConnectionLevelRetryHandlerTest { DelayedConnectionLevelRetryHandler handler = DelayedConnectionLevelRetryHandler.Builder .withFixedDelay(Duration.ofSeconds(2), maxRetries) - .retryForExceptions(Arrays.asList(SSLException.class, ConnectException.class)) + .retryForExceptions(List.of(SSLException.class, ConnectException.class)) .withSleeper(mock(Sleeper.class)) .build(); @@ -122,7 +122,7 @@ public class DelayedConnectionLevelRetryHandlerTest { void does_not_retry_for_non_listed_exception() { DelayedConnectionLevelRetryHandler handler = DelayedConnectionLevelRetryHandler.Builder .withFixedDelay(Duration.ofSeconds(2), 2) - .retryForExceptions(Arrays.asList(SSLException.class, ConnectException.class)) + .retryForExceptions(List.of(SSLException.class, ConnectException.class)) .withSleeper(mock(Sleeper.class)) .build(); diff --git a/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandlerTest.java b/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandlerTest.java index b7d15f3cd12..83c87ab3a23 100644 --- a/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandlerTest.java +++ b/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandlerTest.java @@ -10,7 +10,6 @@ import org.apache.http.message.BasicStatusLine; import org.junit.jupiter.api.Test; import java.time.Duration; -import java.util.Arrays; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -84,7 +83,7 @@ public class DelayedResponseLevelRetryHandlerTest { HttpClientContext ctx = new HttpClientContext(); int lastExecutionCount = maxRetries + 1; List<Duration> expectedIntervals = - Arrays.asList( + List.of( startDelay, Duration.ofSeconds(1), Duration.ofSeconds(2), Duration.ofSeconds(4), Duration.ofSeconds(5), Duration.ofSeconds(5), Duration.ofSeconds(5), Duration.ofSeconds(5), Duration.ofSeconds(5), Duration.ofSeconds(5), Duration.ofSeconds(5)); @@ -100,7 +99,7 @@ public class DelayedResponseLevelRetryHandlerTest { DelayedResponseLevelRetryHandler handler = DelayedResponseLevelRetryHandler.Builder .withFixedDelay(Duration.ofSeconds(2), maxRetries) - .retryForStatusCodes(Arrays.asList(HttpStatus.SC_SERVICE_UNAVAILABLE, HttpStatus.SC_BAD_GATEWAY)) + .retryForStatusCodes(List.of(HttpStatus.SC_SERVICE_UNAVAILABLE, HttpStatus.SC_BAD_GATEWAY)) .build(); HttpResponse response = createResponse(HttpStatus.SC_SERVICE_UNAVAILABLE); @@ -116,7 +115,7 @@ public class DelayedResponseLevelRetryHandlerTest { void does_not_retry_for_non_listed_exception() { DelayedResponseLevelRetryHandler handler = DelayedResponseLevelRetryHandler.Builder .withFixedDelay(Duration.ofSeconds(2), 2) - .retryForStatusCodes(Arrays.asList(HttpStatus.SC_SERVICE_UNAVAILABLE, HttpStatus.SC_BAD_GATEWAY)) + .retryForStatusCodes(List.of(HttpStatus.SC_SERVICE_UNAVAILABLE, HttpStatus.SC_BAD_GATEWAY)) .build(); HttpResponse response = createResponse(HttpStatus.SC_OK); diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java index 6e90142d8a1..c12239a99c3 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java @@ -19,7 +19,7 @@ import java.util.*; public final class CatExpression extends ExpressionList<Expression> { public CatExpression(Expression... lst) { - this(Arrays.asList(lst)); + this(List.of(lst)); } public CatExpression(Collection<? extends Expression> lst) { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceExpression.java index 9038fbad33c..7a556bd90d0 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceExpression.java @@ -5,7 +5,6 @@ import com.yahoo.document.DataType; import com.yahoo.document.datatypes.FieldValue; import com.yahoo.vespa.indexinglanguage.ExpressionConverter; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; @@ -25,7 +24,7 @@ public class ChoiceExpression extends ExpressionList<Expression> { } public ChoiceExpression(Expression... choices) { - this(Arrays.asList(choices)); + this(List.of(choices)); } public ChoiceExpression(Collection<? extends Expression> choices) { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java index 929f51f0fef..810ff261f2d 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java @@ -12,7 +12,6 @@ import com.yahoo.vespa.indexinglanguage.ScriptParserContext; import com.yahoo.vespa.indexinglanguage.parser.IndexingInput; import com.yahoo.vespa.indexinglanguage.parser.ParseException; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -29,7 +28,7 @@ public final class ScriptExpression extends ExpressionList<StatementExpression> } public ScriptExpression(StatementExpression... statements) { - this(Arrays.asList(statements)); + this(List.of(statements)); } public ScriptExpression(Collection<? extends StatementExpression> statements) { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java index 3d28f70cbd5..9c92dd452c3 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java @@ -10,7 +10,6 @@ import com.yahoo.vespa.indexinglanguage.ExpressionConverter; import com.yahoo.vespa.objects.ObjectOperation; import com.yahoo.vespa.objects.ObjectPredicate; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -25,7 +24,7 @@ public final class SelectInputExpression extends CompositeExpression { @SafeVarargs @SuppressWarnings("varargs") public SelectInputExpression(Pair<String, Expression>... cases) { - this(Arrays.asList(cases)); + this(List.of(cases)); } public SelectInputExpression(List<Pair<String, Expression>> cases) { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java index 2db6c760380..f9d8002100f 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java @@ -30,7 +30,7 @@ public final class StatementExpression extends ExpressionList<Expression> { private String outputField; public StatementExpression(Expression... lst) { - this(Arrays.asList(lst)); + this(Arrays.asList(lst)); //TODO Can contain null - necessary ? } public StatementExpression(Iterable<Expression> lst) { 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", diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java index 96306f60d80..83e2a8ea4f0 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java @@ -11,7 +11,8 @@ import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig.Builder; import com.yahoo.jdisc.http.filter.util.FilterTestUtils; import org.junit.jupiter.api.Test; -import java.util.Arrays; + +import java.util.List; import static com.yahoo.jdisc.http.HttpRequest.Method.OPTIONS; import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ACCESS_CONTROL_HEADERS; @@ -75,7 +76,7 @@ public class CorsPreflightRequestFilterTest { private static CorsPreflightRequestFilter newRequestFilter(String... allowedOriginUrls) { Builder builder = new Builder(); - Arrays.asList(allowedOriginUrls).forEach(builder::allowedUrls); + List.of(allowedOriginUrls).forEach(builder::allowedUrls); return new CorsPreflightRequestFilter(new CorsFilterConfig(builder)); } diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java index a8fb8c8d817..8c28e0c2a98 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java @@ -8,9 +8,9 @@ import com.yahoo.jdisc.http.filter.SecurityResponseFilter; import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig.Builder; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Optional; @@ -68,7 +68,7 @@ public class CorsResponseFilterTest { private static CorsResponseFilter newResponseFilter(String... allowedOriginUrls) { Builder builder = new Builder(); - Arrays.asList(allowedOriginUrls).forEach(builder::allowedUrls); + List.of(allowedOriginUrls).forEach(builder::allowedUrls); return new CorsResponseFilter(new CorsFilterConfig(builder)); } diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/AbstractApplication.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/AbstractApplication.java index 71956691623..3485c07c74e 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/AbstractApplication.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/AbstractApplication.java @@ -6,7 +6,6 @@ import com.yahoo.jdisc.service.CurrentContainer; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; -import java.util.Arrays; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -67,7 +66,7 @@ public abstract class AbstractApplication implements Application { } public final List<Bundle> installAndStartBundle(String... locations) throws BundleException { - return installAndStartBundle(Arrays.asList(locations)); + return installAndStartBundle(List.of(locations)); } public final List<Bundle> installAndStartBundle(Iterable<String> locations) throws BundleException { @@ -75,7 +74,7 @@ public abstract class AbstractApplication implements Application { } public final void stopAndUninstallBundle(Bundle... bundles) throws BundleException { - stopAndUninstallBundle(Arrays.asList(bundles)); + stopAndUninstallBundle(List.of(bundles)); } public final void stopAndUninstallBundle(Iterable<Bundle> bundles) throws BundleException { diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java index fb3965108d8..5fc3b42055f 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java @@ -13,7 +13,6 @@ import com.google.inject.spi.Elements; import com.yahoo.jdisc.Container; import org.osgi.framework.Bundle; -import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; @@ -38,7 +37,7 @@ public class GuiceRepository implements Iterable<Module> { private Injector injector; public GuiceRepository(Module... modules) { - installAll(Arrays.asList(modules)); + installAll(List.of(modules)); } public Injector activate() { diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/client/ClientDriver.java b/jdisc_core/src/main/java/com/yahoo/jdisc/client/ClientDriver.java index 8a5c8de92b9..beba03d7d84 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/client/ClientDriver.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/client/ClientDriver.java @@ -10,7 +10,6 @@ import com.yahoo.jdisc.core.FelixFramework; import com.yahoo.jdisc.core.FelixParams; import com.yahoo.jdisc.test.NonWorkingOsgiFramework; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -94,7 +93,7 @@ public abstract class ClientDriver { } private static List<Module> newModuleList(final ClientApplication appInstance, Module... guiceModules) { - List<Module> lst = new LinkedList<>(Arrays.asList(guiceModules)); + List<Module> lst = new LinkedList<>(List.of(guiceModules)); lst.add(new AbstractModule() { @Override @@ -108,7 +107,7 @@ public abstract class ClientDriver { private static List<Module> newModuleList(final Class<? extends ClientApplication> appClass, Module... guiceModules) { - List<Module> lst = new LinkedList<>(Arrays.asList(guiceModules)); + List<Module> lst = new LinkedList<>(List.of(guiceModules)); lst.add(new AbstractModule() { @Override diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java index 80e531c90af..2bf3e05baed 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java @@ -14,7 +14,6 @@ import org.osgi.framework.FrameworkEvent; import org.osgi.framework.wiring.FrameworkWiring; import java.io.File; -import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; @@ -150,14 +149,14 @@ public class FelixFramework implements OsgiFramework { @Override public List<Bundle> bundles() { - return Arrays.asList(felix.getBundleContext().getBundles()); + return List.of(felix.getBundleContext().getBundles()); } @Override public List<Bundle> getBundles(Bundle requestingBundle) { log.fine(() -> "All bundles: " + bundles()); log.fine(() -> "Getting visible bundles for bundle " + requestingBundle); - List<Bundle> visibleBundles = Arrays.asList(requestingBundle.getBundleContext().getBundles()); + List<Bundle> visibleBundles = List.of(requestingBundle.getBundleContext().getBundles()); log.fine(() -> "Visible bundles: " + visibleBundles); return visibleBundles; } diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestDriver.java b/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestDriver.java index 18449f207ee..64c690e89d4 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestDriver.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestDriver.java @@ -26,7 +26,6 @@ import com.yahoo.jdisc.handler.ResponseHandler; import com.yahoo.jdisc.service.CurrentContainer; import java.net.URI; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.concurrent.Callable; @@ -311,7 +310,7 @@ public class TestDriver implements ContainerActivator, CurrentContainer { */ public static TestDriver newApplicationBundleInstance(String bundleLocation, boolean privileged, Module... guiceModules) { - return newInstance(newOsgiFramework(), bundleLocation, privileged, Arrays.asList(guiceModules)); + return newInstance(newOsgiFramework(), bundleLocation, privileged, List.of(guiceModules)); } /** @@ -326,7 +325,7 @@ public class TestDriver implements ContainerActivator, CurrentContainer { */ public static TestDriver newInstance(OsgiFramework osgiFramework, String bundleLocation, boolean privileged, Module... guiceModules) { - return newInstance(osgiFramework, bundleLocation, privileged, Arrays.asList(guiceModules)); + return newInstance(osgiFramework, bundleLocation, privileged, List.of(guiceModules)); } /** @@ -381,7 +380,7 @@ public class TestDriver implements ContainerActivator, CurrentContainer { private static List<Module> newModuleList(final Application app, final Class<? extends Application> appClass, Module... guiceModules) { List<Module> lst = new LinkedList<>(); - lst.addAll(Arrays.asList(guiceModules)); + lst.addAll(List.of(guiceModules)); lst.add(new AbstractModule() { @Override diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/HeaderFieldsTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/HeaderFieldsTestCase.java index 7fe3c052566..acaed01a946 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/HeaderFieldsTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/HeaderFieldsTestCase.java @@ -3,7 +3,6 @@ package com.yahoo.jdisc; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -64,9 +63,9 @@ public class HeaderFieldsTestCase { @Test void requireThatContainsValueWorksAsExpected() { HeaderFields headers = new HeaderFields(); - assertFalse(headers.containsValue(Arrays.asList("bar"))); + assertFalse(headers.containsValue(List.of("bar"))); headers.add("foo", "bar"); - assertTrue(headers.containsValue(Arrays.asList("bar"))); + assertTrue(headers.containsValue(List.of("bar"))); } @Test @@ -102,19 +101,19 @@ public class HeaderFieldsTestCase { HeaderFields headers = new HeaderFields(); assertNull(headers.get("foo")); headers.add("foo", "bar"); - assertEquals(Arrays.asList("bar"), headers.get("foo")); + assertEquals(List.of("bar"), headers.get("foo")); headers.add("foo", "baz"); - assertEquals(Arrays.asList("bar", "baz"), headers.get("foo")); + assertEquals(List.of("bar", "baz"), headers.get("foo")); } @Test void requireThatAddListWorksAsExpected() { HeaderFields headers = new HeaderFields(); assertNull(headers.get("foo")); - headers.add("foo", Arrays.asList("bar")); - assertEquals(Arrays.asList("bar"), headers.get("foo")); - headers.add("foo", Arrays.asList("baz", "cox")); - assertEquals(Arrays.asList("bar", "baz", "cox"), headers.get("foo")); + headers.add("foo", List.of("bar")); + assertEquals(List.of("bar"), headers.get("foo")); + headers.add("foo", List.of("baz", "cox")); + assertEquals(List.of("bar", "baz", "cox"), headers.get("foo")); } @Test @@ -122,16 +121,16 @@ public class HeaderFieldsTestCase { HeaderFields headers = new HeaderFields(); headers.add("foo", "bar"); headers.add("bar", "baz"); - assertEquals(Arrays.asList("bar"), headers.get("foo")); - assertEquals(Arrays.asList("baz"), headers.get("bar")); + assertEquals(List.of("bar"), headers.get("foo")); + assertEquals(List.of("baz"), headers.get("bar")); Map<String, List<String>> map = new HashMap<>(); - map.put("foo", Arrays.asList("baz", "cox")); - map.put("bar", Arrays.asList("cox")); + map.put("foo", List.of("baz", "cox")); + map.put("bar", List.of("cox")); headers.addAll(map); - assertEquals(Arrays.asList("bar", "baz", "cox"), headers.get("foo")); - assertEquals(Arrays.asList("baz", "cox"), headers.get("bar")); + assertEquals(List.of("bar", "baz", "cox"), headers.get("foo")); + assertEquals(List.of("baz", "cox"), headers.get("bar")); } @Test @@ -139,19 +138,19 @@ public class HeaderFieldsTestCase { HeaderFields headers = new HeaderFields(); assertNull(headers.get("foo")); headers.put("foo", "bar"); - assertEquals(Arrays.asList("bar"), headers.get("foo")); + assertEquals(List.of("bar"), headers.get("foo")); headers.put("foo", "baz"); - assertEquals(Arrays.asList("baz"), headers.get("foo")); + assertEquals(List.of("baz"), headers.get("foo")); } @Test void requireThatPutListWorksAsExpected() { HeaderFields headers = new HeaderFields(); assertNull(headers.get("foo")); - headers.put("foo", Arrays.asList("bar")); - assertEquals(Arrays.asList("bar"), headers.get("foo")); - headers.put("foo", Arrays.asList("baz", "cox")); - assertEquals(Arrays.asList("baz", "cox"), headers.get("foo")); + headers.put("foo", List.of("bar")); + assertEquals(List.of("bar"), headers.get("foo")); + headers.put("foo", List.of("baz", "cox")); + assertEquals(List.of("baz", "cox"), headers.get("foo")); } @Test @@ -159,24 +158,24 @@ public class HeaderFieldsTestCase { HeaderFields headers = new HeaderFields(); headers.add("foo", "bar"); headers.add("bar", "baz"); - assertEquals(Arrays.asList("bar"), headers.get("foo")); - assertEquals(Arrays.asList("baz"), headers.get("bar")); + assertEquals(List.of("bar"), headers.get("foo")); + assertEquals(List.of("baz"), headers.get("bar")); Map<String, List<String>> map = new HashMap<>(); - map.put("foo", Arrays.asList("baz", "cox")); - map.put("bar", Arrays.asList("cox")); + map.put("foo", List.of("baz", "cox")); + map.put("bar", List.of("cox")); headers.putAll(map); - assertEquals(Arrays.asList("baz", "cox"), headers.get("foo")); - assertEquals(Arrays.asList("cox"), headers.get("bar")); + assertEquals(List.of("baz", "cox"), headers.get("foo")); + assertEquals(List.of("cox"), headers.get("bar")); } @Test void requireThatRemoveWorksAsExpected() { HeaderFields headers = new HeaderFields(); - headers.put("foo", Arrays.asList("bar", "baz")); - assertEquals(Arrays.asList("bar", "baz"), headers.get("foo")); - assertEquals(Arrays.asList("bar", "baz"), headers.remove("foo")); + headers.put("foo", List.of("bar", "baz")); + assertEquals(List.of("bar", "baz"), headers.get("foo")); + assertEquals(List.of("bar", "baz"), headers.remove("foo")); assertNull(headers.get("foo")); assertNull(headers.remove("foo")); } @@ -184,11 +183,11 @@ public class HeaderFieldsTestCase { @Test void requireThatRemoveStringWorksAsExpected() { HeaderFields headers = new HeaderFields(); - headers.put("foo", Arrays.asList("bar", "baz")); - assertEquals(Arrays.asList("bar", "baz"), headers.get("foo")); + headers.put("foo", List.of("bar", "baz")); + assertEquals(List.of("bar", "baz"), headers.get("foo")); assertTrue(headers.remove("foo", "bar")); assertFalse(headers.remove("foo", "cox")); - assertEquals(Arrays.asList("baz"), headers.get("foo")); + assertEquals(List.of("baz"), headers.get("foo")); assertTrue(headers.remove("foo", "baz")); assertFalse(headers.remove("foo", "cox")); assertNull(headers.get("foo")); @@ -199,8 +198,8 @@ public class HeaderFieldsTestCase { HeaderFields headers = new HeaderFields(); headers.add("foo", "bar"); headers.add("bar", "baz"); - assertEquals(Arrays.asList("bar"), headers.get("foo")); - assertEquals(Arrays.asList("baz"), headers.get("bar")); + assertEquals(List.of("bar"), headers.get("foo")); + assertEquals(List.of("baz"), headers.get("bar")); headers.clear(); assertNull(headers.get("foo")); assertNull(headers.get("bar")); @@ -211,14 +210,14 @@ public class HeaderFieldsTestCase { HeaderFields headers = new HeaderFields(); assertNull(headers.get("foo")); headers.add("foo", "bar"); - assertEquals(Arrays.asList("bar"), headers.get("foo")); + assertEquals(List.of("bar"), headers.get("foo")); } @Test void requireThatGetFirstWorksAsExpected() { HeaderFields headers = new HeaderFields(); assertNull(headers.getFirst("foo")); - headers.add("foo", Arrays.asList("bar", "baz")); + headers.add("foo", List.of("bar", "baz")); assertEquals("bar", headers.getFirst("foo")); } @@ -226,17 +225,17 @@ public class HeaderFieldsTestCase { void requireThatIsTrueWorksAsExpected() { HeaderFields headers = new HeaderFields(); assertFalse(headers.isTrue("foo")); - headers.put("foo", Arrays.asList("true")); + headers.put("foo", List.of("true")); assertTrue(headers.isTrue("foo")); - headers.put("foo", Arrays.asList("true", "true")); + headers.put("foo", List.of("true", "true")); assertTrue(headers.isTrue("foo")); - headers.put("foo", Arrays.asList("true", "false")); + headers.put("foo", List.of("true", "false")); assertFalse(headers.isTrue("foo")); - headers.put("foo", Arrays.asList("false", "true")); + headers.put("foo", List.of("false", "true")); assertFalse(headers.isTrue("foo")); - headers.put("foo", Arrays.asList("false", "false")); + headers.put("foo", List.of("false", "false")); assertFalse(headers.isTrue("foo")); - headers.put("foo", Arrays.asList("false")); + headers.put("foo", List.of("false")); assertFalse(headers.isTrue("foo")); } @@ -245,9 +244,9 @@ public class HeaderFieldsTestCase { HeaderFields headers = new HeaderFields(); assertTrue(headers.keySet().isEmpty()); headers.add("foo", "bar"); - assertEquals(new HashSet<>(Arrays.asList("foo")), headers.keySet()); + assertEquals(new HashSet<>(List.of("foo")), headers.keySet()); headers.add("bar", "baz"); - assertEquals(new HashSet<>(Arrays.asList("foo", "bar")), headers.keySet()); + assertEquals(new HashSet<>(List.of("foo", "bar")), headers.keySet()); } @Test @@ -257,34 +256,34 @@ public class HeaderFieldsTestCase { headers.add("foo", "bar"); Collection<List<String>> values = headers.values(); assertEquals(1, values.size()); - assertTrue(values.contains(Arrays.asList("bar"))); + assertTrue(values.contains(List.of("bar"))); headers.add("bar", "baz"); values = headers.values(); assertEquals(2, values.size()); - assertTrue(values.contains(Arrays.asList("bar"))); - assertTrue(values.contains(Arrays.asList("baz"))); + assertTrue(values.contains(List.of("bar"))); + assertTrue(values.contains(List.of("baz"))); } @Test void requireThatEntrySetWorksAsExpected() { HeaderFields headers = new HeaderFields(); assertTrue(headers.entrySet().isEmpty()); - headers.put("foo", Arrays.asList("bar", "baz")); + headers.put("foo", List.of("bar", "baz")); Set<Map.Entry<String, List<String>>> entries = headers.entrySet(); assertEquals(1, entries.size()); Map.Entry<String, List<String>> entry = entries.iterator().next(); assertNotNull(entry); assertEquals("foo", entry.getKey()); - assertEquals(Arrays.asList("bar", "baz"), entry.getValue()); + assertEquals(List.of("bar", "baz"), entry.getValue()); } @Test void requireThatEntriesWorksAsExpected() { HeaderFields headers = new HeaderFields(); assertTrue(headers.entries().isEmpty()); - headers.put("foo", Arrays.asList("bar", "baz")); + headers.put("foo", List.of("bar", "baz")); List<Map.Entry<String, String>> entries = headers.entries(); assertEquals(2, entries.size()); diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingSetTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingSetTestCase.java index e35f1c69073..133472f5678 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingSetTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingSetTestCase.java @@ -8,7 +8,6 @@ import org.junit.jupiter.api.Test; import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -480,13 +479,13 @@ public class BindingSetTestCase { for (int i = 0; i < expected.length; ++i) { actual.add(expected[(off + i) % expected.length]); } - assertOrder(Arrays.asList(expected), actual); + assertOrder(List.of(expected), actual); actual = new ArrayList<>(); for (int i = expected.length; --i >= 0; ) { actual.add(expected[(off + i) % expected.length]); } - assertOrder(Arrays.asList(expected), actual); + assertOrder(List.of(expected), actual); } } diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/application/BundleInstallationExceptionTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BundleInstallationExceptionTestCase.java index 6a704b1aacc..34ac6603e62 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/application/BundleInstallationExceptionTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BundleInstallationExceptionTestCase.java @@ -5,9 +5,9 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.osgi.framework.Bundle; -import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; +import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -41,7 +41,7 @@ public class BundleInstallationExceptionTestCase { @Test void requireThatBundlesCollectionIsUnmodifiable() { - BundleInstallationException e = new BundleInstallationException(Arrays.asList(Mockito.mock(Bundle.class)), + BundleInstallationException e = new BundleInstallationException(List.of(Mockito.mock(Bundle.class)), new Throwable()); try { e.installedBundles().add(Mockito.mock(Bundle.class)); diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/application/ContainerBuilderTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/ContainerBuilderTestCase.java index 9b3d61d7c89..3737647679d 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/application/ContainerBuilderTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/ContainerBuilderTestCase.java @@ -8,7 +8,7 @@ import com.yahoo.jdisc.test.TestDriver; import org.junit.jupiter.api.Test; import java.net.URISyntaxException; -import java.util.Arrays; +import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; @@ -106,11 +106,11 @@ public class ContainerBuilderTestCase { assertTrue(ContainerBuilder.safeStringSplit(new Object(), ",").isEmpty()); assertTrue(ContainerBuilder.safeStringSplit("", ",").isEmpty()); assertTrue(ContainerBuilder.safeStringSplit(" \f\n\r\t", ",").isEmpty()); - assertEquals(Arrays.asList("foo"), ContainerBuilder.safeStringSplit("foo", ",")); - assertEquals(Arrays.asList("foo"), ContainerBuilder.safeStringSplit(" foo", ",")); - assertEquals(Arrays.asList("foo"), ContainerBuilder.safeStringSplit("foo ", ",")); - assertEquals(Arrays.asList("foo"), ContainerBuilder.safeStringSplit("foo, ", ",")); - assertEquals(Arrays.asList("foo"), ContainerBuilder.safeStringSplit("foo ,", ",")); - assertEquals(Arrays.asList("foo", "bar"), ContainerBuilder.safeStringSplit("foo, bar", ",")); + assertEquals(List.of("foo"), ContainerBuilder.safeStringSplit("foo", ",")); + assertEquals(List.of("foo"), ContainerBuilder.safeStringSplit(" foo", ",")); + assertEquals(List.of("foo"), ContainerBuilder.safeStringSplit("foo ", ",")); + assertEquals(List.of("foo"), ContainerBuilder.safeStringSplit("foo, ", ",")); + assertEquals(List.of("foo"), ContainerBuilder.safeStringSplit("foo ,", ",")); + assertEquals(List.of("foo", "bar"), ContainerBuilder.safeStringSplit("foo, bar", ",")); } } diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/application/GlobPatternTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/GlobPatternTestCase.java index ef09c854f72..0e5df5656c4 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/application/GlobPatternTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/GlobPatternTestCase.java @@ -4,7 +4,6 @@ package com.yahoo.jdisc.application; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -42,14 +41,14 @@ public class GlobPatternTestCase { assertMatch("foo", "foo", Collections.<String>emptyList()); assertNotMatch("foo", "bar"); - assertMatch("*", "foo", Arrays.asList("foo")); - assertMatch("*", "bar", Arrays.asList("bar")); + assertMatch("*", "foo", List.of("foo")); + assertMatch("*", "bar", List.of("bar")); - assertMatch("*foo", "foo", Arrays.asList("")); - assertMatch("*oo", "foo", Arrays.asList("f")); - assertMatch("f*o", "foo", Arrays.asList("o")); - assertMatch("fo*", "foo", Arrays.asList("o")); - assertMatch("foo*", "foo", Arrays.asList("")); + assertMatch("*foo", "foo", List.of("")); + assertMatch("*oo", "foo", List.of("f")); + assertMatch("f*o", "foo", List.of("o")); + assertMatch("fo*", "foo", List.of("o")); + assertMatch("foo*", "foo", List.of("")); assertNotMatch("*foo", "bar"); assertNotMatch("*oo", "bar"); @@ -57,11 +56,11 @@ public class GlobPatternTestCase { assertNotMatch("fo*", "bar"); assertNotMatch("foo*", "bar"); - assertMatch("**foo", "foo", Arrays.asList("", "")); - assertMatch("**oo", "foo", Arrays.asList("", "f")); - assertMatch("f**o", "foo", Arrays.asList("", "o")); - assertMatch("fo**", "foo", Arrays.asList("", "o")); - assertMatch("foo**", "foo", Arrays.asList("", "")); + assertMatch("**foo", "foo", List.of("", "")); + assertMatch("**oo", "foo", List.of("", "f")); + assertMatch("f**o", "foo", List.of("", "o")); + assertMatch("fo**", "foo", List.of("", "o")); + assertMatch("foo**", "foo", List.of("", "")); assertNotMatch("**foo", "bar"); assertNotMatch("**oo", "bar"); @@ -70,9 +69,9 @@ public class GlobPatternTestCase { assertNotMatch("foo**", "bar"); assertMatch("foo bar", "foo bar", Collections.<String>emptyList()); - assertMatch("*foo *bar", "foo bar", Arrays.asList("", "")); - assertMatch("foo* bar*", "foo bar", Arrays.asList("", "")); - assertMatch("f* *r", "foo bar", Arrays.asList("oo", "ba")); + assertMatch("*foo *bar", "foo bar", List.of("", "")); + assertMatch("foo* bar*", "foo bar", List.of("", "")); + assertMatch("f* *r", "foo bar", List.of("oo", "ba")); assertNotMatch("foo bar", "baz cox"); assertNotMatch("*foo *bar", "baz cox"); diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/application/GuiceRepositoryTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/GuiceRepositoryTestCase.java index 7aa8a16d856..30c917f9150 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/application/GuiceRepositoryTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/GuiceRepositoryTestCase.java @@ -12,7 +12,6 @@ import com.google.inject.name.Named; import com.google.inject.name.Names; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -47,7 +46,7 @@ public class GuiceRepositoryTestCase { GuiceRepository guice = new GuiceRepository(); StringBinding foo = new StringBinding("fooKey", "fooVal"); StringBinding bar = new StringBinding("barKey", "barVal"); - guice.installAll(Arrays.asList(foo, bar)); + guice.installAll(List.of(foo, bar)); assertBinding(guice, "fooKey", "fooVal"); assertBinding(guice, "barKey", "barVal"); @@ -77,12 +76,12 @@ public class GuiceRepositoryTestCase { StringBinding foo = new StringBinding("fooKey", "fooVal"); StringBinding bar = new StringBinding("barKey", "barVal"); StringBinding baz = new StringBinding("bazKey", "bazVal"); - guice.installAll(Arrays.asList(foo, bar, baz)); + guice.installAll(List.of(foo, bar, baz)); assertBinding(guice, "fooKey", "fooVal"); assertBinding(guice, "barKey", "barVal"); assertBinding(guice, "bazKey", "bazVal"); - guice.uninstallAll(Arrays.asList(foo, baz)); + guice.uninstallAll(List.of(foo, baz)); assertNoBinding(guice, "fooKey"); assertBinding(guice, "barKey", "barVal"); assertNoBinding(guice, "bazKey"); @@ -122,7 +121,7 @@ public class GuiceRepositoryTestCase { void requireThatPrivateModulesWorks() { GuiceRepository guice = new GuiceRepository(); - List<Named> names = Arrays.asList(Names.named("A"), Names.named("B")); + List<Named> names = List.of(Names.named("A"), Names.named("B")); for (Named name : names) { guice.install(createPrivateInjectNameModule(name)); diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/application/ServerRepositoryTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/ServerRepositoryTestCase.java index 3a2db7d1e75..a54a42228e4 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/application/ServerRepositoryTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/ServerRepositoryTestCase.java @@ -5,8 +5,8 @@ import com.yahoo.jdisc.NoopSharedResource; import com.yahoo.jdisc.service.ServerProvider; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.Iterator; +import java.util.List; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -35,7 +35,7 @@ public class ServerRepositoryTestCase { ServerRepository servers = newServerRepository(); ServerProvider foo = new MyServer(); ServerProvider bar = new MyServer(); - servers.installAll(Arrays.asList(foo, bar)); + servers.installAll(List.of(foo, bar)); Iterator<ServerProvider> it = servers.iterator(); assertTrue(it.hasNext()); @@ -60,8 +60,8 @@ public class ServerRepositoryTestCase { ServerProvider foo = new MyServer(); ServerProvider bar = new MyServer(); ServerProvider baz = new MyServer(); - servers.installAll(Arrays.asList(foo, bar, baz)); - servers.uninstallAll(Arrays.asList(foo, bar)); + servers.installAll(List.of(foo, bar, baz)); + servers.uninstallAll(List.of(foo, bar)); Iterator<ServerProvider> it = servers.iterator(); assertNotNull(it); assertTrue(it.hasNext()); diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/application/UriPatternTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/UriPatternTestCase.java index 063ddc81f45..0f8016eba10 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/application/UriPatternTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/UriPatternTestCase.java @@ -5,7 +5,6 @@ import org.junit.jupiter.api.Test; import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -49,19 +48,19 @@ public class UriPatternTestCase { assertNotMatch(pattern, "barbaz://host:69/path"); pattern = new UriPattern("*://host:69/path"); - assertMatch(pattern, "foobar://host:69/path", Arrays.asList("foobar")); - assertMatch(pattern, "bar://host:69/path", Arrays.asList("bar")); - assertMatch(pattern, "barbaz://host:69/path", Arrays.asList("barbaz")); + assertMatch(pattern, "foobar://host:69/path", List.of("foobar")); + assertMatch(pattern, "bar://host:69/path", List.of("bar")); + assertMatch(pattern, "barbaz://host:69/path", List.of("barbaz")); pattern = new UriPattern("*bar://host:69/path"); - assertMatch(pattern, "foobar://host:69/path", Arrays.asList("foo")); - assertMatch(pattern, "bar://host:69/path", Arrays.asList("")); + assertMatch(pattern, "foobar://host:69/path", List.of("foo")); + assertMatch(pattern, "bar://host:69/path", List.of("")); assertNotMatch(pattern, "barbaz://host:69/path"); pattern = new UriPattern("bar*://host:69/path"); assertNotMatch(pattern, "foobar://host:69/path"); - assertMatch(pattern, "bar://host:69/path", Arrays.asList("")); - assertMatch(pattern, "barbaz://host:69/path", Arrays.asList("baz")); + assertMatch(pattern, "bar://host:69/path", List.of("")); + assertMatch(pattern, "barbaz://host:69/path", List.of("baz")); // host matching pattern = new UriPattern("scheme://bar:69/path"); @@ -70,19 +69,19 @@ public class UriPatternTestCase { assertNotMatch(pattern, "scheme://barbaz:69/path"); pattern = new UriPattern("scheme://*:69/path"); - assertMatch(pattern, "scheme://foobar:69/path", Arrays.asList("foobar")); - assertMatch(pattern, "scheme://bar:69/path", Arrays.asList("bar")); - assertMatch(pattern, "scheme://barbaz:69/path", Arrays.asList("barbaz")); + assertMatch(pattern, "scheme://foobar:69/path", List.of("foobar")); + assertMatch(pattern, "scheme://bar:69/path", List.of("bar")); + assertMatch(pattern, "scheme://barbaz:69/path", List.of("barbaz")); pattern = new UriPattern("scheme://*bar:69/path"); - assertMatch(pattern, "scheme://foobar:69/path", Arrays.asList("foo")); - assertMatch(pattern, "scheme://bar:69/path", Arrays.asList("")); + assertMatch(pattern, "scheme://foobar:69/path", List.of("foo")); + assertMatch(pattern, "scheme://bar:69/path", List.of("")); assertNotMatch(pattern, "scheme://barbaz:69/path"); pattern = new UriPattern("scheme://bar*:69/path"); assertNotMatch(pattern, "scheme://foobar:69/path"); - assertMatch(pattern, "scheme://bar:69/path", Arrays.asList("")); - assertMatch(pattern, "scheme://barbaz:69/path", Arrays.asList("baz")); + assertMatch(pattern, "scheme://bar:69/path", List.of("")); + assertMatch(pattern, "scheme://barbaz:69/path", List.of("baz")); // port matching pattern = new UriPattern("scheme://host:69/path"); @@ -91,9 +90,9 @@ public class UriPatternTestCase { assertNotMatch(pattern, "scheme://host:699/path"); pattern = new UriPattern("scheme://host:*/path"); - assertMatch(pattern, "scheme://host:669/path", Arrays.asList("669")); - assertMatch(pattern, "scheme://host:69/path", Arrays.asList("69")); - assertMatch(pattern, "scheme://host:699/path", Arrays.asList("699")); + assertMatch(pattern, "scheme://host:669/path", List.of("669")); + assertMatch(pattern, "scheme://host:69/path", List.of("69")); + assertMatch(pattern, "scheme://host:699/path", List.of("699")); // path matching pattern = new UriPattern("scheme://host:69/"); @@ -106,20 +105,20 @@ public class UriPatternTestCase { assertNotMatch(pattern, "scheme://host:69/barbaz"); pattern = new UriPattern("scheme://host:69/*"); - assertMatch(pattern, "scheme://host:69/", Arrays.asList("")); - assertMatch(pattern, "scheme://host:69/foobar", Arrays.asList("foobar")); - assertMatch(pattern, "scheme://host:69/bar", Arrays.asList("bar")); - assertMatch(pattern, "scheme://host:69/barbaz", Arrays.asList("barbaz")); + assertMatch(pattern, "scheme://host:69/", List.of("")); + assertMatch(pattern, "scheme://host:69/foobar", List.of("foobar")); + assertMatch(pattern, "scheme://host:69/bar", List.of("bar")); + assertMatch(pattern, "scheme://host:69/barbaz", List.of("barbaz")); pattern = new UriPattern("scheme://host:69/*bar"); - assertMatch(pattern, "scheme://host:69/foobar", Arrays.asList("foo")); - assertMatch(pattern, "scheme://host:69/bar", Arrays.asList("")); + assertMatch(pattern, "scheme://host:69/foobar", List.of("foo")); + assertMatch(pattern, "scheme://host:69/bar", List.of("")); assertNotMatch(pattern, "scheme://host:69/barbaz"); pattern = new UriPattern("scheme://host:69/bar*"); assertNotMatch(pattern, "scheme://host:69/foobar"); - assertMatch(pattern, "scheme://host:69/bar", Arrays.asList("")); - assertMatch(pattern, "scheme://host:69/barbaz", Arrays.asList("baz")); + assertMatch(pattern, "scheme://host:69/bar", List.of("")); + assertMatch(pattern, "scheme://host:69/barbaz", List.of("baz")); } @Test @@ -128,7 +127,7 @@ public class UriPatternTestCase { assertNotMatch(pattern, "scheme://host"); pattern = new UriPattern("scheme://host/*"); - assertMatch(pattern, "scheme://host", Arrays.asList("")); + assertMatch(pattern, "scheme://host", List.of("")); } @Test @@ -141,8 +140,8 @@ public class UriPatternTestCase { @Test void requireThatHostSupportsWildcard() { UriPattern pattern = new UriPattern("scheme://*.host/path"); - assertMatch(pattern, "scheme://a.host/path", Arrays.asList("a")); - assertMatch(pattern, "scheme://a.b.host/path", Arrays.asList("a.b")); + assertMatch(pattern, "scheme://a.host/path", List.of("a")); + assertMatch(pattern, "scheme://a.b.host/path", List.of("a.b")); } @Test diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/benchmark/BindingMatchingTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/benchmark/BindingMatchingTestCase.java index 478f15f721d..53a29cf22c1 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/benchmark/BindingMatchingTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/benchmark/BindingMatchingTestCase.java @@ -8,7 +8,6 @@ import org.junit.jupiter.api.Test; import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -36,7 +35,7 @@ public class BindingMatchingTestCase { void runThroughtputMeasurements() throws Exception { System.err.format("%15s%15s%15s%15s%15s%15s%15s%15s\n", "No. of Bindings", "1 thread", "2 thread", "4 thread", "8 thread", "16 thread", "32 thread", "64 thread"); - for (int numBindings : Arrays.asList(1, 10, 25, 50, 100, 250)) { + for (int numBindings : List.of(1, 10, 25, 50, 100, 250)) { BindingRepository<Object> repo = new BindingRepository<>(); for (int binding = 0; binding < numBindings; ++binding) { repo.bind("http://*/v" + binding + "/*/data/", new Object()); diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/benchmark/UriMatchingTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/benchmark/UriMatchingTestCase.java index 5301eb297b4..cb9114f2981 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/benchmark/UriMatchingTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/benchmark/UriMatchingTestCase.java @@ -6,7 +6,6 @@ import org.junit.jupiter.api.Test; import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; @@ -20,7 +19,7 @@ public class UriMatchingTestCase { @Test void requireThatUriPatternMatchingIsFast() { - List<String> inputs = Arrays.asList( + List<String> inputs = List.of( "other://host/", "scheme://other/", "scheme://host/", diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationRestartTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationRestartTestCase.java index d8aa553b628..95511b3ed1c 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationRestartTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationRestartTestCase.java @@ -15,7 +15,7 @@ import org.junit.jupiter.api.Test; import java.net.URI; import java.nio.ByteBuffer; -import java.util.Arrays; +import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -54,7 +54,7 @@ public class ApplicationRestartTestCase { private static ApplicationLoader newApplicationLoader() { return new ApplicationLoader(new NonWorkingOsgiFramework(), - Arrays.asList(new AbstractModule() { + List.of(new AbstractModule() { @Override public void configure() { bind(Application.class).to(SimpleApplication.class); diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java index 252b7074a2c..25399433e2e 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java @@ -4,7 +4,6 @@ package com.yahoo.jdisc.core; import org.junit.jupiter.api.Test; import org.osgi.framework.Constants; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -60,8 +59,8 @@ public class FelixParamsTestCase { assertEquals(prev.length + 2, next.length); List<String> diff = new LinkedList<>(); - diff.addAll(Arrays.asList(next)); - diff.removeAll(Arrays.asList(prev)); + diff.addAll(List.of(next)); + diff.removeAll(List.of(prev)); assertEquals(2, diff.size()); assertTrue(diff.contains("foo")); assertTrue(diff.contains("bar")); diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ScheduledQueueTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ScheduledQueueTestCase.java index a9ac904c36c..c37b6ffe915 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ScheduledQueueTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ScheduledQueueTestCase.java @@ -3,8 +3,8 @@ package com.yahoo.jdisc.core; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.LinkedList; +import java.util.List; import java.util.Queue; import static com.yahoo.jdisc.core.ScheduledQueue.MILLIS_PER_SLOT; @@ -123,6 +123,6 @@ public class ScheduledQueueTestCase { Queue<Object> expired = new LinkedList<>(); queue.drainTo(currentTimeMillis, expired); assertEquals(expected.length, expired.size()); - assertEquals(Arrays.asList(expected), expired); + assertEquals(List.of(expected), expired); } } diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/handler/RequestDispatchTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/handler/RequestDispatchTestCase.java index c672b33ff2b..acfe8d32e61 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/handler/RequestDispatchTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/handler/RequestDispatchTestCase.java @@ -12,7 +12,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URI; import java.nio.ByteBuffer; -import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; @@ -31,7 +30,7 @@ public class RequestDispatchTestCase { @Test void requireThatRequestCanBeDispatched() throws Exception { final TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi(); - final List<ByteBuffer> writtenContent = Arrays.asList(ByteBuffer.allocate(6), ByteBuffer.allocate(9)); + final List<ByteBuffer> writtenContent = List.of(ByteBuffer.allocate(6), ByteBuffer.allocate(9)); ReadableContentChannel receivedContent = new ReadableContentChannel(); ContainerBuilder builder = driver.newContainerBuilder(); Response response = new Response(Response.Status.OK); @@ -154,7 +153,7 @@ public class RequestDispatchTestCase { @Override protected Iterable<ByteBuffer> requestContent() { - return Arrays.asList(ByteBuffer.allocate(69)); + return List.of(ByteBuffer.allocate(69)); } }.dispatch(); fail(); @@ -192,7 +191,7 @@ public class RequestDispatchTestCase { @Override protected Iterable<ByteBuffer> requestContent() { - return Arrays.asList(ByteBuffer.allocate(69)); + return List.of(ByteBuffer.allocate(69)); } }.dispatch(); fail(); diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/handler/ResponseDispatchTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/handler/ResponseDispatchTestCase.java index 84bdc07dd33..32481b4607e 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/handler/ResponseDispatchTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/handler/ResponseDispatchTestCase.java @@ -8,7 +8,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; -import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -46,7 +45,7 @@ public class ResponseDispatchTestCase { ReadableContentChannel content = new ReadableContentChannel(); FutureResponse handler = new FutureResponse(content); ByteBuffer buf = ByteBuffer.allocate(69); - ResponseDispatch.newInstance(69, Arrays.asList(buf)).dispatch(handler); + ResponseDispatch.newInstance(69, List.of(buf)).dispatch(handler); Response response = handler.get(600, TimeUnit.SECONDS); assertNotNull(response); assertEquals(69, response.getStatus()); @@ -57,7 +56,7 @@ public class ResponseDispatchTestCase { ReadableContentChannel content = new ReadableContentChannel(); FutureResponse handler = new FutureResponse(content); ByteBuffer buf = ByteBuffer.allocate(69); - ResponseDispatch.newInstance(69, Arrays.asList(buf)).dispatch(handler); + ResponseDispatch.newInstance(69, List.of(buf)).dispatch(handler); Response response = handler.get(600, TimeUnit.SECONDS); assertNotNull(response); assertEquals(69, response.getStatus()); @@ -69,7 +68,7 @@ public class ResponseDispatchTestCase { FutureResponse handler = new FutureResponse(content); ByteBuffer buf = ByteBuffer.allocate(69); Response sentResponse = new Response(69); - ResponseDispatch.newInstance(sentResponse, Arrays.asList(buf)).dispatch(handler); + ResponseDispatch.newInstance(sentResponse, List.of(buf)).dispatch(handler); Response receivedResponse = handler.get(600, TimeUnit.SECONDS); assertSame(sentResponse, receivedResponse); assertSame(buf, content.read()); @@ -80,7 +79,7 @@ public class ResponseDispatchTestCase { @Test void requireThatResponseCanBeDispatched() throws Exception { final Response response = new Response(Response.Status.OK); - final List<ByteBuffer> writtenContent = Arrays.asList(ByteBuffer.allocate(6), ByteBuffer.allocate(9)); + final List<ByteBuffer> writtenContent = List.of(ByteBuffer.allocate(6), ByteBuffer.allocate(9)); ResponseDispatch dispatch = new ResponseDispatch() { @Override diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/handler/ThreadedRequestHandlerTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/handler/ThreadedRequestHandlerTestCase.java index 84da19c221a..56d7d2959e8 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/handler/ThreadedRequestHandlerTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/handler/ThreadedRequestHandlerTestCase.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import java.net.URI; import java.nio.ByteBuffer; -import java.util.Arrays; +import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; @@ -170,7 +170,7 @@ public class ThreadedRequestHandlerTestCase { @Override protected Iterable<ByteBuffer> requestContent() { - return Arrays.asList(content); + return List.of(content); } }.dispatch(); } diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/GuiceRepositoryIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/GuiceRepositoryIntegrationTest.java index f3d936b20d0..9c37fc7e0de 100644 --- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/GuiceRepositoryIntegrationTest.java +++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/GuiceRepositoryIntegrationTest.java @@ -10,7 +10,6 @@ import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -56,7 +55,7 @@ public class GuiceRepositoryIntegrationTest { BundleInstaller installer = new BundleInstaller(driver.osgiFramework()); Bundle bundle = installer.installAndStart("my-guice-module.jar").get(0); - builder.guiceModules().installAll(bundle, Arrays.asList("com.yahoo.jdisc.bundle.MyGuiceModule", + builder.guiceModules().installAll(bundle, List.of("com.yahoo.jdisc.bundle.MyGuiceModule", "com.yahoo.jdisc.bundle.MyGuiceModule")); List<Module> next = new LinkedList<>(builder.guiceModules().collection()); next.removeAll(prev); diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/ServerRepositoryIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/ServerRepositoryIntegrationTest.java index 04b88654112..1232e0ecf0d 100644 --- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/ServerRepositoryIntegrationTest.java +++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/ServerRepositoryIntegrationTest.java @@ -8,8 +8,8 @@ import com.yahoo.jdisc.test.TestDriver; import org.junit.Test; import org.osgi.framework.Bundle; -import java.util.Arrays; import java.util.Iterator; +import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -54,7 +54,7 @@ public class ServerRepositoryIntegrationTest { BundleInstaller installer = new BundleInstaller(driver.osgiFramework()); Bundle bundle = installer.installAndStart("my-server-provider.jar").get(0); ContainerBuilder builder = driver.newContainerBuilder(); - builder.serverProviders().installAll(bundle, Arrays.asList("com.yahoo.jdisc.bundle.MyServerProvider", + builder.serverProviders().installAll(bundle, List.of("com.yahoo.jdisc.bundle.MyServerProvider", "com.yahoo.jdisc.bundle.MyServerProvider")); Iterator<ServerProvider> it = builder.serverProviders().iterator(); assertTrue(it.hasNext()); diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/ApplicationLoaderIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/ApplicationLoaderIntegrationTest.java index a0fde346901..cf8914ea39a 100644 --- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/ApplicationLoaderIntegrationTest.java +++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/ApplicationLoaderIntegrationTest.java @@ -8,8 +8,8 @@ import org.apache.felix.framework.util.FelixConstants; import org.junit.Test; import org.osgi.framework.Bundle; -import java.util.Arrays; import java.util.Iterator; +import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -29,7 +29,7 @@ public class ApplicationLoaderIntegrationTest { public void requireThatLifecycleWorks() throws Exception { MyModule module = new MyModule(); ApplicationLoader loader = new ApplicationLoader(TestDriver.newOsgiFramework(), - Arrays.asList(module)); + List.of(module)); loader.init("app-a.jar", false); assertFalse(module.init.await(100, TimeUnit.MILLISECONDS)); diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/FelixFrameworkIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/FelixFrameworkIntegrationTest.java index f91407326c5..53a2b20a0b1 100644 --- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/FelixFrameworkIntegrationTest.java +++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/FelixFrameworkIntegrationTest.java @@ -8,7 +8,6 @@ import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; -import java.util.Arrays; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -214,7 +213,7 @@ public class FelixFrameworkIntegrationTest { for (Bundle bundle : bundles) { actual.add(bundle.getSymbolicName()); } - assertEquals(Arrays.asList(expectedBundles), actual); + assertEquals(List.of(expectedBundles), actual); felix.startBundles(bundles, false); if (className != null) { assertNotNull(bundles.get(0).loadClass(className).getDeclaredConstructor().newInstance()); diff --git a/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java b/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java index 70beb291527..0de39cbbcd2 100644 --- a/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java +++ b/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java @@ -17,7 +17,6 @@ import com.yahoo.jrt.Value; import com.yahoo.jrt.Values; import java.time.Duration; -import java.util.Arrays; import java.util.List; import java.util.ArrayList; @@ -108,7 +107,7 @@ public class RpcInvoker { System.err.println(" supported types: {'b','h','i','l','f','d','s'}"); System.exit(0); } - List<String> arguments = new ArrayList<String>(Arrays.asList(args)); + List<String> arguments = new ArrayList<String>(List.of(args)); String connectSpec = "localhost:8086"; if ("-h".equals(arguments.get(0)) && arguments.size() >= 3) { arguments.remove(0); // Consume -h diff --git a/linguistics/src/test/java/com/yahoo/language/LanguageTestCase.java b/linguistics/src/test/java/com/yahoo/language/LanguageTestCase.java index 1b1c9eb21cb..3be57cb21cf 100644 --- a/linguistics/src/test/java/com/yahoo/language/LanguageTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/LanguageTestCase.java @@ -3,7 +3,6 @@ package com.yahoo.language; import org.junit.Test; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.*; @@ -15,7 +14,7 @@ public class LanguageTestCase { @Test public void requireThatSpecificLanguagesAreCjk() { - List<Language> cjk = Arrays.asList(Language.CHINESE_SIMPLIFIED, + List<Language> cjk = List.of(Language.CHINESE_SIMPLIFIED, Language.CHINESE_TRADITIONAL, Language.JAPANESE, Language.KOREAN, diff --git a/linguistics/src/test/java/com/yahoo/language/process/GramSplitterTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/GramSplitterTestCase.java index b6e33d70ae6..69094cab8f2 100644 --- a/linguistics/src/test/java/com/yahoo/language/process/GramSplitterTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/process/GramSplitterTestCase.java @@ -6,8 +6,8 @@ import com.yahoo.language.process.GramSplitter.GramSplitterIterator; import com.yahoo.language.simple.SimpleLinguistics; import org.junit.Test; -import java.util.Arrays; import java.util.Iterator; +import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -220,7 +220,7 @@ public class GramSplitterTestCase { } private void assertGramSplits(String input, int gramSize, String ... expected) { - assertEquals(Arrays.asList(expected), gramSplitter.split(input, gramSize).toExtractedList()); + assertEquals(List.of(expected), gramSplitter.split(input, gramSize).toExtractedList()); } private void assertGramSplit(String input, int gramSize, String expected) { diff --git a/linguistics/src/test/java/com/yahoo/language/process/SegmenterImplTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/SegmenterImplTestCase.java index f4ec53d1f38..7e097736abe 100644 --- a/linguistics/src/test/java/com/yahoo/language/process/SegmenterImplTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/process/SegmenterImplTestCase.java @@ -8,7 +8,6 @@ import com.yahoo.language.simple.SimpleTokenizer; import org.junit.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -22,25 +21,25 @@ public class SegmenterImplTestCase { @Test public void requireThatNonIndexableCharactersAreDelimiters() { - assertSegments("i've", Arrays.asList("i", "ve")); - assertSegments("foo bar. baz", Arrays.asList("foo", "bar", "baz")); - assertSegments("1,2, 3 4", Arrays.asList("1", "2", "3", "4")); + assertSegments("i've", List.of("i", "ve")); + assertSegments("foo bar. baz", List.of("foo", "bar", "baz")); + assertSegments("1,2, 3 4", List.of("1", "2", "3", "4")); } @Test public void requireThatAdjacentIndexableTokenTypesAreNotSplit() { - assertSegments("a1,2b,c3,4d", Arrays.asList("a1", "2b", "c3", "4d")); + assertSegments("a1,2b,c3,4d", List.of("a1", "2b", "c3", "4d")); } @Test public void requireThatSegmentationReturnsOriginalForm() { - assertSegments("a\u030A", Arrays.asList("a\u030A")); - assertSegments("FOO BAR", Arrays.asList("FOO", "BAR")); + assertSegments("a\u030A", List.of("a\u030A")); + assertSegments("FOO BAR", List.of("FOO", "BAR")); } @Test public void requireThatEmptyInputIsPreserved() { - assertSegments("", Arrays.asList("")); + assertSegments("", List.of("")); } private static void assertSegments(String input, List<String> expectedSegments) { @@ -51,7 +50,7 @@ public class SegmenterImplTestCase { public void requireThatEmptyStringsAreSuppressed() { Tokenizer fancyTokenizer = new FancyTokenizer(); Segmenter fancySegmenter = new SegmenterImpl(fancyTokenizer); - List<String> expectedSegments = Arrays.asList("juice", "\u00BD", "oz"); + List<String> expectedSegments = List.of("juice", "\u00BD", "oz"); String input = "juice \u00BD oz"; assertEquals(expectedSegments, fancySegmenter.segment(input, Language.ENGLISH)); } diff --git a/linguistics/src/test/java/com/yahoo/language/process/StemmerImplTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/StemmerImplTestCase.java index 9c5914baeb9..785225a5096 100644 --- a/linguistics/src/test/java/com/yahoo/language/process/StemmerImplTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/process/StemmerImplTestCase.java @@ -8,7 +8,6 @@ import com.yahoo.language.simple.SimpleTokenizer; import org.junit.Test; import org.mockito.Mockito; -import java.util.Arrays; import java.util.List; import java.util.ArrayList; @@ -21,13 +20,13 @@ public class StemmerImplTestCase { @Test public void requireThatStemIsNormalizedAndLowerCased() { - assertStem("FOO", Arrays.asList("foo")); - assertStem("a\u030A", Arrays.asList("\u00E5")); + assertStem("FOO", List.of("foo")); + assertStem("a\u030A", List.of("\u00E5")); } @Test public void requireThatOnlyIndexableTokensAreReturned() { - assertStem("foo. (bar)!", Arrays.asList("foo", "bar")); + assertStem("foo. (bar)!", List.of("foo", "bar")); } @Test @@ -43,17 +42,17 @@ public class StemmerImplTestCase { Tokenizer tokenizer = Mockito.mock(Tokenizer.class); Mockito.when(tokenizer.tokenize(Mockito.anyString(), Mockito.<Language>any(), Mockito.<StemMode>any(), Mockito.anyBoolean())) - .thenReturn(Arrays.<Token>asList(token)); + .thenReturn(List.of(token)); Stemmer stemmer = new StemmerImpl(tokenizer); token.setSpecialToken(false); - assertEquals(Arrays.asList(new StemList("c"), + assertEquals(List.of(new StemList("c"), new StemList("p"), new StemList("p")), stemmer.stem("c++", StemMode.SHORTEST, Language.ENGLISH)); token.setSpecialToken(true); - assertEquals(Arrays.asList(new StemList("c++")), + assertEquals(List.of(new StemList("c++")), stemmer.stem("c++", StemMode.SHORTEST, Language.ENGLISH)); } diff --git a/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java index cf5a26c1f04..2cfb6c33b93 100644 --- a/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java @@ -7,7 +7,6 @@ import org.junit.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; @@ -31,23 +30,23 @@ public class TokenizationTestCase { @Test public void testTokenizer() { assertTokenize("This is a test, 123", - Arrays.asList("this", "is", "a", "test", "123"), - Arrays.asList("This", " ", "is", " ", "a", " ", "test", ",", " ", "123")); + List.of("this", "is", "a", "test", "123"), + List.of("This", " ", "is", " ", "a", " ", "test", ",", " ", "123")); } @Test public void testUnderScoreTokenization() { - assertTokenize("ugcapi_1", Language.ENGLISH, StemMode.SHORTEST, true, Arrays.asList("ugcapi", "1"), null); + assertTokenize("ugcapi_1", Language.ENGLISH, StemMode.SHORTEST, true, List.of("ugcapi", "1"), null); } @Test public void testPhrasesWithPunctuation() { assertTokenize("PHY_101.html a space/time or space-time course", Language.ENGLISH, StemMode.NONE, false, - Arrays.asList("phy", "101", "html", "a", "space", "time", "or", "space", "time", "course"), + List.of("phy", "101", "html", "a", "space", "time", "or", "space", "time", "course"), null); - assertTokenize("PHY_101.", Language.ENGLISH, StemMode.NONE, false, Arrays.asList("phy", "101"), null); - assertTokenize("101.3", Language.ENGLISH, StemMode.NONE, false, Arrays.asList("101", "3"), null); + assertTokenize("PHY_101.", Language.ENGLISH, StemMode.NONE, false, List.of("phy", "101"), null); + assertTokenize("101.3", Language.ENGLISH, StemMode.NONE, false, List.of("101", "3"), null); } @Test diff --git a/linguistics/src/test/java/com/yahoo/language/simple/TokenizerTester.java b/linguistics/src/test/java/com/yahoo/language/simple/TokenizerTester.java index 401b89f0696..021f04b8b87 100644 --- a/linguistics/src/test/java/com/yahoo/language/simple/TokenizerTester.java +++ b/linguistics/src/test/java/com/yahoo/language/simple/TokenizerTester.java @@ -8,7 +8,6 @@ import com.yahoo.language.process.Token; import com.yahoo.language.process.TokenScript; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -28,7 +27,7 @@ public class TokenizerTester { for (Token token : tokenize(input)) { findTokenStrings(token, actual); } - assertEquals(Arrays.asList(expectedTokenStrings), actual); + assertEquals(List.of(expectedTokenStrings), actual); } public void assertTokenScripts(String input, TokenScript... expectedTokenScripts) { @@ -36,7 +35,7 @@ public class TokenizerTester { for (Token token : tokenize(input)) { findTokenScripts(token, actual); } - assertEquals(Arrays.asList(expectedTokenScripts), actual); + assertEquals(List.of(expectedTokenScripts), actual); } public List<String> findTokenStrings(Token token, List<String> out) { 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) { diff --git a/messagebus_test/src/tests/error/JavaClient.java b/messagebus_test/src/tests/error/JavaClient.java index 764cf4c1d86..487c839013c 100644 --- a/messagebus_test/src/tests/error/JavaClient.java +++ b/messagebus_test/src/tests/error/JavaClient.java @@ -6,7 +6,6 @@ import com.yahoo.messagebus.routing.*; import com.yahoo.messagebus.network.*; import com.yahoo.messagebus.network.rpc.*; import com.yahoo.messagebus.network.rpc.test.*; -import java.util.Arrays; import java.util.logging.*; public class JavaClient { @@ -16,7 +15,7 @@ public class JavaClient { public static void main(String[] args) { try { RPCMessageBus mb = new RPCMessageBus( - Arrays.asList((Protocol)new SimpleProtocol()), + List.of((Protocol)new SimpleProtocol()), new RPCNetworkParams() .setIdentity(new Identity("server/java")) .setSlobrokConfigId("file:slobrok.cfg"), diff --git a/messagebus_test/src/tests/error/JavaServer.java b/messagebus_test/src/tests/error/JavaServer.java index 7cc366fd7b4..97591b65823 100644 --- a/messagebus_test/src/tests/error/JavaServer.java +++ b/messagebus_test/src/tests/error/JavaServer.java @@ -5,7 +5,6 @@ import com.yahoo.config.*; import com.yahoo.messagebus.routing.*; import com.yahoo.messagebus.network.*; import com.yahoo.messagebus.network.rpc.*; -import java.util.Arrays; import java.util.logging.*; public class JavaServer implements MessageHandler { @@ -29,7 +28,7 @@ public class JavaServer implements MessageHandler { public static void main(String[] args) { try { RPCMessageBus mb = new RPCMessageBus( - Arrays.asList((Protocol)new SimpleProtocol()), + List.of((Protocol)new SimpleProtocol()), new RPCNetworkParams() .setIdentity(new Identity("server/java")) .setSlobrokConfigId("file:slobrok.cfg"), diff --git a/messagebus_test/src/tests/speed/JavaServer.java b/messagebus_test/src/tests/speed/JavaServer.java index 256f6f00223..3f7ed6ba5fd 100644 --- a/messagebus_test/src/tests/speed/JavaServer.java +++ b/messagebus_test/src/tests/speed/JavaServer.java @@ -5,7 +5,6 @@ import com.yahoo.config.*; import com.yahoo.messagebus.routing.*; import com.yahoo.messagebus.network.*; import com.yahoo.messagebus.network.rpc.*; -import java.util.Arrays; import java.util.logging.*; public class JavaServer implements MessageHandler { @@ -36,7 +35,7 @@ public class JavaServer implements MessageHandler { public static void main(String[] args) { try { RPCMessageBus mb = new RPCMessageBus( - Arrays.asList((Protocol)new SimpleProtocol()), + List.of((Protocol)new SimpleProtocol()), new RPCNetworkParams() .setIdentity(new Identity("server/java")) .setSlobrokConfigId("file:slobrok.cfg"), diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/HostCapacityResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/HostCapacityResponse.java index 9f7c795cf48..9fbc096667e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/HostCapacityResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/HostCapacityResponse.java @@ -12,7 +12,6 @@ import com.yahoo.vespa.hosted.provision.maintenance.CapacityChecker; import java.io.IOException; import java.io.OutputStream; -import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -46,7 +45,7 @@ public class HostCapacityResponse extends HttpResponse { } private List<Node> parseHostList(String hosts) { - List<String> hostNames = Arrays.asList(hosts.split(",")); + List<String> hostNames = List.of(hosts.split(",")); try { return capacityChecker.nodesFromHostnames(hostNames); } catch (IllegalArgumentException e) { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java index c518087f325..cfe4886c903 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java @@ -27,7 +27,6 @@ import com.yahoo.vespa.orchestrator.status.HostInfo; import com.yahoo.vespa.orchestrator.status.HostStatus; import java.net.URI; -import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.HashSet; @@ -66,7 +65,7 @@ class NodesResponse extends SlimeJsonResponse { this.wantedDockerTagFlag = PermanentFlags.WANTED_DOCKER_TAG.bindTo(nodeRepository.flagSource()); // Cannot use Set.of() because the nodeRepository account can also be the empty account (at least in tests). - var nonEnclaveAccounts = new HashSet<>(Arrays.asList(CloudAccount.empty, nodeRepository.zone().cloud().account())); + var nonEnclaveAccounts = new HashSet<>(List.of(CloudAccount.empty, nodeRepository.zone().cloud().account())); this.filter = NodesV2ApiHandler.toNodeFilter(request, nonEnclaveAccounts); Cursor root = slime.setObject(); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNameResolver.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNameResolver.java index 5f0ac4fbcdb..166fcb8edc7 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNameResolver.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNameResolver.java @@ -9,6 +9,7 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; @@ -37,7 +38,7 @@ public class MockNameResolver implements NameResolver { Objects.requireNonNull(hostname, "hostname must be non-null"); Arrays.stream(ipAddress).forEach(ip -> Objects.requireNonNull(ip, "ipAddress must be non-null")); records.computeIfAbsent(hostname, (k) -> new HashSet<>()) - .addAll(Arrays.asList(ipAddress)); + .addAll(List.of(ipAddress)); return this; } diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java index c61d5cab472..1b1c64c9d9a 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java @@ -5,7 +5,6 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstance; import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.applicationmodel.HostName; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -21,7 +20,7 @@ public class NodeGroup { public NodeGroup(ApplicationInstance application, HostName... hostNames) { this.application = application; - this.hostNames.addAll(Arrays.asList(hostNames)); + this.hostNames.addAll(List.of(hostNames)); } public void addNode(HostName hostName) { diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java index 354799507ab..fc9715dce5c 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java @@ -42,7 +42,6 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -277,7 +276,7 @@ public class OrchestratorImplTest { orchestrator.suspendAll( new HostName("parentHostname"), - Arrays.asList( + List.of( DummyServiceMonitor.TEST1_HOST_NAME, DummyServiceMonitor.TEST3_HOST_NAME, DummyServiceMonitor.TEST6_HOST_NAME)); @@ -317,7 +316,7 @@ public class OrchestratorImplTest { try { orchestrator.suspendAll( new HostName("parentHostname"), - Arrays.asList( + List.of( DummyServiceMonitor.TEST1_HOST_NAME, DummyServiceMonitor.TEST3_HOST_NAME, DummyServiceMonitor.TEST6_HOST_NAME)); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java index c0d6e01104a..8618c6ada90 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java @@ -33,11 +33,11 @@ public class ApplicationApiImplTest { HostName hostName4 = new HostName("host4"); ApplicationInstance applicationInstance = - modelUtils.createApplicationInstance(Arrays.asList( + modelUtils.createApplicationInstance(List.of( modelUtils.createServiceCluster( "cluster-3", new ServiceType("service-type-3"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-1", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-2", hostName2, ServiceStatus.UP) ) @@ -45,7 +45,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-1", new ServiceType("service-type-1"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-3", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-4", hostName3, ServiceStatus.UP) ) @@ -53,7 +53,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-2", new ServiceType("service-type-2"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-5", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-6", hostName2, ServiceStatus.UP) ) @@ -71,7 +71,7 @@ public class ApplicationApiImplTest { try (scopedApi) { // Note: we require the clusters to be in order. List<ClusterApi> clusterApis = scopedApi.applicationApi().getClusters(); - String clusterInfos = clusterApis.stream().map(clusterApi -> clusterApi.clusterInfo()).collect(Collectors.joining(",")); + String clusterInfos = clusterApis.stream().map(ClusterApi::clusterInfo).collect(Collectors.joining(",")); String expectedClusterInfos = Arrays.stream(expectedClusterNumbers) .map(number -> "{ clusterId=cluster-" + number + ", serviceType=service-type-" + number + " }") @@ -92,11 +92,11 @@ public class ApplicationApiImplTest { HostName hostName7 = new HostName("host7"); ApplicationInstance applicationInstance = - modelUtils.createApplicationInstance(Arrays.asList( + modelUtils.createApplicationInstance(List.of( modelUtils.createServiceCluster( "cluster-3", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-30", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-31", hostName2, ServiceStatus.UP) ) @@ -104,7 +104,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-1", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-10", hostName3, ServiceStatus.DOWN), modelUtils.createServiceInstance("config-id-11", hostName4, ServiceStatus.UP) ) @@ -112,7 +112,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-4", new ServiceType("service-type-4"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-40", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-41", hostName2, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-42", hostName3, ServiceStatus.UP), @@ -122,7 +122,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-2", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-20", hostName6, ServiceStatus.DOWN), modelUtils.createServiceInstance("config-id-21", hostName7, ServiceStatus.UP) ) @@ -154,9 +154,9 @@ public class ApplicationApiImplTest { HostName... expectedHostNames) { try (scopedApi) { List<HostName> upStorageNodes = scopedApi.applicationApi().getNoRemarksStorageNodesInGroupInClusterOrder().stream() - .map(storageNode -> storageNode.hostName()) + .map(StorageNode::hostName) .toList(); - assertEquals(Arrays.asList(expectedHostNames), upStorageNodes); + assertEquals(List.of(expectedHostNames), upStorageNodes); } } @@ -191,7 +191,7 @@ public class ApplicationApiImplTest { List<HostName> actualStorageNodes = scopedApi.applicationApi() .getNoRemarksStorageNodesInGroupInClusterOrder() .stream() - .map(storageNode -> storageNode.hostName()) + .map(StorageNode::hostName) .toList(); assertEquals(upStorageNodes, actualStorageNodes); } @@ -204,11 +204,11 @@ public class ApplicationApiImplTest { HostName hostName3 = new HostName("host3"); ApplicationInstance applicationInstance = - modelUtils.createApplicationInstance(Arrays.asList( + modelUtils.createApplicationInstance(List.of( modelUtils.createServiceCluster( "cluster-1", new ServiceType("service-type-1"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-10", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-11", hostName2, ServiceStatus.UP) ) @@ -216,7 +216,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-2", new ServiceType("service-type-2"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-20", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-21", hostName3, ServiceStatus.UP) ) @@ -233,11 +233,11 @@ public class ApplicationApiImplTest { List.of()); verifyNodesInGroupWithoutRemarks( modelUtils.createScopedApplicationApi(applicationInstance, hostName1, hostName2), - Arrays.asList(hostName1, hostName2), + List.of(hostName1, hostName2), List.of()); verifyNodesInGroupWithoutRemarks( modelUtils.createScopedApplicationApi(applicationInstance, hostName1, hostName2, hostName3), - Arrays.asList(hostName1, hostName2), + List.of(hostName1, hostName2), List.of(hostName3)); verifyNodesInGroupWithoutRemarks( modelUtils.createScopedApplicationApi(applicationInstance, hostName3), @@ -268,11 +268,11 @@ public class ApplicationApiImplTest { HostName allowedToBeDownHost7 = new HostName("host7"); ApplicationInstance applicationInstance = - modelUtils.createApplicationInstance(Arrays.asList( + modelUtils.createApplicationInstance(List.of( modelUtils.createServiceCluster( "cluster-4", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-40", allowedToBeDownHost1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-41", noRemarksHost2, ServiceStatus.DOWN) ) @@ -280,7 +280,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-1", new ServiceType("service-type-1"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-10", allowedToBeDownHost1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-11", allowedToBeDownHost3, ServiceStatus.UP) ) @@ -288,7 +288,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-3", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-30", allowedToBeDownHost4, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-31", noRemarksHost5, ServiceStatus.UP) ) @@ -296,7 +296,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-2", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-20", noRemarksHost6, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-21", allowedToBeDownHost7, ServiceStatus.UP) ) @@ -343,9 +343,9 @@ public class ApplicationApiImplTest { .applicationApi() .getSuspendedStorageNodesInGroupInReverseClusterOrder() .stream() - .map(storageNode -> storageNode.hostName()) + .map(StorageNode::hostName) .toList(); - assertEquals(Arrays.asList(hostNames), actualStorageNodes); + assertEquals(List.of(hostNames), actualStorageNodes); } } } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java index db5beafac81..9f8f8a9dd44 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java @@ -27,7 +27,6 @@ import org.junit.Test; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.EnumSet; import java.util.List; import java.util.Optional; @@ -64,7 +63,7 @@ public class ClusterApiImplTest { ServiceCluster serviceCluster = modelUtils.createServiceCluster( "cluster", new ServiceType("service-type"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("service-1", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("service-2", hostName2, ServiceStatus.DOWN), modelUtils.createServiceInstance("service-3", hostName3, ServiceStatus.UP), @@ -268,7 +267,7 @@ public class ClusterApiImplTest { ServiceCluster serviceCluster = modelUtils.createServiceCluster( "cluster", new ServiceType("service-type"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("service-1", hostName1, ServiceStatus.UP), service2, modelUtils.createServiceInstance("service-3", hostName3, ServiceStatus.UP), @@ -336,7 +335,7 @@ public class ClusterApiImplTest { ServiceCluster serviceCluster = modelUtils.createServiceCluster( "cluster", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("storage-1", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("storage-2", hostName2, ServiceStatus.DOWN) ) diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java index 373d512f811..b2802ad9924 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java @@ -7,8 +7,8 @@ import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.applicationmodel.TenantId; import org.junit.Test; -import java.util.Arrays; import java.util.HashSet; +import java.util.List; import static org.junit.Assert.assertEquals; @@ -27,7 +27,7 @@ public class NodeGroupTest { nodeGroup.addNode(hostName2); // hostnames are sorted (for no good reason other than testability due to stability, readability) - assertEquals(Arrays.asList(hostName1, hostName2, hostName3), nodeGroup.getHostNames()); + assertEquals(List.of(hostName1, hostName2, hostName3), nodeGroup.getHostNames()); assertEquals("host1,host2,host3", nodeGroup.toCommaSeparatedString()); } } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java index 3b1bd7af525..33ec7a5c43f 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java @@ -14,7 +14,6 @@ import com.yahoo.vespa.applicationmodel.TenantId; import com.yahoo.vespa.orchestrator.TestUtil; import org.junit.Test; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Optional; @@ -172,7 +171,7 @@ public class VespaModelUtilTest { @Test public void testGettingClusterControllerInstances() { List<HostName> controllers = VespaModelUtil.getClusterControllerInstancesInOrder(application, CONTENT_CLUSTER_ID); - List<HostName> expectedControllers = Arrays.asList(controller0.hostName(), controller1.hostName()); + List<HostName> expectedControllers = List.of(controller0.hostName(), controller1.hostName()); assertEquals(expectedControllers, controllers); } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java index 14d5909522a..77fdbe4067d 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java @@ -20,7 +20,6 @@ import org.junit.Before; import org.junit.Test; import org.mockito.InOrder; -import java.util.Arrays; import java.util.List; import static org.mockito.ArgumentMatchers.any; @@ -56,7 +55,7 @@ public class HostedVespaPolicyTest { ClusterApi clusterApi1 = mock(ClusterApi.class); ClusterApi clusterApi2 = mock(ClusterApi.class); ClusterApi clusterApi3 = mock(ClusterApi.class); - List<ClusterApi> clusterApis = Arrays.asList(clusterApi1, clusterApi2, clusterApi3); + List<ClusterApi> clusterApis = List.of(clusterApi1, clusterApi2, clusterApi3); when(applicationApi.getClusters()).thenReturn(clusterApis); StorageNode storageNode1 = mock(StorageNode.class); @@ -69,11 +68,11 @@ public class HostedVespaPolicyTest { HostName hostName3 = new HostName("storage-3"); when(storageNode1.hostName()).thenReturn(hostName3); - List<StorageNode> upStorageNodes = Arrays.asList(storageNode1, storageNode3); + List<StorageNode> upStorageNodes = List.of(storageNode1, storageNode3); when(applicationApi.getNoRemarksStorageNodesInGroupInClusterOrder()).thenReturn(upStorageNodes); // setHostState - List<HostName> noRemarksHostNames = Arrays.asList(hostName1, hostName2, hostName3); + List<HostName> noRemarksHostNames = List.of(hostName1, hostName2, hostName3); when(applicationApi.getNodesInGroupWithStatus(HostStatus.NO_REMARKS)).thenReturn(noRemarksHostNames); InOrder order = inOrder(applicationApi, clusterPolicy, storageNode1, storageNode3); @@ -108,7 +107,7 @@ public class HostedVespaPolicyTest { ClusterApi clusterApi1 = mock(ClusterApi.class); ClusterApi clusterApi2 = mock(ClusterApi.class); ClusterApi clusterApi3 = mock(ClusterApi.class); - List<ClusterApi> clusterApis = Arrays.asList(clusterApi1, clusterApi2, clusterApi3); + List<ClusterApi> clusterApis = List.of(clusterApi1, clusterApi2, clusterApi3); when(applicationApi.getClusters()).thenReturn(clusterApis); StorageNode storageNode1 = mock(StorageNode.class); @@ -121,10 +120,10 @@ public class HostedVespaPolicyTest { HostName hostName3 = new HostName("storage-3"); when(storageNode1.hostName()).thenReturn(hostName3); - List<StorageNode> upStorageNodes = Arrays.asList(storageNode1, storageNode3); + List<StorageNode> upStorageNodes = List.of(storageNode1, storageNode3); when(applicationApi.getStorageNodesInGroupInClusterOrder()).thenReturn(upStorageNodes); - List<HostName> noRemarksHostNames = Arrays.asList(hostName1, hostName2, hostName3); + List<HostName> noRemarksHostNames = List.of(hostName1, hostName2, hostName3); when(applicationApi.getNodesInGroupWith(any())).thenReturn(noRemarksHostNames); InOrder order = inOrder(applicationApi, clusterPolicy, storageNode1, storageNode3); @@ -161,7 +160,7 @@ public class HostedVespaPolicyTest { ClusterApi clusterApi1 = mock(ClusterApi.class); ClusterApi clusterApi2 = mock(ClusterApi.class); ClusterApi clusterApi3 = mock(ClusterApi.class); - List<ClusterApi> clusterApis = Arrays.asList(clusterApi1, clusterApi2, clusterApi3); + List<ClusterApi> clusterApis = List.of(clusterApi1, clusterApi2, clusterApi3); when(applicationApi.getClusters()).thenReturn(clusterApis); StorageNode storageNode1 = mock(StorageNode.class); @@ -174,10 +173,10 @@ public class HostedVespaPolicyTest { HostName hostName3 = new HostName("storage-3"); when(storageNode1.hostName()).thenReturn(hostName3); - List<StorageNode> upStorageNodes = Arrays.asList(storageNode1, storageNode3); + List<StorageNode> upStorageNodes = List.of(storageNode1, storageNode3); when(applicationApi.getStorageNodesInGroupInClusterOrder()).thenReturn(upStorageNodes); - List<HostName> noRemarksHostNames = Arrays.asList(hostName1, hostName2, hostName3); + List<HostName> noRemarksHostNames = List.of(hostName1, hostName2, hostName3); when(applicationApi.getNodesInGroupWith(any())).thenReturn(noRemarksHostNames); InOrder order = inOrder(applicationApi, clusterPolicy, storageNode1, storageNode3); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandlerTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandlerTest.java index 9e5464f3e3a..41bcbb125ee 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandlerTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandlerTest.java @@ -17,7 +17,6 @@ import com.yahoo.vespa.orchestrator.restapi.wire.SlobrokEntryResponse; import com.yahoo.vespa.service.manager.UnionMonitorManager; import com.yahoo.vespa.service.monitor.SlobrokApi; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.List; import static com.yahoo.jdisc.http.HttpRequest.Method.GET; @@ -34,7 +33,7 @@ class InstanceRequestHandlerTest { private static final String APPLICATION_INSTANCE_REFERENCE = "tenant:app:prod:us-west-1:instance"; private static final ApplicationId APPLICATION_ID = ApplicationId.from( "tenant", "app", "instance"); - private static final List<Mirror.Entry> ENTRIES = Arrays.asList( + private static final List<Mirror.Entry> ENTRIES = List.of( new Mirror.Entry("name1", "tcp/spec:1"), new Mirror.Entry("name2", "tcp/spec:2")); private static final ClusterId CLUSTER_ID = new ClusterId("cluster-id"); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java index e0929090a19..d45dc17e84c 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java @@ -34,7 +34,6 @@ import org.mockito.junit.MockitoJUnitRunner; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -393,7 +392,7 @@ public class ZkStatusServiceTest { @SuppressWarnings("varargs") private static <T> List<T> shuffledList(T... values) { //new ArrayList necessary to avoid "write through" behaviour - List<T> list = new ArrayList<>(Arrays.asList(values)); + List<T> list = new ArrayList<>(List.of(values)); Collections.shuffle(list); return list; } diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java index a5b190d95ab..afe5ea29111 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java @@ -2,7 +2,6 @@ package com.yahoo.document.predicate; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -15,7 +14,7 @@ public class Conjunction extends PredicateOperator { private List<Predicate> operands; public Conjunction(Predicate... operands) { - this(Arrays.asList(operands)); + this(List.of(operands)); } public Conjunction(List<? extends Predicate> operands) { diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java index 0b03f8afc40..db8392dcdb3 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java @@ -2,7 +2,6 @@ package com.yahoo.document.predicate; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -15,7 +14,7 @@ public class Disjunction extends PredicateOperator { private List<Predicate> operands; public Disjunction(Predicate... operands) { - this(Arrays.asList(operands)); + this(List.of(operands)); } public Disjunction(List<? extends Predicate> operands) { diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java index d2486850f3a..bf1d006fda0 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java @@ -1,9 +1,9 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; +import java.util.List; import java.util.Objects; import java.util.Set; import java.util.TreeSet; @@ -17,7 +17,7 @@ public class FeatureSet extends PredicateValue { private String key; public FeatureSet(String key, String... values) { - this(key, Arrays.asList(values)); + this(key, List.of(values)); } public FeatureSet(String key, Collection<String> values) { @@ -83,10 +83,9 @@ public class FeatureSet extends PredicateValue { if (obj == this) { return true; } - if (!(obj instanceof FeatureSet)) { + if (!(obj instanceof FeatureSet rhs)) { return false; } - FeatureSet rhs = (FeatureSet)obj; if (!key.equals(rhs.key)) { return false; } diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java index 62ad522e655..5e138fe8909 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java @@ -28,7 +28,7 @@ public class Negation extends PredicateOperator { @Override public List<Predicate> getOperands() { - return java.util.Arrays.asList(operand); + return java.util.List.of(operand); } @Override diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java index 56b338453d2..a698248ab6b 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java @@ -3,7 +3,7 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -22,18 +22,18 @@ public class ConjunctionTest { Conjunction node = new Conjunction(); Predicate a = SimplePredicates.newString("a"); node.addOperand(a); - assertEquals(Arrays.asList(a), node.getOperands()); + assertEquals(List.of(a), node.getOperands()); Predicate b = SimplePredicates.newString("b"); node.addOperand(b); - assertEquals(Arrays.asList(a, b), node.getOperands()); + assertEquals(List.of(a, b), node.getOperands()); Predicate c = SimplePredicates.newString("c"); Predicate d = SimplePredicates.newString("d"); - node.addOperands(Arrays.asList(c, d)); - assertEquals(Arrays.asList(a, b, c, d), node.getOperands()); + node.addOperands(List.of(c, d)); + assertEquals(List.of(a, b, c, d), node.getOperands()); Predicate e = SimplePredicates.newString("e"); Predicate f = SimplePredicates.newString("f"); - node.setOperands(Arrays.asList(e, f)); - assertEquals(Arrays.asList(e, f), node.getOperands()); + node.setOperands(List.of(e, f)); + assertEquals(List.of(e, f), node.getOperands()); } @Test @@ -41,10 +41,10 @@ public class ConjunctionTest { Predicate foo = SimplePredicates.newString("foo"); Predicate bar = SimplePredicates.newString("bar"); Conjunction node = new Conjunction(foo, bar); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + assertEquals(List.of(foo, bar), node.getOperands()); - node = new Conjunction(Arrays.asList(foo, bar)); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + node = new Conjunction(List.of(foo, bar)); + assertEquals(List.of(foo, bar), node.getOperands()); } @Test diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java index efde8ec7532..fa1cde8fdd3 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java @@ -3,7 +3,7 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -22,18 +22,18 @@ public class DisjunctionTest { Disjunction node = new Disjunction(); Predicate a = SimplePredicates.newString("a"); node.addOperand(a); - assertEquals(Arrays.asList(a), node.getOperands()); + assertEquals(List.of(a), node.getOperands()); Predicate b = SimplePredicates.newString("b"); node.addOperand(b); - assertEquals(Arrays.asList(a, b), node.getOperands()); + assertEquals(List.of(a, b), node.getOperands()); Predicate c = SimplePredicates.newString("c"); Predicate d = SimplePredicates.newString("d"); - node.addOperands(Arrays.asList(c, d)); - assertEquals(Arrays.asList(a, b, c, d), node.getOperands()); + node.addOperands(List.of(c, d)); + assertEquals(List.of(a, b, c, d), node.getOperands()); Predicate e = SimplePredicates.newString("e"); Predicate f = SimplePredicates.newString("f"); - node.setOperands(Arrays.asList(e, f)); - assertEquals(Arrays.asList(e, f), node.getOperands()); + node.setOperands(List.of(e, f)); + assertEquals(List.of(e, f), node.getOperands()); } @Test @@ -41,10 +41,10 @@ public class DisjunctionTest { Predicate foo = SimplePredicates.newString("foo"); Predicate bar = SimplePredicates.newString("bar"); Disjunction node = new Disjunction(foo, bar); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + assertEquals(List.of(foo, bar), node.getOperands()); - node = new Disjunction(Arrays.asList(foo, bar)); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + node = new Disjunction(List.of(foo, bar)); + assertEquals(List.of(foo, bar), node.getOperands()); } @Test diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java index 06c1a445494..3977ad02999 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java @@ -3,7 +3,7 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -249,15 +249,15 @@ public class FeatureRangeTest { @Test void requireThatFeatureRangeCanBeBuiltFromMixedInNode() { assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10-19"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10-19"), 10)); assertEquals(new FeatureRange("foo", -19L, -10L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=-10-19"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=-10-19"), 10)); assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10,10,9"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10,10,9"), 10)); assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10,10,1073741833"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10,10,1073741833"), 10)); assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10,10,2147483648"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10,10,2147483648"), 10)); } } diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java index b61f843c10e..31cfe4318fb 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java @@ -4,7 +4,6 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -25,35 +24,35 @@ public class FeatureSetTest { void requireThatAccessorsWork() { FeatureSet node = new FeatureSet("key", "valueA", "valueB"); assertEquals("key", node.getKey()); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); node.addValue("valueC"); - assertValues(Arrays.asList("valueA", "valueB", "valueC"), node); - node.addValues(Arrays.asList("valueD", "valueE")); - assertValues(Arrays.asList("valueA", "valueB", "valueC", "valueD", "valueE"), node); - node.setValues(Arrays.asList("valueF", "valueG")); - assertValues(Arrays.asList("valueF", "valueG"), node); + assertValues(List.of("valueA", "valueB", "valueC"), node); + node.addValues(List.of("valueD", "valueE")); + assertValues(List.of("valueA", "valueB", "valueC", "valueD", "valueE"), node); + node.setValues(List.of("valueF", "valueG")); + assertValues(List.of("valueF", "valueG"), node); } @Test void requireThatValueSetIsMutable() { FeatureSet node = new FeatureSet("key"); node.getValues().add("valueA"); - assertValues(Arrays.asList("valueA"), node); + assertValues(List.of("valueA"), node); node = new FeatureSet("key", "valueA"); node.getValues().add("valueB"); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); } @Test void requireThatConstructorsWork() { FeatureSet node = new FeatureSet("key", "valueA", "valueB"); assertEquals("key", node.getKey()); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); - node = new FeatureSet("key", Arrays.asList("valueA", "valueB")); + node = new FeatureSet("key", List.of("valueA", "valueB")); assertEquals("key", node.getKey()); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); } @Test @@ -123,7 +122,7 @@ public class FeatureSetTest { } catch (NullPointerException e) { assertEquals("value", e.getMessage()); } - assertValues(Arrays.asList("bar"), node); + assertValues(List.of("bar"), node); } @Test diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java index 8bc434218b7..b8ec623410c 100644 --- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java @@ -4,7 +4,6 @@ package com.yahoo.search.predicate; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -34,7 +33,7 @@ public class PredicateQueryParserTest { (k, v, s) -> result.add(String.format("%s:%s:%#x", k, v, s)), (k, v, s) -> result.add(String.format("%s:%d:%#x", k, v, s))); - assertEquals(result, Arrays.asList( + assertEquals(result, List.of( "k1:value1:0x1", "k2:value2:0x3", "range1:123456789123:0xffff", "range2:0:0xffffffffffffffff")); } diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java index 401c006b273..bc330a7d1f3 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java @@ -6,7 +6,8 @@ import com.yahoo.document.predicate.Predicate; import com.yahoo.document.predicate.PredicateOperator; import org.junit.jupiter.api.Test; -import java.util.Arrays; + +import java.util.List; import static com.yahoo.document.predicate.Predicates.and; import static com.yahoo.document.predicate.Predicates.feature; @@ -208,7 +209,7 @@ public class PredicateTreeAnalyzerTest { } private static FeatureConjunction conj(Predicate... operands) { - return new FeatureConjunction(Arrays.asList(operands)); + return new FeatureConjunction(List.of(operands)); } private static void assertSizeMapContains(PredicateTreeAnalyzerResult r, PredicateSelector selector, int expectedValue) { @@ -217,18 +218,13 @@ public class PredicateTreeAnalyzerTest { assertEquals(expectedValue, actualValue.intValue()); } - private static class PredicateSelector { - public final Predicate predicate; - - public PredicateSelector(Predicate predicate) { - this.predicate = predicate; - } + private record PredicateSelector(Predicate predicate) { public PredicateSelector child(int index) { - PredicateOperator op = (PredicateOperator) predicate; - return new PredicateSelector(op.getOperands().get(index)); + PredicateOperator op = (PredicateOperator) predicate; + return new PredicateSelector(op.getOperands().get(index)); + } } - } private static PredicateSelector pred(Predicate p) { return new PredicateSelector(p); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java index 18cdc4defff..237aeda4fb3 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java @@ -13,7 +13,6 @@ import com.yahoo.search.predicate.index.IntervalWithBounds; import com.yahoo.search.predicate.index.conjunction.IndexableFeatureConjunction; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.List; import java.util.Map; @@ -229,7 +228,7 @@ public class PredicateTreeAnnotatorTest { long hash = PredicateHash.hash64(feature); List<Integer> actualIntervals = r.intervalMap.get(hash); assertNotNull(actualIntervals); - assertArrayEquals(Ints.toArray(Arrays.asList(expectedIntervals)), Ints.toArray(actualIntervals)); + assertArrayEquals(Ints.toArray(List.of(expectedIntervals)), Ints.toArray(actualIntervals)); } private static void assertBoundsContains(PredicateTreeAnnotations r, String feature, IntervalWithBounds expectedBounds) { @@ -258,11 +257,11 @@ public class PredicateTreeAnnotatorTest { private static FeatureRange range(String key, Long lower, Long upper, RangePartition... partitions) { FeatureRange range = new FeatureRange(key, lower, upper); - Arrays.asList(partitions).forEach(range::addPartition); + List.of(partitions).forEach(range::addPartition); return range; } private static FeatureConjunction conj(Predicate... operands) { - return new FeatureConjunction(Arrays.asList(operands)); + return new FeatureConjunction(List.of(operands)); } } diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java index 68f692e3119..cf7e286f89f 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java @@ -6,7 +6,6 @@ import org.eclipse.collections.impl.map.mutable.primitive.ObjectIntHashMap; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.jupiter.api.Assertions.assertArrayEquals; @@ -107,12 +106,12 @@ public class CachedPostingListCounterTest { } private static List<PostingList> list(PostingList... postingLists) { - return Arrays.asList(postingLists); + return List.of(postingLists); } private static PostingList postingList(Integer... docIds) { PostingList postingList = mock(PostingList.class); - when(postingList.getDocIds()).thenReturn(Ints.toArray(Arrays.asList((docIds)))); + when(postingList.getDocIds()).thenReturn(Ints.toArray(List.of((docIds)))); return postingList; } diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/IntervalPostingListTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/IntervalPostingListTest.java index 8b2a5cc1d7e..26f191e13b6 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/IntervalPostingListTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/IntervalPostingListTest.java @@ -4,7 +4,8 @@ package com.yahoo.search.predicate.index; import com.yahoo.search.predicate.SubqueryBitmap; import org.junit.jupiter.api.Test; -import java.util.Arrays; + +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -13,9 +14,9 @@ public class IntervalPostingListTest { @Test void requireThatPostingListCanIterate() { PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); - int ref1 = builder.insert(Arrays.asList(0x1ffff)); - int ref2 = builder.insert(Arrays.asList(0x1ffff)); - int ref3 = builder.insert(Arrays.asList(0x10001, 0x2ffff)); + int ref1 = builder.insert(List.of(0x1ffff)); + int ref2 = builder.insert(List.of(0x1ffff)); + int ref3 = builder.insert(List.of(0x10001, 0x2ffff)); IntervalPostingList postingList = new IntervalPostingList( builder.build(), new int[]{2, 4, 6}, new int[]{ref1, ref2, ref3}, SubqueryBitmap.ALL_SUBQUERIES); assertEquals(-1, postingList.getDocId()); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateIntervalStoreTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateIntervalStoreTest.java index bfc4635aa51..c02c18ae1d7 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateIntervalStoreTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateIntervalStoreTest.java @@ -6,7 +6,6 @@ import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static com.yahoo.search.predicate.serialization.SerializationTestHelper.assertSerializationDeserializationMatches; @@ -49,9 +48,9 @@ public class PredicateIntervalStoreTest { @Test void requireThatSerializationAndDeserializationRetainIntervals() throws IOException { PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); - builder.insert(Arrays.asList(0x00010001, 0x00020002)); - builder.insert(Arrays.asList(0x00010001, 0x00020002, 0x00030003)); - builder.insert(Arrays.asList(0x0fffffff, 0x00020002, 0x00030003)); + builder.insert(List.of(0x00010001, 0x00020002)); + builder.insert(List.of(0x00010001, 0x00020002, 0x00030003)); + builder.insert(List.of(0x0fffffff, 0x00020002, 0x00030003)); PredicateIntervalStore store = builder.build(); assertSerializationDeserializationMatches( store, PredicateIntervalStore::writeToOutputStream, PredicateIntervalStore::fromInputStream); @@ -60,8 +59,8 @@ public class PredicateIntervalStoreTest { @Test void requireThatEqualIntervalListsReturnsSameReference() { PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); - List<Integer> intervals1 = Arrays.asList(0x00010001, 0x00020002); - List<Integer> intervals2 = Arrays.asList(0x00010001, 0x00020002); + List<Integer> intervals1 = List.of(0x00010001, 0x00020002); + List<Integer> intervals2 = List.of(0x00010001, 0x00020002); int ref1 = builder.insert(intervals1); int ref2 = builder.insert(intervals2); PredicateIntervalStore store = builder.build(); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateRangeTermExpanderTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateRangeTermExpanderTest.java index 3c0a2290817..0b8076b310c 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateRangeTermExpanderTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateRangeTermExpanderTest.java @@ -4,8 +4,8 @@ package com.yahoo.search.predicate.index; import com.yahoo.document.predicate.PredicateHash; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.Iterator; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -16,7 +16,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatSmallRangeIsExpanded() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=40-49", "key=0-99", "key=0-999", @@ -46,7 +46,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatLargeRangeIsExpanded() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=123456789012345670-123456789012345679", "key=123456789012345600-123456789012345699", "key=123456789012345000-123456789012345999", @@ -86,7 +86,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatSmallNegativeRangeIsExpanded() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=-49-40", "key=-99-0", "key=-999-0", @@ -126,7 +126,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatMinRangeMinus9IsExpanded() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=-9223372036854775799-9223372036854775790", "key=-9223372036854775799-9223372036854775700").iterator(); expander.expand("key", -9223372036854775799L, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), @@ -150,7 +150,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatSmallRangeIsExpandedInArity2() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(2); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=42-43", "key=40-43", "key=40-47", @@ -225,7 +225,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatSmallNegativeRangeIsExpandedInArity2() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(2); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=-43-42", "key=-43-40", "key=-47-40", @@ -300,7 +300,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatUpperBoundIsUsed() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, -99, 9999); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=40-49", "key=0-99", "key=0-999", @@ -316,7 +316,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatLowerBoundIsUsed() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, -9999, 99); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=-49-40", "key=-99-0", "key=-999-0", @@ -339,7 +339,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatUpperAndLowerBoundGreaterThan0Works() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, 100, 9999); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=140-149", "key=100-199", "key=0-999", @@ -355,7 +355,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatSearchCloseToUnevenUpperBoundIsSensible() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, -99, 1234); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=40-49", "key=0-99", "key=0-999", @@ -371,7 +371,7 @@ public class PredicateRangeTermExpanderTest { @Test void requireThatSearchCloseToMaxUnevenUpperBoundIsSensible() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, 0, 9223372036854771234L); - Iterator<String> expectedLabels = Arrays.asList( + Iterator<String> expectedLabels = List.of( "key=9223372036854770000-9223372036854770009", "key=9223372036854770000-9223372036854770099", "key=9223372036854770000-9223372036854770999").iterator(); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java index 62dde7ac585..d520980193e 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java @@ -32,7 +32,7 @@ public class PredicateSearchTest { entry(0, 0x000100ff), entry(1, 0x00010001, 0x000200ff), entry(2, 0x00010042))); - assertEquals(Arrays.asList(new Hit(0), new Hit(1)).toString(), search.stream().toList().toString()); + assertEquals(List.of(new Hit(0), new Hit(1)).toString(), search.stream().toList().toString()); } @Test @@ -43,7 +43,7 @@ public class PredicateSearchTest { SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x000100ff), entry(1, 0x000100ff))); - assertEquals(Arrays.asList(new Hit(1)).toString(), search.stream().toList().toString()); + assertEquals(List.of(new Hit(1)).toString(), search.stream().toList().toString()); } @Test @@ -54,7 +54,7 @@ public class PredicateSearchTest { entry(0, 0x00010001)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x000200ff))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); + assertEquals(List.of(new Hit(0)).toString(), search.stream().toList().toString()); } @Test @@ -67,7 +67,7 @@ public class PredicateSearchTest { postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(1, 0x000100ff), entry(2, 0x000100ff))); - assertEquals(Arrays.asList(new Hit(1), new Hit(2), new Hit(3)).toString(), search.stream().toList().toString()); + assertEquals(List.of(new Hit(1), new Hit(2), new Hit(3)).toString(), search.stream().toList().toString()); } @Test @@ -75,7 +75,7 @@ public class PredicateSearchTest { PredicateSearch search = createPredicateSearch( new byte[0], postingList(SubqueryBitmap.ALL_SUBQUERIES)); - assertEquals(Arrays.asList().toString(), search.stream().toList().toString()); + assertEquals(List.of().toString(), search.stream().toList().toString()); } @Test @@ -87,7 +87,7 @@ public class PredicateSearchTest { entry(1, 0x000100ff)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(2, 0x000100ff))); - assertEquals(Arrays.asList(new Hit(0), new Hit(1), new Hit(2)).toString(), search.stream().toList().toString()); + assertEquals(List.of(new Hit(0), new Hit(1), new Hit(2)).toString(), search.stream().toList().toString()); } @Test @@ -110,7 +110,7 @@ public class PredicateSearchTest { entry(1, 0x000100ff), entry(3, 0x000100ff))); assertEquals( - Arrays.asList(new Hit(0), new Hit(1), new Hit(2), new Hit(3)).toString(), + List.of(new Hit(0), new Hit(1), new Hit(2), new Hit(3)).toString(), search.stream().toList().toString()); } @@ -121,7 +121,7 @@ public class PredicateSearchTest { postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00010001), entry(1, 0x000200ff))); - assertEquals(Arrays.asList().toString(), search.stream().toList().toString()); + assertEquals(List.of().toString(), search.stream().toList().toString()); } @Test @@ -134,7 +134,7 @@ public class PredicateSearchTest { entry(0, 0x000300ff)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00020002))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); + assertEquals(List.of(new Hit(0)).toString(), search.stream().toList().toString()); } @Test @@ -143,7 +143,7 @@ public class PredicateSearchTest { new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00010001, 0x00020002, 0x00030003, 0x000100ff, 0x00040004, 0x00050005, 0x00060006))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); + assertEquals(List.of(new Hit(0)).toString(), search.stream().toList().toString()); } @Test @@ -154,7 +154,7 @@ public class PredicateSearchTest { entry(0, 0x00010001)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00010000, 0x00ff0001))); - assertEquals(Arrays.asList().toString(), search.stream().toList().toString()); + assertEquals(List.of().toString(), search.stream().toList().toString()); } @Test @@ -163,7 +163,7 @@ public class PredicateSearchTest { new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00010000, 0x00ff0001))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); + assertEquals(List.of(new Hit(0)).toString(), search.stream().toList().toString()); } @Test @@ -172,7 +172,7 @@ public class PredicateSearchTest { new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00020001, 0x00ff0001))); - assertEquals(Arrays.asList().toString(), search.stream().toList().toString()); + assertEquals(List.of().toString(), search.stream().toList().toString()); } @Test @@ -183,7 +183,7 @@ public class PredicateSearchTest { entry(0, 0x00010001)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00fe0001, 0x00ff00fe))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); + assertEquals(List.of(new Hit(0)).toString(), search.stream().toList().toString()); } @Test @@ -202,14 +202,14 @@ public class PredicateSearchTest { entry(0, 0x00010008, 0x00060006)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00020002, 0x000700ff))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); + assertEquals(List.of(new Hit(0)).toString(), search.stream().toList().toString()); } private static PredicateSearch createPredicateSearch(byte[] minFeatures, PostingList... postingLists) { byte[] nPostingListsForDocument = new byte[minFeatures.length]; short[] intervalEnds = new short[minFeatures.length]; Arrays.fill(intervalEnds, (short) 0xFF); - List<PostingList> list = Arrays.asList(postingLists); + List<PostingList> list = List.of(postingLists); for (PostingList postingList : postingLists) { for (int id : postingList.getDocIds()) { nPostingListsForDocument[id]++; diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZstarCompressedPostingListTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZstarCompressedPostingListTest.java index 408d4f43489..43fd35d8689 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZstarCompressedPostingListTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZstarCompressedPostingListTest.java @@ -3,7 +3,8 @@ package com.yahoo.search.predicate.index; import org.junit.jupiter.api.Test; -import java.util.Arrays; + +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -14,9 +15,9 @@ public class ZstarCompressedPostingListTest { @Test void requireThatPostingListCanIterate() { PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); - int ref1 = builder.insert(Arrays.asList(0x10000)); - int ref2 = builder.insert(Arrays.asList(0x10000, 0x0ffff)); - int ref3 = builder.insert(Arrays.asList(0x10000, 0x00003, 0x40003, 0x60005)); + int ref1 = builder.insert(List.of(0x10000)); + int ref2 = builder.insert(List.of(0x10000, 0x0ffff)); + int ref3 = builder.insert(List.of(0x10000, 0x00003, 0x40003, 0x60005)); ZstarCompressedPostingList postingList = new ZstarCompressedPostingList( builder.build(), new int[]{2, 4, 6}, new int[]{ref1, ref2, ref3}); assertEquals(-1, postingList.getDocId()); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexTest.java index 33265d9bb61..c0334b81c59 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexTest.java @@ -343,7 +343,7 @@ public class ConjunctionIndexTest { } private static List<ConjunctionHit> matchingConjunctionList(ConjunctionHit... conjunctionHits) { - return Arrays.asList(conjunctionHits); + return List.of(conjunctionHits); } private static void assertHitsEquals(List<ConjunctionHit> hits, IndexableFeatureConjunction... conjunctions) { @@ -356,15 +356,11 @@ public class ConjunctionIndexTest { } private static void assertHitsEquals(List<ConjunctionHit> expectedHits, List<ConjunctionHit> hits) { - Collections.sort(expectedHits); - Collections.sort(hits); - assertArrayEquals( - expectedHits.toArray(new ConjunctionHit[expectedHits.size()]), - hits.toArray(new ConjunctionHit[expectedHits.size()])); + assertEquals(expectedHits.stream().sorted().toList(), hits.stream().sorted().toList()); } private static FeatureConjunction conj(Predicate... operands) { - return new FeatureConjunction(Arrays.asList(operands)); + return new FeatureConjunction(List.of(operands)); } private static IndexableFeatureConjunction indexableConj(FeatureConjunction conjunction) { diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/optimization/FeatureConjunctionTransformerTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/optimization/FeatureConjunctionTransformerTest.java index 2e9c9a32410..c8c4b1f1911 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/optimization/FeatureConjunctionTransformerTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/optimization/FeatureConjunctionTransformerTest.java @@ -7,7 +7,8 @@ import com.yahoo.document.predicate.FeatureSet; import com.yahoo.document.predicate.Predicate; import org.junit.jupiter.api.Test; -import java.util.Arrays; + +import java.util.List; import static com.yahoo.document.predicate.Predicates.and; import static com.yahoo.document.predicate.Predicates.not; @@ -101,7 +102,7 @@ public class FeatureConjunctionTransformerTest { } private static FeatureConjunction conj(Predicate... operands) { - return new FeatureConjunction(Arrays.asList(operands)); + return new FeatureConjunction(List.of(operands)); } private static FeatureSet featureSet(int id, String... values) { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupTestCase.java index e306d27b6ee..60309db9787 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupTestCase.java @@ -10,7 +10,6 @@ import com.yahoo.vespa.objects.BufferSerializer; import com.yahoo.vespa.objects.Identifiable; import org.junit.Test; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -56,7 +55,7 @@ public class GroupTestCase { group.addOrderBy(bar, false); assertEquals(2, group.getOrderByExpressions().size()); assertSame(bar, group.getOrderByExpressions().get(1)); - assertEquals(Arrays.asList(1, -2), group.getOrderByIndexes()); + assertEquals(List.of(1, -2), group.getOrderByIndexes()); } @Test diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java index 610352ff236..838a4d738ac 100755..100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java @@ -13,7 +13,6 @@ import com.yahoo.searchlib.expression.MultiplyFunctionNode; import com.yahoo.searchlib.expression.StringResultNode; import org.junit.Test; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -725,20 +724,20 @@ public class MergeTestCase { } private static void assertMerge(Grouping request, Group lhs, Group rhs, Group expect) { - assertMerge(Arrays.asList(request.clone().setRoot(lhs.clone()), + assertMerge(List.of(request.clone().setRoot(lhs.clone()), request.clone().setRoot(rhs.clone())), expect); } private static void assertMerge(Grouping request, Group a, Group b, Group c, Group expect) { - assertMerge(Arrays.asList(request.clone().setRoot(a.clone()), + assertMerge(List.of(request.clone().setRoot(a.clone()), request.clone().setRoot(b.clone()), request.clone().setRoot(c.clone())), expect); } private static void assertMerge(Grouping lhs, Grouping rhs, Group expect) { - assertMerge(Arrays.asList(lhs, rhs), expect); + assertMerge(List.of(lhs, rhs), expect); } private static void assertMerge(List<Grouping> groupingList, Group expect) { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/NormalSketchTest.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/NormalSketchTest.java index d5269611b53..8e54c4598a0 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/NormalSketchTest.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/NormalSketchTest.java @@ -4,7 +4,6 @@ package com.yahoo.searchlib.aggregation.hll; import com.yahoo.vespa.objects.BufferSerializer; import org.junit.Test; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -98,7 +97,7 @@ public class NormalSketchTest { NormalSketch sketch = new NormalSketch(10); // Aggregate multiple values - sketch.aggregate(Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)); + sketch.aggregate(List.of(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)); for (int i = 0; i < 10; i++) { assertBucketEquals(sketch, i, 23); } diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/SketchUtils.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/SketchUtils.java index 9bec86c928b..5bf5294a828 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/SketchUtils.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/SketchUtils.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation.hll; -import java.util.Arrays; +import java.util.List; import static org.junit.Assert.assertEquals; @@ -16,13 +16,13 @@ public class SketchUtils { public static SparseSketch createSparseSketch(Integer... values) { SparseSketch sketch = new SparseSketch(); - sketch.aggregate(Arrays.asList(values)); + sketch.aggregate(List.of(values)); return sketch; } public static NormalSketch createNormalSketch(Integer... values) { NormalSketch sketch = new NormalSketch(); - sketch.aggregate(Arrays.asList(values)); + sketch.aggregate(List.of(values)); return sketch; } diff --git a/searchlib/src/test/java/com/yahoo/searchlib/expression/IntegerResultNodeTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/expression/IntegerResultNodeTestCase.java index c765714a4ab..45d809dcd8a 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/expression/IntegerResultNodeTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/expression/IntegerResultNodeTestCase.java @@ -4,7 +4,6 @@ package com.yahoo.searchlib.expression; import org.junit.Test; import java.lang.reflect.InvocationTargetException; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertArrayEquals; @@ -18,7 +17,7 @@ import static org.junit.Assert.assertTrue; public class IntegerResultNodeTestCase extends ResultNodeTest { List<NumericResultNode> getResultNodes(long startvalue) { - return Arrays.asList(new Int8ResultNode((byte)startvalue), + return List.of(new Int8ResultNode((byte)startvalue), new Int16ResultNode((short)startvalue), new Int32ResultNode((int)startvalue), new IntegerResultNode(startvalue)); diff --git a/searchlib/src/test/java/com/yahoo/searchlib/expression/ObjectVisitorTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/expression/ObjectVisitorTestCase.java index 3c224d06cc3..1346577569b 100755..100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/expression/ObjectVisitorTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/expression/ObjectVisitorTestCase.java @@ -4,6 +4,7 @@ package com.yahoo.searchlib.expression; import com.yahoo.vespa.objects.ObjectDumper; import org.junit.Test; + import java.util.Arrays; import static org.junit.Assert.assertEquals; @@ -18,38 +19,46 @@ public class ObjectVisitorTestCase { assertDump("test: <NULL>\n", null); assertDump("test: 1\n", 1); assertDump("test: 'foo'\n", "foo"); - assertDump("test: List {\n" + - " [0]: 'foo'\n" + - " [1]: 69\n" + - " [2]: <NULL>\n" + - "}\n", + assertDump(""" + test: List { + [0]: 'foo' + [1]: 69 + [2]: <NULL> + } + """, Arrays.asList("foo", 69, null)); - assertDump("test: String[] {\n" + - " [0]: 'foo'\n" + - " [1]: 'bar'\n" + - " [2]: 'baz'\n" + - "}\n", + assertDump(""" + test: String[] { + [0]: 'foo' + [1]: 'bar' + [2]: 'baz' + } + """, new String[] { "foo", "bar", "baz" }); - assertDump("test: IntegerResultNode {\n" + - " classId: 16491\n" + - " value: 5\n" + - "}\n", + assertDump(""" + test: IntegerResultNode { + classId: 16491 + value: 5 + } + """, new IntegerResultNode(5)); - assertDump("test: FixedWidthBucketFunctionNode {\n" + - " classId: 16461\n" + - " result: <NULL>\n" + - " args: List {\n" + - " [0]: AttributeNode {\n" + - " classId: 16439\n" + - " result: <NULL>\n" + - " attribute: 'foo'\n" + - " }\n" + - " }\n" + - " width: IntegerResultNode {\n" + - " classId: 16491\n" + - " value: 5\n" + - " }\n" + - "}\n", + assertDump(""" + test: FixedWidthBucketFunctionNode { + classId: 16461 + result: <NULL> + args: List { + [0]: AttributeNode { + classId: 16439 + result: <NULL> + attribute: 'foo' + } + } + width: IntegerResultNode { + classId: 16491 + value: 5 + } + } + """, new FixedWidthBucketFunctionNode(new IntegerResultNode(5), new AttributeNode("foo"))); } diff --git a/searchlib/src/test/java/com/yahoo/searchlib/expression/TimeStampFunctionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/expression/TimeStampFunctionTestCase.java index 69cea09df81..188603749e2 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/expression/TimeStampFunctionTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/expression/TimeStampFunctionTestCase.java @@ -3,7 +3,7 @@ package com.yahoo.searchlib.expression; import org.junit.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; @@ -17,7 +17,7 @@ public class TimeStampFunctionTestCase { public void requireThatAccessorsWork() { ExpressionNode arg = new AttributeNode("foo"); for (TimeStampFunctionNode.TimePart part : TimeStampFunctionNode.TimePart.values()) { - for (Boolean gmt : Arrays.asList(true, false)) { + for (Boolean gmt : List.of(true, false)) { TimeStampFunctionNode node = new TimeStampFunctionNode(arg, part, gmt); assertSame(arg, node.getArg()); assertEquals(part, node.getTimePart()); diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/FeatureListTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/FeatureListTestCase.java index 8de36ee1ec1..0af105885ec 100755..100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/FeatureListTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/FeatureListTestCase.java @@ -8,7 +8,6 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.Reader; import java.io.StringReader; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -22,37 +21,37 @@ public class FeatureListTestCase { @Test public void requireThatFeatureListFromStringWorks() throws ParseException { assertFromString("attribute(foo).out", - Arrays.asList("attribute(foo).out")); + List.of("attribute(foo).out")); assertFromString("attribute(foo).out attribute ( bar ) . out", - Arrays.asList("attribute(foo).out", "attribute(bar).out")); + List.of("attribute(foo).out", "attribute(bar).out")); assertFromString("foo\n bar\n \t \t \n baz \n", - Arrays.asList("foo", "bar", "baz")); + List.of("foo", "bar", "baz")); assertFromString("attribute attribute(foo) attribute(foo).out attribute(bar).out.out", - Arrays.asList("attribute", "attribute(foo)", "attribute(foo).out", "attribute(bar).out.out")); + List.of("attribute", "attribute(foo)", "attribute(foo).out", "attribute(bar).out.out")); } @Test public void requireThatFeatureListFromReaderWorks() throws ParseException { assertFromReader(new StringReader("attribute(foo).out"), - Arrays.asList("attribute(foo).out")); + List.of("attribute(foo).out")); assertFromReader(new StringReader("attribute(foo).out attribute ( bar ) . out"), - Arrays.asList("attribute(foo).out", "attribute(bar).out")); + List.of("attribute(foo).out", "attribute(bar).out")); assertFromReader(new StringReader("foo\n bar\n \t \t \n baz \n"), - Arrays.asList("foo", "bar", "baz")); + List.of("foo", "bar", "baz")); assertFromReader(new StringReader("attribute attribute(foo) attribute(foo).out attribute(bar).out.out"), - Arrays.asList("attribute", "attribute(foo)", "attribute(foo).out", "attribute(bar).out.out")); + List.of("attribute", "attribute(foo)", "attribute(foo).out", "attribute(bar).out.out")); } @Test public void requireThatFeatureListFromFileWorks() throws ParseException, FileNotFoundException { assertFromFile(new File("src/test/files/features01.expression"), - Arrays.asList("attribute(foo).out")); + List.of("attribute(foo).out")); assertFromFile(new File("src/test/files/features02.expression"), - Arrays.asList("attribute(foo).out", "attribute(bar).out")); + List.of("attribute(foo).out", "attribute(bar).out")); assertFromFile(new File("src/test/files/features03.expression"), - Arrays.asList("foo", "bar", "baz")); + List.of("foo", "bar", "baz")); assertFromFile(new File("src/test/files/features04.expression"), - Arrays.asList("attribute", "attribute(foo)", "attribute(foo).out", "attribute(bar).out.out")); + List.of("attribute", "attribute(foo)", "attribute(foo).out", "attribute(bar).out.out")); } public void assertFromString(String input, List<String> expected) throws ParseException { diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java index 8d60f893c7c..13714af8324 100755..100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java @@ -23,7 +23,6 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Optional; @@ -121,28 +120,28 @@ public class RankingExpressionTestCase { @Test public void testSerialization() throws ParseException { List<ExpressionFunction> functions = new ArrayList<>(); - functions.add(new ExpressionFunction("foo", Arrays.asList("arg1", "arg2"), new RankingExpression("min(arg1, pow(arg2, 2))"))); - functions.add(new ExpressionFunction("bar", Arrays.asList("arg1", "arg2"), new RankingExpression("arg1 * arg1 + 2 * arg1 * arg2 + arg2 * arg2"))); - functions.add(new ExpressionFunction("baz", Arrays.asList("arg1", "arg2"), new RankingExpression("foo(1, 2) / bar(arg1, arg2)"))); + functions.add(new ExpressionFunction("foo", List.of("arg1", "arg2"), new RankingExpression("min(arg1, pow(arg2, 2))"))); + functions.add(new ExpressionFunction("bar", List.of("arg1", "arg2"), new RankingExpression("arg1 * arg1 + 2 * arg1 * arg2 + arg2 * arg2"))); + functions.add(new ExpressionFunction("baz", List.of("arg1", "arg2"), new RankingExpression("foo(1, 2) / bar(arg1, arg2)"))); functions.add(new ExpressionFunction("cox", null, new RankingExpression("10 + 08 * 1977"))); - assertSerialization(Arrays.asList( + assertSerialization(List.of( "rankingExpression(foo@e2dc17a89864aed0.12232eb692c6c502) + rankingExpression(foo@af74e3fd9070bd18.a368ed0a5ba3a5d0) * rankingExpression(foo@dbab346efdad5362.e5c39e42ebd91c30)", "min(5,pow(rankingExpression(foo@d1d1417259cdc651.573bbcd4be18f379),2))", "min(6,pow(7,2))", "min(1,pow(2,2))", "min(3,pow(4,2))", "min(rankingExpression(foo@84951be88255b0ec.d0303e061b36fab8),pow(8,2))"), "foo(1,2) + foo(3,4) * foo(5, foo(foo(6, 7), 8))", functions); - assertSerialization(Arrays.asList( + assertSerialization(List.of( "rankingExpression(foo@e2dc17a89864aed0.12232eb692c6c502) + rankingExpression(bar@af74e3fd9070bd18.a368ed0a5ba3a5d0)", "min(1,pow(2,2))", "3 * 3 + 2 * 3 * 4 + 4 * 4"), "foo(1, 2) + bar(3, 4)", functions); - assertSerialization(Arrays.asList( + assertSerialization(List.of( "rankingExpression(baz@e2dc17a89864aed0.12232eb692c6c502)", "min(1,pow(2,2))", "rankingExpression(foo@e2dc17a89864aed0.12232eb692c6c502) / rankingExpression(bar@e2dc17a89864aed0.12232eb692c6c502)", "1 * 1 + 2 * 1 * 2 + 2 * 2"), "baz(1, 2)", functions); - assertSerialization(Arrays.asList( + assertSerialization(List.of( "rankingExpression(cox)", "10 + 8 * 1977"), "cox", functions ); @@ -237,8 +236,8 @@ public class RankingExpressionTestCase { String expRhs = "(rankingExpression(log10tweetage) * rankingExpression(log10tweetage) * " + "rankingExpression(log10tweetage)) + 5.0 * attribute(ythl)"; - assertSerialization(Arrays.asList(expLhs + " + " + expRhs, "69"), lhs + " + " + rhs, functions); - assertSerialization(Arrays.asList(expLhs + " - " + expRhs, "69"), lhs + " - " + rhs, functions); + assertSerialization(List.of(expLhs + " + " + expRhs, "69"), lhs + " + " + rhs, functions); + assertSerialization(List.of(expLhs + " - " + expRhs, "69"), lhs + " - " + rhs, functions); } @Test diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ArgumentsTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ArgumentsTestCase.java index df91c78c1b4..af6e4f1b9a9 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ArgumentsTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ArgumentsTestCase.java @@ -3,8 +3,8 @@ package com.yahoo.searchlib.rankingexpression.rule; import org.junit.Test; -import java.util.Arrays; import java.util.Collections; +import java.util.List; import static org.junit.Assert.*; @@ -23,7 +23,7 @@ public class ArgumentsTestCase { var foo = new ReferenceNode("foo"); var bar = new ReferenceNode("bar"); - args = new Arguments(Arrays.asList(foo, bar)); + args = new Arguments(List.of(foo, bar)); assertEquals(2, args.expressions().size()); assertSame(foo, args.expressions().get(0)); assertSame(bar, args.expressions().get(1)); @@ -31,12 +31,12 @@ public class ArgumentsTestCase { @Test public void requireThatHashCodeAndEqualsWork() { - Arguments arg1 = new Arguments(Arrays.asList(new ReferenceNode("foo"), new ReferenceNode("bar"))); - Arguments arg2 = new Arguments(Arrays.asList(new ReferenceNode("foo"), new ReferenceNode("bar"))); - Arguments arg3 = new Arguments(Arrays.asList(new ReferenceNode("foo"))); + Arguments arg1 = new Arguments(List.of(new ReferenceNode("foo"), new ReferenceNode("bar"))); + Arguments arg2 = new Arguments(List.of(new ReferenceNode("foo"), new ReferenceNode("bar"))); + Arguments arg3 = new Arguments(List.of(new ReferenceNode("foo"))); assertEquals(arg1.hashCode(), arg2.hashCode()); - assertTrue(arg1.equals(arg2)); - assertFalse(arg2.equals(arg3)); + assertEquals(arg1, arg2); + assertNotEquals(arg2, arg3); } } diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNodeTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNodeTestCase.java index 7d0e0d6da84..10a37ff28df 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNodeTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/rule/ReferenceNodeTestCase.java @@ -3,7 +3,6 @@ package com.yahoo.searchlib.rankingexpression.rule; import org.junit.Test; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -15,7 +14,7 @@ public class ReferenceNodeTestCase { @Test public void requireThatAccessorsWork() { - ReferenceNode node = new ReferenceNode("foo", Arrays.asList(new ReferenceNode("bar"), new ReferenceNode("baz")), "cox"); + ReferenceNode node = new ReferenceNode("foo", List.of(new ReferenceNode("bar"), new ReferenceNode("baz")), "cox"); assertEquals("foo", node.getName()); List<ExpressionNode> args = node.getArguments().expressions(); assertEquals(2, args.size()); @@ -23,10 +22,10 @@ public class ReferenceNodeTestCase { assertEquals(new ReferenceNode("baz"), args.get(1)); assertEquals("cox", node.getOutput()); - node = node.setArguments(Arrays.<ExpressionNode>asList(new ReferenceNode("bar@"))); + node = node.setArguments(List.of(new ReferenceNode("bar@"))); assertEquals(new ReferenceNode("bar@"), node.getArguments().expressions().get(0)); - node = node.setArguments(Arrays.<ExpressionNode>asList(new ReferenceNode("baz$"))); + node = node.setArguments(List.of(new ReferenceNode("baz$"))); assertEquals(new ReferenceNode("baz$"), node.getArguments().expressions().get(0)); node = node.setOutput("cox'"); diff --git a/security-utils/src/main/java/com/yahoo/security/AutoReloadingX509KeyManager.java b/security-utils/src/main/java/com/yahoo/security/AutoReloadingX509KeyManager.java index be1940441d4..c98e0791f2d 100644 --- a/security-utils/src/main/java/com/yahoo/security/AutoReloadingX509KeyManager.java +++ b/security-utils/src/main/java/com/yahoo/security/AutoReloadingX509KeyManager.java @@ -6,7 +6,6 @@ import javax.net.ssl.X509ExtendedKeyManager; import java.io.IOException; import java.io.UncheckedIOException; import java.net.Socket; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.security.KeyStore; @@ -14,7 +13,7 @@ import java.security.Principal; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.time.Duration; -import java.util.Arrays; +import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -60,7 +59,7 @@ public class AutoReloadingX509KeyManager extends X509ExtendedKeyManager implemen X509ExtendedKeyManager manager = mutableX509KeyManager.currentManager(); X509Certificate[] certificateChain = manager.getCertificateChain(CERTIFICATE_ALIAS); PrivateKey privateKey = manager.getPrivateKey(CERTIFICATE_ALIAS); - return new X509CertificateWithKey(Arrays.asList(certificateChain), privateKey); + return new X509CertificateWithKey(List.of(certificateChain), privateKey); } private static KeyStore createKeystore(Path privateKey, Path certificateChain) { @@ -68,8 +67,8 @@ public class AutoReloadingX509KeyManager extends X509ExtendedKeyManager implemen return KeyStoreBuilder.withType(KeyStoreType.PKCS12) .withKeyEntry( CERTIFICATE_ALIAS, - KeyUtils.fromPemEncodedPrivateKey(new String(Files.readAllBytes(privateKey), StandardCharsets.UTF_8)), - X509CertificateUtils.certificateListFromPem(new String(Files.readAllBytes(certificateChain), StandardCharsets.UTF_8))) + KeyUtils.fromPemEncodedPrivateKey(Files.readString(privateKey)), + X509CertificateUtils.certificateListFromPem(Files.readString(certificateChain))) .build(); } catch (IOException e) { throw new UncheckedIOException(e); diff --git a/security-utils/src/main/java/com/yahoo/security/KeyManagerUtils.java b/security-utils/src/main/java/com/yahoo/security/KeyManagerUtils.java index ab584dbb48e..f25118029da 100644 --- a/security-utils/src/main/java/com/yahoo/security/KeyManagerUtils.java +++ b/security-utils/src/main/java/com/yahoo/security/KeyManagerUtils.java @@ -27,7 +27,7 @@ public class KeyManagerUtils { .filter(manager -> manager instanceof X509ExtendedKeyManager) .map(X509ExtendedKeyManager.class::cast) .findFirst() - .orElseThrow(() -> new RuntimeException("No X509ExtendedKeyManager in " + Arrays.asList(keyManagers))); + .orElseThrow(() -> new RuntimeException("No X509ExtendedKeyManager in " + List.of(keyManagers))); } catch (GeneralSecurityException e) { throw new RuntimeException(e); } diff --git a/security-utils/src/main/java/com/yahoo/security/TrustManagerUtils.java b/security-utils/src/main/java/com/yahoo/security/TrustManagerUtils.java index 0b06584afb7..2d3adffea87 100644 --- a/security-utils/src/main/java/com/yahoo/security/TrustManagerUtils.java +++ b/security-utils/src/main/java/com/yahoo/security/TrustManagerUtils.java @@ -1,9 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.security; -import com.yahoo.security.KeyStoreBuilder; -import com.yahoo.security.KeyStoreType; - import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509ExtendedTrustManager; @@ -29,7 +26,7 @@ public class TrustManagerUtils { .filter(manager -> manager instanceof X509ExtendedTrustManager) .map(X509ExtendedTrustManager.class::cast) .findFirst() - .orElseThrow(() -> new RuntimeException("No X509ExtendedTrustManager in " + Arrays.asList(trustManagers))); + .orElseThrow(() -> new RuntimeException("No X509ExtendedTrustManager in " + List.of(trustManagers))); } catch (GeneralSecurityException e) { throw new RuntimeException(e); } diff --git a/security-utils/src/main/java/com/yahoo/security/tls/DefaultTlsContext.java b/security-utils/src/main/java/com/yahoo/security/tls/DefaultTlsContext.java index 4e810c2d304..c2092d0c22b 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/DefaultTlsContext.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/DefaultTlsContext.java @@ -64,7 +64,7 @@ public class DefaultTlsContext implements TlsContext { String.format("None of the accepted ciphers are supported (supported=%s, accepted=%s)", supportedCiphers, acceptedCiphers)); } - log.log(Level.FINE, () -> String.format("Allowed cipher suites that are supported: %s", Arrays.asList(allowedCiphers))); + log.log(Level.FINE, () -> String.format("Allowed cipher suites that are supported: %s", List.of(allowedCiphers))); return allowedCiphers; } diff --git a/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrTest.java b/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrTest.java index 04282ceaac7..b78fa16ae56 100644 --- a/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrTest.java +++ b/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrTest.java @@ -5,7 +5,6 @@ import org.junit.jupiter.api.Test; import javax.security.auth.x500.X500Principal; import java.security.KeyPair; -import java.util.Arrays; import java.util.List; import static com.yahoo.security.SubjectAlternativeName.Type.DNS; @@ -27,7 +26,7 @@ public class Pkcs10CsrTest { .addSubjectAlternativeName(san1) .addSubjectAlternativeName(san2) .build(); - assertEquals(Arrays.asList(san1, san2), csr.getSubjectAlternativeNames()); + assertEquals(List.of(san1, san2), csr.getSubjectAlternativeNames()); } @Test @@ -49,7 +48,7 @@ public class Pkcs10CsrTest { .addSubjectAlternativeName("san") .setBasicConstraints(true, true) .build(); - List<String> expected = Arrays.asList(Extension.BASIC_CONSTRAINTS.getOId(), Extension.SUBJECT_ALTERNATIVE_NAMES.getOId()); + List<String> expected = List.of(Extension.BASIC_CONSTRAINTS.getOId(), Extension.SUBJECT_ALTERNATIVE_NAMES.getOId()); List<String> actual = csr.getExtensionOIds(); assertEquals(expected, actual); } diff --git a/security-utils/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java b/security-utils/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java index d91c9fc23f2..5d5cc7b7fa5 100644 --- a/security-utils/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java +++ b/security-utils/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java @@ -10,8 +10,8 @@ import java.security.KeyPair; import java.security.cert.X509Certificate; import java.time.Instant; import java.time.temporal.ChronoUnit; -import java.util.Arrays; import java.util.Collection; +import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class X509CertificateBuilderTest { public static Collection<Object[]> data() { - return Arrays.asList(new Object[][]{ + return List.of(new Object[][]{ {KeyAlgorithm.RSA, 2048, SignatureAlgorithm.SHA512_WITH_RSA}, {KeyAlgorithm.EC, 256, SignatureAlgorithm.SHA512_WITH_ECDSA}}); } diff --git a/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java b/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java index 6ac71a264b3..e67dce9fd8f 100644 --- a/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java +++ b/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java @@ -9,7 +9,6 @@ import java.security.KeyPair; import java.security.cert.X509Certificate; import java.time.Instant; import java.time.temporal.ChronoUnit; -import java.util.Arrays; import java.util.List; import static com.yahoo.security.SubjectAlternativeName.Type.DNS; @@ -42,7 +41,7 @@ public class X509CertificateUtilsTest { X509Certificate cert1 = TestUtils.createCertificate(keypair, subject1); X500Principal subject2 = new X500Principal("CN=myservice2"); X509Certificate cert2 = TestUtils.createCertificate(keypair, subject2); - List<X509Certificate> certificateList = Arrays.asList(cert1, cert2); + List<X509Certificate> certificateList = List.of(cert1, cert2); String pem = X509CertificateUtils.toPem(certificateList); List<X509Certificate> deserializedCertificateList = X509CertificateUtils.certificateListFromPem(pem); assertEquals(2, certificateList.size()); diff --git a/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java b/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java index cde1a346fc9..e7254c12985 100644 --- a/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java +++ b/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializerTest.java @@ -14,7 +14,6 @@ import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; import java.util.Optional; @@ -43,8 +42,8 @@ public class TransportSecurityOptionsJsonSerializerTest { .withHostnameValidationDisabled(false) .withAuthorizedPeers( new AuthorizedPeers( - new LinkedHashSet<>(Arrays.asList( - new PeerPolicy("cfgserver", "cfgserver policy description", Arrays.asList( + new LinkedHashSet<>(List.of( + new PeerPolicy("cfgserver", "cfgserver policy description", List.of( RequiredPeerCredential.of(CN, "mycfgserver"), RequiredPeerCredential.of(SAN_DNS, "*.suffix.com"), RequiredPeerCredential.of(SAN_URI, "myscheme://resource/path/"))), @@ -67,7 +66,7 @@ public class TransportSecurityOptionsJsonSerializerTest { TransportSecurityOptions options = new TransportSecurityOptions.Builder() .withCertificates(Paths.get("certs.pem"), Paths.get("myhost.key")) .withCaCertificates(Paths.get("my_cas.pem")) - .withAcceptedCiphers(Arrays.asList("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_AES_256_GCM_SHA384")) + .withAcceptedCiphers(List.of("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_AES_256_GCM_SHA384")) .withAcceptedProtocols(List.of("TLSv1.2")) .withHostnameValidationDisabled(true) .build(); diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java index 5bafc7ac4bd..7d89b86c07b 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java @@ -9,7 +9,6 @@ import com.yahoo.vespa.applicationmodel.ServiceCluster; import com.yahoo.vespa.applicationmodel.ServiceInstance; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -74,7 +73,7 @@ public class ServiceModel { ApplicationInstance previous = applicationInstances.put(instance.hostName(), application); if (previous != null && !previous.equals(application)) { throw new IllegalStateException("Major assumption broken: Multiple application instances contain host " + - instance.hostName().s() + ": " + Arrays.asList(previous, application)); + instance.hostName().s() + ": " + List.of(previous, application)); } serviceInstances diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java index a5b8054536b..00c15add762 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java @@ -66,7 +66,7 @@ public class DuperModelTest { duperModel.add(application1); assertEquals(Optional.of(application1), duperModel.getApplicationInfo(id1)); - assertEquals(Arrays.asList(application1), duperModel.getApplicationInfos()); + assertEquals(List.of(application1), duperModel.getApplicationInfos()); assertEquals(1, duperModel.numberOfApplications()); duperModel.registerListener(listener1); @@ -86,7 +86,7 @@ public class DuperModelTest { assertEquals(Optional.empty(), duperModel.getApplicationInfo(id1)); verify(listener1, times(1)).applicationRemoved(id1); verifyNoMoreInteractions(listener1); - assertEquals(Arrays.asList(application2), duperModel.getApplicationInfos()); + assertEquals(List.of(application2), duperModel.getApplicationInfos()); duperModel.remove(id1); verifyNoMoreInteractions(listener1); diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java index bef87a627f5..9c0c94cef27 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java @@ -12,7 +12,6 @@ import com.yahoo.config.provision.InstanceName; import com.yahoo.vespa.service.slobrok.SlobrokMonitor; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -151,7 +150,7 @@ public class ExampleModel { * A bit unrealistic, but the port is the same on all hosts. */ ClusterBuilder addPort(int port, String... tags) { - portInfos.add(new PortInfo(port, Arrays.asList(tags))); + portInfos.add(new PortInfo(port, List.of(tags))); return this; } diff --git a/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java b/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java index 72f32ac04b8..9cd48ac85a8 100644 --- a/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java +++ b/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java @@ -6,7 +6,6 @@ import org.junit.Test; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import static com.yahoo.container.standalone.CloudConfigInstallVariables.toConfigModelsPluginDir; import static com.yahoo.container.standalone.CloudConfigInstallVariables.toConfigServer; @@ -39,7 +38,7 @@ public class CloudConfigInstallVariablesTest { assertEquals(2, parsed.length); List<String> hostNames = Arrays.stream(parsed).map(cs -> cs.hostName).toList(); - assertTrue(hostNames.containsAll(Arrays.asList("test1", "test2"))); + assertTrue(hostNames.containsAll(List.of("test1", "test2"))); } @Test(expected = IllegalArgumentException.class) diff --git a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainer.java b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainer.java index 8d207388b42..00430e04858 100644 --- a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainer.java +++ b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainer.java @@ -11,7 +11,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Arrays; import java.util.List; /** @@ -51,7 +50,7 @@ public class StandaloneContainer { private static void writeServicesXml(Path applicationPath, String servicesXml) throws IOException { Path path = applicationPath.resolve("services.xml"); - List<String> output = Arrays.asList("<?xml version=\"1.0\" encoding=\"utf-8\"?>", servicesXml); + List<String> output = List.of("<?xml version=\"1.0\" encoding=\"utf-8\"?>", servicesXml); Files.write(path, output, StandardCharsets.UTF_8); } } diff --git a/testutil/src/main/java/com/yahoo/test/OrderTester.java b/testutil/src/main/java/com/yahoo/test/OrderTester.java index 391eb5c4ebd..6f83cd723b8 100644 --- a/testutil/src/main/java/com/yahoo/test/OrderTester.java +++ b/testutil/src/main/java/com/yahoo/test/OrderTester.java @@ -2,7 +2,6 @@ package com.yahoo.test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -25,7 +24,7 @@ public abstract class OrderTester<T extends Comparable<? super T>> { @SafeVarargs @SuppressWarnings("varargs") private OrderTester<T> addGroup(T... group) { - groups.add(Arrays.asList(group)); + groups.add(List.of(group)); return this; } diff --git a/testutil/src/test/java/com/yahoo/test/MatchersTestCase.java b/testutil/src/test/java/com/yahoo/test/MatchersTestCase.java index 839856db7f2..c36818e4f7f 100644 --- a/testutil/src/test/java/com/yahoo/test/MatchersTestCase.java +++ b/testutil/src/test/java/com/yahoo/test/MatchersTestCase.java @@ -1,13 +1,14 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.test; -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.hamcrest.Matcher; import org.junit.Test; +import java.util.List; + /** * Tests for com.yahoo.test.Matchers. * @@ -18,16 +19,9 @@ public class MatchersTestCase { @Test public final void testHasItemWithMethodObjectString() { @SuppressWarnings("rawtypes") - final Matcher<Iterable> m = Matchers.hasItemWithMethod("nalle", - "toLowerCase"); - assertEquals( - false, - m.matches(Arrays.asList(new Object[] { Integer.valueOf(1), - Character.valueOf('c'), "blbl" }))); - assertEquals( - true, - m.matches(Arrays.asList(new Object[] { Character.valueOf('c'), - "NALLE" }))); + final Matcher<Iterable> m = Matchers.hasItemWithMethod("nalle", "toLowerCase"); + assertFalse(m.matches(List.of(new Object[]{1, 'c', "blbl"}))); + assertTrue(m.matches(List.of(new Object[]{'c', "NALLE"}))); } } diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentSignerTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentSignerTest.java index 46d8976b1ce..2532a394f4e 100644 --- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentSignerTest.java +++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentSignerTest.java @@ -18,8 +18,8 @@ import org.junit.jupiter.api.Test; import java.net.URI; import java.security.KeyPair; import java.time.Instant; -import java.util.Arrays; import java.util.HashSet; +import java.util.List; import static com.yahoo.vespa.athenz.identityprovider.api.IdentityType.TENANT; import static com.yahoo.vespa.athenz.identityprovider.api.SignedIdentityDocument.DEFAULT_DOCUMENT_VERSION; @@ -41,7 +41,7 @@ public class IdentityDocumentSignerTest { private static final String configserverHostname = "configserverhostname"; private static final String instanceHostname = "instancehostname"; private static final Instant createdAt = Instant.EPOCH; - private static final HashSet<String> ipAddresses = new HashSet<>(Arrays.asList("1.2.3.4", "::1")); + private static final HashSet<String> ipAddresses = new HashSet<>(List.of("1.2.3.4", "::1")); private static final ClusterType clusterType = ClusterType.CONTAINER; private static final URI ztsUrl = URI.create("https://foo"); private static final AthenzIdentity serviceIdentity = new AthenzService("vespa", "node"); diff --git a/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java b/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java index 5cd1d3bf9b6..027682e1052 100644 --- a/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java +++ b/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java @@ -598,7 +598,7 @@ public class DocumentGenMojo extends AbstractMojo { private static void exportFieldSetDefinition(Set<FieldSet> fieldSets, Writer out, int ind) throws IOException { out.write(ind(ind) + "java.util.Map<java.lang.String, java.util.Collection<java.lang.String>> fieldSets = new java.util.HashMap<>();\n"); for (FieldSet fieldSet : fieldSets) { - out.write(ind(ind) + "fieldSets.put(\"" + fieldSet.getName() + "\", java.util.Arrays.asList("); + out.write(ind(ind) + "fieldSets.put(\"" + fieldSet.getName() + "\", java.util.List.of("); int count = 0; for (String field : fieldSet.getFieldNames()) { out.write("\"" + field + "\""); diff --git a/vespa-feed-client-api/src/test/java/ai/vespa/feed/client/FeedClientTest.java b/vespa-feed-client-api/src/test/java/ai/vespa/feed/client/FeedClientTest.java index 4b8e91a35a6..d64df85aea3 100644 --- a/vespa-feed-client-api/src/test/java/ai/vespa/feed/client/FeedClientTest.java +++ b/vespa-feed-client-api/src/test/java/ai/vespa/feed/client/FeedClientTest.java @@ -5,7 +5,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.HashSet; import java.util.List; import java.util.Optional; @@ -89,9 +88,9 @@ class FeedClientTest { CompletableFuture<Result> f3 = CompletableFuture.completedFuture(new MyResult()); MultiFeedException multiException = assertThrows(MultiFeedException.class, () -> FeedClient.await(f1, f2, f3)); - Set<DocumentId> expectedDocsIds = new HashSet<>(Arrays.asList(docId1, docId2)); + Set<DocumentId> expectedDocsIds = new HashSet<>(List.of(docId1, docId2)); assertEquals(expectedDocsIds, new HashSet<>(multiException.documentIds())); - Set<FeedException> expectedExceptions = new HashSet<>(Arrays.asList(exceptionDoc1, exceptionDoc2)); + Set<FeedException> expectedExceptions = new HashSet<>(List.of(exceptionDoc1, exceptionDoc2)); assertEquals(expectedExceptions, new HashSet<>(multiException.feedExceptions())); assertEquals("2 feed operations failed", multiException.getMessage()); } diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java index 36f708e6535..1b0ad7a6b81 100644 --- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java +++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java @@ -28,7 +28,6 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.security.spec.PKCS8EncodedKeySpec; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Optional; @@ -81,7 +80,7 @@ class SslContextBuilder { keystore.setKeyEntry("cert", privateKey, new char[0], certificate.toArray(new Certificate[0])); } if (hasCaCertificateFile()) { - addCaCertificates(keystore, Arrays.asList(certificates(caCertificatesFile))); + addCaCertificates(keystore, List.of(certificates(caCertificatesFile))); } else if (hasCaCertificateInstance()) { addCaCertificates(keystore, caCertificates); } diff --git a/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/PomXmlGeneratorTest.java b/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/PomXmlGeneratorTest.java index 56eb741e302..f3aa10dd1fa 100644 --- a/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/PomXmlGeneratorTest.java +++ b/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/PomXmlGeneratorTest.java @@ -6,7 +6,6 @@ import org.junit.Test; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -18,7 +17,7 @@ public class PomXmlGeneratorTest { @Test public void write_system_tests_pom_xml() throws IOException { - List<Path> artifacts = Arrays.asList( + List<Path> artifacts = List.of( Paths.get("components/my-comp.jar"), Paths.get("main.jar")); diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/VersionsTestCase.java b/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/VersionsTestCase.java index f6e50ff1547..b877f9738ce 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/VersionsTestCase.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/VersionsTestCase.java @@ -6,7 +6,6 @@ import com.yahoo.container.jdisc.HttpResponse; import org.junit.Test; import java.io.ByteArrayOutputStream; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; @@ -20,15 +19,15 @@ import static org.junit.Assert.assertTrue; public class VersionsTestCase { private static final List<String> EMPTY = List.of(); - private static final List<String> ONE_TWO = Arrays.asList("1", "2"); - private static final List<String> ONE_THREE = Arrays.asList("1", "3"); - private static final List<String> TWO_THREE = Arrays.asList("3", "2"); - private static final List<String> ONE_NULL_THREE = Arrays.asList("1", null, "3"); + private static final List<String> ONE_TWO = List.of("1", "2"); + private static final List<String> ONE_THREE = List.of("1", "3"); + private static final List<String> TWO_THREE = List.of("3", "2"); + private static final List<String> ONE_NULL_THREE = List.of("1", null, "3"); private static final List<String> ONE_COMMA_THREE = List.of("1, 3"); - private static final List<String> ONE_EMPTY_THREE = Arrays.asList("1", "", "3"); + private static final List<String> ONE_EMPTY_THREE = List.of("1", "", "3"); private static final List<String> TOO_LARGE_NUMBER = List.of("1000000000"); - private static final List<String> THREE_TOO_LARGE_NUMBER = Arrays.asList("3", "1000000000"); - private static final List<String> THREE_COMMA_TOO_LARGE_NUMBER = Arrays.asList("3,1000000000"); + private static final List<String> THREE_TOO_LARGE_NUMBER = List.of("3", "1000000000"); + private static final List<String> THREE_COMMA_TOO_LARGE_NUMBER = List.of("3,1000000000"); private static final List<String> GARBAGE = List.of("garbage"); @Test diff --git a/vespaclient-java/src/main/java/com/yahoo/dummyreceiver/DummyReceiver.java b/vespaclient-java/src/main/java/com/yahoo/dummyreceiver/DummyReceiver.java index 8d8904f042f..9a7d8279b1b 100755..100644 --- a/vespaclient-java/src/main/java/com/yahoo/dummyreceiver/DummyReceiver.java +++ b/vespaclient-java/src/main/java/com/yahoo/dummyreceiver/DummyReceiver.java @@ -18,7 +18,6 @@ import com.yahoo.messagebus.Reply; import com.yahoo.messagebus.network.Identity; import com.yahoo.messagebus.network.rpc.RPCNetworkParams; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.concurrent.BlockingQueue; @@ -174,7 +173,7 @@ public class DummyReceiver implements MessageHandler { LogSetup.initVespaLogging("dummyreceiver"); DummyReceiver rcv = new DummyReceiver(); - if (!rcv.parseArgs(new LinkedList<>(Arrays.asList(args))) && !rcv.helpOption) { + if (!rcv.parseArgs(new LinkedList<>(List.of(args))) && !rcv.helpOption) { System.exit(1); } if (rcv.helpOption) { diff --git a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java index 9c6613058f1..c81b8ff63b0 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java @@ -11,7 +11,6 @@ import java.io.BufferedOutputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.util.ArrayList; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -107,7 +106,7 @@ public class Arguments { private void parse(String[] argList) throws HelpShownException { List<String> args = new LinkedList<>(); - args.addAll(Arrays.asList(argList)); + args.addAll(List.of(argList)); while (!args.isEmpty()) { String arg = args.remove(0); diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java index 8182aa917ae..cd372e72e41 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java @@ -13,7 +13,6 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import java.io.InputStream; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Scanner; @@ -229,7 +228,7 @@ public class CommandLineOptions { private Iterator<String> getDocumentIds(CommandLine cl) { // Fetch document ids from stdin if no ids are passed in as command line arguments - List<String> documentIds = Arrays.asList(cl.getArgs()); + List<String> documentIds = List.of(cl.getArgs()); // WARNING: CommandLine.getArgs may return a single empty string as the only element if (documentIds.isEmpty() || documentIds.size() == 1 && documentIds.get(0).isEmpty()) { diff --git a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java index 2cb3ab17df4..56ca142841c 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java @@ -7,7 +7,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; import java.util.ArrayList; -import java.util.Arrays; +import java.util.List; import com.yahoo.clientmetrics.RouteMetricSet; import com.yahoo.document.DocumentPut; @@ -39,7 +39,7 @@ public class VespaFeederTestCase { Arguments arguments = new Arguments(argsS.split(" "), DummySessionFactory.createWithAutoReply()); FeederConfig config = arguments.getFeederConfig(); - assertEquals(false, config.abortondocumenterror()); + assertFalse(config.abortondocumenterror()); assertEquals(13.0, config.timeout(), 0.00001); assertEquals(false, config.retryenabled()); assertEquals("e6", config.route()); @@ -103,7 +103,7 @@ public class VespaFeederTestCase { public void assertRenderErrorOutput(String expected, String[] errors) { ArrayList<String> l = new ArrayList<String>(); - l.addAll(Arrays.asList(errors)); + l.addAll(List.of(errors)); assertEquals(expected, VespaFeeder.renderErrors(l).getMessage()); } @@ -111,16 +111,29 @@ public class VespaFeederTestCase { void testRenderErrors() { { String[] errors = {"foo"}; - assertRenderErrorOutput("Errors:\n" + - "-------\n" + - " foo\n", errors); + assertRenderErrorOutput(""" + Errors: + ------- + foo + """, errors); } { String[] errors = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"}; - assertRenderErrorOutput("First 10 errors (of 11):\n" + - "------------------------\n" + - " 1\n 2\n 3\n 4\n 5\n 6\n 7\n 8\n 9\n 10\n", errors); + assertRenderErrorOutput(""" + First 10 errors (of 11): + ------------------------ + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + """, errors); } } diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java index ddaf057a0b9..1d8f050a037 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java @@ -23,7 +23,6 @@ import org.mockito.ArgumentMatcher; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; -import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -99,7 +98,7 @@ public class DocumentRetrieverTest { } private static Iterator<String> asIterator(String... docIds) { - return Arrays.asList(docIds).iterator(); + return List.of(docIds).iterator(); } private static Reply createDocumentReply(String docId) { 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 diff --git a/zookeeper-server/zookeeper-server-3.9.2/src/main/java/org/apache/zookeeper/common/ClientX509Util.java b/zookeeper-server/zookeeper-server-3.9.2/src/main/java/org/apache/zookeeper/common/ClientX509Util.java index 83cfaf11a92..f6dfb0fa4d9 100644 --- a/zookeeper-server/zookeeper-server-3.9.2/src/main/java/org/apache/zookeeper/common/ClientX509Util.java +++ b/zookeeper-server/zookeeper-server-3.9.2/src/main/java/org/apache/zookeeper/common/ClientX509Util.java @@ -23,7 +23,6 @@ import io.netty.handler.ssl.DelegatingSslContext; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslProvider; -import java.util.Arrays; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLException; @@ -32,6 +31,8 @@ import javax.net.ssl.TrustManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.List; + /** * X509 utilities specific for client-server communication framework. * <p> @@ -196,9 +197,9 @@ public class ClientX509Util extends X509Util { if (getSslProvider(config) != SslProvider.JDK) { return null; } - return Arrays.asList(X509Util.getDefaultCipherSuites()); + return List.of(X509Util.getDefaultCipherSuites()); } else { - return Arrays.asList(cipherSuitesInput.split(",")); + return List.of(cipherSuitesInput.split(",")); } } diff --git a/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/ClientX509Util.java b/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/ClientX509Util.java index 83cfaf11a92..f6dfb0fa4d9 100644 --- a/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/ClientX509Util.java +++ b/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/ClientX509Util.java @@ -23,7 +23,6 @@ import io.netty.handler.ssl.DelegatingSslContext; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslProvider; -import java.util.Arrays; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLException; @@ -32,6 +31,8 @@ import javax.net.ssl.TrustManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.List; + /** * X509 utilities specific for client-server communication framework. * <p> @@ -196,9 +197,9 @@ public class ClientX509Util extends X509Util { if (getSslProvider(config) != SslProvider.JDK) { return null; } - return Arrays.asList(X509Util.getDefaultCipherSuites()); + return List.of(X509Util.getDefaultCipherSuites()); } else { - return Arrays.asList(cipherSuitesInput.split(",")); + return List.of(cipherSuitesInput.split(",")); } } |