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 /config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java | |
parent | a7d5de098525fe51daefd0342763d79075719a97 (diff) |
Less Optional
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java index a9ebf419783..6220c73dfd5 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java @@ -2,7 +2,6 @@ package com.yahoo.config.provision; import java.util.Objects; -import java.util.Optional; /** * Properties of the cloud service where the zone is deployed. @@ -15,15 +14,15 @@ public class Cloud { private final boolean dynamicProvisioning; private final boolean requireAccessControl; - private final Optional<CloudAccount> account; + private final CloudAccount account; - private Cloud(CloudName name, boolean dynamicProvisioning, boolean requireAccessControl, Optional<CloudAccount> account) { + private Cloud(CloudName name, boolean dynamicProvisioning, boolean requireAccessControl, CloudAccount account) { this.name = Objects.requireNonNull(name); this.dynamicProvisioning = dynamicProvisioning; this.requireAccessControl = requireAccessControl; this.account = Objects.requireNonNull(account); if (name.equals(CloudName.AWS) && account.isEmpty()) { - throw new IllegalArgumentException("Account must be set in cloud '" + name + "'"); + throw new IllegalArgumentException("Account must be non-empty in cloud '" + name + "'"); } } @@ -42,8 +41,8 @@ public class Cloud { return requireAccessControl; } - /** Returns the default account of this cloud, if any */ - public Optional<CloudAccount> account() { + /** Returns the default account of this cloud */ + public CloudAccount account() { return account; } @@ -61,7 +60,7 @@ public class Cloud { private CloudName name = CloudName.DEFAULT; private boolean dynamicProvisioning = false; private boolean requireAccessControl = false; - private CloudAccount account = null; + private CloudAccount account = CloudAccount.empty; public Builder() {} @@ -86,7 +85,7 @@ public class Cloud { } public Cloud build() { - return new Cloud(name, dynamicProvisioning, requireAccessControl, Optional.ofNullable(account)); + return new Cloud(name, dynamicProvisioning, requireAccessControl, account); } } |