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

37 files changed, 68 insertions, 68 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
index d2fd6d8cfc4..f44849e185f 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
@@ -127,11 +127,11 @@ public class InMemoryProvisioner implements HostProvisioner {
     }
 
     private static Collection<Host> toHostInstances(String[] hostnames) {
-        return Arrays.stream(hostnames).map(Host::new).collect(Collectors.toList());
+        return Arrays.stream(hostnames).map(Host::new).toList();
     }
 
     private static Collection<Host> createHostInstances(int hostCount) {
-        return IntStream.range(1, hostCount + 1).mapToObj(i -> new Host("host" + i)).collect(Collectors.toList());
+        return IntStream.range(1, hostCount + 1).mapToObj(i -> new Host("host" + i)).toList();
     }
 
     /** Returns the current allocations of this as a mutable map */
@@ -265,7 +265,7 @@ public class InMemoryProvisioner implements HostProvisioner {
     }
 
     private List<HostSpec> nonRetiredIn(List<HostSpec> hosts) {
-        return hosts.stream().filter(host -> ! retiredHostNames.contains(host.hostname())).collect(Collectors.toList());
+        return hosts.stream().filter(host -> ! retiredHostNames.contains(host.hostname())).toList();
     }
 
     private int totalAllocatedTo(ClusterSpec cluster) {
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java b/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java
index 1ce1c48c0f1..c3531d03d3f 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java
@@ -167,7 +167,7 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce
         String structPrefix = baseFieldName + ".";
         return attributes().stream()
                 .filter(attribute -> attribute.getName().startsWith(structPrefix))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public String toString() {
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java b/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java
index 6dae89bf692..a35bc735608 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java
@@ -76,7 +76,7 @@ public final class IndexingScript extends Derived implements IlscriptsConfig.Pro
         return schema.allFieldsList().stream()
                      .filter(field -> ! field.isImportedField())
                      .filter(field -> field.containsExpression(SetLanguageExpression.class))
-                     .collect(Collectors.toList());
+                     .toList();
     }
 
     public Iterable<Expression> expressions() {
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
index 8bdbe574b0e..0231e0e3c3f 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
@@ -194,7 +194,7 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
             rankProperties = new ArrayList<>(compiled.getRankProperties());
 
             Map<String, RankProfile.RankingExpressionFunction> functions = compiled.getFunctions();
-            List<ExpressionFunction> functionExpressions = functions.values().stream().map(RankProfile.RankingExpressionFunction::function).collect(Collectors.toList());
+            List<ExpressionFunction> functionExpressions = functions.values().stream().map(RankProfile.RankingExpressionFunction::function).toList();
             Map<String, String> functionProperties = new LinkedHashMap<>();
             SerializationContext functionSerializationContext = new SerializationContext(functionExpressions,
                                                                                          Map.of(),
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
index 2de7e5a1b37..48b804dfe6c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
@@ -119,7 +119,7 @@ public class HostSystem extends AbstractConfigProducer<Host> {
     public List<HostResource> getHosts() {
         return hostname2host.values().stream()
                 .filter(host -> !host.getHost().runsConfigServer())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public void dumpPortAllocations() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
index 1a17b082263..97a6f27b759 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
@@ -40,7 +40,7 @@ class ConsumersConfigGenerator {
 
         return allConsumers.values().stream()
                 .map(ConsumersConfigGenerator::toConsumerBuilder)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /*
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java
index b56c5f6c216..678f458dff0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java
@@ -17,7 +17,7 @@ public class MetricsNodesConfigGenerator {
     public static List<MetricsNodesConfig.Node.Builder> generate(List<MetricsProxyContainer> containers) {
         return containers.stream()
                 .map(MetricsNodesConfigGenerator::toNodeBuilder)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static MetricsNodesConfig.Node.Builder toNodeBuilder(MetricsProxyContainer container) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/VespaServicesConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/VespaServicesConfigGenerator.java
index 93ff9f8963c..f8a91b7d3e9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/VespaServicesConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/VespaServicesConfigGenerator.java
@@ -17,7 +17,7 @@ public class VespaServicesConfigGenerator {
         return services.stream()
                 .filter(VespaServicesConfigGenerator::doIncludeServiceMetrics)
                 .map(VespaServicesConfigGenerator::toServiceBuilder)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static boolean doIncludeServiceMetrics(Service s) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
index 1e3b27bc2fa..c8a8df18f98 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
@@ -105,7 +105,7 @@ public class BundleValidator extends AbstractBundleValidator {
             this.name = name;
             this.javaPackageMatchers = javaPackagePatterns.stream()
                 .map(s -> Pattern.compile(s).asMatchPredicate())
-                .collect(Collectors.toList());
+                .toList();
             this.versionDiscriminator = versionDiscriminator;
             this.description = description;
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java
index da470f804d9..4ea74147aaf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java
@@ -76,7 +76,7 @@ public class QuotaValidator extends Validator {
                 })
                 .map(Map.Entry::getKey)
                 .map(ClusterSpec.Id::value)
-                .collect(Collectors.toList());
+                .toList();
 
         if (!invalidClusters.isEmpty()) {
             var clusterNames = String.join(", ", invalidClusters);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java
index 9360c6e707b..077855b4b23 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java
@@ -42,7 +42,7 @@ public class ConfigValueChangeValidator implements ChangeValidator {
     @Override
     public List<ConfigChangeAction> validate(VespaModel currentModel, VespaModel nextModel,
                                              ValidationOverrides overrides, Instant now) {
-        return findConfigChangesFromModels(currentModel, nextModel).collect(Collectors.toList());
+        return findConfigChangesFromModels(currentModel, nextModel).toList();
     }
 
     public Stream<ConfigChangeAction> findConfigChangesFromModels(AbstractConfigProducerRoot currentModel,
@@ -57,7 +57,7 @@ public class ConfigValueChangeValidator implements ChangeValidator {
                                                                           AbstractConfigProducerRoot currentModel,
                                                                           AbstractConfigProducerRoot nextModel) {
         List<ChangesRequiringRestart> changes = findConfigChangesForService(service, currentModel, nextModel)
-            .collect(Collectors.toList());
+            .toList();
         if (changes.isEmpty()) {
             return Optional.empty();
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java
index 7ee5fe8edf6..3a0b1348d7e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java
@@ -31,7 +31,7 @@ public class ContainerRestartValidator implements ChangeValidator {
                                   .filter(container -> isExistingContainer(container, currentModel))
                                   .filter(container -> shouldContainerRestartOnDeploy(container, nextModel))
                                   .map(container -> createConfigChangeAction(cluster.id(), container))
-                                  .collect(Collectors.toList()));
+                                  .toList());
         }
         return actions;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
index a3872d9354b..4acdda03166 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
@@ -73,7 +73,7 @@ public class IndexingModeChangeValidator implements ChangeValidator {
             if (currentTypes.contains(type)) {
                 List<ServiceInfo> services = nextCluster.getSearch().getSearchNodes().stream()
                         .map(SearchNode::getServiceInfo)
-                        .collect(Collectors.toList());
+                        .toList();
                 actions.add(VespaReindexAction.of(
                         nextCluster.id(),
                         ValidationId.indexModeChange,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java
index 8537bb2462f..6486b5aff1b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java
@@ -53,7 +53,7 @@ public class ResourcesReductionValidator implements ChangeValidator {
                                  current.minResources().nodeResources().diskGb(),
                                  next.minResources().nodeResources().diskGb()))
                 .flatMap(Optional::stream)
-                .collect(Collectors.toList());
+                .toList();
         if (illegalChanges.isEmpty()) return;
 
         overrides.invalid(ValidationId.resourcesReduction,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidator.java
index 6b5ae4d4c5c..1f5a54d6b0f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidator.java
@@ -26,7 +26,7 @@ public class StartupCommandChangeValidator implements ChangeValidator {
     @Override
     public List<ConfigChangeAction> validate(VespaModel currentModel, VespaModel nextModel,
                                              ValidationOverrides overrides, Instant now) {
-        return findServicesWithChangedStartupCommand(currentModel, nextModel).collect(Collectors.toList());
+        return findServicesWithChangedStartupCommand(currentModel, nextModel).toList();
     }
 
     public Stream<ConfigChangeAction> findServicesWithChangedStartupCommand(AbstractConfigProducerRoot currentModel,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index dae2f7e8cb8..d27f78f6a8a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -165,7 +165,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
                                                                      .filter(container -> retired == container.isRetired())
                                                                      .map(Container::getHostResource)
                                                                      .sorted(HostResource::comparePrimarilyByIndexTo)
-                                                                     .collect(Collectors.toList());
+                                                                     .collect(Collectors.toCollection(ArrayList::new));
         return hosts.subList(0, Math.min(count, hosts.size()));
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index 9ebaa4f0fd6..c097f856da2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -198,7 +198,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         List<String> hosts = getContainers().stream()
                 .map(AbstractService::getHostName)
                 .sorted()
-                .collect(Collectors.toList());
+                .toList();
 
         for (String suffix : deployState.getProperties().zoneDnsSuffixes()) {
             ApplicationClusterEndpoint.DnsName l4Name = ApplicationClusterEndpoint.DnsName.sharedL4NameFrom(
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java
index 039daba8ad0..901c0877c1f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java
@@ -43,7 +43,7 @@ public class BlockFeedGlobalEndpointsFilter extends Filter implements RuleBasedF
                 .flatMap(e -> e.names().stream())
                 .collect(Collectors.toCollection(() -> new LinkedHashSet<>()));
         if(hostNames.size() > 0) {
-            Collection<String> hostnamesSorted = hostNames.stream().sorted().collect(Collectors.toList());
+            Collection<String> hostnamesSorted = hostNames.stream().sorted().toList();
             RuleBasedFilterConfig.Rule.Builder rule = new RuleBasedFilterConfig.Rule.Builder()
                     .hostNames(hostnamesSorted)
                     .pathExpressions(ContainerCluster.RESERVED_URI_PREFIX + "/{*}")
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
index cb52f701da4..4aa0386bd27 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
@@ -92,9 +92,9 @@ public class HostedSslConnectorFactory extends ConnectorFactory {
         connectorBuilder.ssl.enabledProtocols(List.of("TLSv1.2"));
 
         if (!tlsCiphersOverride.isEmpty()) {
-            connectorBuilder.ssl.enabledCipherSuites(tlsCiphersOverride.stream().sorted().collect(Collectors.toList()));
+            connectorBuilder.ssl.enabledCipherSuites(tlsCiphersOverride.stream().sorted().toList());
         } else {
-            connectorBuilder.ssl.enabledCipherSuites(TlsContext.ALLOWED_CIPHER_SUITES.stream().sorted().collect(Collectors.toList()));
+            connectorBuilder.ssl.enabledCipherSuites(TlsContext.ALLOWED_CIPHER_SUITES.stream().sorted().toList());
         }
 
         connectorBuilder
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java
index 834b0e73b5e..ce999603439 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java
@@ -23,7 +23,7 @@ public class SemanticRuleBuilder {
         List<NamedReader> ruleBaseFiles = null;
         try {
             ruleBaseFiles = applicationPackage.getFiles(ApplicationPackage.RULES_DIR, "sr");
-            return new SemanticRules(ruleBaseFiles.stream().map(this::toRuleBaseConfigView).collect(Collectors.toList()));
+            return new SemanticRules(ruleBaseFiles.stream().map(this::toRuleBaseConfigView).toList());
         }
         finally {
             NamedReader.closeAll(ruleBaseFiles);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudSecretStore.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudSecretStore.java
index 373eb9714d3..b43c7777dec 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudSecretStore.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudSecretStore.java
@@ -41,7 +41,7 @@ public class CloudSecretStore extends SimpleComponent implements SecretStoreConf
                         .awsId(config.awsId)
                         .role(config.role)
                         .externalId(config.externalId)
-                ).collect(Collectors.toList())
+                ).toList()
         );
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index a78750ded02..159ab26414d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -1244,7 +1244,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                                                 .filter(option -> !option.isEmpty())
                                                 .filter(option -> !Pattern.matches(validPattern.pattern(), option))
                                                 .sorted()
-                                                .collect(Collectors.toList());
+                                                .collect(Collectors.toCollection(ArrayList::new));
             if (isHosted)
                 invalidOptions.addAll(Arrays.stream(optionList)
                         .filter(option -> !option.isEmpty())
@@ -1291,17 +1291,12 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                 options = jvmGcOptions;
                 String[] optionList = options.split(" ");
                 List<String> invalidOptions = Arrays.stream(optionList)
-                                                    .filter(option -> !option.isEmpty())
-                                                    .filter(option -> !Pattern.matches(validPattern.pattern(), option))
-                                                    .collect(Collectors.toList());
-
-                if (isHosted) {
-                    // CMS GC options cannot be used in hosted, CMS is unsupported in JDK 17
-                    invalidOptions.addAll(Arrays.stream(optionList)
-                            .filter(option -> !option.isEmpty())
-                            .filter(option -> Pattern.matches(invalidCMSPattern.pattern(), option) ||
-                                    option.equals("-XX:+UseConcMarkSweepGC")).toList());
-                }
+                        .filter(option -> !option.isEmpty())
+                        .filter(option -> !Pattern.matches(validPattern.pattern(), option)
+                                || Pattern.matches(invalidCMSPattern.pattern(), option)
+                                || option.equals("-XX:+UseConcMarkSweepGC"))
+                        .sorted()
+                        .toList();
 
                 logOrFailInvalidOptions(invalidOptions);
             }
@@ -1315,7 +1310,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         private void logOrFailInvalidOptions(List<String> options) {
             if (options.isEmpty()) return;
 
-            Collections.sort(options);
             String message = "Invalid or misplaced JVM GC options in services.xml: " +
                     String.join(",", options) + "." +
                     " See https://docs.vespa.ai/en/reference/services-container.html#jvm";
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 9379e69e278..60ab5dacc5f 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
@@ -355,7 +355,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
     private List<NewDocumentType> documentTypes(Predicate<NewDocumentType> filter) {
         return documentDefinitions.values().stream()
                 .filter(filter)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private boolean hasIndexingModeStreaming(NewDocumentType type) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java
index f74134f26f4..8f16d60d5a1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java
@@ -20,7 +20,7 @@ public class ReservedDocumentTypeNameValidator {
     public void validate(Map<String, NewDocumentType> documentDefinitions) {
         List<String> conflictingNames = documentDefinitions.keySet().stream()
                 .filter(this::isReservedName)
-                .collect(Collectors.toList());
+                .toList();
         if (!conflictingNames.isEmpty()) {
             throw new IllegalArgumentException(makeReservedNameMessage(conflictingNames));
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
index 96a6b39dc1a..ea7d1620fd9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
@@ -173,7 +173,7 @@ public class ConvertedModel {
 
         if (arguments.output().isEmpty()) {
             List<Map.Entry<String, ExpressionFunction>> entriesWithTheRightPrefix =
-                    expressions.entrySet().stream().filter(entry -> entry.getKey().startsWith(arguments.signature().get() + ".")).collect(Collectors.toList());
+                    expressions.entrySet().stream().filter(entry -> entry.getKey().startsWith(arguments.signature().get() + ".")).toList();
             if (entriesWithTheRightPrefix.size() < 1)
                 throw new IllegalArgumentException("No expressions named '" + arguments.signature().get() +
                                                    missingExpressionMessageSuffix());
@@ -416,7 +416,7 @@ public class ConvertedModel {
             CompositeNode composite = (CompositeNode)node;
             return composite.setChildren(composite.children().stream()
                                                   .map(child -> replaceConstantsByFunctions(child, constantsReplacedByFunctions))
-                                                  .collect(Collectors.toList()));
+                                                  .toList());
         }
         return node;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
index 0fe8a1b837a..71f2eff8651 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
@@ -60,7 +60,7 @@ public abstract class SearchCluster extends AbstractConfigProducer<SearchCluster
         return schemas.values()
                       .stream()
                       .map(schema -> schema.fullSchema().getDocument().getDocumentName().getName())
-                      .collect(Collectors.toList());
+                      .toList();
     }
 
     public String getClusterName()              { return clusterName; }
diff --git a/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java
index b5007bba494..268e0b17b24 100644
--- a/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java
@@ -175,7 +175,7 @@ public class SummaryTestCase {
         tests.forEach(testValue -> {
             var actualFields = testValue.summary.getSummaryFields().values().stream()
                     .map(FieldBase::getName)
-                    .collect(Collectors.toList());
+                    .toList();
             assertEquals(Optional.ofNullable(testValue.parent),
                     testValue.summary.inherited(),
                     testValue.summary.getName() + (testValue.parent == null ? " does not inherit anything" : " inherits " + testValue.parent.getName()));
@@ -278,7 +278,7 @@ public class SummaryTestCase {
         public TestValue(DocumentSummary summary, DocumentSummary parent, List<List<String>> fields) {
             this.summary = summary;
             this.parent = parent;
-            this.fields = fields.stream().flatMap(Collection::stream).collect(Collectors.toList());;
+            this.fields = fields.stream().flatMap(Collection::stream).toList();;
         }
 
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
index a08023f2e10..9705bc83e2b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
@@ -161,7 +161,7 @@ public class ConfigValueChangeValidatorTest {
     private List<ConfigChangeAction> getConfigChanges(AbstractConfigProducerRoot currentModel,
                                                       AbstractConfigProducerRoot nextModel) {
         ConfigValueChangeValidator validator = new ConfigValueChangeValidator(logger);
-        return validator.findConfigChangesFromModels(currentModel, nextModel).collect(Collectors.toList());
+        return validator.findConfigChangesFromModels(currentModel, nextModel).toList();
     }
 
     private static void assertComponentsEquals(List<ConfigChangeAction> changes, String name, int index) {
@@ -219,7 +219,7 @@ public class ConfigValueChangeValidatorTest {
     private static List<String> createSchemas(List<String> docTypes) {
         return docTypes.stream()
                 .map(type -> "search " + type + " { document " + type + " { } }")
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static String createQrStartConfigSegment(boolean verboseGc, int heapsize) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
index 8d906259835..5d0a1704a1d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
@@ -70,7 +70,7 @@ public class IndexingModeChangeValidatorTest {
     private void assertReindexingChange(String message, List<ConfigChangeAction> changeActions) {
         List<ConfigChangeAction> reindexingActions = changeActions.stream()
                                                               .filter(a -> a instanceof ConfigChangeReindexAction)
-                                                              .collect(Collectors.toList());
+                                                              .toList();
         assertEquals(1, reindexingActions.size());
         assertTrue(reindexingActions.get(0) instanceof ConfigChangeReindexAction);
         assertEquals("indexing-mode-change", ((ConfigChangeReindexAction)reindexingActions.get(0)).name());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java
index 827aee42b0e..16687af5a9f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java
@@ -49,7 +49,7 @@ public class StartupCommandChangeValidatorTest {
     private static List<ConfigChangeAction> getStartupCommandChanges(
             AbstractConfigProducerRoot currentModel, AbstractConfigProducerRoot nextModel) {
         StartupCommandChangeValidator validator = new StartupCommandChangeValidator();
-        return validator.findServicesWithChangedStartupCommand(currentModel, nextModel).collect(Collectors.toList());
+        return validator.findServicesWithChangedStartupCommand(currentModel, nextModel).toList();
     }
 
     private static MockRoot createRootWithChildren(AbstractConfigProducer<?>... children) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index 23b576be8b3..500843a82a0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -337,7 +337,7 @@ public class ContainerClusterTest {
         cluster.getConfig(configBuilder);
         CuratorConfig config = configBuilder.build();
         assertEquals(List.of("host-c1", "host-c2"),
-                config.server().stream().map(CuratorConfig.Server::hostname).collect(Collectors.toList()));
+                config.server().stream().map(CuratorConfig.Server::hostname).toList());
         assertTrue(config.zookeeperLocalhostAffinity());
         assertEquals(30, config.zookeeperSessionTimeoutSeconds());
     }
@@ -360,7 +360,7 @@ public class ContainerClusterTest {
         cluster.getConfig(configBuilder);
         assertEquals(0, configBuilder.build().myid());
         assertEquals(List.of("host-c1", "host-c2", "host-c3"),
-                configBuilder.build().server().stream().map(ZookeeperServerConfig.Server::hostname).collect(Collectors.toList()));
+                configBuilder.build().server().stream().map(ZookeeperServerConfig.Server::hostname).toList());
 
     }
 
@@ -440,11 +440,11 @@ public class ContainerClusterTest {
         cluster.doPrepare(state);
         List<ApplicationClusterEndpoint> endpoints = cluster.endpoints();
 
-        assertNames(List.of(), endpoints.stream().filter(e -> e.routingMethod() == shared).collect(Collectors.toList()));
-        assertNames(expectedSharedL4Names, endpoints.stream().filter(e -> e.routingMethod() == sharedLayer4).collect(Collectors.toList()));
+        assertNames(List.of(), endpoints.stream().filter(e -> e.routingMethod() == shared).toList());
+        assertNames(expectedSharedL4Names, endpoints.stream().filter(e -> e.routingMethod() == sharedLayer4).toList());
 
         List<ContainerEndpoint> endpointsWithWeight =
-                globalEndpoints.stream().filter(endpoint -> endpoint.weight().isPresent()).collect(Collectors.toList());
+                globalEndpoints.stream().filter(endpoint -> endpoint.weight().isPresent()).toList();
         endpointsWithWeight.stream()
                 .filter(ce -> ce.weight().isPresent())
                 .forEach(ce -> assertTrue(endpointsMatch(ce, endpoints)));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
index 1d534c314ba..5f9ebe85e11 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
@@ -136,7 +136,7 @@ public class ConfigserverClusterTest {
     @SuppressWarnings("varargs")
     private static <T> void assertZookeeperServerProperty(
             List<ZookeeperServerConfig.Server> zkServers, Function<ZookeeperServerConfig.Server, T> propertyMapper, T... expectedProperties) {
-        List<T> actualPropertyValues = zkServers.stream().map(propertyMapper).collect(Collectors.toList());
+        List<T> actualPropertyValues = zkServers.stream().map(propertyMapper).toList();
         List<T> expectedPropertyValues = Arrays.asList(expectedProperties);
         assertEquals(expectedPropertyValues, actualPropertyValues);
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
index 0db52bf8eb5..593fa7e76ba 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
@@ -450,7 +450,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         assertEquals(2, caCerts.size());
         List<String> certnames = caCerts.stream()
                 .map(cert -> cert.getSubjectX500Principal().getName())
-                .collect(Collectors.toList());
+                .toList();
         assertThat(certnames, containsInAnyOrder("CN=operator", "CN=application"));
     }
 
@@ -491,7 +491,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         assertEquals(2, connectorFactories.size());
         List<Integer> ports = connectorFactories.stream()
                 .map(ConnectorFactory::getListenPort)
-                .collect(Collectors.toList());
+                .toList();
         assertThat(ports, Matchers.containsInAnyOrder(8080, 4443));
 
         ConnectorFactory tlsPort = connectorFactories.stream().filter(connectorFactory -> connectorFactory.getListenPort() == 4443).findFirst().orElseThrow();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 6ef7b9f5b56..addf4dffde2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -454,7 +454,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
         final var model = new VespaModel(new NullConfigModelRegistry(), deployState);
         final var containers = model.getContainerClusters().values().stream()
                 .flatMap(cluster -> cluster.getContainers().stream())
-                .collect(Collectors.toList());
+                .toList();
 
         assertFalse(containers.isEmpty(), "Missing container objects based on configuration");
 
@@ -497,7 +497,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
         assertEquals(List.of(cloudAccount), model.provisioned().all().values()
                                                  .stream()
                                                  .map(capacity -> capacity.cloudAccount().get())
-                                                 .collect(Collectors.toList()));
+                                                 .toList());
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
index 3515bb7409e..45546e57808 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
@@ -135,22 +135,28 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase {
         // Valid options, should not log anything
         verifyLoggingOfJvmGcOptions(true, "-XX:+ParallelGCThreads=8");
         verifyLoggingOfJvmGcOptions(true, "-XX:MaxTenuringThreshold=15"); // No + or - after colon
-        verifyLoggingOfJvmGcOptions(false, "-XX:+UseConcMarkSweepGC");
     }
 
-    @Test
-    void requireThatInvalidJvmGcOptionsFailDeployment() throws IOException, SAXException {
+    private void verifyThatInvalidJvmGcOptionsFailDeployment(String options, String expected) throws IOException, SAXException {
         try {
             buildModelWithJvmOptions(new TestProperties().setHostedVespa(true),
-                    new TestLogger(),
-                    "gc-options",
-                    "-XX:+ParallelGCThreads=8 foo     bar");
+                    new TestLogger(), "gc-options", options);
             fail();
         } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("Invalid or misplaced JVM GC options in services.xml: bar,foo"));
+            assertTrue(e.getMessage().startsWith(expected));
         }
     }
 
+    @Test
+    void requireThatInvalidJvmGcOptionsFailDeployment() throws IOException, SAXException {
+        verifyThatInvalidJvmGcOptionsFailDeployment(
+                "-XX:+ParallelGCThreads=8 foo     bar",
+                "Invalid or misplaced JVM GC options in services.xml: bar,foo");
+        verifyThatInvalidJvmGcOptionsFailDeployment(
+                "-XX:+UseConcMarkSweepGC",
+                "Invalid or misplaced JVM GC options in services.xml: -XX:+UseConcMarkSweepGC");
+    }
+
     private void verifyLoggingOfJvmGcOptions(boolean isHosted, String override, String... invalidOptions) throws IOException, SAXException  {
         verifyLoggingOfJvmOptions(isHosted, "gc-options", override, invalidOptions);
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java
index cad888168fe..b5cca3f4e7b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java
@@ -43,7 +43,7 @@ public class TopologicalDocumentTypeSorterTest {
 
     private void assertOrder(List<String> expOrder, DocumentTypesBuilder builder) {
         List<NewDocumentType> sortedDocTypes = TopologicalDocumentTypeSorter.sort(builder.build());
-        List<String> actOrder = sortedDocTypes.stream().map(NewDocumentType::getName).collect(Collectors.toList());
+        List<String> actOrder = sortedDocTypes.stream().map(NewDocumentType::getName).toList();
         assertEquals(expOrder, actOrder);
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java
index 12d14448511..fee16620e02 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java
@@ -42,7 +42,7 @@ public class SchemaBuilder {
         return Arrays.asList(docTypes)
                 .stream()
                 .map(type -> new SchemaBuilder().name(type).build())
-                .collect(Collectors.toList());
+                .toList();
     }
 
 }