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

26 files changed, 43 insertions, 43 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
index 9eefd4e60b7..d132d574658 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
@@ -70,11 +70,11 @@ public class MemoryMetricsDb implements MetricsDb {
         Instant startTime = clock().instant().minus(period);
         synchronized (lock) {
             if (hostnames.isEmpty())
-                return nodeTimeseries.values().stream().map(ns -> ns.keepAfter(startTime)).collect(Collectors.toList());
+                return nodeTimeseries.values().stream().map(ns -> ns.keepAfter(startTime)).toList();
             else
                 return hostnames.stream()
                                 .map(hostname -> nodeTimeseries.getOrDefault(hostname, new NodeTimeseries(hostname, List.of())).keepAfter(startTime))
-                                .collect(Collectors.toList());
+                                .toList();
         }
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java
index cd75a383b87..c25b0684f5a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java
@@ -72,14 +72,14 @@ public class NodeTimeseries {
     public NodeTimeseries keep(Predicate<NodeMetricSnapshot> filter) {
         return new NodeTimeseries(hostname, snapshots.stream()
                                                      .filter(snapshot -> filter.test(snapshot))
-                                                     .collect(Collectors.toList()));
+                                                     .toList());
     }
 
     public NodeTimeseries keepAfter(Instant oldestTime) {
         return new NodeTimeseries(hostname,
                                   snapshots.stream()
                                            .filter(snapshot -> snapshot.at().equals(oldestTime) || snapshot.at().isAfter(oldestTime))
-                                           .collect(Collectors.toList()));
+                                           .toList());
     }
 
     public NodeTimeseries keepGenerationAfterWarmup(long generation, Optional<Node> node) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
index bf9c7bddda1..e0199b5ddaf 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
@@ -176,7 +176,7 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb {
             var snapshots = getNodeSnapshots(clock.instant().minus(period), hostnames, newContext());
             return snapshots.entrySet().stream()
                             .map(entry -> new NodeTimeseries(entry.getKey(), entry.getValue()))
-                            .collect(Collectors.toList());
+                            .toList();
         }
         catch (SqlException e) {
             throw new IllegalStateException("Could not read node timeseries data in Quest stored in " + dataDir, e);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
index e7e1e371047..603056856e2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
@@ -66,7 +66,7 @@ public class CapacityChecker {
     public List<Node> nodesFromHostnames(List<String> hostnames) {
         return hostnames.stream().filter(nodeMap::containsKey)
                                     .map(nodeMap::get)
-                                    .collect(Collectors.toList());
+                                    .toList();
 
     }
 
@@ -79,7 +79,7 @@ public class CapacityChecker {
         var parentNames = hosts.stream().map(Node::hostname).collect(Collectors.toSet());
         return allNodes.nodeType(NodeType.tenant).state(relevantNodeStates).stream()
                 .filter(t -> parentNames.contains(t.parentHostname().orElse("")))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Optional<HostFailurePath> greedyHeuristicFindFailurePath(Map<Node, Integer> heuristic) {
@@ -88,7 +88,7 @@ public class CapacityChecker {
         List<Node> parentRemovalPriorityList = heuristic.entrySet().stream()
                                                         .sorted(this::hostMitigationOrder)
                                                         .map(Map.Entry::getKey)
-                                                        .collect(Collectors.toList());
+                                                        .toList();
 
         for (int i = 1; i <= parentRemovalPriorityList.size(); i++) {
             List<Node> hostsToRemove = parentRemovalPriorityList.subList(0, i);
@@ -170,7 +170,7 @@ public class CapacityChecker {
                 Map.Entry::getKey,
                 e -> e.getValue().stream()
                         .map(Node::allocation).flatMap(Optional::stream)
-                        .collect(Collectors.toList())
+                        .collect(Collectors.toCollection(ArrayList::new))
         ));
     }
 
@@ -189,7 +189,7 @@ public class CapacityChecker {
                                                     .filter(h -> !hostsToRemove.contains(h))
                                                     .filter(host -> !host.status().wantToRetire() &&
                                                             !host.status().wantToFail())
-                                                    .collect(Collectors.toList());
+                                                    .toList();
         if (validAllocationTargets.size() == 0)
             return Optional.of(HostRemovalFailure.none());
 
@@ -482,11 +482,11 @@ public class CapacityChecker {
 
         public AllocationFailureReasonList singularReasonFailures() {
             return new AllocationFailureReasonList(allocationFailureReasons.stream()
-                    .filter(reason -> reason.numberOfReasons() == 1).collect(Collectors.toList()));
+                    .filter(reason -> reason.numberOfReasons() == 1).toList());
         }
         public AllocationFailureReasonList multipleReasonFailures() {
             return new AllocationFailureReasonList(allocationFailureReasons.stream()
-                    .filter(reason -> reason.numberOfReasons() > 1).collect(Collectors.toList()));
+                    .filter(reason -> reason.numberOfReasons() > 1).toList());
         }
         public long size() {
             return allocationFailureReasons.size();
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
index c99c18262ec..d048f43973a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
@@ -85,7 +85,7 @@ public class ExpeditedChangeApplicationMaintainer extends ApplicationMaintainer
                                                             .map(event -> event.type() + (event.agent() == Agent.system ? "" : " by " + event.agent())))
                                     .sorted()
                                     .distinct()
-                                    .collect(Collectors.toList());
+                                    .toList();
 
         return reasons.isEmpty() ?
                 Optional.empty() :
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
index 2fb2f016c95..9e674c573da 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
@@ -86,7 +86,7 @@ public class FailedExpirer extends NodeRepositoryMaintainer {
 
     /** Recycle the nodes matching condition, and remove those nodes from the nodes list. */
     private void recycleIf(Predicate<Node> condition, List<Node> failedNodes, NodeList allNodes) {
-        List<Node> nodesToRecycle = failedNodes.stream().filter(condition).collect(Collectors.toList());
+        List<Node> nodesToRecycle = failedNodes.stream().filter(condition).toList();
         failedNodes.removeAll(nodesToRecycle);
         recycle(nodesToRecycle, allNodes);
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java
index 7310fe63736..c9f53b69dc6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java
@@ -154,7 +154,7 @@ public class HostCapacityMaintainer extends NodeRepositoryMaintainer {
                         return false;
                     }
                 })
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static List<Node> candidatesForRemoval(List<Node> nodes) {
@@ -295,7 +295,7 @@ public class HostCapacityMaintainer extends NodeRepositoryMaintainer {
                                   ClusterMembership.from(clusterSpec, index.next()),
                                   nodeResources,
                                   nodeRepository().clock().instant()))
-                .collect(Collectors.toList());
+                .toList();
 
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java
index bdc9f402d37..7e238470a0c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java
@@ -47,7 +47,7 @@ public class HostRetirer extends NodeRepositoryMaintainer {
                                                      .map(Node::cloudAccount)
                                                      .filter(cloudAccount -> !cloudAccount.isUnspecified())
                                                      .distinct()
-                                                     .collect(Collectors.toList());
+                                                     .toList();
         Map<String, List<HostEvent>> eventsByHostId = hostProvisioner.hostEventsIn(cloudAccounts).stream()
                                                                      .collect(Collectors.groupingBy(HostEvent::hostId));
         Instant now = nodeRepository().clock().instant();
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
index 1b4b9f9c54b..203bb664c1c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
@@ -137,7 +137,7 @@ public class NodeFailer extends NodeRepositoryMaintainer {
                 .filter(report -> report.getType().hostShouldBeFailed())
                 // The generated string is built from the report's ID, created time, and description only.
                 .map(report -> report.getReportId() + " reported " + report.getCreatedTime() + ": " + report.getDescription())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /** Returns whether node has any kind of hardware issue */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java
index 3cd97c64e4d..27945fad7f5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java
@@ -42,7 +42,7 @@ public class NodeRebooter extends NodeRepositoryMaintainer {
         List<Node> nodesToReboot = nodeRepository().nodes().list(Node.State.active, Node.State.ready).stream()
                 .filter(node -> node.type().isHost())
                 .filter(this::shouldReboot)
-                .collect(Collectors.toList());
+                .toList();
 
         if (!nodesToReboot.isEmpty())
             nodeRepository().nodes().reboot(NodeListFilter.from(nodesToReboot));
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java
index 7da10ce085a..93b28d07471 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java
@@ -136,7 +136,7 @@ public class History {
      * This returns a copy of this history with all application level events removed and the log unchanged.
      */
     private History withoutApplicationEvents() {
-        return new History(events().stream().filter(e -> ! e.type().isApplicationLevel()).collect(Collectors.toList()), log);
+        return new History(events().stream().filter(e -> ! e.type().isApplicationLevel()).toList(), log);
     }
 
     /** Returns the empty history */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
index 54e48f881cd..2693fff3b39 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
@@ -380,7 +380,7 @@ public class IP {
             String hostname6 = resolver.resolveHostname(ipv6Address).orElseThrow(() -> new IllegalArgumentException("Could not resolve IP address: " + ipv6Address));
             List<String> ipv4Addresses = resolver.resolveAll(hostname6).stream()
                                                  .filter(IP::isV4)
-                                                 .collect(Collectors.toList());
+                                                 .toList();
             if (ipv4Addresses.size() > 1) {
                 throw new IllegalArgumentException("Hostname " + hostname6 + " resolved to more than 1 IPv4 address: " + ipv4Addresses);
             }
@@ -407,7 +407,7 @@ public class IP {
             String hostname4 = resolver.resolveHostname(ipAddress).orElseThrow(() -> new IllegalArgumentException("Could not resolve IP address: " + ipAddress));
             List<String> addresses = resolver.resolveAll(hostname4).stream()
                                              .filter(IP::isV4)
-                                             .collect(Collectors.toList());
+                                             .toList();
             if (addresses.size() != 1) {
                 throw new IllegalArgumentException("Hostname " + hostname4 + " did not resolve to exactly 1 address. " +
                                                    "Resolved: " + addresses);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
index b98c9c97437..345dccf5faf 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
@@ -264,7 +264,7 @@ public class Nodes {
     private List<Node> fail(List<Node> nodes, Agent agent, String reason, NestedTransaction transaction) {
         nodes = nodes.stream()
                      .map(n -> n.withWantToFail(false, agent, clock.instant()))
-                     .collect(Collectors.toList());
+                     .toList();
         return db.writeTo(Node.State.failed, nodes, agent, Optional.of(reason), transaction);
     }
 
@@ -290,7 +290,7 @@ public class Nodes {
             illegal("Could not deallocate " + nodeToDirty + ": " +
                     hostnamesNotAllowedToDirty + " are not in states [provisioned, failed, parked, breakfixed]");
 
-        return nodesToDirty.stream().map(node -> deallocate(node, agent, reason)).collect(Collectors.toList());
+        return nodesToDirty.stream().map(node -> deallocate(node, agent, reason)).toList();
     }
 
     /**
@@ -305,7 +305,7 @@ public class Nodes {
     }
 
     public List<Node> deallocate(List<Node> nodes, Agent agent, String reason, NestedTransaction transaction) {
-        return nodes.stream().map(node -> deallocate(node, agent, reason, transaction)).collect(Collectors.toList());
+        return nodes.stream().map(node -> deallocate(node, agent, reason, transaction)).toList();
     }
 
     public Node deallocate(Node node, Agent agent, String reason, NestedTransaction transaction) {
@@ -419,7 +419,7 @@ public class Nodes {
         NestedTransaction transaction = new NestedTransaction();
         List<Node> moved = list().childrenOf(hostname).asList().stream()
                                  .map(child -> move(child.hostname(), toState, agent, false, reason, transaction))
-                                 .collect(Collectors.toList());
+                                 .collect(Collectors.toCollection(ArrayList::new));
         moved.add(move(hostname, toState, agent, false, reason, transaction));
         transaction.commit();
         return moved;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java
index 2289ba4a0ea..74088e8d269 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java
@@ -175,7 +175,7 @@ public class ApplicationSerializer {
     }
 
     private static List<ScalingEvent> scalingEventsFromSlime(Inspector eventArray) {
-        return SlimeUtils.entriesStream(eventArray).map(item -> scalingEventFromSlime(item)).collect(Collectors.toList());
+        return SlimeUtils.entriesStream(eventArray).map(item -> scalingEventFromSlime(item)).toList();
     }
 
     private static void toSlime(ScalingEvent event, Cursor object) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
index 5fe9eef7e73..aa935eaf272 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
@@ -63,7 +63,7 @@ public class CuratorDatabase {
                 .filter(hostAndPort -> !hostAndPort.isEmpty())
                 .map(hostAndPort -> hostAndPort.split(":")[0])
                 .map(HostName::of)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /** Create a reentrant lock */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
index 7f24f5e862b..47975c8354a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
@@ -349,7 +349,7 @@ public class CuratorDatabaseClient {
     public List<ApplicationId> readApplicationIds() {
         return db.getChildren(applicationsPath).stream()
                  .map(ApplicationId::fromSerializedForm)
-                 .collect(Collectors.toList());
+                 .toList();
     }
 
     public Optional<Application> readApplication(ApplicationId id) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index 3ee25c23f13..94707f7f429 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -400,14 +400,14 @@ public class NodeSerializer {
     private List<Address> addressesFromSlime(Inspector object) {
         return SlimeUtils.entriesStream(object.field(containersKey))
                          .map(elem -> new Address(elem.field(containerHostnameKey).asString()))
-                         .collect(Collectors.toList());
+                         .toList();
     }
 
     private List<TrustStoreItem> trustedCertificatesFromSlime(Inspector object) {
         return SlimeUtils.entriesStream(object.field(trustedCertificatesKey))
                          .map(elem -> new TrustStoreItem(elem.field(fingerprintKey).asString(),
                                                          Instant.ofEpochMilli(elem.field(expiresKey).asLong())))
-                         .collect(Collectors.toList());
+                         .toList();
     }
 
     // ----------------- Enum <-> string mappings ----------------------------------------
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
index 5e01ba5b0a6..40bad7022d6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
@@ -118,7 +118,7 @@ public class GroupPreparer {
                     List<NodeCandidate> candidates = provisionedHosts.stream()
                             .map(host -> NodeCandidate.createNewExclusiveChild(host.generateNode(),
                                     host.generateHost()))
-                            .collect(Collectors.toList());
+                            .toList();
                     allocation.offer(candidates);
                 };
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
index 605ef280c2e..178ea6ed514 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
@@ -116,7 +116,7 @@ public class InfraDeployerImpl implements InfraDeployer {
 
                     duperModel.infraApplicationActivated(
                             application.getApplicationId(),
-                            hostSpecs.stream().map(HostSpec::hostname).map(HostName::of).collect(Collectors.toList()));
+                            hostSpecs.stream().map(HostSpec::hostname).map(HostName::of).toList());
 
                     logger.log(Level.FINE, () -> generateActivationLogMessage(hostSpecs, application.getApplicationId()));
                 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
index 26a3f231a31..ebb05b69e1a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
@@ -164,7 +164,7 @@ public class LoadBalancerProvisioner {
         var now = nodeRepository.clock().instant();
         var deactivatedLoadBalancers = loadBalancers.stream()
                                                     .map(lb -> lb.with(LoadBalancer.State.inactive, now))
-                                                    .collect(Collectors.toList());
+                                                    .toList();
         db.writeLoadBalancers(deactivatedLoadBalancers, LoadBalancer.State.active, transaction);
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
index 8d350e304a2..61ca7c914c0 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
@@ -410,7 +410,7 @@ class NodeAllocation {
             nodes.put(candidate.toNode().hostname(), candidate);
         }
 
-        return nodes.values().stream().map(n -> n.toNode()).collect(Collectors.toList());
+        return nodes.values().stream().map(n -> n.toNode()).toList();
     }
 
     List<Node> reservableNodes() {
@@ -427,7 +427,7 @@ class NodeAllocation {
         return nodes.values().stream()
                 .filter(predicate)
                 .map(n -> n.toNode())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /** Returns the number of nodes accepted this far */
@@ -440,7 +440,7 @@ class NodeAllocation {
 
     /** Prefer to retire nodes we want the least */
     private List<NodeCandidate> byRetiringPriority(Collection<NodeCandidate> candidates) {
-        return candidates.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
+        return candidates.stream().sorted(Comparator.reverseOrder()).toList();
     }
 
     /** Prefer to unretire nodes we don't want to retire, and otherwise those with lower index */
@@ -448,7 +448,7 @@ class NodeAllocation {
         return candidates.stream()
                          .sorted(Comparator.comparing(NodeCandidate::wantToRetire)
                                            .thenComparing(n -> n.allocation().get().membership().index()))
-                         .collect(Collectors.toList());
+                         .toList();
     }
 
     public String allocationFailureDetails() {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
index 820a654c620..139e8848ab1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
@@ -78,7 +78,7 @@ class Preparer {
                 NodeList activeHosts = allNodesAndHosts.nodes().state(Node.State.active).parents().nodeType(requestedNodes.type().hostType());
                 accepted = accepted.stream()
                                    .filter(node -> node.parentHostname().isEmpty() || activeHosts.parentOf(node).isPresent())
-                                   .collect(Collectors.toList());
+                                   .toList();
             }
 
             replace(acceptedNodes, accepted);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java
index 8a66a9394b2..42904bb6d68 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java
@@ -77,7 +77,7 @@ public class LocksResponse extends HttpResponse {
 
         List<RecordedLockAttempts> historicRecordings = LockStats.getGlobal().getHistoricRecordings().stream()
                 .sorted(Comparator.comparing(RecordedLockAttempts::duration).reversed())
-                .collect(Collectors.toList());
+                .toList();
         if (!historicRecordings.isEmpty()) {
             Cursor recordingsCursor = root.setArray("recordings");
             historicRecordings.forEach(recording -> setRecording(recordingsCursor.addObject(), recording));
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
index 328be3b32b8..2c93992dcab 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
@@ -269,7 +269,7 @@ public class NodePatcher {
         List<TrustStoreItem> trustStoreItems =
                 SlimeUtils.entriesStream(inspector)
                         .map(TrustStoreItem::fromSlime)
-                        .collect(Collectors.toList());
+                        .toList();
         return node.with(trustStoreItems);
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java
index 20a1621b1d2..63386449f0c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java
@@ -232,7 +232,7 @@ public class MockDeployer implements Deployer {
             return clusterContexts.stream()
                     .map(clusterContext -> clusterContext.prepare(provisioner))
                     .flatMap(List::stream)
-                    .collect(Collectors.toList());
+                    .toList();
         }
 
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
index 15ee064b59f..20612e2ad66 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
@@ -184,7 +184,7 @@ public class MockHostProvisioner implements HostProvisioner {
                                     : hostType.childNodeType().name() + i;
                             return new Address(hostname);
                         })
-                        .collect(Collectors.toList());
+                        .toList();
     }
 
     public Node withIpAssigned(Node node) {