diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-10-27 10:44:19 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-10-27 10:49:30 +0200 |
| commit | abdcadc2f31b51d1a0321ef00cd797e4bf586992 (patch) | |
| tree | 0f6c04729af6bd22384f007a5bf86c9bf4560cd6 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi | |
| parent | a7d5de098525fe51daefd0342763d79075719a97 (diff) | |
Less Optional
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi')
2 files changed, 5 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java index 13489db9f62..712797bb76e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java @@ -76,7 +76,8 @@ public class LoadBalancersResponse extends SlimeJsonResponse { }); }); lb.instance() - .flatMap(LoadBalancerInstance::cloudAccount) + .map(LoadBalancerInstance::cloudAccount) + .filter(cloudAccount -> !cloudAccount.isEmpty()) .ifPresent(cloudAccount -> lbObject.setString("cloudAccount", cloudAccount.value())); }); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java index c82cd8fb47f..10f8816134c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java @@ -192,7 +192,9 @@ class NodesResponse extends SlimeJsonResponse { node.switchHostname().ifPresent(switchHostname -> object.setString("switchHostname", switchHostname)); nodeRepository.archiveUris().archiveUriFor(node).ifPresent(uri -> object.setString("archiveUri", uri)); trustedCertsToSlime(node.trustedCertificates(), object); - node.cloudAccount().ifPresent(cloudAccount -> object.setString("cloudAccount", cloudAccount.value())); + if (!node.cloudAccount().isEmpty()) { + object.setString("cloudAccount", node.cloudAccount().value()); + } } private Version resolveVersionFlag(StringFlag flag, Node node, Allocation allocation) { |