diff options
Diffstat (limited to 'controller-server')
3 files changed, 4 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java index 8d082222721..33eafecf60a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java @@ -40,7 +40,6 @@ public final class Change { throw new IllegalArgumentException("Application version to deploy must be a known version"); } this.pinned = pinned; - } public Change withoutPlatform() { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java index f87c6e2d11c..a0fecbdf9e1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicy.java @@ -73,8 +73,8 @@ public class RoutingPolicy { public Endpoint endpointIn(SystemName system, RoutingMethod routingMethod, ZoneRegistry zoneRegistry) { Optional<Endpoint> infraEndpoint = SystemApplication.matching(id.owner()) .flatMap(app -> app.endpointIn(id.zone(), zoneRegistry)); - if (infraEndpoint.isPresent()) return infraEndpoint.get(); - return endpoint(routingMethod).target(id.cluster(), id.zone()).in(system); + return infraEndpoint.orElseGet(() -> endpoint(routingMethod).target(id.cluster(), id.zone()) + .in(system)); } /** Returns the region endpoint of this */ 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 8fd5f07b9ea..69808a987fc 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 @@ -75,8 +75,8 @@ public class OsVersionStatus { var nodeVersion = new NodeVersion(node.hostname(), zone.getVirtualId(), node.currentOsVersion(), targetOsVersion, suspendedAt); var osVersion = new OsVersion(nodeVersion.currentVersion(), zone.getCloudName()); - osVersions.putIfAbsent(osVersion, new ArrayList<>()); - osVersions.get(osVersion).add(nodeVersion); + osVersions.computeIfAbsent(osVersion, (k) -> new ArrayList<>()) + .add(nodeVersion); } } } |