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

46 files changed, 74 insertions, 74 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index e4feaccca89..602a53035a6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -548,7 +548,7 @@ public class ApplicationController {
                                                                  .map(LogEntry::message)
                                                                  .sorted()
                                                                  .distinct()
-                                                                 .collect(Collectors.toList()))
+                                                                 .toList())
                                                 .orElseGet(List::of);
                 if (warnings.isEmpty())
                     controller.notificationsDb().removeNotification(source, Notification.Type.applicationPackage);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
index 84aa26b93f3..4ccebfa11e0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
@@ -143,7 +143,7 @@ public class RoutingController {
                 List<DeploymentId> deployments = spec.zones().stream()
                                                      .filter(zone -> zone.concerns(Environment.prod))
                                                      .map(zone -> new DeploymentId(instance, ZoneId.from(Environment.prod, zone.region().get())))
-                                                     .collect(Collectors.toList());
+                                                     .toList();
                 RoutingId routingId = RoutingId.of(instance, EndpointId.defaultId());
                 endpoints.addAll(computeGlobalEndpoints(routingId, ClusterSpec.Id.from(clusterId), deployments, deploymentSpec));
             });
@@ -153,7 +153,7 @@ public class RoutingController {
                 List<DeploymentId> deployments = declaredEndpoint.regions().stream()
                                                                  .map(region -> new DeploymentId(instance,
                                                                                                  ZoneId.from(Environment.prod, region)))
-                                                                 .collect(Collectors.toList());
+                                                                 .toList();
                 endpoints.addAll(computeGlobalEndpoints(routingId, ClusterSpec.Id.from(declaredEndpoint.containerId()), deployments, deploymentSpec));
             });
         }
@@ -345,7 +345,7 @@ public class RoutingController {
         for (var rotation : instance.rotations()) {
             var deployments = rotation.regions().stream()
                                       .map(region -> new DeploymentId(instance.id(), ZoneId.from(Environment.prod, region)))
-                                      .collect(Collectors.toList());
+                                      .toList();
             endpointsToRemove.addAll(computeGlobalEndpoints(RoutingId.of(instance.id(), rotation.endpointId()),
                                                             rotation.clusterId(), deployments, application.deploymentSpec()));
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
index 563c59630d1..4547e3e2c23 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
@@ -70,7 +70,7 @@ public class TenantController {
         return curator.readTenants().stream()
                 .filter(tenant -> tenant.type() != Tenant.Type.deleted || includeDeleted)
                 .sorted(Comparator.comparing(Tenant::name))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /** Locks a tenant for modification and applies the given action. */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java
index e18f6247cb1..4e4babfea5e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java
@@ -42,7 +42,7 @@ public class ApplicationPackageDiff {
                 .flatMap(contents -> contents.keySet().stream())
                 .sorted()
                 .distinct()
-                .collect(Collectors.toList());
+                .toList();
         for (String file : files) {
             if (sb.length() > maxTotalDiffSize)
                 sb.append("--- ").append(file).append('\n').append("Diff skipped: Total diff size >").append(maxTotalDiffSize).append("B)\n\n");
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
index 977dd30c900..aeac28782a6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
@@ -242,7 +242,7 @@ public class ApplicationPackageValidator {
                                   .flatMap(zone -> zone.region().stream())
                                   .distinct()
                                   .map(region -> new Endpoint.Target(region, instance.name(), 1))
-                                  .collect(Collectors.toList());
+                                  .toList();
             return new Endpoint(EndpointId.defaultId().id(), globalServiceId, Endpoint.Level.instance, targets);
         });
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
index 4c314c64f7f..8d983714be4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
@@ -243,7 +243,7 @@ public class DeploymentStatus {
                        .filter(version -> version.confidence().equalOrHigherThan(target))
                        .map(VespaVersion::versionNumber)
                        .sorted(reverseOrder())
-                       .collect(Collectors.toList());
+                       .toList();
     }
 
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java
index cb0ff0644fa..e3f61afec89 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java
@@ -32,7 +32,7 @@ public class NodeList extends AbstractFilteringList<NodeWithServices, NodeList>
                                                                    parentsByHostName.get(node.parentHostname().get()),
                                                                    services.wantedGeneration(),
                                                                    servicesByHostName.getOrDefault(node.hostname(), List.of())))
-                                 .collect(Collectors.toList()),
+                                 .toList(),
                             false,
                             services.wantedGeneration());
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java
index e0c1fef91b3..5aaa187055d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java
@@ -27,7 +27,7 @@ public class RetriggerEntrySerializer {
     public List<RetriggerEntry> fromSlime(Slime slime) {
         return SlimeUtils.entriesStream(slime.get().field("entries"))
                 .map(this::deserializeEntry)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public Slime toSlime(List<RetriggerEntry> entryList) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java
index 88e4f351f1f..220c1a9a6a3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java
@@ -56,7 +56,7 @@ public class CreateRecords implements NameServiceRequest {
                 nameService.createDirect(name, targets);
             }
             case TXT -> {
-                var dataFields = records.stream().map(Record::data).collect(Collectors.toList());
+                var dataFields = records.stream().map(Record::data).toList();
                 nameService.createTxtRecords(name, dataFields);
             }
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
index 57c83280b8b..df0d8877e07 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
@@ -52,7 +52,7 @@ public class NameServiceForwarder {
     public void createAlias(RecordName name, Set<AliasTarget> targets, NameServiceQueue.Priority priority) {
         var records = targets.stream()
                              .map(target -> new Record(Record.Type.ALIAS, name, target.pack()))
-                             .collect(Collectors.toList());
+                             .toList();
         forward(new CreateRecords(records), priority);
     }
 
@@ -60,7 +60,7 @@ public class NameServiceForwarder {
     public void createDirect(RecordName name, Set<DirectTarget> targets, NameServiceQueue.Priority priority) {
         var records = targets.stream()
                              .map(target -> new Record(Record.Type.DIRECT, name, target.pack()))
-                             .collect(Collectors.toList());
+                             .toList();
         forward(new CreateRecords(records), priority);
     }
 
@@ -68,7 +68,7 @@ public class NameServiceForwarder {
     public void createTxt(RecordName name, List<RecordData> txtData, NameServiceQueue.Priority priority) {
         var records = txtData.stream()
                              .map(data -> new Record(Record.Type.TXT, name, data))
-                             .collect(Collectors.toList());
+                             .toList();
         forward(new CreateRecords(records), priority);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
index 439f1aa9a09..25c4121c271 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
@@ -51,7 +51,7 @@ public class ArtifactExpirer extends ControllerMaintainer {
             Instant now = controller().clock().instant();
             List<Artifact> artifactsToExpire = artifactRegistry.list().stream()
                     .filter(artifact -> isExpired(artifact, now, versionStatus))
-                    .collect(Collectors.toList());
+                    .toList();
             if (!artifactsToExpire.isEmpty()) {
                 log.log(Level.INFO, "Expiring " + artifactsToExpire.size() + " artifacts in " + cloudName + ": " + artifactsToExpire);
                 artifactRegistry.deleteAll(artifactsToExpire);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java
index 128d7e6ac71..fa44b1480e3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java
@@ -51,7 +51,7 @@ public class ChangeManagementAssessor {
         var tenantHosts = prParentHost.keySet().stream()
                 .filter(node -> node.type() == NodeType.host)
                 .map(node -> node.hostname())
-                .collect(Collectors.toList());
+                .toList();
 
         boolean allHostsReplacable = tenantHosts.isEmpty() || nodeRepository.isReplaceable(
                 zone,
@@ -84,7 +84,7 @@ public class ChangeManagementAssessor {
             assessment.impact = getImpact(cluster, impactedStats, totalStats);
 
             return assessment;
-        }).collect(Collectors.toList());
+        }).toList();
 
         var hostAssessments = prParentHost.entrySet().stream().map((entry) -> {
             HostAssessment hostAssessment = new HostAssessment();
@@ -99,7 +99,7 @@ public class ChangeManagementAssessor {
                     .count();
 
             return hostAssessment;
-        }).collect(Collectors.toList());
+        }).toList();
 
         return new Assessment(clusterAssessments, hostAssessments);
     }
@@ -116,7 +116,7 @@ public class ChangeManagementAssessor {
                                 return node.parentHostname().get().value();
                             }).findFirst().stream()
                 )
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static Cluster clusterKey(Node node) {
@@ -127,7 +127,7 @@ public class ChangeManagementAssessor {
     }
 
     private static long[] clusterStats(Cluster cluster, List<Node> containerNodes) {
-        List<Node> clusterNodes = containerNodes.stream().filter(node -> cluster.equals(clusterKey(node))).collect(Collectors.toList());
+        List<Node> clusterNodes = containerNodes.stream().filter(node -> cluster.equals(clusterKey(node))).toList();
         long groups = clusterNodes.stream().map(Node::group).distinct().count();
         return new long[] { clusterNodes.size(), groups};
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
index a279cf46415..e16d52703e9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
@@ -108,7 +108,7 @@ public class ChangeRequestMaintainer extends ControllerMaintainer {
                         zone -> nodeRepository.list(zone, NodeFilter.all())
                                 .stream()
                                 .map(node -> node.hostname().value())
-                                .collect(Collectors.toList())
+                                .toList()
                 ));
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
index d1f6ddc1644..44081081f73 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
@@ -153,7 +153,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
                 .map(ZoneApi::getId)
                 .map(zoneId -> createResourceSnapshotsFromNodes(zoneId, nodeRepository.list(zoneId, NodeFilter.all())))
                 .flatMap(Collection::stream)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Stream<Instance> mapApplicationToInstances(Application application) {
@@ -204,7 +204,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
                 .values()
                 .stream()
                 .flatMap(list -> list.values().stream())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private boolean unlessNodeOwnerIsSystemApplication(Node node) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java
index d45818c2822..74bb89e4105 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java
@@ -43,7 +43,7 @@ public class RetriggerMaintainer extends ControllerMaintainer {
             // Remove all jobs that has succeeded with the required job run and persist the list
             List<RetriggerEntry> remaining = retriggerEntries.stream()
                     .filter(this::needsTrigger)
-                    .collect(Collectors.toList());
+                    .toList();
             controller().curator().writeRetriggerEntries(remaining);
         } catch (Exception e) {
             logger.log(Level.WARNING, "Exception while triggering jobs", e);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java
index 820c67f2d44..583af2f3e20 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java
@@ -31,7 +31,7 @@ public class TenantRoleMaintainer extends ControllerMaintainer {
 
         var tenantsWithRoles = tenants.stream()
                 .map(Tenant::name)
-                .collect(Collectors.toList());
+                .toList();
         roleService.maintainRoles(tenantsWithRoles);
 
         var deletedTenants = controller().tenants().asList(true).stream()
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
index 163a570768f..03987efab8b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
@@ -33,7 +33,7 @@ public class UserManagementMaintainer extends ControllerMaintainer {
         var applications = controller().applications().idList()
                 .stream()
                 .map(appId -> ApplicationId.from(appId.tenant(), appId.application(), InstanceName.defaultName()))
-                .collect(Collectors.toList());
+                .toList();
         roleMaintainer.deleteLeftoverRoles(tenants, applications);
 
         if (!controller().system().isPublic()) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java
index daba7e74f34..9211580abf1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java
@@ -140,7 +140,7 @@ public class VcmrMaintainer extends ControllerMaintainer {
                     }
                     var spareCapacity = hasSpareCapacity(zone, nodes);
                     return nodes.stream().map(node -> nextAction(zone, node, changeRequest, spareCapacity));
-                }).collect(Collectors.toList());
+                }).toList();
 
     }
 
@@ -151,7 +151,7 @@ public class VcmrMaintainer extends ControllerMaintainer {
                 .filter(entry -> entry.getValue().stream().anyMatch(isImpacted(changeRequest))) // Skip zones without impacted nodes
                 .collect(Collectors.toMap(
                         Map.Entry::getKey,
-                        entry -> entry.getValue().stream().filter(isImpacted(changeRequest)).collect(Collectors.toList())
+                        entry -> entry.getValue().stream().filter(isImpacted(changeRequest)).toList()
                 ));
     }
 
@@ -305,7 +305,7 @@ public class VcmrMaintainer extends ControllerMaintainer {
         var tenantHosts = nodes.stream()
                 .filter(node -> node.type() == NodeType.host)
                 .map(Node::hostname)
-                .collect(Collectors.toList());
+                .toList();
 
         return tenantHosts.isEmpty() ||
                 nodeRepository.isReplaceable(zoneId, tenantHosts);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
index f6a5bb5519d..957eada62b4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
@@ -50,7 +50,7 @@ public class CostCalculator {
                               .reachable().in(Environment.prod).in(CloudName.YAHOO).zones().stream()
                               .flatMap(zone -> uncheck(() -> nodeRepository.list(zone.getId(), NodeFilter.all()).stream()))
                               .filter(node -> node.owner().isPresent() && !node.owner().get().tenant().equals(SystemApplication.TENANT))
-                              .collect(Collectors.toList());
+                              .toList();
         var totalAllocation = ResourceAllocation.ZERO;
         for (var node : nodes) {
             Property property = propertyByTenantName.get(node.owner().get().tenant());
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
index 81ae787b507..a2960754570 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
@@ -143,7 +143,7 @@ public class NotificationsDb {
             if (!initial.equals(updated)) {
                 curatorDb.writeNotifications(deploymentSource.tenant(), updated);
             }
-            changed = newNotifications.stream().filter(n -> !notificationExists(n, initial, true)).collect(Collectors.toList());
+            changed = newNotifications.stream().filter(n -> !notificationExists(n, initial, true)).toList();
         }
         notifier.dispatch(changed, deploymentSource);
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
index 64dd51ce304..5d0e71b0727 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
@@ -107,7 +107,7 @@ public class Notifier {
     private void dispatch(Notification notification, TenantContacts.Type type, Collection<? extends TenantContacts.Contact> contacts) {
         switch (type) {
             case EMAIL:
-                dispatch(notification, contacts.stream().map(c -> (TenantContacts.EmailContact) c).collect(Collectors.toList()));
+                dispatch(notification, contacts.stream().map(c -> (TenantContacts.EmailContact) c).toList());
                 break;
             default:
                 throw new IllegalArgumentException("Unknown TenantContacts type " + type.name());
@@ -120,7 +120,7 @@ public class Notifier {
             mailer.send(mailOf(content, contacts.stream()
                     .filter(c -> c.email().isVerified())
                     .map(c -> c.email().getEmailAddress())
-                    .collect(Collectors.toList())));
+                    .toList()));
         } catch (MailerException e) {
             log.log(Level.SEVERE, "Failed sending email", e);
         } catch (MissingOptionalException e) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java
index 32f5e6714f2..a3ec30bb122 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java
@@ -126,7 +126,7 @@ public class BufferedLogStore {
         return logSerializer.fromJson(Arrays.stream(chunkIds, firstChunk, chunkIds.length)
                                             .mapToObj(chunkId -> buffer.readLog(id, type, chunkId))
                                             .flatMap(Optional::stream)
-                                            .collect(Collectors.toList()),
+                                            .toList(),
                                       after);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
index 149dba41c1e..be58370285a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
@@ -353,7 +353,7 @@ public class CuratorDb {
     public List<TenantName> readTenantNames() {
         return curator.getChildren(tenantRoot).stream()
                       .map(TenantName::from)
-                      .collect(Collectors.toList());
+                      .toList();
     }
 
     public void removeTenant(TenantName name) {
@@ -450,7 +450,7 @@ public class CuratorDb {
     public List<ApplicationId> applicationsWithJobs() {
         return curator.getChildren(jobRoot).stream()
                       .map(ApplicationId::fromSerializedForm)
-                      .collect(Collectors.toList());
+                      .toList();
     }
 
 
@@ -618,7 +618,7 @@ public class CuratorDb {
                 .stream()
                 .map(this::readChangeRequest)
                 .flatMap(Optional::stream)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public void writeChangeRequest(VespaChangeRequest changeRequest) {
@@ -682,7 +682,7 @@ public class CuratorDb {
                 .stream()
                 .map(this::getPendingMailVerification)
                 .flatMap(Optional::stream)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public void writePendingMailVerification(PendingMailVerification pendingMailVerification) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java
index e1181f1cede..02b718829f3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java
@@ -70,7 +70,7 @@ public class EndpointCertificateMetadataSerializer {
                 inspector.field(rootRequestIdField).asString(),
                 SlimeUtils.optionalString(inspector.field(leafRequestIdField)),
                 IntStream.range(0, inspector.field(requestedDnsSansField).entries())
-                        .mapToObj(i -> inspector.field(requestedDnsSansField).entry(i).asString()).collect(Collectors.toList()),
+                        .mapToObj(i -> inspector.field(requestedDnsSansField).entry(i).asString()).toList(),
                 inspector.field(issuerField).asString(),
                 inspector.field(expiryField).valid() ?
                         Optional.of(inspector.field(expiryField).asLong()) :
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java
index 26cd4acdb4c..6567b0076e7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java
@@ -72,7 +72,7 @@ class LogSerializer {
     Map<Step, List<LogEntry>> fromJson(List<byte[]> logJsons, long after) {
         return fromSlime(logJsons.stream()
                                  .map(SlimeUtils::jsonToSlime)
-                                 .collect(Collectors.toList()),
+                                 .toList(),
                          after);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java
index c200ca467da..a913e86dda9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java
@@ -68,14 +68,14 @@ public class SupportAccessSerializer {
 
         List<SupportAccessGrant> inactiveGrants = supportAccess.grantHistory().stream()
                 .filter(grant -> currentTime.isAfter(grant.certificate().getNotAfter().toInstant()))
-                .collect(Collectors.toList());
+                .toList();
 
         serializeHistoricEvents(root, supportAccess.changeHistory(), inactiveGrants);
 
         // Active grants should show up in the grant section
         List<SupportAccessGrant> activeGrants = supportAccess.grantHistory().stream()
                 .filter(grant -> currentTime.isBefore(grant.certificate().getNotAfter().toInstant()))
-                .collect(Collectors.toList());
+                .toList();
         serializeGrants(root, activeGrants, false);
         return slime;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
index bb55b2e8fcf..d1962b16120 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
@@ -117,7 +117,7 @@ public class BillingApiHandler extends ThreadedHttpRequestHandler {
                             bill.sumAdditionalCost()
                     };
                 })
-                .collect(Collectors.toList());
+                .toList();
         return new CsvResponse(headers, rows);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java
index 813d2b8d3e6..5148577880f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java
@@ -295,7 +295,7 @@ public class ChangeManagementApiHandler extends AuditLoggingRequestHandler {
                 .flatMap(zone -> controller.serviceRegistry().configServer().nodeRepository().list(zone, NodeFilter.all()).stream())
                 .filter(node -> node.switchHostname().map(switches::contains).orElse(false))
                 .map(node -> node.hostname().value())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<ZoneId> getProdZones() {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
index 8675f4f18c6..cfd6ea3d6d9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
@@ -134,7 +134,7 @@ public class OsApiHandler extends AuditLoggingRequestHandler {
         ZoneList zones = controller.zoneRegistry().zones().controllerUpgraded();
         if (path.get("region") != null) zones = zones.in(RegionName.from(path.get("region")));
         if (path.get("environment") != null) zones = zones.in(Environment.from(path.get("environment")));
-        return zones.zones().stream().map(ZoneApi::getId).collect(Collectors.toList());
+        return zones.zones().stream().map(ZoneApi::getId).toList();
     }
 
     private HttpResponse setOsVersion(HttpRequest request) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
index 05dd8257ad0..4184601179f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
@@ -146,7 +146,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
                                   .map(zone -> zone.environment().value() +
                                                "/region/" + zone.region().value())
                                   .sorted()
-                                  .collect(Collectors.toList());
+                                  .toList();
         return new ResourceResponse(request.getUri(), resources);
     }
 
@@ -168,7 +168,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
                                   .map(ApplicationName::value)
                                   .map(application -> "application/" + application)
                                   .sorted()
-                                  .collect(Collectors.toList());
+                                  .toList();
         return new ResourceResponse(request.getUri(), resources);
     }
 
@@ -185,7 +185,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
                                   .map(InstanceName::value)
                                   .map(instance -> "instance/" + instance)
                                   .sorted()
-                                  .collect(Collectors.toList());
+                                  .toList();
         return new ResourceResponse(request.getUri(), resources);
     }
 
@@ -202,7 +202,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
                                   .map(zone -> "environment/" + zone.environment().value() +
                                                "/region/" + zone.region().value())
                                   .sorted()
-                                  .collect(Collectors.toList());
+                                  .toList();
         return new ResourceResponse(request.getUri(), resources);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
index 7a8ef1d4ee6..c2e926f777b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
@@ -368,7 +368,7 @@ public class UserApiHandler extends ThreadedHttpRequestHandler {
 
     private boolean hasTrialCapacity() {
         if (! controller.system().isPublic()) return true;
-        var existing = controller.tenants().asList().stream().map(Tenant::name).collect(Collectors.toList());
+        var existing = controller.tenants().asList().stream().map(Tenant::name).toList();
         var trialTenants = controller.serviceRegistry().billingController().tenantsWithPlan(existing, PlanId.from("trial"));
         return maxTrialTenants.value() < 0 || trialTenants.size() < maxTrialTenants.value();
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
index a19006d8f9e..0b1411d5bc3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
@@ -116,7 +116,7 @@ public abstract class DeploymentRoutingContext implements RoutingContext {
                                                    .asList().stream()
                                                    .map(endpoint -> endpoint.upstreamName(deployment))
                                                    .distinct()
-                                                   .collect(Collectors.toList());
+                                                   .toList();
             if (upstreamNames.isEmpty()) {
                 throw new IllegalArgumentException("No upstream names found for " + deployment);
             }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java
index 39a0b6a8858..1e9f11e0349 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java
@@ -158,7 +158,7 @@ public class RotationRepository {
                                                          .flatMap(application -> application.instances().values().stream())
                                                          .flatMap(instance -> instance.rotations().stream())
                                                          .map(AssignedRotation::rotationId)
-                                                         .collect(Collectors.toList());
+                                                         .toList();
         Map<RotationId, Rotation> unassignedRotations = new LinkedHashMap<>(this.allRotations);
         assignedRotations.forEach(unassignedRotations::remove);
         return Collections.unmodifiableMap(unassignedRotations);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
index 81e9b1972b9..0e7fefba15d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
@@ -72,7 +72,7 @@ public class CloudAccessControl implements AccessControl {
 
     private void requireTenantTrialLimitNotReached(List<Tenant> existing) {
         var trialPlanId = PlanId.from("trial");
-        var tenantNames = existing.stream().filter(tenant -> tenant.type() == Tenant.Type.cloud).map(Tenant::name).collect(Collectors.toList());
+        var tenantNames = existing.stream().filter(tenant -> tenant.type() == Tenant.Type.cloud).map(Tenant::name).toList();
         var trialTenants = billingController.tenantsWithPlan(tenantNames, trialPlanId).size();
 
         if (maxTrialTenants.value() >= 0 && maxTrialTenants.value() <= trialTenants) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
index d6b8f79dbe6..ed7bd924ccc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
@@ -155,7 +155,7 @@ public record VersionStatus(List<VespaVersion> versions) {
                 boolean isReleased = Collections.binarySearch(releasedVersions, statistics.version()) >= 0;
                 List<NodeVersion> nodeVersions = systemApplicationVersions.stream()
                                                                           .filter(nodeVersion -> nodeVersion.currentVersion().equals(statistics.version()))
-                                                                          .collect(Collectors.toList());
+                                                                          .toList();
                 VespaVersion vespaVersion = createVersion(statistics,
                                                           controllerVersions.keySet(),
                                                           systemVersion,
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());