Revert collect(Collectors.toList())

6 files changed, 16 insertions, 16 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
index 6c519a4656e..f69bd5fa475 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
@@ -222,7 +222,7 @@ public class DeploymentSpec {
     private static List<DeploymentInstanceSpec> instances(List<DeploymentSpec.Step> steps) {
         return steps.stream()
                     .flatMap(DeploymentSpec::flatten)
-                    .toList();
+                    .collect(Collectors.toList());
     }
 
     private static Stream<DeploymentInstanceSpec> flatten(Step step) {
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java b/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java
index 8256237dc43..746d7226d82 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java
@@ -79,7 +79,7 @@ public class TimeWindow {
                hours.toString() +
                " on " + days.stream().map(DayOfWeek::name)
                             .map(String::toLowerCase)
-                            .toList() +
+                            .collect(Collectors.toList()) +
                " in time zone " + zone + " and " + dateRange.toString();
     }
 
@@ -90,7 +90,7 @@ public class TimeWindow {
                 ? List.copyOf(dateRange.days()) // Default to the days contained in the date range
                 : parse(daySpec, TimeWindow::parseDays);
         List<Integer> hours = hourSpec.isEmpty()
-                ? IntStream.rangeClosed(0, 23).boxed().toList() // All hours by default
+                ? IntStream.rangeClosed(0, 23).boxed().collect(Collectors.toList()) // All hours by default
                 : parse(hourSpec, TimeWindow::parseHours);
         ZoneId zone = zoneFrom(zoneSpec.isEmpty() ? "UTC" : zoneSpec);
         return new TimeWindow(days, hours, zone, dateRange);
@@ -123,7 +123,7 @@ public class TimeWindow {
                                                              endInclusive));
         }
         return IntStream.rangeClosed(start, end).boxed()
-                        .toList();
+                        .collect(Collectors.toList());
     }
 
     /** Returns a list of all days occurring between startInclusive and endInclusive */
@@ -136,7 +136,7 @@ public class TimeWindow {
         }
         return IntStream.rangeClosed(start.getValue(), end.getValue()).boxed()
                         .map(DayOfWeek::of)
-                        .toList();
+                        .collect(Collectors.toList());
     }
 
     /** Parse day of week from string */
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
index 8182e697e7e..c1ecddee456 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
@@ -215,7 +215,7 @@ public class DeploymentSpecXmlReader {
                                                              notifications,
                                                              endpoints,
                                                              now))
-                     .toList();
+                     .collect(Collectors.toList());
     }
 
     private List<Step> readSteps(Element stepTag, Map<String, String> prodAttributes, Element parentTag) {
@@ -250,7 +250,7 @@ public class DeploymentSpecXmlReader {
             case prodTag: // regions, delay and parallel may be nested within, but we can flatten them
                 return XML.getChildren(stepTag).stream()
                                                .flatMap(child -> readNonInstanceSteps(child, prodAttributes, stepTag).stream())
-                                               .toList();
+                                               .collect(Collectors.toList());
             case delayTag:
                 return List.of(new Delay(Duration.ofSeconds(longAttribute("hours", stepTag) * 60 * 60 +
                                                             longAttribute("minutes", stepTag) * 60 +
@@ -258,11 +258,11 @@ public class DeploymentSpecXmlReader {
             case parallelTag: // regions and instances may be nested within
                 return List.of(new ParallelSteps(XML.getChildren(stepTag).stream()
                                                     .flatMap(child -> readSteps(child, prodAttributes, parentTag).stream())
-                                                    .toList()));
+                                                    .collect(Collectors.toList())));
             case stepsTag: // regions and instances may be nested within
                 return List.of(new Steps(XML.getChildren(stepTag).stream()
                                             .flatMap(child -> readSteps(child, prodAttributes, parentTag).stream())
-                                            .toList()));
+                                            .collect(Collectors.toList())));
             case regionTag:
                 return List.of(readDeclaredZone(Environment.prod, athenzService, testerFlavor, stepTag));
             default:
@@ -378,7 +378,7 @@ public class DeploymentSpecXmlReader {
      * Imposes some constraints on tag order which are not expressible in the schema
      */
     private void validateTagOrder(Element root) {
-        List<String> tags = XML.getChildren(root).stream().map(Element::getTagName).toList();
+        List<String> tags = XML.getChildren(root).stream().map(Element::getTagName).collect(Collectors.toList());
         for (int i = 0; i < tags.size(); i++) {
             if (tags.get(i).equals(blockChangeTag)) {
                 String constraint = "<block-change> must be placed after <test> and <staging> and before <prod>";
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index 96cd4810ec4..d6af531ff89 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -1235,12 +1235,12 @@ public class DeploymentSpecTest {
 
         assertEquals(
                 List.of("foo", "nalle", "default"),
-                spec.requireInstance("default").endpoints().stream().map(Endpoint::endpointId).toList()
+                spec.requireInstance("default").endpoints().stream().map(Endpoint::endpointId).collect(Collectors.toList())
         );
 
         assertEquals(
                 List.of("bar", "frosk", "quux"),
-                spec.requireInstance("default").endpoints().stream().map(Endpoint::containerId).toList()
+                spec.requireInstance("default").endpoints().stream().map(Endpoint::containerId).collect(Collectors.toList())
         );
 
         assertEquals(List.of(RegionName.from("us-east")), spec.requireInstance("default").endpoints().get(0).regions());
@@ -1677,7 +1677,7 @@ public class DeploymentSpecTest {
 
         return DeploymentSpec.fromXml(xml).requireInstance("default").endpoints().stream()
                              .map(Endpoint::endpointId)
-                             .toList();
+                             .collect(Collectors.toList());
     }
 
 }
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
index 6ff5616a80f..e822b42a909 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
@@ -670,12 +670,12 @@ public class DeploymentSpecWithoutInstanceTest {
 
         assertEquals(
                 List.of("foo", "nalle", "default"),
-                spec.requireInstance("default").endpoints().stream().map(Endpoint::endpointId).toList()
+                spec.requireInstance("default").endpoints().stream().map(Endpoint::endpointId).collect(Collectors.toList())
         );
 
         assertEquals(
                 List.of("bar", "frosk", "quux"),
-                spec.requireInstance("default").endpoints().stream().map(Endpoint::containerId).toList()
+                spec.requireInstance("default").endpoints().stream().map(Endpoint::containerId).collect(Collectors.toList())
         );
 
         assertEquals(List.of(RegionName.from("us-east")), spec.requireInstance("default").endpoints().get(0).regions());
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java
index 6a939aea574..2403066868b 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java
@@ -114,7 +114,7 @@ public class TimeWindowTest {
         { // Empty results in default values
             TimeWindow tw = TimeWindow.from("", "", "", "", "");
             assertEquals(List.of(DayOfWeek.values()), tw.days());
-            assertEquals(IntStream.rangeClosed(0, 23).boxed().toList(), tw.hours());
+            assertEquals(IntStream.rangeClosed(0, 23).boxed().collect(Collectors.toList()), tw.hours());
             assertEquals("UTC", tw.zone().getId());
         }
         {