Merge pull request #25610 from vespa-engine/balder/unify-on-toList

Balder/unify on to list

17 files changed, 28 insertions, 47 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/LargeRankingExpressions.java b/config-model/src/main/java/com/yahoo/schema/LargeRankingExpressions.java
index 2ae9041b1a2..319b1ac343a 100644
--- a/config-model/src/main/java/com/yahoo/schema/LargeRankingExpressions.java
+++ b/config-model/src/main/java/com/yahoo/schema/LargeRankingExpressions.java
@@ -40,7 +40,7 @@ public class LargeRankingExpressions {
 
     /** Returns a read-only list of ranking constants ordered by name */
     public Collection<RankingExpressionBody> expressions() {
-        return expressions.values().stream().sorted().collect(Collectors.toUnmodifiableList());
+        return expressions.values().stream().sorted().toList();
     }
 
     // Note: Use by integration tests in internal repo
diff --git a/config-model/src/main/java/com/yahoo/schema/document/ImmutableImportedComplexSDField.java b/config-model/src/main/java/com/yahoo/schema/document/ImmutableImportedComplexSDField.java
index 553b5b4d940..35b5d06067f 100644
--- a/config-model/src/main/java/com/yahoo/schema/document/ImmutableImportedComplexSDField.java
+++ b/config-model/src/main/java/com/yahoo/schema/document/ImmutableImportedComplexSDField.java
@@ -3,8 +3,6 @@ package com.yahoo.schema.document;
 
 import java.util.Collection;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * Wraps {@link ImportedComplexField} as {@link ImmutableSDField}.
  */
@@ -24,6 +22,6 @@ public class ImmutableImportedComplexSDField extends ImmutableImportedSDField {
 
     @Override
     public Collection<? extends ImmutableSDField> getStructFields() {
-        return importedComplexField.getNestedFields().stream().map(field -> field.asImmutableSDField()).collect(toList());
+        return importedComplexField.getNestedFields().stream().map(field -> field.asImmutableSDField()).toList();
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/CloudWatchValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/CloudWatchValidator.java
index 67be9d7bad8..847a3402dc5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/CloudWatchValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/CloudWatchValidator.java
@@ -8,8 +8,6 @@ import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer;
 
 import java.util.List;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * @author gjoranv
  */
@@ -23,7 +21,7 @@ public class CloudWatchValidator extends Validator {
 
         var offendingConsumers = model.getAdmin().getUserMetrics().getConsumers().values().stream()
                 .filter(consumer -> !consumer.cloudWatches().isEmpty())
-                .collect(toList());
+                .toList();
 
         if (! offendingConsumers.isEmpty()) {
             throw new IllegalArgumentException("CloudWatch cannot be set up for non-public hosted Vespa and must " +
@@ -32,7 +30,7 @@ public class CloudWatchValidator extends Validator {
     }
 
     private List<String> consumerIds(List<MetricsConsumer> offendingConsumers) {
-        return offendingConsumers.stream().map(MetricsConsumer::id).collect(toList());
+        return offendingConsumers.stream().map(MetricsConsumer::id).toList();
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java
index 877dd12104f..93a28820125 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java
@@ -42,7 +42,6 @@ import java.util.stream.Collectors;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.mapping;
 import static java.util.stream.Collectors.toCollection;
-import static java.util.stream.Collectors.toList;
 
 /**
  * Executor of validators. This defines the right order of validator execution.
@@ -129,7 +128,7 @@ public class Validation {
         };
         List<ConfigChangeAction> actions = Arrays.stream(validators)
                                                  .flatMap(v -> v.validate(currentModel, nextModel, overrides, now).stream())
-                                                 .collect(toList());
+                                                 .toList();
 
         Map<ValidationId, Collection<String>> disallowableActions = actions.stream()
                                                                            .filter(action -> action.validationId().isPresent())
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexedSearchClusterChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexedSearchClusterChangeValidator.java
index 8c333a099d0..778ae604333 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexedSearchClusterChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexedSearchClusterChangeValidator.java
@@ -94,7 +94,7 @@ public class IndexedSearchClusterChangeValidator implements ChangeValidator {
     private static List<ServiceInfo> getSearchNodeServices(IndexedSearchCluster cluster) {
         return cluster.getSearchNodes().stream().
                 map(node -> node.getServiceInfo()).
-                collect(Collectors.toList());
+                toList();
     }
 
     private static List<ConfigChangeAction> modifyActions(List<VespaConfigChangeAction> result,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidator.java
index 7c6f242bbe2..490fea40fab 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidator.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.model.application.validation.change;
 import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.model.api.ConfigChangeAction;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
@@ -46,7 +47,7 @@ public class NodeResourceChangeValidator implements ChangeValidator {
         return model.allocatedHosts().getHosts().stream().filter(host -> host.membership().isPresent())
                                                          .filter(host -> host.membership().get().cluster().id().equals(clusterId))
                                                          .findFirst()
-                                                         .map(host -> host.advertisedResources());
+                                                         .map(HostSpec::advertisedResources);
     }
 
     private List<ConfigChangeAction> createRestartActionsFor(ClusterSpec.Id clusterId, VespaModel model) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java
index 167aff1064b..83d723398a6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java
@@ -8,6 +8,7 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.documentmodel.NewDocumentType;
 import com.yahoo.schema.derived.AttributeFields;
 import com.yahoo.schema.document.Attribute;
+import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.change.search.ChangeMessageBuilder;
 import com.yahoo.vespa.model.application.validation.change.search.DocumentTypeChangeValidator;
@@ -36,10 +37,8 @@ public class StreamingSearchClusterChangeValidator implements ChangeValidator {
                 List<StreamingSearchCluster> nextStreamingClusters = nextCluster.getSearch().getStreamingClusters();
                 currentCluster.getSearch().getStreamingClusters().forEach(currentStreamingCluster -> {
                     Optional<StreamingSearchCluster> nextStreamingCluster = findStreamingCluster(currentStreamingCluster.getClusterName(), nextStreamingClusters);
-                    if (nextStreamingCluster.isPresent()) {
-                        result.addAll(validateStreamingCluster(currentCluster, currentStreamingCluster,
-                                nextCluster, nextStreamingCluster.get(), overrides, now));
-                    }
+                    nextStreamingCluster.ifPresent(streamingSearchCluster -> result.addAll(validateStreamingCluster(currentCluster, currentStreamingCluster,
+                            nextCluster, streamingSearchCluster)));
                 });
             }
         });
@@ -55,14 +54,12 @@ public class StreamingSearchClusterChangeValidator implements ChangeValidator {
     private static List<ConfigChangeAction> validateStreamingCluster(ContentCluster currentCluster,
                                                                      StreamingSearchCluster currentStreamingCluster,
                                                                      ContentCluster nextCluster,
-                                                                     StreamingSearchCluster nextStreamingCluster,
-                                                                     ValidationOverrides overrides,
-                                                                     Instant now) {
+                                                                     StreamingSearchCluster nextStreamingCluster) {
         List<VespaConfigChangeAction> result = new ArrayList<>();
 
         result.addAll(validateDocumentTypeChanges(currentCluster.id(),
                                                   getDocumentType(currentCluster, currentStreamingCluster),
-                                                  getDocumentType(nextCluster, nextStreamingCluster), overrides, now));
+                                                  getDocumentType(nextCluster, nextStreamingCluster)));
         result.addAll(validateAttributeFastAccessAdded(currentCluster.id(),
                                                        currentStreamingCluster.derived().getAttributeFields(),
                                                        nextStreamingCluster.derived().getAttributeFields()));
@@ -75,9 +72,7 @@ public class StreamingSearchClusterChangeValidator implements ChangeValidator {
 
     private static List<VespaConfigChangeAction> validateDocumentTypeChanges(ClusterSpec.Id id,
                                                                              NewDocumentType currentDocType,
-                                                                             NewDocumentType nextDocType,
-                                                                             ValidationOverrides overrides,
-                                                                             Instant now) {
+                                                                             NewDocumentType nextDocType) {
         return new DocumentTypeChangeValidator(id, currentDocType, nextDocType).validate();
     }
 
@@ -115,8 +110,8 @@ public class StreamingSearchClusterChangeValidator implements ChangeValidator {
 
     private static List<ServiceInfo> getSearchNodeServices(ContentCluster cluster) {
         return cluster.getSearch().getSearchNodes().stream()
-                .map(node -> node.getServiceInfo())
-                .collect(Collectors.toList());
+                .map(AbstractService::getServiceInfo)
+                .toList();
     }
 
     private static List<ConfigChangeAction> modifyActions(List<VespaConfigChangeAction> result,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java
index 5c3905e3311..838c96a8249 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java
@@ -69,7 +69,7 @@ public class AttributeChangeValidator {
 
     private List<VespaConfigChangeAction> validateAddAttributeAspect() {
         return nextFields.attributes().stream().
-                map(attr -> attr.getName()).
+                map(Attribute::getName).
                 filter(attrName -> !currentFields.containsAttribute(attrName) &&
                                    currentDocType.containsField(attrName)).
                 map(attrName -> new VespaRestartAction(id, new ChangeMessageBuilder(attrName).addChange("add attribute aspect").build())).
@@ -78,7 +78,7 @@ public class AttributeChangeValidator {
 
     private List<VespaConfigChangeAction> validateRemoveAttributeAspect() {
         return currentFields.attributes().stream().
-                map(attr -> attr.getName()).
+                map(Attribute::getName).
                 filter(attrName -> !nextFields.containsAttribute(attrName) &&
                                    nextDocType.containsField(attrName) &&
                                    !isIndexField(attrName)).
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/DiscBindingsConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/DiscBindingsConfigGenerator.java
index e4a5c2cd440..ca45a1d1687 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/DiscBindingsConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/DiscBindingsConfigGenerator.java
@@ -7,7 +7,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import static com.yahoo.container.jdisc.JdiscBindingsConfig.Handlers;
-import static java.util.stream.Collectors.toList;
 
 /**
  * @author gjoranv
@@ -34,6 +33,6 @@ public class DiscBindingsConfigGenerator {
     }
 
     private static Collection<String> toStrings(Collection<BindingPattern> bindings) {
-        return bindings.stream().map(BindingPattern::patternString).collect(toList());
+        return bindings.stream().map(BindingPattern::patternString).toList();
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
index 69480ee0703..8a89355ee36 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
@@ -19,8 +19,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * @author Einar M R Rosenvinge
  * @author mortent
@@ -76,7 +74,7 @@ public class JettyConnectorBuilder extends VespaDomBuilder.DomConfigProducerBuil
                              Arrays.stream(element.split(","))
                                      .filter(listEntry -> !listEntry.isBlank())
                                      .map(String::trim)
-                                     .collect(toList()))
+                                     .toList())
                 .orElse(List.of());
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index 60ab5dacc5f..d4a41a090b9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -35,8 +35,6 @@ import java.util.TreeMap;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * Encapsulates the various options for search in a content model.
  * Wraps a search cluster from com.yahoo.vespa.model.search.
@@ -345,7 +343,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         return getClusters().values().stream()
                 .filter(StreamingSearchCluster.class::isInstance)
                 .map(StreamingSearchCluster.class::cast)
-                .collect(toList());
+                .toList();
     }
 
     public List<NewDocumentType> getDocumentTypesWithStreamingCluster() { return documentTypes(this::hasIndexingModeStreaming); }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index bf5770681ef..3b01cd02b9c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -62,8 +62,6 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.logging.Level;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * A content cluster.
  *
@@ -304,7 +302,7 @@ public class ContentCluster extends AbstractConfigProducer<AbstractConfigProduce
             }
             else { // self-hosted: Put cluster controller on config servers or use explicit cluster controllers
                 if (admin.getClusterControllers() == null) {
-                    var hosts = admin.getConfigservers().stream().map(s -> s.getHostResource()).collect(toList());
+                    var hosts = admin.getConfigservers().stream().map(s -> s.getHostResource()).toList();
                     if (hosts.size() > 1) {
                         var message = "When having content clusters and more than 1 config server " +
                                       "it is recommended to configure cluster controllers explicitly.";
diff --git a/config-model/src/test/java/com/yahoo/schema/DocumentGraphValidatorTest.java b/config-model/src/test/java/com/yahoo/schema/DocumentGraphValidatorTest.java
index ccfa5c51a16..a8a606c87b2 100644
--- a/config-model/src/test/java/com/yahoo/schema/DocumentGraphValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/schema/DocumentGraphValidatorTest.java
@@ -14,7 +14,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -136,7 +135,7 @@ public class DocumentGraphValidatorTest {
     }
 
     private static List<SDDocumentType> documentListOf(Schema... schemas) {
-        return Arrays.stream(schemas).map(Schema::getDocument).collect(toList());
+        return Arrays.stream(schemas).map(Schema::getDocument).toList();
     }
 
     private static Schema createSearchWithName(String name, Schema... parents) {
diff --git a/config-model/src/test/java/com/yahoo/schema/derived/SchemaOrdererTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SchemaOrdererTestCase.java
index 16001d3912d..a3c0897bb02 100644
--- a/config-model/src/test/java/com/yahoo/schema/derived/SchemaOrdererTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/derived/SchemaOrdererTestCase.java
@@ -19,7 +19,6 @@ import java.util.Map;
 import java.util.Objects;
 
 import static java.util.Collections.emptyMap;
-import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
@@ -80,12 +79,12 @@ public class SchemaOrdererTestCase extends AbstractSchemaTestCase {
         List<Schema> inputSchemas = inputNames.stream()
                                               .map(schemas::get)
                                               .map(Objects::requireNonNull)
-                                              .collect(toList());
+                                              .toList();
         List<String> actualSearchOrder = new SearchOrderer()
                 .order(inputSchemas)
                 .stream()
                 .map(Schema::getName)
-                .collect(toList());
+                .toList();
         assertEquals(expectedSearchOrder, actualSearchOrder);
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
index 0eb1db1acaa..a388fdd1b3d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
@@ -37,7 +37,6 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.g
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getMetricsNodesConfig;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.servicesWithAdminOnly;
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -82,7 +81,7 @@ public class MetricsProxyContainerClusterTest {
     void http_handlers_are_set_up() {
         VespaModel model = getModel(servicesWithAdminOnly(), self_hosted);
         Collection<Handler> handlers = model.getAdmin().getMetricsProxyCluster().getHandlers();
-        Collection<ComponentSpecification> handlerClasses = handlers.stream().map(Component::getClassId).collect(toList());
+        Collection<ComponentSpecification> handlerClasses = handlers.stream().map(Component::getClassId).toList();
 
         assertTrue(handlerClasses.contains(ComponentSpecification.fromString(MetricsV1Handler.class.getName())));
         assertTrue(handlerClasses.contains(ComponentSpecification.fromString(PrometheusHandler.class.getName())));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigChangeTestUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigChangeTestUtils.java
index d975618c1db..64eb63e8a56 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigChangeTestUtils.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigChangeTestUtils.java
@@ -54,7 +54,7 @@ public class ConfigChangeTestUtils {
         return services.stream()
                 .map(service -> new ServiceInfo(service.getServiceName(), "null", null, null,
                         service.getConfigId(), "null"))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public static void assertEqualActions(List<ConfigChangeAction> exp, List<ConfigChangeAction> act) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
index b56f8fa2f25..2538cdb5ab1 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
@@ -56,7 +56,7 @@ public class ContentClusterBuilder {
     public ContentClusterBuilder docTypes(String ... docTypes) {
         this.docTypes = Arrays.asList(docTypes).stream().
                 map(type -> DocType.index(type)).
-                collect(Collectors.toList());
+                toList();
         return this;
     }