diff options
Diffstat (limited to 'controller-server/src/main/java')
35 files changed, 54 insertions, 54 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index 602a53035a6..e4feaccca89 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -548,7 +548,7 @@ public class ApplicationController { .map(LogEntry::message) .sorted() .distinct() - .toList()) + .collect(Collectors.toList())) .orElseGet(List::of); if (warnings.isEmpty()) controller.notificationsDb().removeNotification(source, Notification.Type.applicationPackage); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java index 4ccebfa11e0..84aa26b93f3 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java @@ -143,7 +143,7 @@ public class RoutingController { List<DeploymentId> deployments = spec.zones().stream() .filter(zone -> zone.concerns(Environment.prod)) .map(zone -> new DeploymentId(instance, ZoneId.from(Environment.prod, zone.region().get()))) - .toList(); + .collect(Collectors.toList()); RoutingId routingId = RoutingId.of(instance, EndpointId.defaultId()); endpoints.addAll(computeGlobalEndpoints(routingId, ClusterSpec.Id.from(clusterId), deployments, deploymentSpec)); }); @@ -153,7 +153,7 @@ public class RoutingController { List<DeploymentId> deployments = declaredEndpoint.regions().stream() .map(region -> new DeploymentId(instance, ZoneId.from(Environment.prod, region))) - .toList(); + .collect(Collectors.toList()); endpoints.addAll(computeGlobalEndpoints(routingId, ClusterSpec.Id.from(declaredEndpoint.containerId()), deployments, deploymentSpec)); }); } @@ -345,7 +345,7 @@ public class RoutingController { for (var rotation : instance.rotations()) { var deployments = rotation.regions().stream() .map(region -> new DeploymentId(instance.id(), ZoneId.from(Environment.prod, region))) - .toList(); + .collect(Collectors.toList()); endpointsToRemove.addAll(computeGlobalEndpoints(RoutingId.of(instance.id(), rotation.endpointId()), rotation.clusterId(), deployments, application.deploymentSpec())); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java index 4547e3e2c23..563c59630d1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java @@ -70,7 +70,7 @@ public class TenantController { return curator.readTenants().stream() .filter(tenant -> tenant.type() != Tenant.Type.deleted || includeDeleted) .sorted(Comparator.comparing(Tenant::name)) - .toList(); + .collect(Collectors.toList()); } /** Locks a tenant for modification and applies the given action. */ diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java index 4e4babfea5e..e18f6247cb1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java @@ -42,7 +42,7 @@ public class ApplicationPackageDiff { .flatMap(contents -> contents.keySet().stream()) .sorted() .distinct() - .toList(); + .collect(Collectors.toList()); for (String file : files) { if (sb.length() > maxTotalDiffSize) sb.append("--- ").append(file).append('\n').append("Diff skipped: Total diff size >").append(maxTotalDiffSize).append("B)\n\n"); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java index aeac28782a6..977dd30c900 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java @@ -242,7 +242,7 @@ public class ApplicationPackageValidator { .flatMap(zone -> zone.region().stream()) .distinct() .map(region -> new Endpoint.Target(region, instance.name(), 1)) - .toList(); + .collect(Collectors.toList()); return new Endpoint(EndpointId.defaultId().id(), globalServiceId, Endpoint.Level.instance, targets); }); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java index 8d983714be4..4c314c64f7f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java @@ -243,7 +243,7 @@ public class DeploymentStatus { .filter(version -> version.confidence().equalOrHigherThan(target)) .map(VespaVersion::versionNumber) .sorted(reverseOrder()) - .toList(); + .collect(Collectors.toList()); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java index e3f61afec89..cb0ff0644fa 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java @@ -32,7 +32,7 @@ public class NodeList extends AbstractFilteringList<NodeWithServices, NodeList> parentsByHostName.get(node.parentHostname().get()), services.wantedGeneration(), servicesByHostName.getOrDefault(node.hostname(), List.of()))) - .toList(), + .collect(Collectors.toList()), false, services.wantedGeneration()); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java index 5aaa187055d..e0c1fef91b3 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java @@ -27,7 +27,7 @@ public class RetriggerEntrySerializer { public List<RetriggerEntry> fromSlime(Slime slime) { return SlimeUtils.entriesStream(slime.get().field("entries")) .map(this::deserializeEntry) - .toList(); + .collect(Collectors.toList()); } public Slime toSlime(List<RetriggerEntry> entryList) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java index 220c1a9a6a3..88e4f351f1f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java @@ -56,7 +56,7 @@ public class CreateRecords implements NameServiceRequest { nameService.createDirect(name, targets); } case TXT -> { - var dataFields = records.stream().map(Record::data).toList(); + var dataFields = records.stream().map(Record::data).collect(Collectors.toList()); nameService.createTxtRecords(name, dataFields); } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java index df0d8877e07..57c83280b8b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java @@ -52,7 +52,7 @@ public class NameServiceForwarder { public void createAlias(RecordName name, Set<AliasTarget> targets, NameServiceQueue.Priority priority) { var records = targets.stream() .map(target -> new Record(Record.Type.ALIAS, name, target.pack())) - .toList(); + .collect(Collectors.toList()); forward(new CreateRecords(records), priority); } @@ -60,7 +60,7 @@ public class NameServiceForwarder { public void createDirect(RecordName name, Set<DirectTarget> targets, NameServiceQueue.Priority priority) { var records = targets.stream() .map(target -> new Record(Record.Type.DIRECT, name, target.pack())) - .toList(); + .collect(Collectors.toList()); forward(new CreateRecords(records), priority); } @@ -68,7 +68,7 @@ public class NameServiceForwarder { public void createTxt(RecordName name, List<RecordData> txtData, NameServiceQueue.Priority priority) { var records = txtData.stream() .map(data -> new Record(Record.Type.TXT, name, data)) - .toList(); + .collect(Collectors.toList()); forward(new CreateRecords(records), priority); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java index 25c4121c271..439f1aa9a09 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java @@ -51,7 +51,7 @@ public class ArtifactExpirer extends ControllerMaintainer { Instant now = controller().clock().instant(); List<Artifact> artifactsToExpire = artifactRegistry.list().stream() .filter(artifact -> isExpired(artifact, now, versionStatus)) - .toList(); + .collect(Collectors.toList()); if (!artifactsToExpire.isEmpty()) { log.log(Level.INFO, "Expiring " + artifactsToExpire.size() + " artifacts in " + cloudName + ": " + artifactsToExpire); artifactRegistry.deleteAll(artifactsToExpire); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java index fa44b1480e3..128d7e6ac71 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java @@ -51,7 +51,7 @@ public class ChangeManagementAssessor { var tenantHosts = prParentHost.keySet().stream() .filter(node -> node.type() == NodeType.host) .map(node -> node.hostname()) - .toList(); + .collect(Collectors.toList()); boolean allHostsReplacable = tenantHosts.isEmpty() || nodeRepository.isReplaceable( zone, @@ -84,7 +84,7 @@ public class ChangeManagementAssessor { assessment.impact = getImpact(cluster, impactedStats, totalStats); return assessment; - }).toList(); + }).collect(Collectors.toList()); var hostAssessments = prParentHost.entrySet().stream().map((entry) -> { HostAssessment hostAssessment = new HostAssessment(); @@ -99,7 +99,7 @@ public class ChangeManagementAssessor { .count(); return hostAssessment; - }).toList(); + }).collect(Collectors.toList()); return new Assessment(clusterAssessments, hostAssessments); } @@ -116,7 +116,7 @@ public class ChangeManagementAssessor { return node.parentHostname().get().value(); }).findFirst().stream() ) - .toList(); + .collect(Collectors.toList()); } private static Cluster clusterKey(Node node) { @@ -127,7 +127,7 @@ public class ChangeManagementAssessor { } private static long[] clusterStats(Cluster cluster, List<Node> containerNodes) { - List<Node> clusterNodes = containerNodes.stream().filter(node -> cluster.equals(clusterKey(node))).toList(); + List<Node> clusterNodes = containerNodes.stream().filter(node -> cluster.equals(clusterKey(node))).collect(Collectors.toList()); long groups = clusterNodes.stream().map(Node::group).distinct().count(); return new long[] { clusterNodes.size(), groups}; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java index e16d52703e9..a279cf46415 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java @@ -108,7 +108,7 @@ public class ChangeRequestMaintainer extends ControllerMaintainer { zone -> nodeRepository.list(zone, NodeFilter.all()) .stream() .map(node -> node.hostname().value()) - .toList() + .collect(Collectors.toList()) )); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java index 44081081f73..d1f6ddc1644 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java @@ -153,7 +153,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer { .map(ZoneApi::getId) .map(zoneId -> createResourceSnapshotsFromNodes(zoneId, nodeRepository.list(zoneId, NodeFilter.all()))) .flatMap(Collection::stream) - .toList(); + .collect(Collectors.toList()); } private Stream<Instance> mapApplicationToInstances(Application application) { @@ -204,7 +204,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer { .values() .stream() .flatMap(list -> list.values().stream()) - .toList(); + .collect(Collectors.toList()); } private boolean unlessNodeOwnerIsSystemApplication(Node node) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java index 74bb89e4105..d45818c2822 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java @@ -43,7 +43,7 @@ public class RetriggerMaintainer extends ControllerMaintainer { // Remove all jobs that has succeeded with the required job run and persist the list List<RetriggerEntry> remaining = retriggerEntries.stream() .filter(this::needsTrigger) - .toList(); + .collect(Collectors.toList()); controller().curator().writeRetriggerEntries(remaining); } catch (Exception e) { logger.log(Level.WARNING, "Exception while triggering jobs", e); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java index 583af2f3e20..820c67f2d44 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java @@ -31,7 +31,7 @@ public class TenantRoleMaintainer extends ControllerMaintainer { var tenantsWithRoles = tenants.stream() .map(Tenant::name) - .toList(); + .collect(Collectors.toList()); roleService.maintainRoles(tenantsWithRoles); var deletedTenants = controller().tenants().asList(true).stream() diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java index 03987efab8b..163a570768f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java @@ -33,7 +33,7 @@ public class UserManagementMaintainer extends ControllerMaintainer { var applications = controller().applications().idList() .stream() .map(appId -> ApplicationId.from(appId.tenant(), appId.application(), InstanceName.defaultName())) - .toList(); + .collect(Collectors.toList()); roleMaintainer.deleteLeftoverRoles(tenants, applications); if (!controller().system().isPublic()) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java index 9211580abf1..daba7e74f34 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java @@ -140,7 +140,7 @@ public class VcmrMaintainer extends ControllerMaintainer { } var spareCapacity = hasSpareCapacity(zone, nodes); return nodes.stream().map(node -> nextAction(zone, node, changeRequest, spareCapacity)); - }).toList(); + }).collect(Collectors.toList()); } @@ -151,7 +151,7 @@ public class VcmrMaintainer extends ControllerMaintainer { .filter(entry -> entry.getValue().stream().anyMatch(isImpacted(changeRequest))) // Skip zones without impacted nodes .collect(Collectors.toMap( Map.Entry::getKey, - entry -> entry.getValue().stream().filter(isImpacted(changeRequest)).toList() + entry -> entry.getValue().stream().filter(isImpacted(changeRequest)).collect(Collectors.toList()) )); } @@ -305,7 +305,7 @@ public class VcmrMaintainer extends ControllerMaintainer { var tenantHosts = nodes.stream() .filter(node -> node.type() == NodeType.host) .map(Node::hostname) - .toList(); + .collect(Collectors.toList()); return tenantHosts.isEmpty() || nodeRepository.isReplaceable(zoneId, tenantHosts); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java index 957eada62b4..f6a5bb5519d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java @@ -50,7 +50,7 @@ public class CostCalculator { .reachable().in(Environment.prod).in(CloudName.YAHOO).zones().stream() .flatMap(zone -> uncheck(() -> nodeRepository.list(zone.getId(), NodeFilter.all()).stream())) .filter(node -> node.owner().isPresent() && !node.owner().get().tenant().equals(SystemApplication.TENANT)) - .toList(); + .collect(Collectors.toList()); var totalAllocation = ResourceAllocation.ZERO; for (var node : nodes) { Property property = propertyByTenantName.get(node.owner().get().tenant()); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java index a2960754570..81ae787b507 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java @@ -143,7 +143,7 @@ public class NotificationsDb { if (!initial.equals(updated)) { curatorDb.writeNotifications(deploymentSource.tenant(), updated); } - changed = newNotifications.stream().filter(n -> !notificationExists(n, initial, true)).toList(); + changed = newNotifications.stream().filter(n -> !notificationExists(n, initial, true)).collect(Collectors.toList()); } notifier.dispatch(changed, deploymentSource); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java index 5d0e71b0727..64dd51ce304 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java @@ -107,7 +107,7 @@ public class Notifier { private void dispatch(Notification notification, TenantContacts.Type type, Collection<? extends TenantContacts.Contact> contacts) { switch (type) { case EMAIL: - dispatch(notification, contacts.stream().map(c -> (TenantContacts.EmailContact) c).toList()); + dispatch(notification, contacts.stream().map(c -> (TenantContacts.EmailContact) c).collect(Collectors.toList())); break; default: throw new IllegalArgumentException("Unknown TenantContacts type " + type.name()); @@ -120,7 +120,7 @@ public class Notifier { mailer.send(mailOf(content, contacts.stream() .filter(c -> c.email().isVerified()) .map(c -> c.email().getEmailAddress()) - .toList())); + .collect(Collectors.toList()))); } catch (MailerException e) { log.log(Level.SEVERE, "Failed sending email", e); } catch (MissingOptionalException e) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java index a3ec30bb122..32f5e6714f2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java @@ -126,7 +126,7 @@ public class BufferedLogStore { return logSerializer.fromJson(Arrays.stream(chunkIds, firstChunk, chunkIds.length) .mapToObj(chunkId -> buffer.readLog(id, type, chunkId)) .flatMap(Optional::stream) - .toList(), + .collect(Collectors.toList()), after); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java index be58370285a..149dba41c1e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java @@ -353,7 +353,7 @@ public class CuratorDb { public List<TenantName> readTenantNames() { return curator.getChildren(tenantRoot).stream() .map(TenantName::from) - .toList(); + .collect(Collectors.toList()); } public void removeTenant(TenantName name) { @@ -450,7 +450,7 @@ public class CuratorDb { public List<ApplicationId> applicationsWithJobs() { return curator.getChildren(jobRoot).stream() .map(ApplicationId::fromSerializedForm) - .toList(); + .collect(Collectors.toList()); } @@ -618,7 +618,7 @@ public class CuratorDb { .stream() .map(this::readChangeRequest) .flatMap(Optional::stream) - .toList(); + .collect(Collectors.toList()); } public void writeChangeRequest(VespaChangeRequest changeRequest) { @@ -682,7 +682,7 @@ public class CuratorDb { .stream() .map(this::getPendingMailVerification) .flatMap(Optional::stream) - .toList(); + .collect(Collectors.toList()); } public void writePendingMailVerification(PendingMailVerification pendingMailVerification) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java index 02b718829f3..e1181f1cede 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java @@ -70,7 +70,7 @@ public class EndpointCertificateMetadataSerializer { inspector.field(rootRequestIdField).asString(), SlimeUtils.optionalString(inspector.field(leafRequestIdField)), IntStream.range(0, inspector.field(requestedDnsSansField).entries()) - .mapToObj(i -> inspector.field(requestedDnsSansField).entry(i).asString()).toList(), + .mapToObj(i -> inspector.field(requestedDnsSansField).entry(i).asString()).collect(Collectors.toList()), inspector.field(issuerField).asString(), inspector.field(expiryField).valid() ? Optional.of(inspector.field(expiryField).asLong()) : diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java index 6567b0076e7..26cd4acdb4c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java @@ -72,7 +72,7 @@ class LogSerializer { Map<Step, List<LogEntry>> fromJson(List<byte[]> logJsons, long after) { return fromSlime(logJsons.stream() .map(SlimeUtils::jsonToSlime) - .toList(), + .collect(Collectors.toList()), after); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java index a913e86dda9..c200ca467da 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java @@ -68,14 +68,14 @@ public class SupportAccessSerializer { List<SupportAccessGrant> inactiveGrants = supportAccess.grantHistory().stream() .filter(grant -> currentTime.isAfter(grant.certificate().getNotAfter().toInstant())) - .toList(); + .collect(Collectors.toList()); serializeHistoricEvents(root, supportAccess.changeHistory(), inactiveGrants); // Active grants should show up in the grant section List<SupportAccessGrant> activeGrants = supportAccess.grantHistory().stream() .filter(grant -> currentTime.isBefore(grant.certificate().getNotAfter().toInstant())) - .toList(); + .collect(Collectors.toList()); serializeGrants(root, activeGrants, false); return slime; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java index d1962b16120..bb55b2e8fcf 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java @@ -117,7 +117,7 @@ public class BillingApiHandler extends ThreadedHttpRequestHandler { bill.sumAdditionalCost() }; }) - .toList(); + .collect(Collectors.toList()); return new CsvResponse(headers, rows); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java index 5148577880f..813d2b8d3e6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java @@ -295,7 +295,7 @@ public class ChangeManagementApiHandler extends AuditLoggingRequestHandler { .flatMap(zone -> controller.serviceRegistry().configServer().nodeRepository().list(zone, NodeFilter.all()).stream()) .filter(node -> node.switchHostname().map(switches::contains).orElse(false)) .map(node -> node.hostname().value()) - .toList(); + .collect(Collectors.toList()); } private List<ZoneId> getProdZones() { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java index cfd6ea3d6d9..8675f4f18c6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java @@ -134,7 +134,7 @@ public class OsApiHandler extends AuditLoggingRequestHandler { ZoneList zones = controller.zoneRegistry().zones().controllerUpgraded(); if (path.get("region") != null) zones = zones.in(RegionName.from(path.get("region"))); if (path.get("environment") != null) zones = zones.in(Environment.from(path.get("environment"))); - return zones.zones().stream().map(ZoneApi::getId).toList(); + return zones.zones().stream().map(ZoneApi::getId).collect(Collectors.toList()); } private HttpResponse setOsVersion(HttpRequest request) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java index 4184601179f..05dd8257ad0 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java @@ -146,7 +146,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { .map(zone -> zone.environment().value() + "/region/" + zone.region().value()) .sorted() - .toList(); + .collect(Collectors.toList()); return new ResourceResponse(request.getUri(), resources); } @@ -168,7 +168,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { .map(ApplicationName::value) .map(application -> "application/" + application) .sorted() - .toList(); + .collect(Collectors.toList()); return new ResourceResponse(request.getUri(), resources); } @@ -185,7 +185,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { .map(InstanceName::value) .map(instance -> "instance/" + instance) .sorted() - .toList(); + .collect(Collectors.toList()); return new ResourceResponse(request.getUri(), resources); } @@ -202,7 +202,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { .map(zone -> "environment/" + zone.environment().value() + "/region/" + zone.region().value()) .sorted() - .toList(); + .collect(Collectors.toList()); return new ResourceResponse(request.getUri(), resources); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java index c2e926f777b..7a8ef1d4ee6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java @@ -368,7 +368,7 @@ public class UserApiHandler extends ThreadedHttpRequestHandler { private boolean hasTrialCapacity() { if (! controller.system().isPublic()) return true; - var existing = controller.tenants().asList().stream().map(Tenant::name).toList(); + var existing = controller.tenants().asList().stream().map(Tenant::name).collect(Collectors.toList()); var trialTenants = controller.serviceRegistry().billingController().tenantsWithPlan(existing, PlanId.from("trial")); return maxTrialTenants.value() < 0 || trialTenants.size() < maxTrialTenants.value(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java index 0b1411d5bc3..a19006d8f9e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java @@ -116,7 +116,7 @@ public abstract class DeploymentRoutingContext implements RoutingContext { .asList().stream() .map(endpoint -> endpoint.upstreamName(deployment)) .distinct() - .toList(); + .collect(Collectors.toList()); if (upstreamNames.isEmpty()) { throw new IllegalArgumentException("No upstream names found for " + deployment); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java index 1e9f11e0349..39a0b6a8858 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java @@ -158,7 +158,7 @@ public class RotationRepository { .flatMap(application -> application.instances().values().stream()) .flatMap(instance -> instance.rotations().stream()) .map(AssignedRotation::rotationId) - .toList(); + .collect(Collectors.toList()); Map<RotationId, Rotation> unassignedRotations = new LinkedHashMap<>(this.allRotations); assignedRotations.forEach(unassignedRotations::remove); return Collections.unmodifiableMap(unassignedRotations); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java index 0e7fefba15d..81e9b1972b9 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java @@ -72,7 +72,7 @@ public class CloudAccessControl implements AccessControl { private void requireTenantTrialLimitNotReached(List<Tenant> existing) { var trialPlanId = PlanId.from("trial"); - var tenantNames = existing.stream().filter(tenant -> tenant.type() == Tenant.Type.cloud).map(Tenant::name).toList(); + var tenantNames = existing.stream().filter(tenant -> tenant.type() == Tenant.Type.cloud).map(Tenant::name).collect(Collectors.toList()); var trialTenants = billingController.tenantsWithPlan(tenantNames, trialPlanId).size(); if (maxTrialTenants.value() >= 0 && maxTrialTenants.value() <= trialTenants) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java index ed7bd924ccc..d6b8f79dbe6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java @@ -155,7 +155,7 @@ public record VersionStatus(List<VespaVersion> versions) { boolean isReleased = Collections.binarySearch(releasedVersions, statistics.version()) >= 0; List<NodeVersion> nodeVersions = systemApplicationVersions.stream() .filter(nodeVersion -> nodeVersion.currentVersion().equals(statistics.version())) - .toList(); + .collect(Collectors.toList()); VespaVersion vespaVersion = createVersion(statistics, controllerVersions.keySet(), systemVersion, |