Unify on List.of

8 files changed, 11 insertions, 16 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
index 06e5ded4cdb..c80d034a2f9 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
@@ -19,7 +19,7 @@ import com.yahoo.vespa.config.server.http.v2.request.HttpConfigRequests;
 import com.yahoo.vespa.config.server.http.v2.request.TenantRequest;
 import com.yahoo.vespa.config.util.ConfigUtils;
 
-import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -190,7 +190,7 @@ public class HttpConfigRequest implements GetConfigRequest, TenantRequest {
 
     @Override
     public DefContent getDefContent() {
-        return DefContent.fromList(Collections.emptyList());
+        return DefContent.fromList(List.of());
     }
 
     @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
index 801f599c2d8..34900f61463 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
@@ -35,7 +35,6 @@ import java.io.IOException;
 import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BooleanSupplier;
@@ -311,7 +310,7 @@ public class ConfigServerBootstrapTest {
     }
 
     private Host createHost(String hostname, String version) {
-        return new Host(hostname, Collections.emptyList(), Optional.empty(), Optional.of(com.yahoo.component.Version.fromString(version)));
+        return new Host(hostname, List.of(), Optional.empty(), Optional.of(com.yahoo.component.Version.fromString(version)));
     }
 
     private VipStatus createVipStatus(StateMonitor stateMonitor) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
index af86463bb81..39f1cb70112 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
@@ -30,8 +30,8 @@ import org.xml.sax.SAXException;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -73,7 +73,7 @@ public class SuperModelControllerTest {
     public void test_unknown_config_definition() {
         PayloadChecksums payloadChecksums = PayloadChecksums.empty();
         Request request = createWithParams(new ConfigKey<>("foo", "id", "bar", null),
-                                           DefContent.fromList(Collections.emptyList()), "fromHost",
+                                           DefContent.fromList(List.of()), "fromHost",
                                            payloadChecksums, 1, 1, Trace.createDummy(),
                                            CompressionType.UNCOMPRESSED, Optional.empty())
                 .getRequest();
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 c18dad1ea67..4025c88de32 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
@@ -48,7 +48,7 @@ public class MockModel implements Model {
         hostnames.forEach(hostname -> {
             ServiceInfo configProxy = createServiceInfo(hostname, "configproxy", "configproxy",
                                             ClusterSpec.Type.admin, rpcPort, "rpc");
-            hostInfos.add(new HostInfo(hostname, Collections.singletonList(configProxy)));
+            hostInfos.add(new HostInfo(hostname, List.of(configProxy)));
         });
         return new MockModel(hostInfos);
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
index 67a1a335067..68add64ddd9 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
@@ -53,7 +53,6 @@ import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -219,7 +218,7 @@ public class DeployTester {
         public ModelCreateResult createAndValidateModel(ModelContext modelContext, ValidationParameters validationParameters) {
             if ( ! validationParameters.ignoreValidationErrors())
                 throw new IllegalArgumentException("Model building fails");
-            return new ModelCreateResult(createModel(modelContext), Collections.emptyList());
+            return new ModelCreateResult(createModel(modelContext), List.of());
         }
 
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
index 838b1b6b209..512f4dff6b7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
@@ -47,7 +47,6 @@ import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -581,7 +580,7 @@ public class HostedDeployTest {
     }
 
     private Host createHost(String hostname, String version) {
-        return new Host(hostname, Collections.emptyList(), Optional.empty(), Optional.ofNullable(version).map(Version::fromString));
+        return new Host(hostname, List.of(), Optional.empty(), Optional.ofNullable(version).map(Version::fromString));
     }
 
     private DeployTester createTester(List<Host> hosts, List<ModelFactory> modelFactories, Zone zone) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java
index 2ca0155ac6f..0773ace0051 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java
@@ -17,7 +17,6 @@ import org.junit.rules.TemporaryFolder;
 
 import java.io.IOException;
 import java.time.Duration;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -80,7 +79,7 @@ public class DelayedConfigResponseTest {
 
     private JRTServerConfigRequest createRequest(String configName, String configId, long generation, long timeout, String namespace) {
         Request request = createWithParams(new ConfigKey<>(configName, configId, namespace, null),
-                                           DefContent.fromList(Collections.emptyList()), "fromHost",
+                                           DefContent.fromList(List.of()), "fromHost",
                                            PayloadChecksums.empty(), generation, timeout, Trace.createDummy(),
                                            CompressionType.UNCOMPRESSED, Optional.empty())
                 .getRequest();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index f736eab0576..0ec651468cd 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -61,7 +61,6 @@ import java.security.KeyPair;
 import java.security.cert.X509Certificate;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -192,7 +191,7 @@ public class SessionPreparerTest {
     public void require_exception_for_overlapping_host() throws IOException {
         FilesApplicationPackage app = getApplicationPackage(testApp);
         HostRegistry hostValidator = new HostRegistry();
-        hostValidator.update(applicationId("foo"), Collections.singletonList("mytesthost"));
+        hostValidator.update(applicationId("foo"), List.of("mytesthost"));
         preparer.prepare(hostValidator, new BaseDeployLogger(), new PrepareParams.Builder().applicationId(applicationId("default")).build(),
                          Optional.empty(), Instant.now(), app.getAppDir(), app, createSessionZooKeeperClient());
     }
@@ -206,7 +205,7 @@ public class SessionPreparerTest {
         FilesApplicationPackage app = getApplicationPackage(testApp);
         HostRegistry hostValidator = new HostRegistry();
         ApplicationId applicationId = applicationId();
-        hostValidator.update(applicationId, Collections.singletonList("mytesthost"));
+        hostValidator.update(applicationId, List.of("mytesthost"));
         preparer.prepare(hostValidator, logger, new PrepareParams.Builder().applicationId(applicationId).build(),
                          Optional.empty(), Instant.now(), app.getAppDir(), app,
                          createSessionZooKeeperClient());