diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-12 08:30:35 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-12 08:39:04 +0200 |
commit | 76a89b62274060452022ddf24a7685ee2f380cb4 (patch) | |
tree | ef924603de22efd026f519ab31fd8f5a6ff60f2f /orchestrator | |
parent | 7e7ebf7b527be1f163d497a41898e2252d878fe7 (diff) |
Replace all usages of Arrays.asList with List.of where possible.
Diffstat (limited to 'orchestrator')
9 files changed, 45 insertions, 52 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java index c61d5cab472..1b1c64c9d9a 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java @@ -5,7 +5,6 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstance; import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.applicationmodel.HostName; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -21,7 +20,7 @@ public class NodeGroup { public NodeGroup(ApplicationInstance application, HostName... hostNames) { this.application = application; - this.hostNames.addAll(Arrays.asList(hostNames)); + this.hostNames.addAll(List.of(hostNames)); } public void addNode(HostName hostName) { diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java index 354799507ab..fc9715dce5c 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java @@ -42,7 +42,6 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -277,7 +276,7 @@ public class OrchestratorImplTest { orchestrator.suspendAll( new HostName("parentHostname"), - Arrays.asList( + List.of( DummyServiceMonitor.TEST1_HOST_NAME, DummyServiceMonitor.TEST3_HOST_NAME, DummyServiceMonitor.TEST6_HOST_NAME)); @@ -317,7 +316,7 @@ public class OrchestratorImplTest { try { orchestrator.suspendAll( new HostName("parentHostname"), - Arrays.asList( + List.of( DummyServiceMonitor.TEST1_HOST_NAME, DummyServiceMonitor.TEST3_HOST_NAME, DummyServiceMonitor.TEST6_HOST_NAME)); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java index c0d6e01104a..8618c6ada90 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java @@ -33,11 +33,11 @@ public class ApplicationApiImplTest { HostName hostName4 = new HostName("host4"); ApplicationInstance applicationInstance = - modelUtils.createApplicationInstance(Arrays.asList( + modelUtils.createApplicationInstance(List.of( modelUtils.createServiceCluster( "cluster-3", new ServiceType("service-type-3"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-1", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-2", hostName2, ServiceStatus.UP) ) @@ -45,7 +45,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-1", new ServiceType("service-type-1"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-3", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-4", hostName3, ServiceStatus.UP) ) @@ -53,7 +53,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-2", new ServiceType("service-type-2"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-5", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-6", hostName2, ServiceStatus.UP) ) @@ -71,7 +71,7 @@ public class ApplicationApiImplTest { try (scopedApi) { // Note: we require the clusters to be in order. List<ClusterApi> clusterApis = scopedApi.applicationApi().getClusters(); - String clusterInfos = clusterApis.stream().map(clusterApi -> clusterApi.clusterInfo()).collect(Collectors.joining(",")); + String clusterInfos = clusterApis.stream().map(ClusterApi::clusterInfo).collect(Collectors.joining(",")); String expectedClusterInfos = Arrays.stream(expectedClusterNumbers) .map(number -> "{ clusterId=cluster-" + number + ", serviceType=service-type-" + number + " }") @@ -92,11 +92,11 @@ public class ApplicationApiImplTest { HostName hostName7 = new HostName("host7"); ApplicationInstance applicationInstance = - modelUtils.createApplicationInstance(Arrays.asList( + modelUtils.createApplicationInstance(List.of( modelUtils.createServiceCluster( "cluster-3", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-30", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-31", hostName2, ServiceStatus.UP) ) @@ -104,7 +104,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-1", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-10", hostName3, ServiceStatus.DOWN), modelUtils.createServiceInstance("config-id-11", hostName4, ServiceStatus.UP) ) @@ -112,7 +112,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-4", new ServiceType("service-type-4"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-40", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-41", hostName2, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-42", hostName3, ServiceStatus.UP), @@ -122,7 +122,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-2", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-20", hostName6, ServiceStatus.DOWN), modelUtils.createServiceInstance("config-id-21", hostName7, ServiceStatus.UP) ) @@ -154,9 +154,9 @@ public class ApplicationApiImplTest { HostName... expectedHostNames) { try (scopedApi) { List<HostName> upStorageNodes = scopedApi.applicationApi().getNoRemarksStorageNodesInGroupInClusterOrder().stream() - .map(storageNode -> storageNode.hostName()) + .map(StorageNode::hostName) .toList(); - assertEquals(Arrays.asList(expectedHostNames), upStorageNodes); + assertEquals(List.of(expectedHostNames), upStorageNodes); } } @@ -191,7 +191,7 @@ public class ApplicationApiImplTest { List<HostName> actualStorageNodes = scopedApi.applicationApi() .getNoRemarksStorageNodesInGroupInClusterOrder() .stream() - .map(storageNode -> storageNode.hostName()) + .map(StorageNode::hostName) .toList(); assertEquals(upStorageNodes, actualStorageNodes); } @@ -204,11 +204,11 @@ public class ApplicationApiImplTest { HostName hostName3 = new HostName("host3"); ApplicationInstance applicationInstance = - modelUtils.createApplicationInstance(Arrays.asList( + modelUtils.createApplicationInstance(List.of( modelUtils.createServiceCluster( "cluster-1", new ServiceType("service-type-1"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-10", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-11", hostName2, ServiceStatus.UP) ) @@ -216,7 +216,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-2", new ServiceType("service-type-2"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-20", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-21", hostName3, ServiceStatus.UP) ) @@ -233,11 +233,11 @@ public class ApplicationApiImplTest { List.of()); verifyNodesInGroupWithoutRemarks( modelUtils.createScopedApplicationApi(applicationInstance, hostName1, hostName2), - Arrays.asList(hostName1, hostName2), + List.of(hostName1, hostName2), List.of()); verifyNodesInGroupWithoutRemarks( modelUtils.createScopedApplicationApi(applicationInstance, hostName1, hostName2, hostName3), - Arrays.asList(hostName1, hostName2), + List.of(hostName1, hostName2), List.of(hostName3)); verifyNodesInGroupWithoutRemarks( modelUtils.createScopedApplicationApi(applicationInstance, hostName3), @@ -268,11 +268,11 @@ public class ApplicationApiImplTest { HostName allowedToBeDownHost7 = new HostName("host7"); ApplicationInstance applicationInstance = - modelUtils.createApplicationInstance(Arrays.asList( + modelUtils.createApplicationInstance(List.of( modelUtils.createServiceCluster( "cluster-4", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-40", allowedToBeDownHost1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-41", noRemarksHost2, ServiceStatus.DOWN) ) @@ -280,7 +280,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-1", new ServiceType("service-type-1"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-10", allowedToBeDownHost1, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-11", allowedToBeDownHost3, ServiceStatus.UP) ) @@ -288,7 +288,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-3", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-30", allowedToBeDownHost4, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-31", noRemarksHost5, ServiceStatus.UP) ) @@ -296,7 +296,7 @@ public class ApplicationApiImplTest { modelUtils.createServiceCluster( "cluster-2", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("config-id-20", noRemarksHost6, ServiceStatus.UP), modelUtils.createServiceInstance("config-id-21", allowedToBeDownHost7, ServiceStatus.UP) ) @@ -343,9 +343,9 @@ public class ApplicationApiImplTest { .applicationApi() .getSuspendedStorageNodesInGroupInReverseClusterOrder() .stream() - .map(storageNode -> storageNode.hostName()) + .map(StorageNode::hostName) .toList(); - assertEquals(Arrays.asList(hostNames), actualStorageNodes); + assertEquals(List.of(hostNames), actualStorageNodes); } } } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java index db5beafac81..9f8f8a9dd44 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java @@ -27,7 +27,6 @@ import org.junit.Test; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.EnumSet; import java.util.List; import java.util.Optional; @@ -64,7 +63,7 @@ public class ClusterApiImplTest { ServiceCluster serviceCluster = modelUtils.createServiceCluster( "cluster", new ServiceType("service-type"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("service-1", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("service-2", hostName2, ServiceStatus.DOWN), modelUtils.createServiceInstance("service-3", hostName3, ServiceStatus.UP), @@ -268,7 +267,7 @@ public class ClusterApiImplTest { ServiceCluster serviceCluster = modelUtils.createServiceCluster( "cluster", new ServiceType("service-type"), - Arrays.asList( + List.of( modelUtils.createServiceInstance("service-1", hostName1, ServiceStatus.UP), service2, modelUtils.createServiceInstance("service-3", hostName3, ServiceStatus.UP), @@ -336,7 +335,7 @@ public class ClusterApiImplTest { ServiceCluster serviceCluster = modelUtils.createServiceCluster( "cluster", ServiceType.STORAGE, - Arrays.asList( + List.of( modelUtils.createServiceInstance("storage-1", hostName1, ServiceStatus.UP), modelUtils.createServiceInstance("storage-2", hostName2, ServiceStatus.DOWN) ) diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java index 373d512f811..b2802ad9924 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java @@ -7,8 +7,8 @@ import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.applicationmodel.TenantId; import org.junit.Test; -import java.util.Arrays; import java.util.HashSet; +import java.util.List; import static org.junit.Assert.assertEquals; @@ -27,7 +27,7 @@ public class NodeGroupTest { nodeGroup.addNode(hostName2); // hostnames are sorted (for no good reason other than testability due to stability, readability) - assertEquals(Arrays.asList(hostName1, hostName2, hostName3), nodeGroup.getHostNames()); + assertEquals(List.of(hostName1, hostName2, hostName3), nodeGroup.getHostNames()); assertEquals("host1,host2,host3", nodeGroup.toCommaSeparatedString()); } } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java index 3b1bd7af525..33ec7a5c43f 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java @@ -14,7 +14,6 @@ import com.yahoo.vespa.applicationmodel.TenantId; import com.yahoo.vespa.orchestrator.TestUtil; import org.junit.Test; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Optional; @@ -172,7 +171,7 @@ public class VespaModelUtilTest { @Test public void testGettingClusterControllerInstances() { List<HostName> controllers = VespaModelUtil.getClusterControllerInstancesInOrder(application, CONTENT_CLUSTER_ID); - List<HostName> expectedControllers = Arrays.asList(controller0.hostName(), controller1.hostName()); + List<HostName> expectedControllers = List.of(controller0.hostName(), controller1.hostName()); assertEquals(expectedControllers, controllers); } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java index 14d5909522a..77fdbe4067d 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java @@ -20,7 +20,6 @@ import org.junit.Before; import org.junit.Test; import org.mockito.InOrder; -import java.util.Arrays; import java.util.List; import static org.mockito.ArgumentMatchers.any; @@ -56,7 +55,7 @@ public class HostedVespaPolicyTest { ClusterApi clusterApi1 = mock(ClusterApi.class); ClusterApi clusterApi2 = mock(ClusterApi.class); ClusterApi clusterApi3 = mock(ClusterApi.class); - List<ClusterApi> clusterApis = Arrays.asList(clusterApi1, clusterApi2, clusterApi3); + List<ClusterApi> clusterApis = List.of(clusterApi1, clusterApi2, clusterApi3); when(applicationApi.getClusters()).thenReturn(clusterApis); StorageNode storageNode1 = mock(StorageNode.class); @@ -69,11 +68,11 @@ public class HostedVespaPolicyTest { HostName hostName3 = new HostName("storage-3"); when(storageNode1.hostName()).thenReturn(hostName3); - List<StorageNode> upStorageNodes = Arrays.asList(storageNode1, storageNode3); + List<StorageNode> upStorageNodes = List.of(storageNode1, storageNode3); when(applicationApi.getNoRemarksStorageNodesInGroupInClusterOrder()).thenReturn(upStorageNodes); // setHostState - List<HostName> noRemarksHostNames = Arrays.asList(hostName1, hostName2, hostName3); + List<HostName> noRemarksHostNames = List.of(hostName1, hostName2, hostName3); when(applicationApi.getNodesInGroupWithStatus(HostStatus.NO_REMARKS)).thenReturn(noRemarksHostNames); InOrder order = inOrder(applicationApi, clusterPolicy, storageNode1, storageNode3); @@ -108,7 +107,7 @@ public class HostedVespaPolicyTest { ClusterApi clusterApi1 = mock(ClusterApi.class); ClusterApi clusterApi2 = mock(ClusterApi.class); ClusterApi clusterApi3 = mock(ClusterApi.class); - List<ClusterApi> clusterApis = Arrays.asList(clusterApi1, clusterApi2, clusterApi3); + List<ClusterApi> clusterApis = List.of(clusterApi1, clusterApi2, clusterApi3); when(applicationApi.getClusters()).thenReturn(clusterApis); StorageNode storageNode1 = mock(StorageNode.class); @@ -121,10 +120,10 @@ public class HostedVespaPolicyTest { HostName hostName3 = new HostName("storage-3"); when(storageNode1.hostName()).thenReturn(hostName3); - List<StorageNode> upStorageNodes = Arrays.asList(storageNode1, storageNode3); + List<StorageNode> upStorageNodes = List.of(storageNode1, storageNode3); when(applicationApi.getStorageNodesInGroupInClusterOrder()).thenReturn(upStorageNodes); - List<HostName> noRemarksHostNames = Arrays.asList(hostName1, hostName2, hostName3); + List<HostName> noRemarksHostNames = List.of(hostName1, hostName2, hostName3); when(applicationApi.getNodesInGroupWith(any())).thenReturn(noRemarksHostNames); InOrder order = inOrder(applicationApi, clusterPolicy, storageNode1, storageNode3); @@ -161,7 +160,7 @@ public class HostedVespaPolicyTest { ClusterApi clusterApi1 = mock(ClusterApi.class); ClusterApi clusterApi2 = mock(ClusterApi.class); ClusterApi clusterApi3 = mock(ClusterApi.class); - List<ClusterApi> clusterApis = Arrays.asList(clusterApi1, clusterApi2, clusterApi3); + List<ClusterApi> clusterApis = List.of(clusterApi1, clusterApi2, clusterApi3); when(applicationApi.getClusters()).thenReturn(clusterApis); StorageNode storageNode1 = mock(StorageNode.class); @@ -174,10 +173,10 @@ public class HostedVespaPolicyTest { HostName hostName3 = new HostName("storage-3"); when(storageNode1.hostName()).thenReturn(hostName3); - List<StorageNode> upStorageNodes = Arrays.asList(storageNode1, storageNode3); + List<StorageNode> upStorageNodes = List.of(storageNode1, storageNode3); when(applicationApi.getStorageNodesInGroupInClusterOrder()).thenReturn(upStorageNodes); - List<HostName> noRemarksHostNames = Arrays.asList(hostName1, hostName2, hostName3); + List<HostName> noRemarksHostNames = List.of(hostName1, hostName2, hostName3); when(applicationApi.getNodesInGroupWith(any())).thenReturn(noRemarksHostNames); InOrder order = inOrder(applicationApi, clusterPolicy, storageNode1, storageNode3); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandlerTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandlerTest.java index 9e5464f3e3a..41bcbb125ee 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandlerTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandlerTest.java @@ -17,7 +17,6 @@ import com.yahoo.vespa.orchestrator.restapi.wire.SlobrokEntryResponse; import com.yahoo.vespa.service.manager.UnionMonitorManager; import com.yahoo.vespa.service.monitor.SlobrokApi; import org.junit.jupiter.api.Test; -import java.util.Arrays; import java.util.List; import static com.yahoo.jdisc.http.HttpRequest.Method.GET; @@ -34,7 +33,7 @@ class InstanceRequestHandlerTest { private static final String APPLICATION_INSTANCE_REFERENCE = "tenant:app:prod:us-west-1:instance"; private static final ApplicationId APPLICATION_ID = ApplicationId.from( "tenant", "app", "instance"); - private static final List<Mirror.Entry> ENTRIES = Arrays.asList( + private static final List<Mirror.Entry> ENTRIES = List.of( new Mirror.Entry("name1", "tcp/spec:1"), new Mirror.Entry("name2", "tcp/spec:2")); private static final ClusterId CLUSTER_ID = new ClusterId("cluster-id"); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java index e0929090a19..d45dc17e84c 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java @@ -34,7 +34,6 @@ import org.mockito.junit.MockitoJUnitRunner; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -393,7 +392,7 @@ public class ZkStatusServiceTest { @SuppressWarnings("varargs") private static <T> List<T> shuffledList(T... values) { //new ArrayList necessary to avoid "write through" behaviour - List<T> list = new ArrayList<>(Arrays.asList(values)); + List<T> list = new ArrayList<>(List.of(values)); Collections.shuffle(list); return list; } |