diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-06-06 15:52:37 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-06-06 17:04:14 +0200 |
commit | 809e52f09d2298e81c5c88c9d9f8d8456451de44 (patch) | |
tree | b5da6c01028cb38509e7bd1f8cd91673c0394ba5 /config-provisioning | |
parent | 3780e5ca31f0af3068c354a94181c77234e8c4ed (diff) |
Use ZoneApi(Mock) instead of ZoneId in ZoneFilterMock and ZoneRegistryMock
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneApi.java | 4 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneApi.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneApi.java index fd76dc10bdb..9f6ba29d8de 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneApi.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneApi.java @@ -17,4 +17,8 @@ public interface ZoneApi { default RegionName getRegionName() { return getId().region(); } CloudName getCloudName(); + + default ZoneId toDeprecatedId() { + return ZoneId.from(getEnvironment(), getRegionName(), getCloudName(), getSystemName()); + } } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java index 44c6b709cee..c6aaf05492e 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java @@ -77,6 +77,10 @@ public class ZoneId { return new ZoneId(Environment.from(environment), RegionName.from(region), CloudName.from(cloud), SystemName.from(system)); } + public static ZoneId defaultId() { + return new ZoneId(Environment.defaultEnvironment(), RegionName.defaultName()); + } + public Environment environment() { return environment; } |