diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-12-04 23:02:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-04 23:02:42 +0100 |
commit | 5381962e747ea9ac515abcf51dc70ad40bbbf70d (patch) | |
tree | d25af24e6a007091bb4a321a63747f1c7b439045 /configserver/src/main/java/com/yahoo/vespa/config/server | |
parent | 2555b49b4390ed9dac9eab3959d6cc6e3511515c (diff) |
Revert "Revert collect(Collectors.toList())"
Diffstat (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server')
19 files changed, 23 insertions, 23 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index b4a3a95e019..25de283ad3a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -632,7 +632,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye .filter(fileReference -> ! fileReferencesInUse.contains(fileReference)) .filter(fileReference -> isLastModifiedBefore(new File(fileReferencesPath, fileReference), instant)) .sorted(Comparator.comparing(a -> lastModified(new File(fileReferencesPath, a)))) - .collect(Collectors.toList()); + .toList(); } public Set<FileReference> getFileReferences(ApplicationId applicationId) { @@ -682,7 +682,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye public List<ApplicationId> listApplications() { return tenantRepository.getAllTenants().stream() .flatMap(tenant -> tenant.getApplicationRepo().activeApplications().stream()) - .collect(Collectors.toList()); + .toList(); } private boolean isLastModifiedBefore(File fileReference, Instant instant) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java index ae8dd2a329f..ad50117e327 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java @@ -87,7 +87,7 @@ public final class ApplicationSet { return applications.values().stream() .flatMap(app -> app.getModel().getHosts().stream() .map(HostInfo::getHostname)) - .collect(Collectors.toList()); + .toList(); } public void updateHostMetrics() { @@ -109,7 +109,7 @@ public final class ApplicationSet { .filter(application -> application.getId().equals(applicationId)) .map(Application::getVespaVersion) .sorted() - .collect(Collectors.toList()); + .toList(); } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java index 14d96eb7748..b2672f7ad85 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java @@ -59,7 +59,7 @@ public class DefaultClusterReindexingStatusClient implements ClusterReindexingSt clusters.forEach((clusterId, clusterNodes) -> { var parallelRequests = clusterNodes.stream() .map(this::getReindexingStatus) - .collect(Collectors.toList()); + .toList(); CompletableFuture<Map<String, ClusterReindexing>> combinedRequest = CompletableFutures.firstOf(parallelRequests); futureStatusPerCluster.put(clusterId, combinedRequest); }); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java index a1ddad7bfd4..8d68541ea2a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java @@ -37,7 +37,7 @@ public class FileDistributionUtil { .stream() .filter(spec -> !spec.getHostName().equals(HostName.getLocalhost())) .map(spec -> "tcp/" + spec.getHostName() + ":" + spec.getConfigServerPort()) - .collect(Collectors.toList()); + .toList(); } public static boolean fileReferenceExistsOnDisk(File downloadDirectory, FileReference applicationPackageReference) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java index bd831944d77..b19e8813434 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java @@ -261,7 +261,7 @@ public class FileServer { private static List<CompressionType> compressionTypesAsList(List<String> compressionTypes) { return compressionTypes.stream() .map(CompressionType::valueOf) - .collect(Collectors.toList()); + .toList(); } private static ConnectionPool createConnectionPool(List<String> configServers, Supervisor supervisor) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java index df0d879b533..cbd66c0bb67 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java @@ -129,7 +129,7 @@ public class RoutingStatusApiHandler extends RestApiRequestHandler<RoutingStatus DeploymentRoutingStatus wantedStatus = deploymentRoutingStatusFromSlime(requestBody, clock.instant()); List<DeploymentRoutingStatus> currentStatuses = upstreamNames.stream() .map(this::deploymentStatus) - .collect(Collectors.toList()); + .toList(); DeploymentRoutingStatus currentStatus = currentStatuses.get(0); log.log(Level.INFO, "Changing routing status of " + instance + " from " + currentStatus.status() + " to " + wantedStatus.status()); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java index ce068f4929e..39904a5b2f2 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java @@ -89,7 +89,7 @@ public abstract class ConfigServerMaintainer extends Maintainer { return Arrays.stream(curator.zooKeeperEnsembleConnectionSpec().split(",")) .filter(hostAndPort -> !hostAndPort.isEmpty()) .map(hostAndPort -> hostAndPort.split(":")[0]) - .collect(Collectors.toList()); + .toList(); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java index a95b9c4cfc2..19cb31b6575 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java @@ -86,7 +86,7 @@ public class ClusterDeploymentMetricsRetriever { } return null; }) - .collect(Collectors.toList()); + .toList(); try { executor.invokeAll(jobs, 1, TimeUnit.MINUTES); } catch (InterruptedException e) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java index c2a335e3429..1c28538fb90 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java @@ -40,7 +40,7 @@ public class DeploymentMetricsRetriever { .filter(host -> host.getServices().stream().noneMatch(isLogserver())) .map(HostInfo::getHostname) .map(DeploymentMetricsRetriever::createMetricsProxyURI) - .collect(Collectors.toList()); + .toList(); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java index 9cf9258d6ce..2e0cd7c0a81 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java @@ -32,7 +32,7 @@ public class ProtonMetricsRetriever { .filter(host -> host.getServices().stream().anyMatch(isSearchNode())) .map(HostInfo::getHostname) .map(ProtonMetricsRetriever::createMetricsProxyURI) - .collect(Collectors.toList()); + .toList(); } private static Predicate<ServiceInfo> isSearchNode() { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java index bfe61155c99..e0d333db082 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java @@ -74,7 +74,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer { .sorted(Comparator.comparing(ApplicationClusterInfo::name)) .map(ApplicationClusterInfo::endpoints) .flatMap(endpoints -> getEndpointConfig(endpoints).stream()) - .collect(Collectors.toList()); + .toList(); ab.endpoints(endpointBuilder); return ab; } @@ -83,7 +83,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer { return clusterEndpoints.stream() .sorted(Comparator.comparing(ApplicationClusterEndpoint::dnsName)) .map(this::getEndpointConfig) - .collect(Collectors.toList()); + .toList(); } private LbServicesConfig.Tenants.Applications.Endpoints.Builder getEndpointConfig(ApplicationClusterEndpoint clusterEndpoints) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java index d32d1a4e000..2733ff9721e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java @@ -109,7 +109,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> { .map(Version::getMajor) .distinct() .sorted(Comparator.reverseOrder()) - .collect(Collectors.toList()); + .toList(); List<MODELRESULT> allApplicationModels = new ArrayList<>(); // Build latest model for latest major only, if that fails build latest model for previous major diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java index e6ae5c491c0..9714ff495b3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java @@ -186,7 +186,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P try { hostValidator.verifyHosts(applicationId, model.getHosts().stream() .map(HostInfo::getHostname) - .collect(Collectors.toList())); + .toList()); return; } catch (IllegalArgumentException e) { exception = e; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java index 4469c0f95de..f36ddaafd03 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java @@ -38,7 +38,7 @@ public class StaticProvisioner implements HostProvisioner { List<HostSpec> hostsAlreadyAllocatedToCluster = allocatedHosts.getHosts().stream() .filter(host -> host.membership().isPresent() && matches(host.membership().get().cluster(), cluster)) - .collect(Collectors.toList()); + .toList(); if ( ! hostsAlreadyAllocatedToCluster.isEmpty()) return hostsAlreadyAllocatedToCluster; else diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java index ec673377af9..a7a22393771 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java @@ -395,7 +395,7 @@ public final class PrepareParams { return SlimeUtils.entriesStream(array) .map(Inspector::asString) .map(X509CertificateUtils::fromPem) - .collect(Collectors.toList()); + .toList(); } public String getApplicationName() { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java index 4928af488e1..7041840de12 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java @@ -460,7 +460,7 @@ public class SessionPreparer { public ConfigChangeActions getConfigChangeActions() { return new ConfigChangeActions(results.stream().map(result -> result.actions) .flatMap(Collection::stream) - .collect(Collectors.toList())); + .toList()); } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java index 9c50636ecfb..bcb9882f008 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java @@ -408,11 +408,11 @@ public class SessionRepository { private List<Long> getSessionListFromDirectoryCache(List<ChildData> children) { return getSessionList(children.stream() .map(child -> Path.fromString(child.getPath()).getName()) - .collect(Collectors.toList())); + .toList()); } private List<Long> getSessionList(List<String> children) { - return children.stream().map(Long::parseLong).collect(Collectors.toList()); + return children.stream().map(Long::parseLong).toList(); } private void loadRemoteSessions(ExecutorService executor) throws NumberFormatException { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/OperatorCertificateSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/OperatorCertificateSerializer.java index 23d90b68ee4..232dd2e5fe7 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/OperatorCertificateSerializer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/OperatorCertificateSerializer.java @@ -32,6 +32,6 @@ public class OperatorCertificateSerializer { return SlimeUtils.entriesStream(object.field(certificateField)) .map(Inspector::asString) .map(X509CertificateUtils::fromPem) - .collect(Collectors.toList()); + .toList(); } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java index e775d8d0124..89395b66a39 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java @@ -24,7 +24,7 @@ public class SecretStoreExternalIdRetriever { throw new RuntimeException("No secret found in secret store for " + secretName); return tenantSecretStore.withExternalId(secret); }) - .collect(Collectors.toList()); + .toList(); } public static String secretName(TenantName tenant, SystemName system, String storeName) { |