Merge pull request #25104 from vespa-engine/revert-25103-balder/manual-revert-of-25097

Revert "Revert collect(Collectors.toList())"

5 files changed, 12 insertions, 14 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 74ec5e81da3..2e60a6c6cd0 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -295,10 +295,8 @@ public class ApplicationRepositoryTest {
         // deployApp(new File("src/test/apps/app"), prepareParams);
 
         List<String> deleted = applicationRepository.deleteUnusedFileDistributionReferences(fileDirectory, keepFileReferencesDuration);
-        Collections.sort(deleted);
-        List<String> expected = new ArrayList<>(List.of("bar", "baz0", "baz1"));
-        Collections.sort(expected);
-        assertEquals(expected, deleted);
+        List<String> expected = List.of("bar", "baz0", "baz1");
+        assertEquals(expected.stream().sorted().toList(), deleted.stream().sorted().toList());
         // bar, baz0 and baz1 will be deleted and foo is not old enough to be considered
         assertFalse(filereferenceDirOldest.exists());
         assertFalse(new File(fileReferencesDir, "baz0").exists());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
index dad029e909a..2f595d4ed06 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
@@ -75,7 +75,7 @@ public class ConfigServerBootstrapTest {
         assertEquals(List.of("ApplicationPackageMaintainer", "TenantsMaintainer"),
                      bootstrap.configServerMaintenance().maintainers().stream()
                               .map(Maintainer::name)
-                              .sorted().collect(Collectors.toList()));
+                              .sorted().toList());
         assertFalse(bootstrap.vipStatus().isInRotation());
 
         bootstrap.doStart();
@@ -86,7 +86,7 @@ public class ConfigServerBootstrapTest {
         assertEquals(List.of("ApplicationPackageMaintainer", "FileDistributionMaintainer", "ReindexingMaintainer", "SessionsMaintainer", "TenantsMaintainer"),
                      bootstrap.configServerMaintenance().maintainers().stream()
                               .map(Maintainer::name)
-                              .sorted().collect(Collectors.toList()));
+                              .sorted().toList());
 
         bootstrap.deconstruct();
         assertEquals(StateMonitor.Status.down, bootstrap.status());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
index 97e184bdcfa..df52ab624c6 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
@@ -38,7 +38,7 @@ public class ClusterDeploymentMetricsRetrieverTest {
     public void testMetricAggregation() throws IOException {
         List<URI> hosts = Stream.of(1, 2, 3, 4)
                 .map(item -> URI.create("http://localhost:" + wireMock.port() + "/" + item))
-                .collect(Collectors.toList());
+                .toList();
 
         stubFor(get(urlEqualTo("/1"))
                 .willReturn(aResponse()
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java
index 7af02370e7e..585ce3980fc 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java
@@ -30,7 +30,7 @@ public class ClusterProtonMetricsRetrieverTest {
     public void testMetricAggregation() throws IOException {
         List<URI> hosts = Stream.of(1, 2)
                 .map(item -> URI.create("http://localhost:" + wireMock.port() + "/metrics" + item + "/v2/values"))
-                .collect(Collectors.toList());
+                .toList();
 
         stubFor(get(urlEqualTo("/metrics1/v2/values"))
                 .willReturn(aResponse()
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
index 8167cd8a2ee..4f52eede4e8 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
@@ -127,24 +127,24 @@ public class LbServicesProducerTest {
         List<Endpoints> endpointList = config.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").endpoints();
         // Expect 2 zone endpoints (2 suffixes), 2 global endpoints and 1 application endpoint
         assertEquals(5, endpointList.size());
-        List<Endpoints> zoneEndpoints = endpointList.stream().filter(e -> e.scope() == zone).collect(Collectors.toList());
+        List<Endpoints> zoneEndpoints = endpointList.stream().filter(e -> e.scope() == zone).toList();
         assertEquals(2, zoneEndpoints.size());
         assertTrue(zoneEndpoints.stream()
                            .filter(e -> e.routingMethod() == sharedLayer4)
-                           .map(Endpoints::dnsName).collect(Collectors.toList())
+                           .map(Endpoints::dnsName).toList()
                 .containsAll(List.of("mydisc.foo.foo.endpoint1.suffix", "mydisc.foo.foo.endpoint2.suffix")));
         assertContainsEndpoint(zoneEndpoints, "mydisc.foo.foo.endpoint1.suffix", "mydisc", zone, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
         assertContainsEndpoint(zoneEndpoints, "mydisc.foo.foo.endpoint2.suffix", "mydisc", zone, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
 
-        List<Endpoints> globalEndpoints = endpointList.stream().filter(e -> e.scope() == global).collect(Collectors.toList());
+        List<Endpoints> globalEndpoints = endpointList.stream().filter(e -> e.scope() == global).toList();
         assertEquals(2, globalEndpoints.size());
-        assertTrue(globalEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()).containsAll(List.of("rotation-1", "rotation-2")));
+        assertTrue(globalEndpoints.stream().map(Endpoints::dnsName).toList().containsAll(List.of("rotation-1", "rotation-2")));
         assertContainsEndpoint(globalEndpoints, "rotation-1", "mydisc", global, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
         assertContainsEndpoint(globalEndpoints, "rotation-2", "mydisc", global, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
 
-        List<Endpoints> applicationEndpoints = endpointList.stream().filter(e -> e.scope() == application).collect(Collectors.toList());
+        List<Endpoints> applicationEndpoints = endpointList.stream().filter(e -> e.scope() == application).toList();
         assertEquals(1, applicationEndpoints.size());
-        assertTrue(applicationEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()).contains("app-endpoint"));
+        assertTrue(applicationEndpoints.stream().map(Endpoints::dnsName).toList().contains("app-endpoint"));
         assertContainsEndpoint(applicationEndpoints, "app-endpoint", "mydisc", application, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
     }