summaryrefslogtreecommitdiffstats
path: root/clustercontroller-core
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-12-04 22:42:13 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2022-12-04 22:42:13 +0100
commitfd54b4e4b136b05b67b471dca3ca6ce3dd116710 (patch)
tree88ab77cc41620eb2b8639b10b7edd1e57b901f12 /clustercontroller-core
parentfae49834f53500587921196e86ee4af4c670d8c9 (diff)
Revert collect(Collectors.toList())
Diffstat (limited to 'clustercontroller-core')
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java2
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java4
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java2
-rw-r--r--clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBuilder.java6
-rw-r--r--clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java2
-rw-r--r--clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java2
6 files changed, 9 insertions, 9 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
index 5d9ec6f5f80..695fecb6314 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
@@ -144,7 +144,7 @@ public class ContentCluster {
Objects.equals(userWantedState.getDescription(), ORCHESTRATOR_RESERVED_DESCRIPTION);
})
.map(NodeInfo::getNodeIndex)
- .toList();
+ .collect(Collectors.toList());
default:
// Note: There is no trace left if the Orchestrator set the state to UP, so that's handled
// like any other state:
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
index 0efba56284b..004cefe1e3c 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
@@ -191,7 +191,7 @@ public class SystemStateBroadcaster {
return dbContext.getCluster().getNodeInfos().stream()
.filter(this::nodeNeedsClusterStateBundle)
.filter(node -> !newestStateBundleAlreadySentToNode(node))
- .toList();
+ .collect(Collectors.toList());
}
// Precondition: no nodes in the cluster need to receive the current cluster state version bundle
@@ -199,7 +199,7 @@ public class SystemStateBroadcaster {
return dbContext.getCluster().getNodeInfos().stream()
.filter(this::nodeNeedsClusterStateActivation)
.filter(node -> !newestStateActivationAlreadySentToNode(node))
- .toList();
+ .collect(Collectors.toList());
}
private boolean newestStateBundleAlreadySentToNode(NodeInfo node) {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java
index 363eec4e8e4..d840529d361 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java
@@ -219,7 +219,7 @@ public class VdsClusterHtmlRenderer {
if (stateBundle.clusterFeedIsBlocked()) {
var exhaustions = stateBundle.getFeedBlockOrNull().getConcreteExhaustions().stream()
.filter(ex -> ex.node.getIndex() == nodeInfo.getNodeIndex())
- .toList();
+ .collect(Collectors.toList());
if (!exhaustions.isEmpty()) {
var exhaustionsDesc = exhaustions.stream()
.map(NodeResourceExhaustion::toShorthandDescription)
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBuilder.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBuilder.java
index 652991a6f36..a7278be548f 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBuilder.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBuilder.java
@@ -23,13 +23,13 @@ public class DistributionBuilder {
GroupBuilder(int... nodeCounts) {
this.groupCount = nodeCounts.length;
this.groupsWithNodeCount = IntStream.of(nodeCounts).boxed()
- .toList();
+ .collect(Collectors.toList());
}
GroupBuilder eachWithNodeCount(int nodeCount) {
groupsWithNodeCount = IntStream.range(0, groupCount)
.map(i -> nodeCount).boxed()
- .toList();
+ .collect(Collectors.toList());
return this;
}
@@ -54,7 +54,7 @@ public class DistributionBuilder {
static List<ConfiguredNode> buildConfiguredNodes(int nodeCount) {
return IntStream.range(0, nodeCount)
.mapToObj(i -> new ConfiguredNode(i, false))
- .toList();
+ .collect(Collectors.toList());
}
private static StorDistributionConfig.Group.Nodes.Builder configuredNode(ConfiguredNode node) {
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
index 36fe5321788..5981c2a1cf6 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
@@ -258,7 +258,7 @@ public class DummyVdsNode {
synchronized(timer) {
return clusterStateBundles.stream()
.map(ClusterStateBundle::getBaselineClusterState)
- .toList();
+ .collect(Collectors.toList());
}
}
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index e8b56cbc142..f7efbd2cc3b 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -241,7 +241,7 @@ public abstract class FleetControllerTest implements Waiter {
public List<DummyVdsNode> getDummyNodes() {
return nodes.stream()
.filter(n -> !excludedNodes.contains(n.getNode().getIndex()))
- .toList();
+ .collect(Collectors.toList());
}
@Override
public Duration getTimeout() { return timeout; }