From 76a89b62274060452022ddf24a7685ee2f380cb4 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 12 Apr 2024 08:30:35 +0200 Subject: Replace all usages of Arrays.asList with List.of where possible. --- .../src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java | 3 +-- .../src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java | 4 ++-- .../src/test/java/com/yahoo/vespa/service/model/ExampleModel.java | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'service-monitor') diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java index 5bafc7ac4bd..7d89b86c07b 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceModel.java @@ -9,7 +9,6 @@ import com.yahoo.vespa.applicationmodel.ServiceCluster; import com.yahoo.vespa.applicationmodel.ServiceInstance; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -74,7 +73,7 @@ public class ServiceModel { ApplicationInstance previous = applicationInstances.put(instance.hostName(), application); if (previous != null && !previous.equals(application)) { throw new IllegalStateException("Major assumption broken: Multiple application instances contain host " + - instance.hostName().s() + ": " + Arrays.asList(previous, application)); + instance.hostName().s() + ": " + List.of(previous, application)); } serviceInstances diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java index a5b8054536b..00c15add762 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java @@ -66,7 +66,7 @@ public class DuperModelTest { duperModel.add(application1); assertEquals(Optional.of(application1), duperModel.getApplicationInfo(id1)); - assertEquals(Arrays.asList(application1), duperModel.getApplicationInfos()); + assertEquals(List.of(application1), duperModel.getApplicationInfos()); assertEquals(1, duperModel.numberOfApplications()); duperModel.registerListener(listener1); @@ -86,7 +86,7 @@ public class DuperModelTest { assertEquals(Optional.empty(), duperModel.getApplicationInfo(id1)); verify(listener1, times(1)).applicationRemoved(id1); verifyNoMoreInteractions(listener1); - assertEquals(Arrays.asList(application2), duperModel.getApplicationInfos()); + assertEquals(List.of(application2), duperModel.getApplicationInfos()); duperModel.remove(id1); verifyNoMoreInteractions(listener1); diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java index bef87a627f5..9c0c94cef27 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java @@ -12,7 +12,6 @@ import com.yahoo.config.provision.InstanceName; import com.yahoo.vespa.service.slobrok.SlobrokMonitor; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -151,7 +150,7 @@ public class ExampleModel { * A bit unrealistic, but the port is the same on all hosts. */ ClusterBuilder addPort(int port, String... tags) { - portInfos.add(new PortInfo(port, Arrays.asList(tags))); + portInfos.add(new PortInfo(port, List.of(tags))); return this; } -- cgit v1.2.3