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 /node-repository | |
| parent | 2555b49b4390ed9dac9eab3959d6cc6e3511515c (diff) | |
Revert "Revert collect(Collectors.toList())"
Diffstat (limited to 'node-repository')
48 files changed, 72 insertions, 72 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java index 9eefd4e60b7..d132d574658 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java @@ -70,11 +70,11 @@ public class MemoryMetricsDb implements MetricsDb { Instant startTime = clock().instant().minus(period); synchronized (lock) { if (hostnames.isEmpty()) - return nodeTimeseries.values().stream().map(ns -> ns.keepAfter(startTime)).collect(Collectors.toList()); + return nodeTimeseries.values().stream().map(ns -> ns.keepAfter(startTime)).toList(); else return hostnames.stream() .map(hostname -> nodeTimeseries.getOrDefault(hostname, new NodeTimeseries(hostname, List.of())).keepAfter(startTime)) - .collect(Collectors.toList()); + .toList(); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java index cd75a383b87..c25b0684f5a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java @@ -72,14 +72,14 @@ public class NodeTimeseries { public NodeTimeseries keep(Predicate<NodeMetricSnapshot> filter) { return new NodeTimeseries(hostname, snapshots.stream() .filter(snapshot -> filter.test(snapshot)) - .collect(Collectors.toList())); + .toList()); } public NodeTimeseries keepAfter(Instant oldestTime) { return new NodeTimeseries(hostname, snapshots.stream() .filter(snapshot -> snapshot.at().equals(oldestTime) || snapshot.at().isAfter(oldestTime)) - .collect(Collectors.toList())); + .toList()); } public NodeTimeseries keepGenerationAfterWarmup(long generation, Optional<Node> node) { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java index bf9c7bddda1..e0199b5ddaf 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java @@ -176,7 +176,7 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { var snapshots = getNodeSnapshots(clock.instant().minus(period), hostnames, newContext()); return snapshots.entrySet().stream() .map(entry -> new NodeTimeseries(entry.getKey(), entry.getValue())) - .collect(Collectors.toList()); + .toList(); } catch (SqlException e) { throw new IllegalStateException("Could not read node timeseries data in Quest stored in " + dataDir, e); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java index e7e1e371047..603056856e2 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java @@ -66,7 +66,7 @@ public class CapacityChecker { public List<Node> nodesFromHostnames(List<String> hostnames) { return hostnames.stream().filter(nodeMap::containsKey) .map(nodeMap::get) - .collect(Collectors.toList()); + .toList(); } @@ -79,7 +79,7 @@ public class CapacityChecker { var parentNames = hosts.stream().map(Node::hostname).collect(Collectors.toSet()); return allNodes.nodeType(NodeType.tenant).state(relevantNodeStates).stream() .filter(t -> parentNames.contains(t.parentHostname().orElse(""))) - .collect(Collectors.toList()); + .toList(); } private Optional<HostFailurePath> greedyHeuristicFindFailurePath(Map<Node, Integer> heuristic) { @@ -88,7 +88,7 @@ public class CapacityChecker { List<Node> parentRemovalPriorityList = heuristic.entrySet().stream() .sorted(this::hostMitigationOrder) .map(Map.Entry::getKey) - .collect(Collectors.toList()); + .toList(); for (int i = 1; i <= parentRemovalPriorityList.size(); i++) { List<Node> hostsToRemove = parentRemovalPriorityList.subList(0, i); @@ -170,7 +170,7 @@ public class CapacityChecker { Map.Entry::getKey, e -> e.getValue().stream() .map(Node::allocation).flatMap(Optional::stream) - .collect(Collectors.toList()) + .collect(Collectors.toCollection(ArrayList::new)) )); } @@ -189,7 +189,7 @@ public class CapacityChecker { .filter(h -> !hostsToRemove.contains(h)) .filter(host -> !host.status().wantToRetire() && !host.status().wantToFail()) - .collect(Collectors.toList()); + .toList(); if (validAllocationTargets.size() == 0) return Optional.of(HostRemovalFailure.none()); @@ -482,11 +482,11 @@ public class CapacityChecker { public AllocationFailureReasonList singularReasonFailures() { return new AllocationFailureReasonList(allocationFailureReasons.stream() - .filter(reason -> reason.numberOfReasons() == 1).collect(Collectors.toList())); + .filter(reason -> reason.numberOfReasons() == 1).toList()); } public AllocationFailureReasonList multipleReasonFailures() { return new AllocationFailureReasonList(allocationFailureReasons.stream() - .filter(reason -> reason.numberOfReasons() > 1).collect(Collectors.toList())); + .filter(reason -> reason.numberOfReasons() > 1).toList()); } public long size() { return allocationFailureReasons.size(); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java index c99c18262ec..d048f43973a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java @@ -85,7 +85,7 @@ public class ExpeditedChangeApplicationMaintainer extends ApplicationMaintainer .map(event -> event.type() + (event.agent() == Agent.system ? "" : " by " + event.agent()))) .sorted() .distinct() - .collect(Collectors.toList()); + .toList(); return reasons.isEmpty() ? Optional.empty() : diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java index 2fb2f016c95..9e674c573da 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java @@ -86,7 +86,7 @@ public class FailedExpirer extends NodeRepositoryMaintainer { /** Recycle the nodes matching condition, and remove those nodes from the nodes list. */ private void recycleIf(Predicate<Node> condition, List<Node> failedNodes, NodeList allNodes) { - List<Node> nodesToRecycle = failedNodes.stream().filter(condition).collect(Collectors.toList()); + List<Node> nodesToRecycle = failedNodes.stream().filter(condition).toList(); failedNodes.removeAll(nodesToRecycle); recycle(nodesToRecycle, allNodes); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java index 7310fe63736..c9f53b69dc6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java @@ -154,7 +154,7 @@ public class HostCapacityMaintainer extends NodeRepositoryMaintainer { return false; } }) - .collect(Collectors.toList()); + .toList(); } private static List<Node> candidatesForRemoval(List<Node> nodes) { @@ -295,7 +295,7 @@ public class HostCapacityMaintainer extends NodeRepositoryMaintainer { ClusterMembership.from(clusterSpec, index.next()), nodeResources, nodeRepository().clock().instant())) - .collect(Collectors.toList()); + .toList(); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java index bdc9f402d37..7e238470a0c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java @@ -47,7 +47,7 @@ public class HostRetirer extends NodeRepositoryMaintainer { .map(Node::cloudAccount) .filter(cloudAccount -> !cloudAccount.isUnspecified()) .distinct() - .collect(Collectors.toList()); + .toList(); Map<String, List<HostEvent>> eventsByHostId = hostProvisioner.hostEventsIn(cloudAccounts).stream() .collect(Collectors.groupingBy(HostEvent::hostId)); Instant now = nodeRepository().clock().instant(); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java index 1b4b9f9c54b..203bb664c1c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java @@ -137,7 +137,7 @@ public class NodeFailer extends NodeRepositoryMaintainer { .filter(report -> report.getType().hostShouldBeFailed()) // The generated string is built from the report's ID, created time, and description only. .map(report -> report.getReportId() + " reported " + report.getCreatedTime() + ": " + report.getDescription()) - .collect(Collectors.toList()); + .toList(); } /** Returns whether node has any kind of hardware issue */ diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java index 3cd97c64e4d..27945fad7f5 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java @@ -42,7 +42,7 @@ public class NodeRebooter extends NodeRepositoryMaintainer { List<Node> nodesToReboot = nodeRepository().nodes().list(Node.State.active, Node.State.ready).stream() .filter(node -> node.type().isHost()) .filter(this::shouldReboot) - .collect(Collectors.toList()); + .toList(); if (!nodesToReboot.isEmpty()) nodeRepository().nodes().reboot(NodeListFilter.from(nodesToReboot)); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java index 7da10ce085a..93b28d07471 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java @@ -136,7 +136,7 @@ public class History { * This returns a copy of this history with all application level events removed and the log unchanged. */ private History withoutApplicationEvents() { - return new History(events().stream().filter(e -> ! e.type().isApplicationLevel()).collect(Collectors.toList()), log); + return new History(events().stream().filter(e -> ! e.type().isApplicationLevel()).toList(), log); } /** Returns the empty history */ diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java index 54e48f881cd..2693fff3b39 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java @@ -380,7 +380,7 @@ public class IP { String hostname6 = resolver.resolveHostname(ipv6Address).orElseThrow(() -> new IllegalArgumentException("Could not resolve IP address: " + ipv6Address)); List<String> ipv4Addresses = resolver.resolveAll(hostname6).stream() .filter(IP::isV4) - .collect(Collectors.toList()); + .toList(); if (ipv4Addresses.size() > 1) { throw new IllegalArgumentException("Hostname " + hostname6 + " resolved to more than 1 IPv4 address: " + ipv4Addresses); } @@ -407,7 +407,7 @@ public class IP { String hostname4 = resolver.resolveHostname(ipAddress).orElseThrow(() -> new IllegalArgumentException("Could not resolve IP address: " + ipAddress)); List<String> addresses = resolver.resolveAll(hostname4).stream() .filter(IP::isV4) - .collect(Collectors.toList()); + .toList(); if (addresses.size() != 1) { throw new IllegalArgumentException("Hostname " + hostname4 + " did not resolve to exactly 1 address. " + "Resolved: " + addresses); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java index b98c9c97437..345dccf5faf 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java @@ -264,7 +264,7 @@ public class Nodes { private List<Node> fail(List<Node> nodes, Agent agent, String reason, NestedTransaction transaction) { nodes = nodes.stream() .map(n -> n.withWantToFail(false, agent, clock.instant())) - .collect(Collectors.toList()); + .toList(); return db.writeTo(Node.State.failed, nodes, agent, Optional.of(reason), transaction); } @@ -290,7 +290,7 @@ public class Nodes { illegal("Could not deallocate " + nodeToDirty + ": " + hostnamesNotAllowedToDirty + " are not in states [provisioned, failed, parked, breakfixed]"); - return nodesToDirty.stream().map(node -> deallocate(node, agent, reason)).collect(Collectors.toList()); + return nodesToDirty.stream().map(node -> deallocate(node, agent, reason)).toList(); } /** @@ -305,7 +305,7 @@ public class Nodes { } public List<Node> deallocate(List<Node> nodes, Agent agent, String reason, NestedTransaction transaction) { - return nodes.stream().map(node -> deallocate(node, agent, reason, transaction)).collect(Collectors.toList()); + return nodes.stream().map(node -> deallocate(node, agent, reason, transaction)).toList(); } public Node deallocate(Node node, Agent agent, String reason, NestedTransaction transaction) { @@ -419,7 +419,7 @@ public class Nodes { NestedTransaction transaction = new NestedTransaction(); List<Node> moved = list().childrenOf(hostname).asList().stream() .map(child -> move(child.hostname(), toState, agent, false, reason, transaction)) - .collect(Collectors.toList()); + .collect(Collectors.toCollection(ArrayList::new)); moved.add(move(hostname, toState, agent, false, reason, transaction)); transaction.commit(); return moved; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java index 2289ba4a0ea..74088e8d269 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java @@ -175,7 +175,7 @@ public class ApplicationSerializer { } private static List<ScalingEvent> scalingEventsFromSlime(Inspector eventArray) { - return SlimeUtils.entriesStream(eventArray).map(item -> scalingEventFromSlime(item)).collect(Collectors.toList()); + return SlimeUtils.entriesStream(eventArray).map(item -> scalingEventFromSlime(item)).toList(); } private static void toSlime(ScalingEvent event, Cursor object) { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java index 5fe9eef7e73..aa935eaf272 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java @@ -63,7 +63,7 @@ public class CuratorDatabase { .filter(hostAndPort -> !hostAndPort.isEmpty()) .map(hostAndPort -> hostAndPort.split(":")[0]) .map(HostName::of) - .collect(Collectors.toList()); + .toList(); } /** Create a reentrant lock */ diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java index 7f24f5e862b..47975c8354a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java @@ -349,7 +349,7 @@ public class CuratorDatabaseClient { public List<ApplicationId> readApplicationIds() { return db.getChildren(applicationsPath).stream() .map(ApplicationId::fromSerializedForm) - .collect(Collectors.toList()); + .toList(); } public Optional<Application> readApplication(ApplicationId id) { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java index 3ee25c23f13..94707f7f429 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java @@ -400,14 +400,14 @@ public class NodeSerializer { private List<Address> addressesFromSlime(Inspector object) { return SlimeUtils.entriesStream(object.field(containersKey)) .map(elem -> new Address(elem.field(containerHostnameKey).asString())) - .collect(Collectors.toList()); + .toList(); } private List<TrustStoreItem> trustedCertificatesFromSlime(Inspector object) { return SlimeUtils.entriesStream(object.field(trustedCertificatesKey)) .map(elem -> new TrustStoreItem(elem.field(fingerprintKey).asString(), Instant.ofEpochMilli(elem.field(expiresKey).asLong()))) - .collect(Collectors.toList()); + .toList(); } // ----------------- Enum <-> string mappings ---------------------------------------- diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java index 5e01ba5b0a6..40bad7022d6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java @@ -118,7 +118,7 @@ public class GroupPreparer { List<NodeCandidate> candidates = provisionedHosts.stream() .map(host -> NodeCandidate.createNewExclusiveChild(host.generateNode(), host.generateHost())) - .collect(Collectors.toList()); + .toList(); allocation.offer(candidates); }; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java index 605ef280c2e..178ea6ed514 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java @@ -116,7 +116,7 @@ public class InfraDeployerImpl implements InfraDeployer { duperModel.infraApplicationActivated( application.getApplicationId(), - hostSpecs.stream().map(HostSpec::hostname).map(HostName::of).collect(Collectors.toList())); + hostSpecs.stream().map(HostSpec::hostname).map(HostName::of).toList()); logger.log(Level.FINE, () -> generateActivationLogMessage(hostSpecs, application.getApplicationId())); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java index 26a3f231a31..ebb05b69e1a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java @@ -164,7 +164,7 @@ public class LoadBalancerProvisioner { var now = nodeRepository.clock().instant(); var deactivatedLoadBalancers = loadBalancers.stream() .map(lb -> lb.with(LoadBalancer.State.inactive, now)) - .collect(Collectors.toList()); + .toList(); db.writeLoadBalancers(deactivatedLoadBalancers, LoadBalancer.State.active, transaction); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java index 8d350e304a2..61ca7c914c0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java @@ -410,7 +410,7 @@ class NodeAllocation { nodes.put(candidate.toNode().hostname(), candidate); } - return nodes.values().stream().map(n -> n.toNode()).collect(Collectors.toList()); + return nodes.values().stream().map(n -> n.toNode()).toList(); } List<Node> reservableNodes() { @@ -427,7 +427,7 @@ class NodeAllocation { return nodes.values().stream() .filter(predicate) .map(n -> n.toNode()) - .collect(Collectors.toList()); + .toList(); } /** Returns the number of nodes accepted this far */ @@ -440,7 +440,7 @@ class NodeAllocation { /** Prefer to retire nodes we want the least */ private List<NodeCandidate> byRetiringPriority(Collection<NodeCandidate> candidates) { - return candidates.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()); + return candidates.stream().sorted(Comparator.reverseOrder()).toList(); } /** Prefer to unretire nodes we don't want to retire, and otherwise those with lower index */ @@ -448,7 +448,7 @@ class NodeAllocation { return candidates.stream() .sorted(Comparator.comparing(NodeCandidate::wantToRetire) .thenComparing(n -> n.allocation().get().membership().index())) - .collect(Collectors.toList()); + .toList(); } public String allocationFailureDetails() { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java index 820a654c620..139e8848ab1 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java @@ -78,7 +78,7 @@ class Preparer { NodeList activeHosts = allNodesAndHosts.nodes().state(Node.State.active).parents().nodeType(requestedNodes.type().hostType()); accepted = accepted.stream() .filter(node -> node.parentHostname().isEmpty() || activeHosts.parentOf(node).isPresent()) - .collect(Collectors.toList()); + .toList(); } replace(acceptedNodes, accepted); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java index 8a66a9394b2..42904bb6d68 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java @@ -77,7 +77,7 @@ public class LocksResponse extends HttpResponse { List<RecordedLockAttempts> historicRecordings = LockStats.getGlobal().getHistoricRecordings().stream() .sorted(Comparator.comparing(RecordedLockAttempts::duration).reversed()) - .collect(Collectors.toList()); + .toList(); if (!historicRecordings.isEmpty()) { Cursor recordingsCursor = root.setArray("recordings"); historicRecordings.forEach(recording -> setRecording(recordingsCursor.addObject(), recording)); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java index 328be3b32b8..2c93992dcab 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java @@ -269,7 +269,7 @@ public class NodePatcher { List<TrustStoreItem> trustStoreItems = SlimeUtils.entriesStream(inspector) .map(TrustStoreItem::fromSlime) - .collect(Collectors.toList()); + .toList(); return node.with(trustStoreItems); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java index 20a1621b1d2..63386449f0c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java @@ -232,7 +232,7 @@ public class MockDeployer implements Deployer { return clusterContexts.stream() .map(clusterContext -> clusterContext.prepare(provisioner)) .flatMap(List::stream) - .collect(Collectors.toList()); + .toList(); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java index 15ee064b59f..20612e2ad66 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java @@ -184,7 +184,7 @@ public class MockHostProvisioner implements HostProvisioner { : hostType.childNodeType().name() + i; return new Address(hostname); }) - .collect(Collectors.toList()); + .toList(); } public Node withIpAssigned(Node node) { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeListMicroBenchmarkTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeListMicroBenchmarkTest.java index b7f9dcb8e8a..85338bdb2b4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeListMicroBenchmarkTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeListMicroBenchmarkTest.java @@ -38,7 +38,7 @@ public class NodeListMicroBenchmarkTest { public void testChildrenOf() { List<Node> nodes = createHosts(); - List<Node> childNodes = nodes.stream().map(host -> createNodes(host.hostname())).flatMap(Collection::stream).collect(Collectors.toList()); + List<Node> childNodes = nodes.stream().map(host -> createNodes(host.hostname())).flatMap(Collection::stream).toList(); nodes.addAll(childNodes); NodeList nodeList = new NodeList(nodes, false); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/RealDataScenarioTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/RealDataScenarioTest.java index 3dd76c76cac..e569e9b0382 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/RealDataScenarioTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/RealDataScenarioTest.java @@ -120,7 +120,7 @@ public class RealDataScenarioTest { List<HostSpec> hostSpecs = IntStream.range(0, capacities.length) .mapToObj(i -> tester.provisioner().prepare(app, specs[i], capacities[i], log::log)) .flatMap(Collection::stream) - .collect(Collectors.toList()); + .toList(); NestedTransaction transaction = new NestedTransaction(); tester.provisioner().activate(hostSpecs, new ActivationContext(0), new ApplicationTransaction(new ProvisionLock(app, () -> {}), transaction)); transaction.commit(); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java index bba06fb9080..311428de8ff 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java @@ -209,7 +209,7 @@ public class Fixture { } public Fixture.Builder hostFlavors(NodeResources ... hostResources) { - this.hostFlavors = Arrays.stream(hostResources).map(r -> new Flavor(r)).collect(Collectors.toList()); + this.hostFlavors = Arrays.stream(hostResources).map(r -> new Flavor(r)).toList(); return this; } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java index 59080f60982..4978fe431dc 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java @@ -311,7 +311,7 @@ public class FailedExpirerTest { public FailureScenario setReady(String... hostname) { List<Node> nodes = Stream.of(hostname) .map(this::get) - .collect(Collectors.toList()); + .toList(); nodes = nodeRepository.nodes().deallocate(nodes, Agent.system, getClass().getSimpleName()); tester.move(Node.State.ready, nodes); return this; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java index b26d9f677db..a1b2fb5d0ad 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java @@ -690,7 +690,7 @@ public class HostCapacityMaintainerTest { flavor.resources(), Generation.initial(), false)); - List<Address> addresses = Stream.of(additionalHostnames).map(Address::new).collect(Collectors.toList()); + List<Address> addresses = Stream.of(additionalHostnames).map(Address::new).toList(); Node.Builder builder = Node.create("fake-id-" + hostname, hostname, flavor, state, nodeType) .ipConfig(new IP.Config(state == Node.State.active ? Set.of("::1") : Set.of(), Set.of(), addresses)); parentHostname.ifPresent(builder::parentHostname); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java index d47b8955b56..d7e2dbb6f58 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java @@ -78,7 +78,7 @@ public class InactiveAndFailedExpirerTest { Node ready = tester.move(Node.State.ready, dirty.asList().get(0)); assertEquals("Allocated history is removed on readying", List.of(History.Event.Type.provisioned, History.Event.Type.readied), - ready.history().events().stream().map(History.Event::type).collect(Collectors.toList())); + ready.history().events().stream().map(History.Event::type).toList()); // Dirty times out for the other one tester.advanceTime(Duration.ofMinutes(14)); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java index 77dbc86769f..4f23ea3a578 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java @@ -306,7 +306,7 @@ public class MetricsReporterTest { private Number getMetric(String name, TestMetric metric, Map<String, String> dimensions) { List<TestMetric.TestContext> metrics = metric.context.get(name).stream() .filter(ctx -> ctx.properties.entrySet().containsAll(dimensions.entrySet())) - .collect(Collectors.toList()); + .toList(); if (metrics.isEmpty()) throw new IllegalArgumentException("No value found for metric " + name + " with dimensions " + dimensions); return metrics.get(metrics.size() - 1).value; } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java index 8a84c81e082..d379513a8f9 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java @@ -49,7 +49,7 @@ public class NodeMetricsDbMaintainerTest { assertEquals(2, timeseriesList.size()); List<NodeMetricSnapshot> allSnapshots = timeseriesList.stream() .flatMap(timeseries -> timeseries.asList().stream()) - .collect(Collectors.toList()); + .toList(); assertTrue(allSnapshots.stream().anyMatch(snapshot -> snapshot.inService())); assertTrue(allSnapshots.stream().anyMatch(snapshot -> ! snapshot.inService())); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooterTest.java index 5613f1961f8..fb3c6ec89d9 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooterTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooterTest.java @@ -142,7 +142,7 @@ public class NodeRebooterTest { /** Returns the subset of the given nodes which have the given current reboot generation */ private List<Node> withCurrentRebootGeneration(long generation, List<Node> nodes) { - return nodes.stream().filter(n -> n.status().reboot().current() == generation).collect(Collectors.toList()); + return nodes.stream().filter(n -> n.status().reboot().current() == generation).toList(); } private static ProvisioningTester createTester(Duration rebootInterval, InMemoryFlagSource flagSource) { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java index 329e6c833a9..32886733856 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java @@ -44,7 +44,7 @@ public class ProvisionedExpirerTest { private void populateNodeRepo() { var nodes = IntStream.range(0, 25) .mapToObj(i -> Node.create("id-" + i, "host-" + i, new Flavor(NodeResources.unspecified()), Node.State.provisioned, NodeType.host).build()) - .collect(Collectors.toList()); + .toList(); tester.nodeRepository().database().addNodesInState(nodes, Node.State.provisioned, Agent.system); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancerTest.java index 6be07f6f702..6895f5eeae7 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancerTest.java @@ -233,7 +233,7 @@ public class SwitchRebalancerTest { private static MockDeployer deployer(ProvisioningTester tester, Capacity capacity, ClusterSpec first, ClusterSpec... rest) { List<ClusterContext> clusterContexts = Stream.concat(Stream.of(first), Stream.of(rest)) .map(spec -> new ClusterContext(app, spec, capacity)) - .collect(Collectors.toList()); + .toList(); ApplicationContext context = new ApplicationContext(app, clusterContexts); return new MockDeployer(tester.provisioner(), tester.clock(), Map.of(app, context)); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java index ccd60ded517..f8fe1c1ef73 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java @@ -28,7 +28,7 @@ public class HistoryTest { assertEquals(3, history.log().size()); assertEquals("Most recent events are kept", List.of(2L, 3L, 4L), - history.log().stream().map(e -> e.at().toEpochMilli()).collect(Collectors.toList())); + history.log().stream().map(e -> e.at().toEpochMilli()).toList()); } private static List<Event> shuffledEvents(int count) { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java index be35176ed98..f4610e722a8 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java @@ -66,7 +66,7 @@ public class IPTest { .map(IP::parse) .sorted(IP.NATURAL_ORDER) .map(IP::asString) - .collect(Collectors.toList()) + .toList() ); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java index 1741dbdb749..4635d3ff525 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java @@ -129,7 +129,7 @@ public class OsVersionsTest { minVersion(nodesUpgrading, OsVersion::wanted)); var nodesOnLowestVersion = nodes.asList().stream() .sorted(Comparator.comparing(node -> node.status().osVersion().current().orElse(Version.emptyVersion))) - .collect(Collectors.toList()) + .toList() .subList(0, maxActiveUpgrades); assertEquals("Nodes on lowest version are told to upgrade", nodesUpgrading.asList(), nodesOnLowestVersion); @@ -543,7 +543,7 @@ public class OsVersionsTest { return nodes.stream() .map(Node::hostname) .flatMap(hostname -> tester.nodeRepository().nodes().node(hostname).stream()) - .collect(Collectors.toList()); + .toList(); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java index e8155234989..ab487cc7d04 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java @@ -167,7 +167,7 @@ public class NodeSerializerTest { assertEquals(3, node.allocation().get().restartGeneration().wanted()); assertEquals(4, node.allocation().get().restartGeneration().current()); assertEquals(List.of(History.Event.Type.provisioned, History.Event.Type.reserved), - node.history().events().stream().map(History.Event::type).collect(Collectors.toList())); + node.history().events().stream().map(History.Event::type).toList()); assertTrue(node.allocation().get().removable()); assertEquals(NodeType.tenant, node.type()); } @@ -368,7 +368,7 @@ public class NodeSerializerTest { assertEquals(Version.fromString("7.2"), serialized.status().osVersion().current().get()); var osUpgradedEvents = serialized.history().events().stream() .filter(event -> event.type() == History.Event.Type.osUpgraded) - .collect(Collectors.toList()); + .toList(); assertEquals("OS upgraded event is added", 1, osUpgradedEvents.size()); assertEquals("Duplicate updates of same version uses earliest instant", Instant.ofEpochMilli(123), osUpgradedEvents.get(0).at()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java index ea9c0e1193d..d26ac4d3916 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java @@ -245,12 +245,12 @@ public class AclProvisioningTest { .flatMap(List::stream) .distinct() .sorted(Comparator.comparing(TrustedNode::hostname)) - .collect(Collectors.toList()); + .toList(); List<TrustedNode> actualTrustedNodes = actual.stream() .flatMap(acl -> acl.trustedNodes().stream()) .distinct() .sorted(Comparator.comparing(TrustedNode::hostname)) - .collect(Collectors.toList()); + .toList(); assertEquals(expectedTrustedNodes, actualTrustedNodes); Set<String> actualTrustedNetworks = actual.stream() diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java index 623ce47b611..66b278a52db 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java @@ -190,7 +190,7 @@ public class DynamicProvisioningTest { var indices = tester.nodeRepository().nodes().list().owner(app).stream() .map(node -> node.allocation().get().membership().index()) .collect(Collectors.toSet()); - assertTrue(indices.containsAll(IntStream.range(0, 10).boxed().collect(Collectors.toList()))); + assertTrue(indices.containsAll(IntStream.range(0, 10).boxed().toList())); } @Test diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java index 31643b2ac79..ea2af5f3fca 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java @@ -167,7 +167,7 @@ public class HostCapacityTest { } private Node setupHostWithAdditionalHostnames(String hostHostname, String... additionalHostnames) { - List<Address> addresses = Stream.of(additionalHostnames).map(Address::new).collect(Collectors.toList()); + List<Address> addresses = Stream.of(additionalHostnames).map(Address::new).toList(); doAnswer(invocation -> ((Flavor)invocation.getArguments()[0]).resources()) .when(hostResourcesCalculator).advertisedResourcesOf(any()); @@ -181,7 +181,7 @@ public class HostCapacityTest { } private boolean hasCapacity(NodeResources requestedCapacity, Node host, Node... remainingNodes) { - List<Node> nodes = Stream.concat(Stream.of(host), Stream.of(remainingNodes)).collect(Collectors.toList()); + List<Node> nodes = Stream.concat(Stream.of(host), Stream.of(remainingNodes)).toList(); var capacity = new HostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); return capacity.hasCapacity(host, requestedCapacity); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java index 3c98cdef93b..9a38cbbba44 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java @@ -133,7 +133,7 @@ public class InfraDeployerImplTest { @SuppressWarnings("unchecked") private void verifyActivated(String... hostnames) { verify(duperModelInfraApi).infraApplicationActivated( - eq(application.getApplicationId()), eq(Stream.of(hostnames).map(HostName::of).collect(Collectors.toList()))); + eq(application.getApplicationId()), eq(Stream.of(hostnames).map(HostName::of).toList())); ArgumentMatcher<ApplicationTransaction> transactionMatcher = t -> { assertEquals(application.getApplicationId(), t.application()); return true; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java index c7a2c94783b..30bd1250430 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java @@ -377,13 +377,13 @@ public class LoadBalancerProvisionerTest { List<String> reals = loadBalancers.get(0).instance().get().reals().stream() .map(real -> real.hostname().value()) .sorted() - .collect(Collectors.toList()); + .toList(); List<String> activeNodes = tester.nodeRepository().nodes().list(states) .owner(application) .cluster(cluster) .hostnames().stream() .sorted() - .collect(Collectors.toList()); + .toList(); assertEquals("Load balancer targets active nodes of " + application + " in " + cluster, activeNodes, reals); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java index 12f1abf0cf5..4af5728f167 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java @@ -194,7 +194,7 @@ public class NodeTypeProvisioningTest { // Verify that wantToRetire has been propagated List<Node> nodesCurrentlyRetiring = nodes.stream() .filter(node -> node.allocation().get().membership().retired()) - .collect(Collectors.toList()); + .toList(); assertEquals(5, nodesCurrentlyRetiring.size()); // The retiring nodes should be the nodes we marked for retirement @@ -211,7 +211,7 @@ public class NodeTypeProvisioningTest { // Verify that wantToRetire has been propagated List<Node> nodesCurrentlyRetiring = nodes.stream() .filter(node -> node.allocation().get().membership().retired()) - .collect(Collectors.toList()); + .toList(); assertEquals(5, nodesCurrentlyRetiring.size()); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java index bf15e4bbe1c..405d9578c95 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java @@ -572,7 +572,7 @@ public class ProvisioningTester { /** Returns the hosts from the input list which are not retired */ public List<HostSpec> nonRetired(Collection<HostSpec> hosts) { - return hosts.stream().filter(host -> ! host.membership().get().retired()).collect(Collectors.toList()); + return hosts.stream().filter(host -> ! host.membership().get().retired()).toList(); } public void assertAllocatedOn(String explanation, String hostFlavor, ApplicationId app) { @@ -595,7 +595,7 @@ public class ProvisioningTester { Optional<String> allocatedSwitchHostname = allNodes.parentOf(node).flatMap(Node::switchHostname); return allocatedSwitchHostname.isPresent() && allocatedSwitchHostname.get().equals(switchHostname); - }).collect(Collectors.toList()); + }).toList(); } public Set<String> switchesOf(NodeList applicationNodes, NodeList allNodes) { |