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

11 files changed, 20 insertions, 20 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
index 0c908b1f035..38a4945e354 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
@@ -218,14 +218,14 @@ public final class ControllerTester {
     /** Set the zones and system for this and bootstrap infrastructure nodes */
     public ControllerTester setZones(List<ZoneId> zones) {
         ZoneApiMock.Builder builder = ZoneApiMock.newBuilder().withSystem(zoneRegistry().system());
-        zoneRegistry().setZones(zones.stream().map(zone -> builder.with(zone).build()).collect(Collectors.toList()));
+        zoneRegistry().setZones(zones.stream().map(zone -> builder.with(zone).build()).toList());
         configServer().bootstrap(zones, SystemApplication.notController());
         return this;
     }
 
     /** Set the routing method for given zones */
     public ControllerTester setRoutingMethod(List<ZoneId> zones, RoutingMethod routingMethod) {
-        zoneRegistry().setRoutingMethod(zones.stream().map(ZoneApiMock::from).collect(Collectors.toList()),
+        zoneRegistry().setRoutingMethod(zones.stream().map(ZoneApiMock::from).toList(),
                                         routingMethod);
         return this;
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/LinesComparatorTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/LinesComparatorTest.java
index 8d9f88ca0ca..9fd15a2f55d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/LinesComparatorTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/LinesComparatorTest.java
@@ -107,6 +107,6 @@ public class LinesComparatorTest {
 
     private static void assertDiff(String expected, String left, String right) {
         assertEquals(Optional.ofNullable(expected),
-                LinesComparator.diff(left.lines().collect(Collectors.toList()), right.lines().collect(Collectors.toList())));
+                LinesComparator.diff(left.lines().toList(), right.lines().toList()));
     }
 }
\ No newline at end of file
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index c0f0b67926a..7b82ec5ea55 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -197,7 +197,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
                                                                                                                                       43,
                                                                                                                                       "container",
                                                                                                                                       2))
-                                                                                           .collect(Collectors.toList())));
+                                                                                           .toList()));
     }
 
     /** The version given in the previous prepare call, or empty if no call has been made */
@@ -431,7 +431,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
                                                                                                      43,
                                                                                                      "container",
                                                                                                      1))
-                                                          .collect(Collectors.toList())));
+                                                          .toList()));
 
         DeploymentResult result = new DeploymentResult("foo", warnings.getOrDefault(id, List.of()));
         return () -> result;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
index f440d724b56..fbc72970e8d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
@@ -81,7 +81,7 @@ public class NodeRepositoryMock implements NodeRepository {
                                              (node.owner().isPresent() && filter.applications().contains(node.owner().get())))
                              .filter(node -> filter.hostnames().isEmpty() || filter.hostnames().contains(node.hostname()))
                              .filter(node -> filter.states().isEmpty() || filter.states().contains(node.state()))
-                             .collect(Collectors.toList());
+                             .toList();
     }
 
     @Override
@@ -101,7 +101,7 @@ public class NodeRepositoryMock implements NodeRepository {
                 applications.containsKey(zone)
                         ? applications.get(zone).keySet().stream()
                                       .map(id -> new ApplicationStats(id, Load.zero(), 0, 0))
-                                      .collect(Collectors.toList())
+                                      .toList()
                         : List.of();
 
         return new NodeRepoStats(0.0, 0.0, Load.zero(), Load.zero(), applicationStats);
@@ -336,7 +336,7 @@ public class NodeRepositoryMock implements NodeRepository {
         } else {
             nodes = list(zone, NodeFilter.all());
         }
-        putNodes(zone, nodes.stream().map(patcher).collect(Collectors.toList()));
+        putNodes(zone, nodes.stream().map(patcher).toList());
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java
index c2882da67d6..7aac44805b3 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java
@@ -106,7 +106,7 @@ public class ZoneFilterMock implements ZoneList {
                         .filter(zone -> negate ?
                                 condition.negate().test(zone) :
                                 condition.test(zone))
-                        .collect(Collectors.toList()),
+                        .toList(),
                 zoneRoutingMethods, dynamicallyProvisioned, false);
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
index e7e542d2b82..8dfbec097cb 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
@@ -251,7 +251,7 @@ public class JobRunnerTest {
         }
 
         // Thread is still trying to deploy tester -- delete application, and see all data is garbage collected.
-        assertEquals(Collections.singletonList(runId), jobs.active().stream().map(run -> run.id()).collect(Collectors.toList()));
+        assertEquals(Collections.singletonList(runId), jobs.active().stream().map(run -> run.id()).toList());
         tester.controllerTester().controller().applications().deleteApplication(TenantAndApplicationId.from(id), tester.controllerTester().credentialsFor(id.tenant()));
         assertEquals(Collections.emptyList(), jobs.active());
         assertEquals(runId, jobs.last(id, systemTest).get().id());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
index 4072fef3395..869a94c0449 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
@@ -625,7 +625,7 @@ public class MetricsReporterTest {
         var currentNodes = getNodes(zone, nodes, tester);
         var updatedNodes = currentNodes.stream()
                                        .map(node -> builderOps.apply(Node.builder(node)).build())
-                                       .collect(Collectors.toList());
+                                       .toList();
         tester.configServer().nodeRepository().putNodes(zone, updatedNodes);
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
index 0f5bb605c37..adfb0286202 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
@@ -58,7 +58,7 @@ public class OsUpgraderTest {
         // Bootstrap system
         List<ZoneId> nonControllerZones = Stream.of(zone1, zone2, zone3, zone4, zone5)
                 .map(ZoneApi::getVirtualId)
-                .collect(Collectors.toList());
+                .toList();
         tester.configServer().bootstrap(nonControllerZones, List.of(SystemApplication.tenantHost));
         tester.configServer().addNodes(List.of(zone0.getVirtualId()), List.of(SystemApplication.controllerHost));
 
@@ -181,7 +181,7 @@ public class OsUpgraderTest {
         return tester.controller().osVersionStatus().versions().entrySet().stream()
                      .filter(entry -> entry.getKey().version().equals(version))
                      .flatMap(entry -> entry.getValue().stream())
-                     .collect(Collectors.toList());
+                     .toList();
     }
 
     private void assertCurrent(Version version, SystemApplication application, ZoneApi... zones) {
@@ -210,7 +210,7 @@ public class OsUpgraderTest {
         return nodeRepository().list(zone.getVirtualId(), NodeFilter.all().applications(application.id()))
                                .stream()
                                .filter(node -> OsUpgrader.canUpgrade(node, false))
-                               .collect(Collectors.toList());
+                               .toList();
     }
 
     private Node failNodeIn(ZoneApi zone, SystemApplication application) {
@@ -266,7 +266,7 @@ public class OsUpgraderTest {
     }
 
     private OsUpgrader osUpgrader(UpgradePolicy upgradePolicy, CloudName cloud, boolean dynamicProvisioning) {
-        var zones = upgradePolicy.steps().stream().map(Step::zones).flatMap(Collection::stream).collect(Collectors.toList());
+        var zones = upgradePolicy.steps().stream().map(Step::zones).flatMap(Collection::stream).toList();
         tester.zoneRegistry()
               .setZones(zones)
               .setOsUpgradePolicy(cloud, upgradePolicy);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
index 7426e0dd23b..a7360f3d2d8 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
@@ -464,7 +464,7 @@ public class SystemUpgraderTest {
     private List<Node> listNodes(ZoneApi zone, SystemApplication application) {
         return nodeRepository().list(zone.getId(), NodeFilter.all().applications(application.id())).stream()
                                .filter(SystemUpgrader::eligibleForUpgrade)
-                               .collect(Collectors.toList());
+                               .toList();
     }
 
     private NodeRepositoryMock nodeRepository() {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
index fb85b876adf..7d7b66b035c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
@@ -295,7 +295,7 @@ public class RoutingPoliciesTest {
                 "c0.app2.tenant1.us-west-1.vespa.oath.cloud",
                 "c1.app2.tenant1.us-west-1.vespa.oath.cloud"
         );
-        assertEquals(expectedRecords.stream().sorted().collect(Collectors.toList()), tester.recordNames().stream().sorted().collect(Collectors.toList()));
+        assertEquals(expectedRecords.stream().sorted().toList(), tester.recordNames().stream().sorted().toList());
         assertEquals(4, tester.policiesOf(context2.instanceId()).size());
 
         // Deploy removes cluster from app1
@@ -1053,7 +1053,7 @@ public class RoutingPoliciesTest {
             return tester.controllerTester().nameService().findRecords(type, RecordName.from(name)).stream()
                          .map(Record::data)
                          .map(RecordData::asString)
-                         .collect(Collectors.toList());
+                         .toList();
         }
 
         /** Assert that an application endpoint points to given targets and weights */
@@ -1110,7 +1110,7 @@ public class RoutingPoliciesTest {
                 String latencyTarget = "latency/" + regionEndpoint + "/dns-zone-1/" + zone.value();
                 latencyTargets.add(latencyTarget);
             });
-            List<DeploymentId> deployments = zoneWeights.keySet().stream().map(z -> new DeploymentId(instance, z)).collect(Collectors.toList());
+            List<DeploymentId> deployments = zoneWeights.keySet().stream().map(z -> new DeploymentId(instance, z)).toList();
             String globalEndpoint = tester.controller().routing().readDeclaredEndpointsOf(instance)
                                           .named(endpointId)
                                           .targets(deployments)
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
index ee72a0ec339..f08e92a515d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
@@ -375,7 +375,7 @@ public class VersionStatusTest {
 
         // Test version order
         List<VespaVersion> versions = tester.controller().readVersionStatus().versions();
-        assertEquals(List.of("6.2", "6.4", "6.5"), versions.stream().map(version -> version.versionNumber().toString()).collect(Collectors.toList()));
+        assertEquals(List.of("6.2", "6.4", "6.5"), versions.stream().map(version -> version.versionNumber().toString()).toList());
 
         // Check release status is correct (static data in MockMavenRepository, and upgradeSystem "releases" a version).
         assertTrue(versions.get(0).isReleased());