diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-01-02 13:58:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-02 13:58:54 +0100 |
commit | c71969101b26dd4e29e5bef4c507550ebb47a9d9 (patch) | |
tree | 8f27590a3063bc592b85dc5d269e89491def2524 /config-provisioning | |
parent | e77379005bccd3d5009b1484038183a05856b4cd (diff) |
Revert "Jvenstad/zone cleanup 4"
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java | 25 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ZoneId.java | 70 |
2 files changed, 83 insertions, 12 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 fbbdb1df635..26c20d56d63 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,8 +20,7 @@ public class Zone { private final SystemName systemName; private final FlavorDefaults flavorDefaults; private final Optional<NodeFlavors> nodeFlavors; - private final Environment environment; - private final RegionName region; + private final ZoneId id; @Inject public Zone(ConfigserverConfig configserverConfig, NodeFlavors nodeFlavors) { @@ -47,21 +46,25 @@ public class Zone { RegionName region, FlavorDefaults flavorDefaults, NodeFlavors nodeFlavors) { - this.environment = environment; - this.region = region; + this.id = ZoneId.from(environment, 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 environment; + return id.environment(); } /** Returns the current region */ public RegionName region() { - return region; + return id.region(); } /** Returns the current system */ @@ -80,21 +83,19 @@ public class Zone { @Override public String toString() { - return "zone " + environment + "." + region; + return id.toString(); } @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof Zone)) return false; - Zone zone = (Zone) o; - return environment == zone.environment && - Objects.equals(region, zone.region); + if ( ! (o instanceof Zone)) return false; + return Objects.equals(id, ((Zone) o).id); } @Override public int hashCode() { - return Objects.hash(environment, region); + return id.hashCode(); } private static class FlavorDefaults { diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneId.java new file mode 100644 index 00000000000..d51a8d5e0c9 --- /dev/null +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneId.java @@ -0,0 +1,70 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.config.provision; + +import java.util.Objects; + +/** + * Unique identifier for a Zone; use when referencing them. + * + * Serialised form is 'environment.region'. + * + * @author jvenstad + */ +public class ZoneId { + // TODO: Replace usages of zone + region with usages of this. + + private final Environment environment; + private final RegionName region; + + private ZoneId(Environment environment, RegionName region) { + this.environment = Objects.requireNonNull(environment); + this.region = Objects.requireNonNull(region); + } + + public static ZoneId from(Environment environment, RegionName region) { + return new ZoneId(environment, region); + } + + public static ZoneId from(String environment, String region) { + return from(Environment.from(environment), RegionName.from(region)); + } + /** Create from a serialised ZoneId. Inverse of {@code ZoneId.value()}. */ + public static ZoneId from(String value) { + String[] parts = value.split("\\."); + return from(parts[0], parts[1]); + } + + public Environment environment() { + return environment; + } + + public RegionName region() { + return region; + } + + /** Returns the serialised value of this. Inverse of {@code ZoneId.from(String value)}. */ + public String value() { + return environment + "." + region; + } + + @Override + public String toString() { + return "zone " + value(); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if ( ! (o instanceof ZoneId)) return false; + ZoneId id = (ZoneId) o; + return environment == id.environment && + Objects.equals(region, id.region); + } + + @Override + public int hashCode() { + return Objects.hash(environment, region); + } + +} + |