From 5381962e747ea9ac515abcf51dc70ad40bbbf70d Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sun, 4 Dec 2022 23:02:42 +0100 Subject: Revert "Revert collect(Collectors.toList())" --- .../main/java/com/yahoo/vespa/service/duper/InfraApplication.java | 2 +- .../java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java | 6 +++--- .../src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java | 2 +- .../com/yahoo/vespa/service/health/HealthMonitorManagerTest.java | 2 +- .../java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java | 2 +- .../yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java | 2 +- .../src/test/java/com/yahoo/vespa/service/model/ExampleModel.java | 4 ++-- .../test/java/com/yahoo/vespa/service/model/ExampleModelTest.java | 4 ++-- .../yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java | 2 +- .../java/com/yahoo/vespa/service/model/ServiceMonitorImplTest.java | 2 +- .../test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) (limited to 'service-monitor') diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java index eccffa27930..e82e2cc0265 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java @@ -94,7 +94,7 @@ public abstract class InfraApplication implements InfraApplicationApi { } public ApplicationInfo makeApplicationInfo(List hostnames) { - List hostInfos = hostnames.stream().map(this::makeHostInfo).collect(Collectors.toList()); + List hostInfos = hostnames.stream().map(this::makeHostInfo).toList(); return new ApplicationInfo(application.id(), 0, new HostsModel(hostInfos)); } diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java index d02cad1c068..6cf7d4d9f26 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java @@ -64,7 +64,7 @@ public class DuperModelManagerTest { makeManager(false); ApplicationId id = proxyHostApplication.getApplicationId(); - List proxyHostHosts = Stream.of("proxyhost1", "proxyhost2").map(HostName::of).collect(Collectors.toList()); + List proxyHostHosts = Stream.of("proxyhost1", "proxyhost2").map(HostName::of).toList(); verify(duperModel, times(0)).add(any()); manager.infraApplicationActivated(id, proxyHostHosts); verify(duperModel, times(1)).add(any()); @@ -91,12 +91,12 @@ public class DuperModelManagerTest { } private void testEnabledConfigServerLikeInfraApplication(ApplicationId firstId, ApplicationId secondId) { - List hostnames1 = Stream.of("node11", "node12").map(HostName::of).collect(Collectors.toList()); + List hostnames1 = Stream.of("node11", "node12").map(HostName::of).toList(); manager.infraApplicationActivated(firstId, hostnames1); verify(duperModel, times(1)).add(any()); // Adding the second config server like application will be ignored - List hostnames2 = Stream.of("node21", "node22").map(HostName::of).collect(Collectors.toList()); + List hostnames2 = Stream.of("node21", "node22").map(HostName::of).toList(); assertThrows(IllegalArgumentException.class, () -> manager.infraApplicationActivated(secondId, hostnames2)); verify(duperModel, times(1)).add(any()); 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 69d3ef4d498..73a49ca8717 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 @@ -57,7 +57,7 @@ public class DuperModelTest { List hostInfos = Arrays.stream(hostnames) .map(hostname -> new HostInfo(hostname.value(), List.of())) - .collect(Collectors.toList()); + .toList(); when(model.getHosts()).thenReturn(hostInfos); } diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java index c77ff519abd..f7ee64b52a6 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java @@ -48,7 +48,7 @@ public class HealthMonitorManagerTest { public void infrastructureApplication() { ProxyHostApplication proxyHostApplication = new ProxyHostApplication(); when(duperModel.isSupportedInfraApplication(proxyHostApplication.getApplicationId())).thenReturn(true); - List hostnames = Stream.of("proxyhost1", "proxyhost2").map(HostName::of).collect(Collectors.toList()); + List hostnames = Stream.of("proxyhost1", "proxyhost2").map(HostName::of).toList(); ApplicationInfo proxyHostApplicationInfo = proxyHostApplication.makeApplicationInfo(hostnames); manager.applicationActivated(proxyHostApplicationInfo); diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java index 8ae0e55fe41..18b56f76e88 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java @@ -38,7 +38,7 @@ public class StateV1HealthModelTest { private final Duration requestTimeout = Duration.ofSeconds(2); private final Duration keepAlive = Duration.ofSeconds(3); private final ProxyHostApplication proxyHostApplication = new ProxyHostApplication(); - private final List hostnames = Stream.of("host1", "host2").map(HostName::of).collect(Collectors.toList()); + private final List hostnames = Stream.of("host1", "host2").map(HostName::of).toList(); private final ApplicationInfo proxyHostApplicationInfo = proxyHostApplication.makeApplicationInfo(hostnames); private final StateV1HealthModel model = new StateV1HealthModel(healthStaleness, requestTimeout, keepAlive, executor); diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java index 8f87a7bad68..a2532590f52 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java @@ -34,7 +34,7 @@ public class ApplicationInstanceGeneratorTest { when(statusProvider.getStatus(any(), any(), any(), any())).thenReturn(new ServiceStatusInfo(ServiceStatus.NOT_CHECKED)); Zone zone = mock(Zone.class); ApplicationInfo configServer = configServerApplication.makeApplicationInfo( - configServerList.stream().map(HostName::of).collect(Collectors.toList())); + configServerList.stream().map(HostName::of).toList()); ApplicationInstance applicationInstance = new ApplicationInstanceGenerator(configServer, zone) .makeApplicationInstance(statusProvider); 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 508c98d1292..8e1f2349046 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 @@ -35,7 +35,7 @@ public class ExampleModel { public static final ApplicationId APPLICATION_ID = ApplicationId.from(TENANT, APPLICATION_NAME, INSTANCE_NAME); public static SuperModel createExampleSuperModelWithOneRpcPort(String hostname, int rpcPort) { - List hosts = Stream.of(hostname).collect(Collectors.toList()); + List hosts = Stream.of(hostname).toList(); ApplicationInfo applicationInfo = ExampleModel .createApplication(TENANT, APPLICATION_NAME) @@ -83,7 +83,7 @@ public class ExampleModel { List allHosts = clusters.stream() .flatMap(clusterBuilder -> clusterBuilder.hosts.stream()) .distinct() - .collect(Collectors.toList()); + .toList(); List hostInfos = new ArrayList<>(); for (String hostname : allHosts) { diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModelTest.java index b66c6968764..829b1fe5859 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModelTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModelTest.java @@ -30,8 +30,8 @@ public class ExampleModelTest { @Test public void test() { - List contentNodes = Stream.of("host1", "host2").collect(Collectors.toList()); - List containerNodes = Stream.of("host3", "host4").collect(Collectors.toList()); + List contentNodes = Stream.of("host1", "host2").toList(); + List containerNodes = Stream.of("host3", "host4").toList(); ApplicationInfo application = ExampleModel .createApplication( diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java index 97b6ff0c3e2..c93e4dfb7fe 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java @@ -142,7 +142,7 @@ public class ServiceHostListenerAdapterTest { List hostnameList = Stream.of(hostnames) .map(hostname -> new HostInfo(hostname, List.of())) - .collect(Collectors.toList()); + .toList(); when(model.getHosts()).thenReturn(hostnameList); return applicationInfo; diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceMonitorImplTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceMonitorImplTest.java index c98e9ae2b18..c3f805b0572 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceMonitorImplTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceMonitorImplTest.java @@ -31,7 +31,7 @@ public class ServiceMonitorImplTest { ApplicationInfo application1 = mock(ApplicationInfo.class); ApplicationInfo application2 = mock(ApplicationInfo.class); List applications = Stream.of(application1, application2) - .collect(Collectors.toList()); + .toList(); when(duperModelManager.getApplicationInfos()).thenReturn(applications); ServiceModel serviceModel = serviceMonitor.getServiceModelSnapshot(); diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java index df489a8c336..498a9dfc15e 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java @@ -37,7 +37,7 @@ public class ConfigserverUtil { String configServerHostname3) { return new ConfigServerApplication().makeApplicationInfo( Stream.of(configServerHostname1, configServerHostname2, configServerHostname3) - .map(HostName::of).collect(Collectors.toList())); + .map(HostName::of).toList()); } public static ApplicationInfo makeExampleConfigServer() { -- cgit v1.2.3