Use ZoneApi(Mock) instead of ZoneId in ZoneFilterMock and ZoneRegistryMock

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;
     }