aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-05-23 09:03:17 +0200
committerMartin Polden <mpolden@mpolden.no>2019-05-23 09:03:27 +0200
commiteae2b9349be3721f21dfb5e593f9f2a5fe93e948 (patch)
tree71caac66eda54b5a84dfda9b968bfab9de2d4caa /controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
parent11b0f0b29f816e9208afdc787615b9fe0e8575a1 (diff)
Simplify
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
index a18c1f47036..d55855a2f36 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
@@ -74,13 +74,11 @@ public class OsVersionStatus {
controller.configServer().nodeRepository().list(zone, application.id()).stream()
.filter(node -> OsUpgrader.eligibleForUpgrade(node, application))
.map(node -> new Node(node.hostname(), node.currentOsVersion(), zone.environment(), zone.region()))
- .forEach(node -> versions.compute(new OsVersion(node.version(), zone.cloud()), (ignored, nodes) -> {
- if (nodes == null) {
- nodes = new ArrayList<>();
- }
- nodes.add(node);
- return nodes;
- }));
+ .forEach(node -> {
+ var version = new OsVersion(node.version(), zone.cloud());
+ versions.putIfAbsent(version, new ArrayList<>());
+ versions.get(version).add(node);
+ });
}
}