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

4 files changed, 5 insertions, 5 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
index e5a66fea8d1..e2748c592b8 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
@@ -112,7 +112,7 @@ public class ComponentNode extends Node {
         if (Provider.class.isAssignableFrom(clazz)) {
             //TODO: Test what happens if you ask for something that isn't a class, e.g. a parameterized type.
 
-            List<Type> allGenericInterfaces = allSuperClasses(clazz).stream().flatMap(c -> Arrays.stream(c.getGenericInterfaces())).collect(Collectors.toList());
+            List<Type> allGenericInterfaces = allSuperClasses(clazz).stream().flatMap(c -> Arrays.stream(c.getGenericInterfaces())).toList();
             for (Type t : allGenericInterfaces) {
                 if (t instanceof ParameterizedType && ((ParameterizedType) t).getRawType().equals(Provider.class)) {
                     Type[] typeArgs = ((ParameterizedType) t).getActualTypeArguments();
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
index 244327ab4ec..ae06275fd2b 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
@@ -96,8 +96,8 @@ public class ComponentRegistryNode extends Node {
 
     public static boolean equalNodeEdges(List<Node> edges, List<Node> otherEdges) {
         if (edges.size() == otherEdges.size()) {
-            List<ComponentId> left = edges.stream().map(Node::componentId).sorted().collect(Collectors.toList());
-            List<ComponentId> right = otherEdges.stream().map(Node::componentId).sorted().collect(Collectors.toList());
+            List<ComponentId> left = edges.stream().map(Node::componentId).sorted().toList();
+            List<ComponentId> right = otherEdges.stream().map(Node::componentId).sorted().toList();
             return left.equals(right);
         } else {
             return false;
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
index d8c9f0ce98c..353613a8a4f 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
@@ -89,7 +89,7 @@ public class CycleFinder<T> {
         T cycleStart = pathWithCycle.get(pathWithCycle.size() - 1);
         return pathWithCycle.stream()
                 .dropWhile(vertex -> ! vertex.equals(cycleStart))
-                .collect(Collectors.toList());
+                .toList();
     }
 
 }
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
index 2e2eb257b6a..53d8698c417 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
@@ -310,7 +310,7 @@ class JettyConnectionLogger extends AbstractLifeCycle implements Connection.List
                 this.sslPeerNotAfter = peerCertificate.getNotAfter();
                 this.sslSubjectAlternativeNames = X509CertificateUtils.getSubjectAlternativeNames(peerCertificate).stream()
                         .map(SubjectAlternativeName::getValue)
-                        .collect(Collectors.toList());
+                        .toList();
                 this.sslPeerIssuerSubject = peerCertificate.getIssuerX500Principal().getName();
                 this.sslPeerEncodedCertificate = peerCertificate.getEncoded();
             } catch (SSLPeerUnverifiedException | CertificateEncodingException e) {