Merge pull request #9823 from vespa-engine/hakonhall/remove-system-from-zoneid

Remove system from ZoneId

3 files changed, 4 insertions, 49 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 9f6ba29d8de..fd76dc10bdb 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,8 +17,4 @@ 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 5e664e00b4c..b0ac59718aa 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
@@ -20,30 +20,16 @@ public class ZoneId {
 
     private final Environment environment;
     private final RegionName region;
-    private final SystemName system;
 
-    private ZoneId(Environment environment, RegionName region, CloudName cloud, SystemName system) {
+    private ZoneId(Environment environment, RegionName region) {
         this.environment = Objects.requireNonNull(environment, "environment must be non-null");
         this.region = Objects.requireNonNull(region, "region must be non-null");
-        this.system = Objects.requireNonNull(system, "system must be non-null");
-    }
-
-    private ZoneId(Environment environment, RegionName region) {
-        this(environment, region, CloudName.defaultName(), SystemName.defaultSystem());
     }
 
     public static ZoneId from(Environment environment, RegionName region) {
         return new ZoneId(environment, region);
     }
 
-    public static ZoneId from(SystemName system, Environment environment, RegionName region) {
-        return new ZoneId(environment, region, CloudName.defaultName(), system);
-    }
-
-    public static ZoneId from(Environment environment, RegionName region, CloudName cloud, SystemName system) {
-        return new ZoneId(environment, region, cloud, system);
-    }
-
     public static ZoneId from(String environment, String region) {
         return from(Environment.from(environment), RegionName.from(region));
     }
@@ -55,20 +41,14 @@ public class ZoneId {
             case 2:
                 return from(parts[0], parts[1]);
             case 4:
-                return from(parts[2], parts[3], parts[0], parts[1]);
+                // Deprecated: parts[0] == cloud, parts[1] == system
+                // TODO: Figure out whether this can be removed
+                return from(parts[2], parts[3]);
             default:
                 throw new IllegalArgumentException("Cannot deserialize zone id '" + value + "'");
         }
     }
 
-    public static ZoneId from(Environment environment, RegionName region, CloudName cloud) {
-        return new ZoneId(environment, region, cloud, SystemName.defaultSystem());
-    }
-
-    public static ZoneId from(String environment, String region, String cloud, String system) {
-        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());
     }
@@ -81,10 +61,6 @@ public class ZoneId {
         return region;
     }
 
-    public SystemName system() {
-        return system;
-    }
-
     /** Returns the serialised value of this. Inverse of {@code ZoneId.from(String value)}. */
     public String value() {
         return environment + "." + region;
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java
index 27d45ba7d7d..434badbe9bf 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java
@@ -26,17 +26,6 @@ public class ZoneIdTest {
         ZoneId zoneId = ZoneId.from(environment, region);
         assertEquals(region, zoneId.region());
         assertEquals(environment, zoneId.environment());
-        assertEquals(SystemName.defaultSystem(), zoneId.system());
-
-        ZoneId zoneIdWithSystem = ZoneId.from(system, environment, region);
-        assertEquals(region, zoneIdWithSystem.region());
-        assertEquals(environment, zoneIdWithSystem.environment());
-        assertEquals(system, zoneIdWithSystem.system());
-
-        ZoneId zoneIdWithCloudAndSystem = ZoneId.from(environment, region, cloud, system);
-        assertEquals(region, zoneIdWithCloudAndSystem.region());
-        assertEquals(environment, zoneIdWithCloudAndSystem.environment());
-        assertEquals(system, zoneIdWithCloudAndSystem.system());
     }
 
     @Test
@@ -45,12 +34,6 @@ public class ZoneIdTest {
         assertEquals(environment.value() + "." + region.value(), zoneId.value());
         assertEquals(ZoneId.from(zoneId.value()), zoneId);
 
-        ZoneId zoneIdWithCloudAndSystem = ZoneId.from(environment, region, cloud, system);
-        assertEquals(environment.value() + "." + region.value(), zoneIdWithCloudAndSystem.value());
-        assertEquals(ZoneId.from(zoneIdWithCloudAndSystem.value()), zoneIdWithCloudAndSystem);
-        // TODO: Expect cloud and system to be part of deserialized value when the new format is supported everywhere
-        //assertEquals(cloud.value() + "." + system.name() + "." + environment.value() + "." + region.value() , zoneId.value());
-
         String serializedZoneId = "some.illegal.value";
         expectedException.expect(IllegalArgumentException.class);
         expectedException.expectMessage("Cannot deserialize zone id '" + serializedZoneId + "'");