diff options
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
26 files changed, 43 insertions, 37 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 f44849e185f..d2fd6d8cfc4 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).toList(); + return Arrays.stream(hostnames).map(Host::new).collect(Collectors.toList()); } private static Collection<Host> createHostInstances(int hostCount) { - return IntStream.range(1, hostCount + 1).mapToObj(i -> new Host("host" + i)).toList(); + return IntStream.range(1, hostCount + 1).mapToObj(i -> new Host("host" + i)).collect(Collectors.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())).toList(); + return hosts.stream().filter(host -> ! retiredHostNames.contains(host.hostname())).collect(Collectors.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 c3531d03d3f..1ce1c48c0f1 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)) - .toList(); + .collect(Collectors.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 a35bc735608..6dae89bf692 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)) - .toList(); + .collect(Collectors.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 0231e0e3c3f..8bdbe574b0e 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).toList(); + List<ExpressionFunction> functionExpressions = functions.values().stream().map(RankProfile.RankingExpressionFunction::function).collect(Collectors.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 48b804dfe6c..2de7e5a1b37 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()) - .toList(); + .collect(Collectors.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 97a6f27b759..1a17b082263 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) - .toList(); + .collect(Collectors.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 678f458dff0..b56c5f6c216 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) - .toList(); + .collect(Collectors.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 f8a91b7d3e9..93ff9f8963c 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) - .toList(); + .collect(Collectors.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 c8a8df18f98..1e3b27bc2fa 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()) - .toList(); + .collect(Collectors.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 4ea74147aaf..da470f804d9 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) - .toList(); + .collect(Collectors.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 077855b4b23..9360c6e707b 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).toList(); + return findConfigChangesFromModels(currentModel, nextModel).collect(Collectors.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) - .toList(); + .collect(Collectors.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 3a0b1348d7e..7ee5fe8edf6 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)) - .toList()); + .collect(Collectors.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 4acdda03166..a3872d9354b 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) - .toList(); + .collect(Collectors.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 6486b5aff1b..8537bb2462f 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) - .toList(); + .collect(Collectors.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 1f5a54d6b0f..6b5ae4d4c5c 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).toList(); + return findServicesWithChangedStartupCommand(currentModel, nextModel).collect(Collectors.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 d27f78f6a8a..dae2f7e8cb8 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.toCollection(ArrayList::new)); + .collect(Collectors.toList()); 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 c097f856da2..9ebaa4f0fd6 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() - .toList(); + .collect(Collectors.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 901c0877c1f..039daba8ad0 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().toList(); + Collection<String> hostnamesSorted = hostNames.stream().sorted().collect(Collectors.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 4aa0386bd27..cb52f701da4 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().toList()); + connectorBuilder.ssl.enabledCipherSuites(tlsCiphersOverride.stream().sorted().collect(Collectors.toList())); } else { - connectorBuilder.ssl.enabledCipherSuites(TlsContext.ALLOWED_CIPHER_SUITES.stream().sorted().toList()); + connectorBuilder.ssl.enabledCipherSuites(TlsContext.ALLOWED_CIPHER_SUITES.stream().sorted().collect(Collectors.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 ce999603439..834b0e73b5e 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).toList()); + return new SemanticRules(ruleBaseFiles.stream().map(this::toRuleBaseConfigView).collect(Collectors.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 b43c7777dec..373eb9714d3 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) - ).toList() + ).collect(Collectors.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 159ab26414d..a78750ded02 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.toCollection(ArrayList::new)); + .collect(Collectors.toList()); if (isHosted) invalidOptions.addAll(Arrays.stream(optionList) .filter(option -> !option.isEmpty()) @@ -1291,12 +1291,17 @@ 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) - || Pattern.matches(invalidCMSPattern.pattern(), option) - || option.equals("-XX:+UseConcMarkSweepGC")) - .sorted() - .toList(); + .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()); + } logOrFailInvalidOptions(invalidOptions); } @@ -1310,6 +1315,7 @@ 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 60ab5dacc5f..9379e69e278 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) - .toList(); + .collect(Collectors.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 8f16d60d5a1..f74134f26f4 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) - .toList(); + .collect(Collectors.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 ea7d1620fd9..96a6b39dc1a 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() + ".")).toList(); + expressions.entrySet().stream().filter(entry -> entry.getKey().startsWith(arguments.signature().get() + ".")).collect(Collectors.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)) - .toList()); + .collect(Collectors.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 71f2eff8651..0fe8a1b837a 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()) - .toList(); + .collect(Collectors.toList()); } public String getClusterName() { return clusterName; } |