diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-11-14 11:30:43 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-11-14 11:37:15 +0100 |
| commit | e185fd3ca0a6ff6bc42be303c4cdde614de57c59 (patch) | |
| tree | 8fc3910ff494eb0a28540375bb0fa4b328ed4764 /config-provisioning | |
| parent | 1de6f92b18a9096ace4ac3e90ac7b06800062f84 (diff) | |
Rename isEmpty -> isUnspecified
Diffstat (limited to 'config-provisioning')
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java | 2 | ||||
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java | 4 |
2 files changed, 3 insertions, 3 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 6220c73dfd5..b9f56ab02a7 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 @@ -21,7 +21,7 @@ public class Cloud { this.dynamicProvisioning = dynamicProvisioning; this.requireAccessControl = requireAccessControl; this.account = Objects.requireNonNull(account); - if (name.equals(CloudName.AWS) && account.isEmpty()) { + if (name.equals(CloudName.AWS) && account.isUnspecified()) { throw new IllegalArgumentException("Account must be non-empty in cloud '" + name + "'"); } } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java b/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java index f466e6f2ebb..0d58c2953b5 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java @@ -19,7 +19,7 @@ public class CloudAccount extends PatternedStringWrapper<CloudAccount> { super(value, Pattern.compile("^([0-9]{12})?$"), "cloud account"); } - public boolean isEmpty() { + public boolean isUnspecified() { return this.equals(empty); } @@ -32,7 +32,7 @@ public class CloudAccount extends PatternedStringWrapper<CloudAccount> { @Override public String toString() { - return isEmpty() ? "unspecified account" : "account '" + value() + "'"; + return isUnspecified() ? "unspecified account" : "account '" + value() + "'"; } } |