Extract superclass with environment and region

3 files changed, 10 insertions, 10 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java
index 80fe98a4489..c0bebf54803 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.identifiers;
 
-import com.yahoo.config.provision.Zone;
+import com.yahoo.config.provision.ZoneId;
 
 /**
  * Application + zone. 
@@ -12,9 +12,9 @@ import com.yahoo.config.provision.Zone;
 public class DeploymentId {
 
     private final com.yahoo.config.provision.ApplicationId application;
-    private final Zone zone;
+    private final ZoneId zone;
 
-    public DeploymentId(com.yahoo.config.provision.ApplicationId application, Zone zone) {
+    public DeploymentId(com.yahoo.config.provision.ApplicationId application, ZoneId zone) {
         this.application = application;
         this.zone = zone;
     }
@@ -22,7 +22,7 @@ public class DeploymentId {
     public com.yahoo.config.provision.ApplicationId applicationId() {
         return application;
     }
-    public Zone zone() { return zone; }
+    public ZoneId zone() { return zone; }
 
 
     public String dottedString() {
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java
index 1ceb064ad44..d3e1b881bbd 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MetricsService.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.hosted.controller.api.integration;
 
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Zone;
+import com.yahoo.config.provision.ZoneId;
 
 import java.util.Map;
 
@@ -15,9 +15,9 @@ public interface MetricsService {
 
     ApplicationMetrics getApplicationMetrics(ApplicationId application);
 
-    DeploymentMetrics getDeploymentMetrics(ApplicationId application, Zone zone);
+    DeploymentMetrics getDeploymentMetrics(ApplicationId application, ZoneId zone);
 
-    Map<String, SystemMetrics> getSystemMetrics(ApplicationId application, Zone zone);
+    Map<String, SystemMetrics> getSystemMetrics(ApplicationId application, ZoneId zone);
 
     class DeploymentMetrics {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
index df6f023f6af..3318bf783d8 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
@@ -5,7 +5,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
-import com.yahoo.config.provision.Zone;
+import com.yahoo.config.provision.ZoneId;
 
 import java.net.URI;
 import java.time.Duration;
@@ -20,8 +20,8 @@ import java.util.Optional;
 public interface ZoneRegistry {
 
     SystemName system();
-    List<Zone> zones();
-    Optional<Zone> getZone(Environment environment, RegionName region);
+    List<ZoneId> zones();
+    Optional<ZoneId> getZone(Environment environment, RegionName region);
     List<URI> getConfigServerUris(Environment environment, RegionName region);
     Optional<URI> getLogServerUri(Environment environment, RegionName region);
     Optional<Duration> getDeploymentTimeToLive(Environment environment, RegionName region);