From 9b7f64abf7601305856d0480cb5b3199c85a831f Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <jvenstad@yahoo-inc.com>
Date: Sat, 16 Dec 2017 08:16:38 +0100
Subject: Split Zones and renamed it

---
 .../hosted/controller/proxy/ConfigServerRestExecutorImpl.java     | 4 ++--
 .../java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'controller-server')

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java
index 751fe25b897..e8689a06162 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java
@@ -7,8 +7,8 @@ import com.yahoo.config.provision.Environment;
 import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
 import com.yahoo.io.IOUtils;
 import com.yahoo.jdisc.http.HttpRequest.Method;
+import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneList;
 import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
-import com.yahoo.vespa.hosted.controller.api.integration.zone.Zones;
 import org.apache.http.Header;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -83,7 +83,7 @@ public class ConfigServerRestExecutorImpl implements ConfigServerRestExecutor {
         DiscoveryResponseStructure responseStructure = new DiscoveryResponseStructure();
         String environmentName = proxyRequest.getEnvironment();
 
-        Zones.List zones = zoneRegistry.zones().all();
+        ZoneList zones = zoneRegistry.zones().all();
         if ( ! environmentName.isEmpty())
             zones = zones.in(Environment.from(environmentName));
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
index 092e21fec14..82434b6260c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
@@ -9,8 +9,8 @@ import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
-import com.yahoo.vespa.hosted.controller.api.integration.zone.Zones;
-import com.yahoo.vespa.hosted.controller.api.integration.zone.ZonesMock;
+import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneFilter;
+import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneFilterMock;
 
 import java.net.URI;
 import java.time.Duration;
@@ -64,8 +64,8 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
     }
 
     @Override
-    public Zones zones() {
-        return ZonesMock.from(Collections.unmodifiableList(zones));
+    public ZoneFilter zones() {
+        return ZoneFilterMock.from(Collections.unmodifiableList(zones));
     }
 
     @Override
-- 
cgit v1.2.3