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 /clustercontroller-core/src/main | |
| parent | 2555b49b4390ed9dac9eab3959d6cc6e3511515c (diff) | |
Revert "Revert collect(Collectors.toList())"
Diffstat (limited to 'clustercontroller-core/src/main')
3 files changed, 4 insertions, 4 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 695fecb6314..5d9ec6f5f80 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) - .collect(Collectors.toList()); + .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 004cefe1e3c..0efba56284b 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)) - .collect(Collectors.toList()); + .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)) - .collect(Collectors.toList()); + .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 d840529d361..363eec4e8e4 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()) - .collect(Collectors.toList()); + .toList(); if (!exhaustions.isEmpty()) { var exhaustionsDesc = exhaustions.stream() .map(NodeResourceExhaustion::toShorthandDescription) |