diff options
Diffstat (limited to 'configserver/src/test')
22 files changed, 41 insertions, 73 deletions
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/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/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/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 c18dad1ea67..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) { @@ -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/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/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/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/http/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java index 34045cf3804..452ee53c439 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java @@ -17,7 +17,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import java.io.File; import java.io.IOException; -import java.util.Collections; +import java.util.Map; import static com.yahoo.jdisc.http.HttpRequest.Method.GET; import static com.yahoo.jdisc.http.HttpResponse.Status.BAD_REQUEST; @@ -90,7 +90,7 @@ public class HttpGetConfigHandlerTest { @Test public void require_that_nocache_property_works() throws IOException { - HttpRequest request = HttpRequest.createTestRequest(configUri, GET, null, Collections.singletonMap("nocache", "true")); + HttpRequest request = HttpRequest.createTestRequest(configUri, GET, null, Map.of("nocache", "true")); HttpResponse response = handler.handle(request); String renderedString = SessionHandlerTest.getRenderedString(response); assertTrue(renderedString, renderedString.startsWith(expected)); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java index a7f86133fce..b58bca074b8 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.time.Duration; -import java.util.Collections; +import java.util.Map; import static org.junit.Assert.assertEquals; @@ -39,7 +39,7 @@ public class HttpHandlerTest { HttpRequest.createTestRequest("foo", com.yahoo.jdisc.http.HttpRequest.Method.GET, null, - Collections.singletonMap("timeout", "1.5")), Duration.ofSeconds(5)).toMillis()); + Map.of("timeout", "1.5")), Duration.ofSeconds(5)).toMillis()); } private static class HttpTestHandler extends HttpHandler { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java index 6f2c7366b62..4c140159e12 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java @@ -24,7 +24,6 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import java.io.File; import java.io.IOException; -import java.util.Collections; import java.util.Map; import static com.yahoo.jdisc.Response.Status.BAD_REQUEST; @@ -126,7 +125,7 @@ public class HttpGetConfigHandlerTest { @Test public void require_that_nocache_property_works() throws IOException { - HttpRequest request = HttpRequest.createTestRequest(configUri, GET, null, Collections.singletonMap("nocache", "true")); + HttpRequest request = HttpRequest.createTestRequest(configUri, GET, null, Map.of("nocache", "true")); HttpResponse response = handler.handle(request); String renderedString = SessionHandlerTest.getRenderedString(response); assertTrue(renderedString, renderedString.startsWith(expected)); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java index b8c9a2f8fb8..4fb514bde17 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java @@ -30,7 +30,6 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -93,7 +92,7 @@ public class SessionCreateHandlerTest extends SessionHandlerTest { @Ignore @Test public void require_that_from_parameter_cannot_be_set_if_data_in_request() throws IOException { - HttpRequest request = post(Collections.singletonMap("from", "active")); + HttpRequest request = post(Map.of("from", "active")); HttpResponse response = createHandler().handle(request); assertHttpStatusCodeErrorCodeAndMessage(response, BAD_REQUEST, HttpErrorResponse.ErrorCode.BAD_REQUEST, "Parameter 'from' is illegal for POST"); } @@ -114,14 +113,14 @@ public class SessionCreateHandlerTest extends SessionHandlerTest { private void assertIllegalFromParameter(String fromValue) throws IOException { File outFile = CompressedApplicationInputStreamTest.createTarFile(temporaryFolder.getRoot().toPath()); - HttpRequest request = post(outFile, postHeaders, Collections.singletonMap("from", fromValue)); + HttpRequest request = post(outFile, postHeaders, Map.of("from", fromValue)); assertHttpStatusCodeErrorCodeAndMessage(createHandler().handle(request), BAD_REQUEST, HttpErrorResponse.ErrorCode.BAD_REQUEST, "Parameter 'from' has illegal value '" + fromValue + "'"); } @Test public void require_that_prepare_url_is_returned_on_success() throws IOException { File outFile = CompressedApplicationInputStreamTest.createTarFile(temporaryFolder.getRoot().toPath()); - Map<String, String> parameters = Collections.singletonMap("name", "foo"); + Map<String, String> parameters = Map.of("name", "foo"); HttpResponse response = createHandler().handle(post(outFile, postHeaders, parameters)); assertNotNull(response); assertEquals(OK, response.getStatus()); @@ -160,7 +159,7 @@ public class SessionCreateHandlerTest extends SessionHandlerTest { @Test public void require_that_application_urls_can_be_given_as_from_parameter() throws Exception { ApplicationId applicationId = ApplicationId.from(tenant.value(), "foo", "quux"); - HttpRequest request = post(Collections.singletonMap( + HttpRequest request = post(Map.of( "from", "http://myhost:40555/application/v2/tenant/" + tenant + "/application/foo/environment/test/region/baz/instance/quux")); assertEquals(applicationId, SessionCreateHandler.getFromApplicationId(request)); @@ -180,7 +179,7 @@ public class SessionCreateHandlerTest extends SessionHandlerTest { public void require_that_content_type_is_parsed_correctly() throws FileNotFoundException { HttpRequest request = post(new ByteArrayInputStream("foo".getBytes(StandardCharsets.UTF_8)), Map.of("Content-Type", "multipart/form-data; charset=ISO-8859-1; boundary=g5gJAzUWl_t6"), - Collections.emptyMap()); + Map.of()); // Valid header should validate ok SessionCreateHandler.validateDataAndHeader(request, List.of(ContentType.MULTIPART_FORM_DATA.getMimeType())); 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()); 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 |