diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-01-03 11:06:26 +0100 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-01-03 11:06:26 +0100 |
commit | 0eab0f1de57dc41cd6eecce1365666cd05a94ec0 (patch) | |
tree | 4a0a483c19f48287eef54f401e227f7d86d058fe /config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java | |
parent | 96373e3f8379d3e4783d87733b32458fd4e18007 (diff) |
Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4""""
This reverts commit 7b99d259bf378c0e5c43c9a199efffdf056678f4.
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java index 26c20d56d63..fbbdb1df635 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java @@ -20,7 +20,8 @@ public class Zone { private final SystemName systemName; private final FlavorDefaults flavorDefaults; private final Optional<NodeFlavors> nodeFlavors; - private final ZoneId id; + private final Environment environment; + private final RegionName region; @Inject public Zone(ConfigserverConfig configserverConfig, NodeFlavors nodeFlavors) { @@ -46,25 +47,21 @@ public class Zone { RegionName region, FlavorDefaults flavorDefaults, NodeFlavors nodeFlavors) { - this.id = ZoneId.from(environment, region); + this.environment = environment; + this.region = region; this.flavorDefaults = flavorDefaults; this.systemName = systemName; this.nodeFlavors = Optional.ofNullable(nodeFlavors); } - /** Returns the id of this */ - public ZoneId id() { - return id; - } - /** Returns the current environment */ public Environment environment() { - return id.environment(); + return environment; } /** Returns the current region */ public RegionName region() { - return id.region(); + return region; } /** Returns the current system */ @@ -83,19 +80,21 @@ public class Zone { @Override public String toString() { - return id.toString(); + return "zone " + environment + "." + region; } @Override public boolean equals(Object o) { if (this == o) return true; - if ( ! (o instanceof Zone)) return false; - return Objects.equals(id, ((Zone) o).id); + if (!(o instanceof Zone)) return false; + Zone zone = (Zone) o; + return environment == zone.environment && + Objects.equals(region, zone.region); } @Override public int hashCode() { - return id.hashCode(); + return Objects.hash(environment, region); } private static class FlavorDefaults { |