diff options
Diffstat (limited to 'container-core/src/test/java')
6 files changed, 16 insertions, 20 deletions
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") |