Merge pull request #25104 from vespa-engine/revert-25103-balder/manual-revert-of-25097

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

3 files changed, 3 insertions, 3 deletions

diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java b/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java
index f755d988f28..c2f16f3e1b4 100644
--- a/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java
+++ b/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java
@@ -68,7 +68,7 @@ public class LocalFileDb implements FileAcquirer, FileRegistry {
     @Override
     public List<Entry> export() {
         return fileReferenceToFile.entrySet().stream().map(entry -> new Entry(entry.getValue().getPath(), entry.getKey()))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java
index f80cdbed900..d26a70ea8bf 100644
--- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java
+++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java
@@ -309,7 +309,7 @@ public class StandaloneContainerApplication implements Application {
             throw new RuntimeException("No jdisc element found under services.");
         } else {
             List<String> nameAndId = jDiscElements.stream().map(e -> e.getNodeName() + " id='" + e.getAttribute("id") + "'")
-                    .collect(Collectors.toList());
+                    .toList();
             throw new RuntimeException("Found multiple JDisc elements: " + String.join(", ", nameAndId));
         }
     }
diff --git a/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java b/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java
index 3bb42879960..cdb0bffc3f9 100644
--- a/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java
+++ b/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java
@@ -38,7 +38,7 @@ public class CloudConfigInstallVariablesTest {
         CloudConfigOptions.ConfigServer[] parsed = toConfigServers("test1     test2");
         assertEquals(2, parsed.length);
 
-        List<String> hostNames = Arrays.stream(parsed).map(cs -> cs.hostName).collect(Collectors.toList());
+        List<String> hostNames = Arrays.stream(parsed).map(cs -> cs.hostName).toList();
         assertTrue(hostNames.containsAll(Arrays.asList("test1", "test2")));
     }