Merge pull request #25610 from vespa-engine/balder/unify-on-toList

Balder/unify on to list

23 files changed, 44 insertions, 58 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 a092a133807..2693fdcbd7c 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
@@ -114,7 +114,6 @@ import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.counting;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.toSet;
 
@@ -648,7 +647,7 @@ public class ApplicationController {
                     .orElse(List.of());
             List<X509Certificate> operatorCertificates = controller.supportAccess().activeGrantsFor(deployment).stream()
                                                                    .map(SupportAccessGrant::certificate)
-                                                                   .collect(toList());
+                                                                   .toList();
             if (testerCertificate.isPresent()) {
                 operatorCertificates = Stream.concat(operatorCertificates.stream(), testerCertificate.stream()).toList();
             }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java
index 17644d5e207..afb854b2aaa 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java
@@ -172,11 +172,11 @@ public class TestPackage {
                                           if (bundleCategoriesHeader == null) continue;
                                           for (String suite : bundleCategoriesHeader.split(","))
                                               if ( ! suite.isBlank()) switch (suite.trim()) {
-                                                  case "SystemTest": suites.add(system); break;
-                                                  case "StagingSetup": suites.add(staging_setup); break;
-                                                  case "StagingTest": suites.add(staging); break;
-                                                  case "ProductionTest": suites.add(production); break;
-                                                  default: problems.add("unexpected test suite name '" + suite + "' in bundle manifest");
+                                                  case "SystemTest" -> suites.add(system);
+                                                  case "StagingSetup" -> suites.add(staging_setup);
+                                                  case "StagingTest" -> suites.add(staging);
+                                                  case "ProductionTest" -> suites.add(production);
+                                                  default -> problems.add("unexpected test suite name '" + suite + "' in bundle manifest");
                                               }
                                       }
                                       catch (Exception e) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java
index 3bc2aec95ff..6a493f3f5ed 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java
@@ -235,7 +235,7 @@ public class AthenzFacade implements AccessControl {
         return tenants.stream()
                       .filter(tenant ->    tenant.type() == Tenant.Type.athenz
                                         && userDomains.apply(identity).contains(((AthenzTenant) tenant).domain()))
-                      .collect(Collectors.toUnmodifiableList());
+                      .toList();
     }
 
     public void addTenantAdmin(AthenzDomain tenantDomain, AthenzUser user) {
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 dd285917f2a..a76e76611c2 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
@@ -67,7 +67,6 @@ import static java.util.function.BinaryOperator.maxBy;
 import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.mapping;
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.toSet;
 
@@ -104,7 +103,7 @@ public class DeploymentStatus {
         Map<JobId, JobStatus> jobs = new HashMap<>();
         this.jobSteps = jobDependencies(application.deploymentSpec(), allSteps, job -> jobs.computeIfAbsent(job, allJobs));
         this.allSteps = Collections.unmodifiableList(allSteps);
-        this.allJobs = JobList.from(jobSteps.keySet().stream().map(allJobs).collect(toList()));
+        this.allJobs = JobList.from(jobSteps.keySet().stream().map(allJobs).toList());
     }
 
     private JobType systemTest(JobType dependent) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index e905b60687e..a5cb839e9c9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -40,7 +40,6 @@ import java.util.stream.Collectors;
 
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
 /**
@@ -153,7 +152,7 @@ public class DeploymentTrigger {
                 .collect(groupingBy(Job::applicationId))
                 .values().stream()
                 .flatMap(List::stream)
-                .collect(Collectors.toUnmodifiableList());
+                .toList();
 
         // Map of test jobs, a list for each job type. Jobs in each list are sorted by priority.
         Map<JobType, List<Job>> sortedTestJobsByType = testJobs.stream()
@@ -284,7 +283,7 @@ public class DeploymentTrigger {
                 }
                 newList = newList.stream()
                         .filter(entry -> !(entry.jobId().equals(requiredEntry.jobId()) && entry.requiredRun() < requiredEntry.requiredRun()))
-                        .collect(toList());
+                        .toList();
                 controller.curator().writeRetriggerEntries(newList);
             }
             controller.jobController().abort(run.id(), "force re-triggered");
@@ -367,7 +366,7 @@ public class DeploymentTrigger {
                    .filter(status -> ! hasExceededQuota(status.application().id().tenant()))
                    .map(this::computeReadyJobs)
                    .flatMap(Collection::stream)
-                   .collect(toList());
+                   .toList();
     }
 
     /** Finds the next step to trigger for the given application, if any, and returns these as a list. */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index c500189dc4d..7da61f9bc63 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -92,7 +92,6 @@ import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 
 /**
@@ -210,7 +209,7 @@ public class InternalStepRunner implements StepRunner {
                                                                Instant.ofEpochMilli(entry.epochMillis()),
                                                                LogEntry.typeOf(entry.level()),
                                                                entry.message()))
-                                    .collect(toList()));
+                                    .toList());
 
             logger.log("Deployment successful.");
             logger.log(result.message());
@@ -330,7 +329,7 @@ public class InternalStepRunner implements StepRunner {
             logger.log("######## Details for all nodes ########");
             logger.log(nodeList.asList().stream()
                                .flatMap(node -> nodeDetails(node, true))
-                               .collect(toList()));
+                               .toList());
         }
         else if ( ! summary.converged()) {
             logger.log("Waiting for convergence of " + summary.services() + " services across " + summary.nodes() + " nodes");
@@ -396,7 +395,7 @@ public class InternalStepRunner implements StepRunner {
             logger.log("######## Details for all nodes ########");
             logger.log(nodeList.asList().stream()
                                .flatMap(node -> nodeDetails(node, true))
-                               .collect(toList()));
+                               .toList());
             logger.log("######## Details for nodes with pending changes ########");
             logger.log(nodeList.not().in(nodeList.not().needsNewConfig()
                                                  .not().needsPlatformUpgrade()
@@ -406,7 +405,7 @@ public class InternalStepRunner implements StepRunner {
                                                  .not().needsOsUpgrade())
                                .asList().stream()
                                .flatMap(node -> nodeDetails(node, true))
-                               .collect(toList()));
+                               .toList());
             logger.log(INFO, failureReason);
             return Optional.of(installationFailed);
         }
@@ -415,7 +414,7 @@ public class InternalStepRunner implements StepRunner {
             logger.log(FINE, nodeList.expectedDown().and(nodeList.needsNewConfig()).asList().stream()
                                      .distinct()
                                      .flatMap(node -> nodeDetails(node, false))
-                                     .collect(toList()));
+                                     .toList());
 
         controller.jobController().locked(id, lockedRun -> {
             Instant noNodesDownSince = nodeList.allowedDown().size() == 0 ? lockedRun.noNodesDownSince().orElse(controller.clock().instant()) : null;
@@ -461,7 +460,7 @@ public class InternalStepRunner implements StepRunner {
         NodeList nodeList = NodeList.of(nodes, parents, services.get());
         logger.log(nodeList.asList().stream()
                            .flatMap(node -> nodeDetails(node, false))
-                           .collect(toList()));
+                           .toList());
 
         if (nodeList.summary().converged() && testerContainersAreUp(testerId, zone, logger)) {
             logger.log("Tester container successfully installed!");
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 97eb405b32d..73c64be3e47 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -94,8 +94,6 @@ import static java.util.Comparator.naturalOrder;
 import static java.util.function.Predicate.not;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toUnmodifiableList;
 
 /**
  * A singleton owned by the controller, which contains the state and methods for controlling deployment jobs.
@@ -184,7 +182,7 @@ public class JobController {
     public void log(RunId id, Step step, Level level, List<String> messages) {
         log(id, step, messages.stream()
                               .map(message -> new LogEntry(0, controller.clock().instant(), LogEntry.typeOf(level), message))
-                              .collect(toList()));
+                              .toList());
     }
 
     /** Stores the given log message for the given run and step. */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RevisionHistory.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RevisionHistory.java
index ab8f7fe22d3..bbab9487ea2 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RevisionHistory.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RevisionHistory.java
@@ -19,7 +19,6 @@ import java.util.TreeMap;
 
 import static ai.vespa.validation.Validation.require;
 import static java.util.Collections.emptyNavigableMap;
-import static java.util.stream.Collectors.toList;
 
 /**
  * History of application revisions for an {@link com.yahoo.vespa.hosted.controller.Application}.
@@ -113,7 +112,7 @@ public class RevisionHistory {
     public List<ApplicationVersion> withPackage() {
         return production.values().stream()
                          .filter(ApplicationVersion::hasPackage)
-                         .collect(toList());
+                         .toList();
     }
 
     /** Returns the currently deployable revisions of the application. */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Run.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Run.java
index 71ff28c47e6..fd1e5592608 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Run.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Run.java
@@ -307,7 +307,7 @@ public class Run {
                                              .allMatch(step ->    steps.get(step) == null
                                                                || steps.get(step).status() == succeeded))
                     .map(Map.Entry::getKey)
-                    .collect(Collectors.toUnmodifiableList());
+                    .toList();
     }
 
     /** Returns the list of not-yet-run run-always steps whose run-always prerequisites have all run. */
@@ -320,7 +320,7 @@ public class Run {
                                              .allMatch(step ->    steps.get(step) == null
                                                                || steps.get(step).status() != unfinished))
                     .map(Map.Entry::getKey)
-                    .collect(Collectors.toUnmodifiableList());
+                    .toList();
     }
 
     private void requireActive() {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java
index ec4d138c44f..358925d00b2 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java
@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.stream.Stream;
 
 import static java.util.Comparator.reverseOrder;
-import static java.util.stream.Collectors.toList;
 
 /**
  * Steps that make up a deployment job. See {@link JobProfile} for preset profiles.
@@ -90,7 +89,7 @@ public enum Step {
                                                           pre.allPrerequisites(among).stream()))
                             .sorted(reverseOrder())
                             .distinct()
-                            .collect(toList());
+                            .toList();
     }
 
 
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 a913e86dda9..af7c03f8657 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
@@ -124,7 +124,7 @@ public class SupportAccessSerializer {
                                 inspector.field(requestorFieldName).asString(),
                                 X509CertificateUtils.fromPem(inspector.field(certificateFieldName).asString())
                         ))
-                .collect(Collectors.toUnmodifiableList());
+                .toList();
 
         List<SupportAccessChange> changeHistory = SlimeUtils.entriesStream(slime.get().field(historyFieldName))
                 .map(inspector ->
@@ -133,7 +133,7 @@ public class SupportAccessSerializer {
                                 Instant.parse(inspector.field(atFieldName).asString()),
                                 inspector.field(byFieldName).asString())
                 )
-                .collect(Collectors.toUnmodifiableList());
+                .toList();
 
         return new SupportAccess(changeHistory, grantHistory);
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
index d4536da91fe..f6b28a2ee34 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
@@ -271,7 +271,7 @@ public class TenantSerializer {
                         inspector.field(nameField).asString(),
                         inspector.field(awsIdField).asString(),
                         inspector.field(roleField).asString()))
-                .collect(Collectors.toUnmodifiableList());
+                .toList();
     }
 
     private LastLoginInfo lastLoginInfoFromSlime(Inspector lastLoginInfoObject) {
@@ -337,7 +337,7 @@ public class TenantSerializer {
     private TenantContacts tenantContactsFrom(Inspector object) {
         List<TenantContacts.Contact> contacts = SlimeUtils.entriesStream(object)
                 .map(this::readContact)
-                .collect(Collectors.toUnmodifiableList());
+                .toList();
         return new TenantContacts(contacts);
     }
 
@@ -405,7 +405,7 @@ public class TenantSerializer {
                 .orElseThrow(() -> new RuntimeException("Unknown type: " + inspector.field("type").asString()));
         var audiences = SlimeUtils.entriesStream(inspector.field("audiences"))
                 .map(audience -> TenantSerializer.fromAudience(audience.asString()))
-                .collect(Collectors.toUnmodifiableList());
+                .toList();
         switch (type) {
             case EMAIL:
                 var isVerified = asBoolOrTrue(inspector.field("data").field("emailVerified"));
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 39cb9bf0d8d..3f68be611eb 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -168,7 +168,6 @@ import static java.util.Comparator.comparingInt;
 import static java.util.Map.Entry.comparingByKey;
 import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
 
 /**
  * This implements the application/v4 API which is used to deploy and manage applications
@@ -398,7 +397,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         for (Tenant tenant : controller.tenants().asList(includeDeleted(request)))
             toSlime(tenantArray.addObject(),
                     tenant,
-                    applications.stream().filter(app -> app.id().tenant().equals(tenant.name())).collect(toList()),
+                    applications.stream().filter(app -> app.id().tenant().equals(tenant.name())).toList(),
                     request);
         return new SlimeJsonResponse(slime);
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java
index 26a5da45bdb..eed12f61a76 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java
@@ -17,8 +17,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import static java.util.stream.Collectors.toList;
-
 public class Badges {
 
     // https://chrishewett.com/blog/calculating-text-width-programmatically/ thank you!
@@ -120,7 +118,7 @@ public class Badges {
                                .filter(Run::hasEnded)
                                .skip(1)
                                .limit(length)
-                               .collect(toList());
+                               .toList();
 
         text = lastTriggered.id().type().jobName();
         textWidth = widthOf(text);
@@ -312,4 +310,4 @@ public class Badges {
                "</svg>\n";
     }
 
-}
\ No newline at end of file
+}
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
index 9c529230a7f..6946efdbe2a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
@@ -98,7 +98,7 @@ public class DeploymentApiHandler extends ThreadedHttpRequestHandler {
         var versionStatus = controller.readVersionStatus();
         ApplicationList applications = ApplicationList.from(controller.applications().asList()).withJobs();
         var deploymentStatuses = controller.jobController().deploymentStatuses(applications, versionStatus);
-        Map<Version, DeploymentStatistics> deploymentStatistics = DeploymentStatistics.compute(versionStatus.versions().stream().map(VespaVersion::versionNumber).collect(toList()),
+        Map<Version, DeploymentStatistics> deploymentStatistics = DeploymentStatistics.compute(versionStatus.versions().stream().map(VespaVersion::versionNumber).toList(),
                                                                                                deploymentStatuses)
                                                                                       .stream().collect(toMap(DeploymentStatistics::version, identity()));
         for (VespaVersion version : versionStatus.versions()) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResult.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResult.java
index b8f884e67ac..872202dc222 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResult.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResult.java
@@ -23,8 +23,6 @@ import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * @author bjorncs
  */
@@ -104,7 +102,7 @@ class SystemFlagsDeployResult {
             wireChange.flagId = change.flagId().toString();
             wireChange.owners = owners(change.flagId());
             wireChange.operation = change.operation().asString();
-            wireChange.targets = change.targets().stream().map(FlagsTarget::asString).collect(toList());
+            wireChange.targets = change.targets().stream().map(FlagsTarget::asString).toList();
             wireChange.data = change.data().map(FlagData::toWire).orElse(null);
             wireChange.previousData = change.previousData().map(FlagData::toWire).orElse(null);
             wireResult.changes.add(wireChange);
@@ -114,7 +112,7 @@ class SystemFlagsDeployResult {
             var wireError = new WireOperationFailure();
             wireError.message = error.message();
             wireError.operation = error.operation().asString();
-            wireError.targets = error.targets().stream().map(FlagsTarget::asString).collect(toList());
+            wireError.targets = error.targets().stream().map(FlagsTarget::asString).toList();
             wireError.flagId = error.flagId().map(FlagId::toString).orElse(null);
             wireError.owners = error.flagId().map(id -> owners(id)).orElse(List.of());
             wireError.data = error.flagData().map(FlagData::toWire).orElse(null);
@@ -126,7 +124,7 @@ class SystemFlagsDeployResult {
             wireWarning.message = warning.message();
             wireWarning.flagId = warning.flagId().toString();
             wireWarning.owners = owners(warning.flagId());
-            wireWarning.targets = warning.targets().stream().map(FlagsTarget::asString).collect(toList());
+            wireWarning.targets = warning.targets().stream().map(FlagsTarget::asString).toList();
             wireResult.warnings.add(wireWarning);
         }
         return wireResult;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserFlagsSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserFlagsSerializer.java
index 44d537883f9..54a24360b5a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserFlagsSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserFlagsSerializer.java
@@ -36,7 +36,7 @@ public class UserFlagsSerializer {
                 .filter(fd -> fd.getDimensions().contains(FetchVector.Dimension.CONSOLE_USER_EMAIL))
                 .map(FlagDefinition::getUnboundFlag)
                 .map(flag -> filteredFlagData(flag, Optional.ofNullable(rawFlagData.get(flag.id())), authorizedForTenantNames, isOperator, resolveVector))
-                .collect(Collectors.toUnmodifiableList());
+                .toList();
 
         byte[] bytes = FlagData.serializeListToUtf8Json(filteredFlagData);
         SlimeUtils.copyObject(SlimeUtils.jsonToSlime(bytes).get(), cursor);
@@ -55,10 +55,10 @@ public class UserFlagsSerializer {
                 .map(rule -> new Rule(rule.getValueToApply().or(() -> defaultValue),
                         rule.conditions().stream()
                                 .flatMap(condition -> filteredCondition(condition, authorizedForTenantNames, isOperator, resolveVector).stream())
-                                .collect(Collectors.toUnmodifiableList())))
+                                .toList()))
                 // We can stop as soon as we hit the first rule that has no conditions
                 .takeWhile(rule -> !encounteredEmpty.getAndSet(rule.conditions().isEmpty()))
-                .collect(Collectors.toUnmodifiableList());
+                .toList();
 
         return new FlagData(definition.id(), new FetchVector(), rules);
     }
@@ -80,7 +80,7 @@ public class UserFlagsSerializer {
     private static Optional<Condition> valueSubset(Condition condition, Predicate<String> predicate) {
         Condition.CreateParams createParams = condition.toCreateParams();
         return Optional.of(createParams
-                .withValues(createParams.values().stream().filter(predicate).collect(Collectors.toUnmodifiableList()))
+                .withValues(createParams.values().stream().filter(predicate).toList())
                 .createAs(condition.type()));
     }
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/support/access/SupportAccess.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/support/access/SupportAccess.java
index 27cf61564aa..e5304a05d02 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/support/access/SupportAccess.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/support/access/SupportAccess.java
@@ -71,7 +71,7 @@ public class SupportAccess {
 
     private <T> List<T> prepend(T newEntry, List<T> existingEntries) {
         return Stream.concat(Stream.of(newEntry), existingEntries.stream()) // latest change first
-                .collect(Collectors.toUnmodifiableList());
+                .toList();
     }
 
     public static class CurrentStatus {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/support/access/SupportAccessControl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/support/access/SupportAccessControl.java
index 27b61a4fd17..1561a486fda 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/support/access/SupportAccessControl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/support/access/SupportAccessControl.java
@@ -88,7 +88,7 @@ public class SupportAccessControl {
         return supportAccess.grantHistory().stream()
                 .filter(grant -> now.isAfter(grant.certificate().getNotBefore().toInstant()))
                 .filter(grant -> now.isBefore(grant.certificate().getNotAfter().toInstant()))
-                .collect(Collectors.toUnmodifiableList());
+                .toList();
     }
 
     public boolean allowDataplaneMembership(AthenzUser identity, DeploymentId deploymentId) {
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 7acd31c2ded..6f859ff3d15 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
@@ -338,7 +338,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
     public List<LoadBalancer> getLoadBalancers(ApplicationId application, ZoneId zone) {
         return getLoadBalancers(zone).stream()
                                      .filter(lb -> lb.application().equals(application))
-                                     .collect(Collectors.toUnmodifiableList());
+                                     .toList();
     }
 
     @Override
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
index 1f92c7f6e41..157abe17841 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
@@ -152,6 +152,6 @@ public class ResourceMeterMaintainerTest {
                                        .clusterId("clusterA")
                                        .clusterType(state == Node.State.active ? Node.ClusterType.admin : Node.ClusterType.container)
                                        .build())
-                     .collect(Collectors.toUnmodifiableList());
+                     .toList();
     }
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStoreTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStoreTest.java
index eb5422f5cff..59433a6bb69 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStoreTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStoreTest.java
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.IntStream;
 
-import static java.util.stream.Collectors.toUnmodifiableList;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -100,7 +99,7 @@ public class BufferedLogStoreTest {
         // Logging a large entry enough times to reach the maximum size causes no further entries to be stored.
         List<LogEntry> monsterLog = IntStream.range(0, 2 * maxChunks + 3)
                 .mapToObj(i -> new LogEntry(i, entry.at(), entry.type(), entry.message()))
-                .collect(toUnmodifiableList());
+                .toList();
         List<LogEntry> logged = new ArrayList<>(monsterLog);
         logged.remove(logged.size() - 1);
         logged.remove(logged.size() - 1);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java
index cd8a9e72051..43ad01fc5c2 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java
@@ -209,7 +209,7 @@ public class RotationRepositoryTest {
     }
 
     private static List<RotationId> rotationIds(List<AssignedRotation> assignedRotations) {
-        return assignedRotations.stream().map(AssignedRotation::rotationId).collect(Collectors.toUnmodifiableList());
+        return assignedRotations.stream().map(AssignedRotation::rotationId).toList();
     }
 
 }