diff options
Diffstat (limited to 'node-repository/src/test/java')
22 files changed, 29 insertions, 29 deletions
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 85338bdb2b4..b7f9dcb8e8a 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).toList(); + List<Node> childNodes = nodes.stream().map(host -> createNodes(host.hostname())).flatMap(Collection::stream).collect(Collectors.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 e569e9b0382..3dd76c76cac 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) - .toList(); + .collect(Collectors.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 311428de8ff..bba06fb9080 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)).toList(); + this.hostFlavors = Arrays.stream(hostResources).map(r -> new Flavor(r)).collect(Collectors.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 4978fe431dc..59080f60982 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) - .toList(); + .collect(Collectors.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 a1b2fb5d0ad..b26d9f677db 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).toList(); + List<Address> addresses = Stream.of(additionalHostnames).map(Address::new).collect(Collectors.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 d7e2dbb6f58..d47b8955b56 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).toList()); + ready.history().events().stream().map(History.Event::type).collect(Collectors.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 4f23ea3a578..77dbc86769f 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())) - .toList(); + .collect(Collectors.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 d379513a8f9..8a84c81e082 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()) - .toList(); + .collect(Collectors.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 fb3c6ec89d9..5613f1961f8 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).toList(); + return nodes.stream().filter(n -> n.status().reboot().current() == generation).collect(Collectors.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 32886733856..329e6c833a9 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()) - .toList(); + .collect(Collectors.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 6895f5eeae7..6be07f6f702 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)) - .toList(); + .collect(Collectors.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 f8fe1c1ef73..ccd60ded517 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()).toList()); + history.log().stream().map(e -> e.at().toEpochMilli()).collect(Collectors.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 f4610e722a8..be35176ed98 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) - .toList() + .collect(Collectors.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 4635d3ff525..1741dbdb749 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))) - .toList() + .collect(Collectors.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()) - .toList(); + .collect(Collectors.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 ab487cc7d04..e8155234989 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).toList()); + node.history().events().stream().map(History.Event::type).collect(Collectors.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) - .toList(); + .collect(Collectors.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 d26ac4d3916..ea9c0e1193d 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)) - .toList(); + .collect(Collectors.toList()); List<TrustedNode> actualTrustedNodes = actual.stream() .flatMap(acl -> acl.trustedNodes().stream()) .distinct() .sorted(Comparator.comparing(TrustedNode::hostname)) - .toList(); + .collect(Collectors.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 66b278a52db..623ce47b611 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().toList())); + assertTrue(indices.containsAll(IntStream.range(0, 10).boxed().collect(Collectors.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 ea2af5f3fca..31643b2ac79 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).toList(); + List<Address> addresses = Stream.of(additionalHostnames).map(Address::new).collect(Collectors.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)).toList(); + List<Node> nodes = Stream.concat(Stream.of(host), Stream.of(remainingNodes)).collect(Collectors.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 9a38cbbba44..3c98cdef93b 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).toList())); + eq(application.getApplicationId()), eq(Stream.of(hostnames).map(HostName::of).collect(Collectors.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 30bd1250430..c7a2c94783b 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() - .toList(); + .collect(Collectors.toList()); List<String> activeNodes = tester.nodeRepository().nodes().list(states) .owner(application) .cluster(cluster) .hostnames().stream() .sorted() - .toList(); + .collect(Collectors.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 4af5728f167..12f1abf0cf5 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()) - .toList(); + .collect(Collectors.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()) - .toList(); + .collect(Collectors.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 405d9578c95..bf15e4bbe1c 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()).toList(); + return hosts.stream().filter(host -> ! host.membership().get().retired()).collect(Collectors.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); - }).toList(); + }).collect(Collectors.toList()); } public Set<String> switchesOf(NodeList applicationNodes, NodeList allNodes) { |