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

14 files changed, 24 insertions, 51 deletions

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