Revert collect(Collectors.toList())

14 files changed, 22 insertions, 22 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java
index 16d8b72ff52..f761734aa13 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java
@@ -60,7 +60,7 @@ public class AthenzAccessControlService implements AccessControlService {
         return zmsClient.listMembers(dataPlaneAccessRole)
                 .stream().filter(AthenzUser.class::isInstance)
                 .map(AthenzUser.class::cast)
-                .toList();
+                .collect(Collectors.toList());
     }
 
     /**
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
index 91ca763abb6..28bb9182c6a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
@@ -199,7 +199,7 @@ public class ZmsClientMock implements ZmsClient {
                         AthenzResourceName.fromString(a.resource()),
                         a.action())
                         .build())
-                .toList();
+                .collect(Collectors.toList());
         return Optional.of(new AthenzPolicy(policy.name(), assertions));
     }
 
@@ -221,7 +221,7 @@ public class ZmsClientMock implements ZmsClient {
     public List<AthenzService> listServices(AthenzDomain athenzDomain) {
         return athenz.getOrCreateDomain(athenzDomain).services.keySet().stream()
                 .map(serviceName -> new AthenzService(athenzDomain, serviceName))
-                .toList();
+                .collect(Collectors.toList());
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java
index 3cee9e1ca2c..2ac3242f6aa 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java
@@ -159,7 +159,7 @@ public class BillingDatabaseClientMock implements BillingDatabaseClient {
                     var end = endTimes.get(invoiceId);
                     return new Bill(invoiceId, tenant, status, items, start, end);
                 })
-                .toList();
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -173,7 +173,7 @@ public class BillingDatabaseClientMock implements BillingDatabaseClient {
                     var end = endTimes.get(invoiceId);
                     return new Bill(invoiceId, tenant, status, items, start, end);
                 })
-                .toList();
+                .collect(Collectors.toList());
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
index c9f9b7f50e4..44dd3a293c5 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
@@ -42,7 +42,7 @@ public class MockBillingController implements BillingController {
     public List<TenantName> tenantsWithPlan(List<TenantName> tenants, PlanId planId) {
         return tenants.stream()
                 .filter(t -> plans.getOrDefault(t, PlanId.from("trial")).equals(planId))
-                .toList();
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -156,7 +156,7 @@ public class MockBillingController implements BillingController {
 
     @Override
     public List<Bill> getBills() {
-        return committedBills.values().stream().flatMap(Collection::stream).toList();
+        return committedBills.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java
index f7e7d69cd2f..3bc3d3ee9e8 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java
@@ -86,7 +86,7 @@ public class EndpointCertificateMock implements EndpointCertificateProvider {
                 "ok",
                 "ticket_id",
                 "athenz_domain",
-                metadata.requestedDnsSans().stream().map(name -> new EndpointCertificateRequestMetadata.DnsNameStatus(name, "done")).toList(),
+                metadata.requestedDnsSans().stream().map(name -> new EndpointCertificateRequestMetadata.DnsNameStatus(name, "done")).collect(Collectors.toList()),
                 "duration_sec",
                 "expiry",
                 metadata.keyName(),
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
index 0a71e185717..aff58989231 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
@@ -45,7 +45,7 @@ public class MemoryNameService implements NameService {
         var records = targets.stream()
                              .sorted((a, b) -> Comparator.comparing(AliasTarget::name).compare(a, b))
                              .map(d -> new Record(Record.Type.ALIAS, name, d.pack()))
-                             .toList();
+                             .collect(Collectors.toList());
         // Satisfy idempotency contract of interface
         for (var r1 : records) {
             this.records.removeIf(r2 -> conflicts(r1, r2));
@@ -59,7 +59,7 @@ public class MemoryNameService implements NameService {
         var records = targets.stream()
                 .sorted((a, b) -> Comparator.comparing((DirectTarget target) -> target.recordData().asString()).compare(a, b))
                 .map(d -> new Record(Record.Type.DIRECT, name, d.pack()))
-                .toList();
+                .collect(Collectors.toList());
         // Satisfy idempotency contract of interface
         for (var r1 : records) {
             this.records.removeIf(r2 -> conflicts(r1, r2));
@@ -72,7 +72,7 @@ public class MemoryNameService implements NameService {
     public List<Record> createTxtRecords(RecordName name, List<RecordData> txtData) {
         var records = txtData.stream()
                              .map(data -> new Record(Record.Type.TXT, name, data))
-                             .toList();
+                             .collect(Collectors.toList());
         records.forEach(this::add);
         return records;
     }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ApplicationData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ApplicationData.java
index fe3a2993f17..b6f99d611f8 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ApplicationData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ApplicationData.java
@@ -24,7 +24,7 @@ public class ApplicationData {
 
     public Application toApplication() {
         return new Application(ApplicationId.fromFullString(id),
-                               clusters.entrySet().stream().map(e -> e.getValue().toCluster(e.getKey())).toList());
+                               clusters.entrySet().stream().map(e -> e.getValue().toCluster(e.getKey())).collect(Collectors.toList()));
     }
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
index 9c2104232f1..ffc74f002d5 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
@@ -56,7 +56,7 @@ public class ClusterData {
                            suggested == null ? Optional.empty() : Optional.of(suggested.toClusterResources()),
                            utilization == null ? Cluster.Utilization.empty() : utilization.toClusterUtilization(),
                            scalingEvents == null ? List.of()
-                                                 : scalingEvents.stream().map(data -> data.toScalingEvent()).toList(),
+                                                 : scalingEvents.stream().map(data -> data.toScalingEvent()).collect(Collectors.toList()),
                            autoscalingStatusCode,
                            autoscalingStatus,
                            scalingDuration == null ? Duration.ofMillis(0) : Duration.ofMillis(scalingDuration),
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java
index 3d29d12b87f..75ac919f776 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java
@@ -34,7 +34,7 @@ public class NodeRepoStatsData {
     public NodeRepoStats toNodeRepoStats() {
         return new NodeRepoStats(totalCost, totalAllocatedCost,
                                  load.toLoad(), activeLoad.toLoad(),
-                                 applications.stream().map(stats -> stats.toApplicationStats()).toList());
+                                 applications.stream().map(stats -> stats.toApplicationStats()).collect(Collectors.toList()));
     }
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockIssueHandler.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockIssueHandler.java
index d60c4d196e2..b0fed17bdea 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockIssueHandler.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockIssueHandler.java
@@ -56,7 +56,7 @@ public class MockIssueHandler implements IssueHandler {
                                                  entry.getValue().updated,
                                                  entry.getValue().isOpen() ? Status.toDo : Status.done,
                                                  entry.getValue().assignee))
-                     .toList();
+                     .collect(Collectors.toList());
     }
 
     @Override
@@ -146,8 +146,8 @@ public class MockIssueHandler implements IssueHandler {
                         userList.stream().map(user ->
                                 user.split(" ")[0])
                                 .map(User::from)
-                                .toList()
-                ).toList();
+                                .collect(Collectors.toList())
+                ).collect(Collectors.toList());
     }
 
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java
index 542bdd52477..f3abfd37b38 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java
@@ -84,7 +84,7 @@ public class ResourceDatabaseClientMock implements ResourceDatabaseClient {
                             BigDecimal.valueOf(a.getDiskGb()).multiply(d)
                     );
                 })
-                .toList();
+                .collect(Collectors.toList());
     }
 
     private ResourceUsage resourceUsageAdd(ResourceUsage a, ResourceUsage b) {
@@ -119,7 +119,7 @@ public class ResourceDatabaseClientMock implements ResourceDatabaseClient {
                 .map(usages -> usages.stream().reduce(this::resourceUsageAdd))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .toList();
+                .collect(Collectors.toList());
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java
index 939c74fe61d..e53be91f94b 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java
@@ -42,7 +42,7 @@ public class MockTesterCloud implements TesterCloud {
 
     @Override
     public List<LogEntry> getLog(DeploymentId deploymentId, long after) {
-        return log.stream().filter(entry -> entry.id() > after).toList();
+        return log.stream().filter(entry -> entry.id() > after).collect(Collectors.toList());
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Enforcer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Enforcer.java
index 571f38d34a5..84217e4107f 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Enforcer.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Enforcer.java
@@ -27,7 +27,7 @@ public class Enforcer {
     public boolean allows(Role role, Action action, URI resource) {
         List<Policy> matchingPolicies = role.definition().policies().stream()
                 .filter(policy -> policy.evaluate(action, resource, role.context, system))
-                .toList();
+                .collect(Collectors.toList());
         logger.log(Level.FINE, "Matching policies for " +
                                "role: " + role.definition().name() + ", "+
                                "action " + action.name() + ", " +
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java
index 3d0ee65961f..7e0fc50660e 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java
@@ -40,7 +40,7 @@ public class TenantContacts {
         return contacts.stream()
                 .filter(type::isInstance)
                 .map(type::cast)
-                .toList();
+                .collect(Collectors.toList());
     }
 
     public boolean isEmpty() {