diff options
Diffstat (limited to 'node-admin/src/test/java/com/yahoo')
15 files changed, 29 insertions, 44 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java index 0909a03749e..84a9c7a0a7d 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java @@ -19,7 +19,6 @@ import java.net.SocketTimeoutException; import java.net.URI; import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -54,7 +53,7 @@ public class ConfigServerApiImplTest { private final String uri1 = "http://host1:666"; private final String uri2 = "http://host2:666"; - private final List<URI> configServers = Arrays.asList(URI.create(uri1), URI.create(uri2)); + private final List<URI> configServers = List.of(URI.create(uri1), URI.create(uri2)); private final StringBuilder mockLog = new StringBuilder(); private ConfigServerApiImpl configServerApi; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java index 3010586e708..341f2b8ca02 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AclTest.java @@ -5,7 +5,6 @@ import com.yahoo.vespa.hosted.node.admin.task.util.network.IPVersion; import org.junit.Test; import java.util.Arrays; -import java.util.Collections; import java.util.Set; import java.util.stream.Collectors; @@ -20,12 +19,12 @@ public class AclTest { private static final Acl aclCommon = new Acl( Set.of(1234, 453), testNodes("192.1.2.2", "fb00::1", "fe80::2", "fe80::3"), - Collections.emptySet()); + Set.of()); private static final Acl aclWithoutPorts = new Acl( - Collections.emptySet(), + Set.of(), testNodes("192.1.2.2", "fb00::1", "fe80::2"), - Collections.emptySet()); + Set.of()); @Test public void no_trusted_ports() { @@ -80,7 +79,7 @@ public class AclTest { Acl aclCommonDifferentOrder = new Acl( Set.of(453, 1234), testNodes("fe80::2", "192.1.2.2", "fb00::1", "fe80::3"), - Collections.emptySet()); + Set.of()); for (IPVersion ipVersion: IPVersion.values()) { assertEquals(aclCommon.toRules(ipVersion), aclCommonDifferentOrder.toRules(ipVersion)); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java index 9b392395045..4e0fd95384c 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.net.ServerSocket; import java.net.URI; import java.time.Instant; -import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.Set; @@ -67,7 +66,7 @@ public class RealNodeRepositoryTest { int port = findRandomOpenPort(); container = JDisc.fromServicesXml(ContainerConfig.servicesXmlV2(port), Networking.enable); ConfigServerApi configServerApi = ConfigServerApiImpl.createForTesting( - Collections.singletonList(URI.create("http://127.0.0.1:" + port))); + List.of(URI.create("http://127.0.0.1:" + port))); waitForJdiscContainerToServe(configServerApi); return; } catch (RuntimeException e) { diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java index 936a7bb224d..d118da07247 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java @@ -8,7 +8,6 @@ import com.yahoo.vespa.orchestrator.restapi.wire.HostStateChangeDenialReason; import com.yahoo.vespa.orchestrator.restapi.wire.UpdateHostResponse; import org.junit.Test; -import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -109,7 +108,7 @@ public class OrchestratorImplTest { @Test public void testBatchSuspendCall() { String parentHostName = "host1.test.yahoo.com"; - List<String> hostNames = Arrays.asList("a1.host1.test.yahoo.com", "a2.host1.test.yahoo.com"); + List<String> hostNames = List.of("a1.host1.test.yahoo.com", "a2.host1.test.yahoo.com"); when(configServerApi.put( eq("/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com"), @@ -124,7 +123,7 @@ public class OrchestratorImplTest { @Test(expected=OrchestratorException.class) public void testBatchSuspendCallWithFailureReason() { String parentHostName = "host1.test.yahoo.com"; - List<String> hostNames = Arrays.asList("a1.host1.test.yahoo.com", "a2.host1.test.yahoo.com"); + List<String> hostNames = List.of("a1.host1.test.yahoo.com", "a2.host1.test.yahoo.com"); String failureReason = "Failed to suspend"; when(configServerApi.put( @@ -140,7 +139,7 @@ public class OrchestratorImplTest { @Test(expected=RuntimeException.class) public void testBatchSuspendCallWithSomeException() { String parentHostName = "host1.test.yahoo.com"; - List<String> hostNames = Arrays.asList("a1.host1.test.yahoo.com", "a2.host1.test.yahoo.com"); + List<String> hostNames = List.of("a1.host1.test.yahoo.com", "a2.host1.test.yahoo.com"); String exceptionMessage = "Exception: Something crashed!"; when(configServerApi.put( diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java index 625166a10d2..80069b38748 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java @@ -8,7 +8,6 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeReposit import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -46,7 +45,7 @@ public class NodeRepoMock implements NodeRepository { @Override public Map<String, Acl> getAcls(String hostname) { - return Collections.emptyMap(); + return Map.of(); } @Override diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java index 4a232a5b2bd..d1778982043 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState; import com.yahoo.vespa.hosted.node.admin.nodeadmin.NodeAdminStateUpdater; import org.junit.Test; -import java.util.Arrays; +import java.util.List; import java.util.OptionalLong; import static com.yahoo.vespa.hosted.node.admin.integrationTests.DockerTester.HOST_HOSTNAME; @@ -40,7 +40,7 @@ public class RebootTest { } catch (RuntimeException ignored) { } tester.inOrder(tester.orchestrator).suspend( - eq(HOST_HOSTNAME.value()), eq(Arrays.asList(hostname, HOST_HOSTNAME.value()))); + eq(HOST_HOSTNAME.value()), eq(List.of(hostname, HOST_HOSTNAME.value()))); tester.inOrder(tester.docker).executeInContainerAsUser( eq(new ContainerName("host1")), eq("root"), eq(OptionalLong.empty()), eq(NODE_PROGRAM), eq("stop")); assertTrue(tester.nodeAdmin.setFrozen(true)); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java index 90674f86907..adecc370b85 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java @@ -15,8 +15,6 @@ import org.junit.Test; import java.nio.file.FileSystem; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.function.Function; @@ -70,7 +68,7 @@ public class AclMaintainerTest { verify(dockerOperations, times(2)).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); verifyNoMoreInteractions(dockerOperations); - List<String> expected = Arrays.asList( + List<String> expected = List.of( // IPv4 filter table restore "*filter\n" + "-P INPUT ACCEPT\n" + @@ -137,7 +135,7 @@ public class AclMaintainerTest { verify(dockerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); verifyNoMoreInteractions(dockerOperations); - List<String> expected = Arrays.asList( + List<String> expected = List.of( // IPv4 filter table restore "*filter\n" + "-P INPUT ACCEPT\n" + @@ -194,7 +192,7 @@ public class AclMaintainerTest { verify(dockerOperations, never()).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); //we don't have a ip4 address for the container so no redirect verifyNoMoreInteractions(dockerOperations); - List<String> expected = Collections.singletonList( + List<String> expected = List.of( "*filter\n" + "-P INPUT ACCEPT\n" + "-P FORWARD ACCEPT\n" + diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/FilterTableLineEditorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/FilterTableLineEditorTest.java index f72cde92839..192422492c8 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/FilterTableLineEditorTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/FilterTableLineEditorTest.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.hosted.node.admin.task.util.file.Editor; import com.yahoo.vespa.hosted.node.admin.task.util.network.IPVersion; import org.junit.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.Assert.assertEquals; @@ -42,7 +42,7 @@ public class FilterTableLineEditorTest { FilterTableLineEditor filterLineEditor = FilterTableLineEditor.from(acl, ipVersion); Editor editor = new Editor( "nat-table", - () -> Arrays.asList(currentFilterTable.split("\n")), + () -> List.of(currentFilterTable.split("\n")), result -> assertEquals(expectedRestoreFileContent, String.join("\n", result)), filterLineEditor); editor.edit(m -> {}); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/NatTableLineEditorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/NatTableLineEditorTest.java index 63dc69a180c..1ea3658db76 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/NatTableLineEditorTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/NatTableLineEditorTest.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.node.admin.maintenance.acl; import com.yahoo.vespa.hosted.node.admin.task.util.file.Editor; import org.junit.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.Assert.assertEquals; @@ -88,7 +88,7 @@ public class NatTableLineEditorTest { NatTableLineEditor natLineEditor = NatTableLineEditor.from(redirectRule); Editor editor = new Editor( "nat-table", - () -> Arrays.asList(currentNatTable.split("\n")), + () -> List.of(currentNatTable.split("\n")), result -> assertEquals(expectedNatTable, String.join("\n", result)), natLineEditor); editor.edit(m -> {}); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelperTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelperTest.java index a930e2babff..afb0c86ba2a 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelperTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelperTest.java @@ -1,10 +1,9 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - package com.yahoo.vespa.hosted.node.admin.provider; import org.junit.Test; -import java.util.Collections; +import java.util.Map; import static org.junit.Assert.assertEquals; @@ -14,7 +13,7 @@ public class DebugHandlerHelperTest { DebugHandlerHelper helper = new DebugHandlerHelper(); helper.addConstant("constant-key", "constant-value"); - NodeAdminDebugHandler handler = () -> Collections.singletonMap("handler-value-key", "handler-value-value"); + NodeAdminDebugHandler handler = () -> Map.of("handler-value-key", "handler-value-value"); helper.addHandler("handler-key", handler); helper.addThreadSafeSupplier("supplier-key", () -> "supplier-value"); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/EditorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/EditorTest.java index 3d492c41d0f..70e9ae50584 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/EditorTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/EditorTest.java @@ -1,5 +1,4 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - package com.yahoo.vespa.hosted.node.admin.task.util.file; import com.yahoo.vespa.hosted.node.admin.component.TaskContext; @@ -8,7 +7,6 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import java.nio.file.FileSystem; -import java.util.Collections; import java.util.List; import static org.junit.Assert.assertEquals; @@ -62,8 +60,8 @@ public class EditorTest { LineEdit.insertBefore("first"), // insert first, and keep the second line LineEdit.replaceWith("third", "fourth"), // remove eight, and replace with third and fourth instead LineEdit.none(), // Keep fifth - LineEdit.insert(Collections.singletonList("sixth"), // insert sixth before seventh - Collections.singletonList("eight"))); // add eight after seventh + LineEdit.insert(List.of("sixth"), // insert sixth before seventh + List.of("eight"))); // add eight after seventh Editor editor = new Editor(path.toPath(), lineEditor); TaskContext context = mock(TaskContext.class); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinderTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinderTest.java index 1308e4ead8c..197077159d1 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinderTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinderTest.java @@ -19,7 +19,6 @@ import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.FileTime; import java.time.Duration; import java.time.Instant; -import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -157,7 +156,7 @@ public class FileFinderTest { }); return paths; } catch (NoSuchFileException e) { - return Collections.emptyList(); + return List.of(); } catch (IOException e) { throw new UncheckedIOException(e); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java index a141faf290b..cbf471bd611 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java @@ -11,7 +11,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertArrayEquals; @@ -71,7 +70,7 @@ public class FileSyncTest { fileData.getPermissions().ifPresent(permissions -> assertEquals(permissions, unixPath.getPermissions())); List<String> actualMods = taskContext.getSystemModificationLog(); - List<String> expectedMods = Arrays.asList(systemModificationMessages); + List<String> expectedMods = List.of(systemModificationMessages); assertEquals(expectedMods, actualMods); UnixPath unixPath = new UnixPath(path); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectoryTest.java index b714ab539f6..c28aa6faa30 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectoryTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectoryTest.java @@ -1,5 +1,4 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - package com.yahoo.vespa.hosted.node.admin.task.util.file; import com.yahoo.vespa.hosted.node.admin.component.TestTaskContext; @@ -10,8 +9,7 @@ import java.io.UncheckedIOException; import java.nio.file.FileSystem; import java.nio.file.Files; import java.nio.file.NoSuchFileException; -import java.util.Arrays; -import java.util.Collections; +import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -56,11 +54,11 @@ public class MakeDirectoryTest { .withGroup(group); assertTrue(makeDirectory.converge(context)); - assertEquals(Arrays.asList(modifications), context.getSystemModificationLog()); + assertEquals(List.of(modifications), context.getSystemModificationLog()); context.clearSystemModificationLog(); assertFalse(makeDirectory.converge(context)); - assertEquals(Collections.emptyList(), context.getSystemModificationLog()); + assertEquals(List.of(), context.getSystemModificationLog()); } @Test diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLineTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLineTest.java index 7bdf9a44ec7..6dd5087e8a0 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLineTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLineTest.java @@ -6,7 +6,6 @@ import org.junit.After; import org.junit.Test; import java.nio.charset.StandardCharsets; -import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.function.Predicate; @@ -43,7 +42,7 @@ public class CommandLineTest { assertEquals(0, result.getExitCode()); assertEquals("line1\nline2", result.getOutput()); assertEquals("line1\nline2\n\n", result.getUntrimmedOutput()); - assertEquals(Arrays.asList("line1", "line2"), result.getOutputLines()); + assertEquals(List.of("line1", "line2"), result.getOutputLines()); assertEquals(1, context.getSystemModificationLog().size()); assertEquals("Executing command: foo bar 2>&1", context.getSystemModificationLog().get(0)); |