Unify on Streams.toList()

3 files changed, 8 insertions, 9 deletions

diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
index 587875363d5..51f6379ae95 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
@@ -49,7 +49,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static com.yahoo.vespa.orchestrator.controller.ClusterControllerNodeState.MAINTENANCE;
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 
 /**
@@ -141,7 +140,7 @@ public class OrchestratorImpl implements Orchestrator {
                 .serviceClusters().stream()
                 .flatMap(cluster -> cluster.serviceInstances().stream())
                 .filter(serviceInstance -> hostName.equals(serviceInstance.hostName()))
-                .collect(toList());
+                .toList();
 
         HostInfo hostInfo = statusService.getHostInfo(applicationInstance.reference(), hostName);
 
@@ -365,7 +364,7 @@ public class OrchestratorImpl implements Orchestrator {
 
         return nodeGroupMap.values().stream()
                 .sorted(OrchestratorImpl::compareNodeGroupsForSuspend)
-                .collect(toList());
+                .toList();
     }
 
     private static int compareNodeGroupsForSuspend(NodeGroup leftNodeGroup, NodeGroup rightNodeGroup) {
@@ -418,7 +417,7 @@ public class OrchestratorImpl implements Orchestrator {
 
             List<ServiceCluster> contentClusters = application.serviceClusters().stream()
                                                               .filter(VespaModelUtil::isContent)
-                                                              .collect(toList());
+                                                              .toList();
 
             // For all content clusters, probe whether maintenance is OK.
             OrchestratorContext context = OrchestratorContext.createContextForBatchProbe(clock);
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImpl.java
index 380e34aab8d..478373c8bef 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImpl.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImpl.java
@@ -67,7 +67,7 @@ public class ApplicationApiImpl implements ApplicationApi {
         return getStorageNodesInGroupInClusterOrder().stream()
                 .filter(storageNode -> getHostStatus(storageNode.hostName()).isSuspended())
                 .sorted(Comparator.reverseOrder())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -81,7 +81,7 @@ public class ApplicationApiImpl implements ApplicationApi {
                 .map(ClusterApi::storageNodeInGroup)
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -91,7 +91,7 @@ public class ApplicationApiImpl implements ApplicationApi {
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .filter(x -> hostInfos.getOrNoRemarks(x.hostName()).status() == HostStatus.NO_REMARKS)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -108,7 +108,7 @@ public class ApplicationApiImpl implements ApplicationApi {
     public List<HostName> getNodesInGroupWith(Predicate<HostStatus> statusPredicate) {
         return nodeGroup.getHostNames().stream()
                 .filter(hostName -> statusPredicate.test(getHostStatus(hostName)))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<ClusterApi> makeClustersInOrder(NodeGroup nodeGroup,
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java
index f2133d32867..914929f9cfb 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java
@@ -103,7 +103,7 @@ public class VespaModelUtil {
 
         return controllerClusters.stream().
                 filter(cluster -> cluster.clusterId().equals(clusterControllerClusterId)).
-                collect(Collectors.toList());
+                toList();
     }
 
     public static Set<ServiceCluster> getClusterControllerServiceClusters(ApplicationInstance application) {