Revert "Factory constructor with region/env"

This reverts commit e5f2b434d614b49bef40038ec1fe1d391db62e1e.

15 files changed, 48 insertions, 47 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
index 754a3386d89..98f8c2a3d99 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
@@ -13,6 +13,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueId;
 
 import java.time.Instant;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -228,7 +229,7 @@ public class DeploymentJobs {
                 case test: return Optional.of(systemTest);
                 case staging: return Optional.of(stagingTest);
             }
-            return from(system, Zone.from(environment, region));
+            return from(system, new Zone(environment, region));
         }
 
         private static Zone zone(SystemName system, String environment, String region) {
@@ -236,7 +237,7 @@ public class DeploymentJobs {
         }
 
         private static Zone zone(String environment, String region) {
-            return Zone.from(Environment.from(environment), RegionName.from(region));
+            return new Zone(Environment.from(environment), RegionName.from(region));
         }
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java
index 59da90d033a..aa4d07634db 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java
@@ -107,7 +107,7 @@ public class DeploymentOrder {
     public List<Deployment> sortBy(List<DeploymentSpec.DeclaredZone> zones, Collection<Deployment> deployments) {
         List<Zone> productionZones = zones.stream()
                 .filter(z -> z.region().isPresent())
-                .map(z -> Zone.from(z.environment(), z.region().get()))
+                .map(z -> new Zone(z.environment(), z.region().get()))
                 .collect(toList());
         return deployments.stream()
                 .sorted(comparingInt(deployment -> productionZones.indexOf(deployment.zone())))
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
index 6df856d7ee2..c71409aaba9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
@@ -339,8 +339,8 @@ public class ApplicationSerializer {
     }
 
     private Zone zoneFromSlime(Inspector object) {
-        return Zone.from(Environment.from(object.field(environmentField).asString()),
-                         RegionName.from(object.field(regionField).asString()));
+        return new Zone(Environment.from(object.field(environmentField).asString()),
+                        RegionName.from(object.field(regionField).asString()));
     }
 
     private Optional<ApplicationRevision> applicationRevisionFromSlime(Inspector object) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index a5a368b62f6..d64f07906ab 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -423,7 +423,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                 .orElseThrow(() -> new NotExistsException(id + " not found"));
 
         DeploymentId deploymentId = new DeploymentId(application.id(),
-                                                     Zone.from(Environment.from(environment), RegionName.from(region)));
+                                                     new Zone(Environment.from(environment), RegionName.from(region)));
 
         Deployment deployment = application.deployments().get(deploymentId.zone());
         if (deployment == null)
@@ -514,7 +514,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
 
         // DeploymentId identifies the zone and application we are dealing with
         DeploymentId deploymentId = new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName),
-                                                     Zone.from(Environment.from(environment), RegionName.from(region)));
+                new Zone(Environment.from(environment), RegionName.from(region)));
         try {
             List<String> rotations = controller.applications().setGlobalRotationStatus(deploymentId, endPointStatus);
             return new MessageResponse(String.format("Rotations %s successfully set to %s service", rotations.toString(), inService ? "in" : "out of"));
@@ -526,7 +526,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
     private HttpResponse getGlobalRotationOverride(String tenantName, String applicationName, String instanceName, String environment, String region) {
 
         DeploymentId deploymentId = new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName),
-                                                     Zone.from(Environment.from(environment), RegionName.from(region)));
+                new Zone(Environment.from(environment), RegionName.from(region)));
 
         Slime slime = new Slime();
         Cursor c1 = slime.setObject().setArray("globalrotationoverride");
@@ -571,13 +571,13 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
 
     private HttpResponse waitForConvergence(String tenantName, String applicationName, String instanceName, String environment, String region, HttpRequest request) {
         return new JacksonJsonResponse(controller.waitForConfigConvergence(new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName),
-                                                                                            Zone.from(Environment.from(environment), RegionName.from(region))),
+                                                                                            new Zone(Environment.from(environment), RegionName.from(region))),
                                                                            asLong(request.getProperty("timeout"), 1000)));
     }
 
     private HttpResponse services(String tenantName, String applicationName, String instanceName, String environment, String region, HttpRequest request) {
         ApplicationView applicationView = controller.getApplicationView(tenantName, applicationName, instanceName, environment, region);
-        ServiceApiResponse response = new ServiceApiResponse(Zone.from(Environment.from(environment), RegionName.from(region)),
+        ServiceApiResponse response = new ServiceApiResponse(new Zone(Environment.from(environment), RegionName.from(region)),
                                                              new ApplicationId.Builder().tenant(tenantName).applicationName(applicationName).instanceName(instanceName).build(),
                                                              controller.getConfigServerUris(Environment.from(environment), RegionName.from(region)),
                                                              request.getUri());
@@ -587,7 +587,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
 
     private HttpResponse service(String tenantName, String applicationName, String instanceName, String environment, String region, String serviceName, String restPath, HttpRequest request) {
         Map<?,?> result = controller.getServiceApiResponse(tenantName, applicationName, instanceName, environment, region, serviceName, restPath);
-        ServiceApiResponse response = new ServiceApiResponse(Zone.from(Environment.from(environment), RegionName.from(region)),
+        ServiceApiResponse response = new ServiceApiResponse(new Zone(Environment.from(environment), RegionName.from(region)),
                                                              new ApplicationId.Builder().tenant(tenantName).applicationName(applicationName).instanceName(instanceName).build(),
                                                              controller.getConfigServerUris(Environment.from(environment), RegionName.from(region)),
                                                              request.getUri());
@@ -737,7 +737,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
     /** Schedule restart of deployment, or specific host in a deployment */
     private HttpResponse restart(String tenantName, String applicationName, String instanceName, String environment, String region, HttpRequest request) {
         DeploymentId deploymentId = new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName),
-                                                     Zone.from(Environment.from(environment), RegionName.from(region)));
+                                                     new Zone(Environment.from(environment), RegionName.from(region)));
         // TODO: Propagate all filters
         Optional<Hostname> hostname = Optional.ofNullable(request.getProperty("hostname")).map(Hostname::new);
         controller.applications().restart(deploymentId, hostname);
@@ -758,7 +758,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
     private HttpResponse log(String tenantName, String applicationName, String instanceName, String environment, String region) {
         try {
             DeploymentId deploymentId = new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName),
-                                                         Zone.from(Environment.from(environment), RegionName.from(region)));
+                                                         new Zone(Environment.from(environment), RegionName.from(region)));
             return new JacksonJsonResponse(controller.grabLog(deploymentId));
         }
         catch (RuntimeException e) {
@@ -770,7 +770,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
 
     private HttpResponse deploy(String tenantName, String applicationName, String instanceName, String environment, String region, HttpRequest request) {
         ApplicationId applicationId = ApplicationId.from(tenantName, applicationName, instanceName);
-        Zone zone = Zone.from(Environment.from(environment), RegionName.from(region));
+        Zone zone = new Zone(Environment.from(environment), RegionName.from(region));
 
         Map<String, byte[]> dataParts = new MultipartParser().parse(request);
         if ( ! dataParts.containsKey("deployOptions"))
@@ -821,7 +821,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
     private HttpResponse deactivate(String tenantName, String applicationName, String instanceName, String environment, String region) {
         Application application = controller.applications().require(ApplicationId.from(tenantName, applicationName, instanceName));
 
-        Zone zone = Zone.from(Environment.from(environment), RegionName.from(region));
+        Zone zone = new Zone(Environment.from(environment), RegionName.from(region));
         Deployment deployment = application.deployments().get(zone);
         if (deployment == null) {
             // Attempt to deactivate application even if the deployment is not known by the controller
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 94241d7934d..c41fc20d5c2 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -526,7 +526,7 @@ public class ControllerTest {
             application = application.withDeploying(Optional.of(new Change.VersionChange(Version.fromString("6.3"))));
             applications.store(application);
             try {
-                tester.deploy(app, Zone.from(Environment.prod, RegionName.from("us-east-3")));
+                tester.deploy(app, new Zone(Environment.prod, RegionName.from("us-east-3")));
                 fail("Expected exception");
             } catch (IllegalArgumentException e) {
                 assertEquals("Rejecting deployment of application 'tenant1.app1' to zone prod.us-east-3 as version change to 6.3 is not tested", e.getMessage());
@@ -626,7 +626,7 @@ public class ControllerTest {
         Application app = tester.createApplication("app1", "tenant1", 1, 2L);
 
         // Direct deploy is allowed when project ID is missing
-        Zone zone = Zone.from(Environment.prod, RegionName.from("cd-us-central-1"));
+        Zone zone = new Zone(Environment.prod, RegionName.from("cd-us-central-1"));
         // Same options as used in our integration tests
         DeployOptions options = new DeployOptions(Optional.empty(), Optional.empty(), false,
                                                   false);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
index 8ed4ae9ec19..bdb8160a3f6 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
@@ -165,9 +165,9 @@ public final class ControllerTester {
 
     public Zone toZone(Environment environment) {
         switch (environment) {
-            case dev: case test: return Zone.from(environment, RegionName.from("us-east-1"));
-            case staging: return Zone.from(environment, RegionName.from("us-east-3"));
-            default: return Zone.from(environment, RegionName.from("us-west-1"));
+            case dev: case test: return new Zone(environment, RegionName.from("us-east-1"));
+            case staging: return new Zone(environment, RegionName.from("us-east-3"));
+            default: return new Zone(environment, RegionName.from("us-west-1"));
         }
     }
 
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 fb05552ba38..18332942c24 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
@@ -88,7 +88,7 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
 
     @Override
     public Optional<Duration> getDeploymentTimeToLive(Environment environment, RegionName region) {
-        return Optional.ofNullable(deploymentTimeToLive.get(Zone.from(environment, region)));
+        return Optional.ofNullable(deploymentTimeToLive.get(new Zone(environment, region)));
     }
 
     @Override
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirerTest.java
index bc3a89f911d..ef0b05f9bb2 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirerTest.java
@@ -35,7 +35,7 @@ public class DeploymentExpirerTest {
     @Test
     public void testDeploymentExpiry() throws IOException, InterruptedException {
         tester.controllerTester().zoneRegistry().setDeploymentTimeToLive(
-                Zone.from(Environment.dev, RegionName.from("us-east-1")),
+                new Zone(Environment.dev, RegionName.from("us-east-1")),
                 Duration.ofDays(14)
         );
         DeploymentExpirer expirer = new DeploymentExpirer(tester.controller(), Duration.ofDays(10),
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
index 7fc3f323353..8839f6a5a18 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
@@ -692,7 +692,7 @@ public class UpgraderTest {
 
         // Dev deployment which should be ignored
         Application dev0 = tester.createApplication("dev0", "tenant1", 7, 1L);
-        tester.controllerTester().deploy(dev0, Zone.from(Environment.dev, RegionName.from("dev-region")));
+        tester.controllerTester().deploy(dev0, new Zone(Environment.dev, RegionName.from("dev-region")));
 
         // New version is released and canaries upgrade
         version = Version.fromString("5.1");
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
index e3d477cefeb..bf869230e8d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
@@ -48,8 +48,8 @@ public class ApplicationSerializerTest {
 
     private static final ApplicationSerializer applicationSerializer = new ApplicationSerializer();
 
-    private static final Zone zone1 = Zone.from(Environment.from("prod"), RegionName.from("us-west-1"));
-    private static final Zone zone2 = Zone.from(Environment.from("prod"), RegionName.from("us-east-3"));
+    private static final Zone zone1 = new Zone(Environment.from("prod"), RegionName.from("us-west-1"));
+    private static final Zone zone2 = new Zone(Environment.from("prod"), RegionName.from("us-east-3"));
 
     @Test
     public void testSerialization() {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ServiceApiResponseTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ServiceApiResponseTest.java
index c5a413847d8..6cf90905679 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ServiceApiResponseTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ServiceApiResponseTest.java
@@ -32,10 +32,10 @@ public class ServiceApiResponseTest {
 
     @Test
     public void testServiceViewResponse() throws URISyntaxException, IOException {
-        ServiceApiResponse response = new ServiceApiResponse(Zone.from(Environment.prod, RegionName.from("us-west-1")),
-                                                             ApplicationId.from("tenant1", "application1", "default"),
-                                                             Collections.singletonList(new URI("config-server1")),
-                                                             new URI("http://server1:4080/request/path?foo=bar"));
+        ServiceApiResponse response = new ServiceApiResponse(new Zone(Environment.prod, RegionName.from("us-west-1")),
+                                                      ApplicationId.from("tenant1", "application1", "default"),
+                                                      Collections.singletonList(new URI("config-server1")),
+                                                      new URI("http://server1:4080/request/path?foo=bar"));
         ApplicationView applicationView = new ApplicationView();
         ClusterView clusterView = new ClusterView();
         clusterView.type = "container";
@@ -63,7 +63,7 @@ public class ServiceApiResponseTest {
 
     @Test
     public void testServiceViewResponseWithURLs() throws URISyntaxException, IOException {
-        ServiceApiResponse response = new ServiceApiResponse(Zone.from(Environment.prod, RegionName.from("us-west-1")),
+        ServiceApiResponse response = new ServiceApiResponse(new Zone(Environment.prod, RegionName.from("us-west-1")),
                                                              ApplicationId.from("tenant2", "application2", "default"),
                                                              Collections.singletonList(new URI("http://cfg1.test/")),
                                                              new URI("http://cfg1.test/serviceview/v1/tenant/tenant2/application/application2/environment/prod/region/us-west-1/instance/default/service/searchnode-9dujk1pa0vufxrj6n4yvmi8uc/state/v1"));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
index 75101e62754..55a4b46f4a7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
@@ -95,14 +95,14 @@ public class DeploymentApiTest extends ControllerContainerTest {
     private void deployCompletely(Application application, ApplicationPackage applicationPackage, long projectId,
                                   boolean success) {
         tester.notifyJobCompletion(application.id(), projectId, true, component);
-        tester.deploy(application, applicationPackage, Zone.from(Environment.test,
-                                                                 RegionName.from("us-east-1")), projectId);
+        tester.deploy(application, applicationPackage, new Zone(Environment.test,
+                                                                       RegionName.from("us-east-1")), projectId);
         tester.notifyJobCompletion(application.id(), projectId, true, systemTest);
-        tester.deploy(application, applicationPackage, Zone.from(Environment.staging,
-                                                                 RegionName.from("us-east-3")), projectId);
+        tester.deploy(application, applicationPackage, new Zone(Environment.staging,
+                                                                       RegionName.from("us-east-3")), projectId);
         tester.notifyJobCompletion(application.id(), projectId, success, stagingTest);
         if (success) {
-            tester.deploy(application, applicationPackage, Zone.from(Environment.prod, RegionName.from("corp-us-east-1")),
+            tester.deploy(application, applicationPackage, new Zone(Environment.prod,RegionName.from("corp-us-east-1")),
                           projectId);
             tester.notifyJobCompletion(application.id(), projectId, true, productionCorpUsEast1);
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java
index 3e1a324918e..e2c3725ea5f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java
@@ -39,8 +39,8 @@ import static org.junit.Assert.assertTrue;
 public class ScrewdriverApiTest extends ControllerContainerTest {
 
     private static final String responseFiles = "src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/responses/";
-    private static final Zone testZone = Zone.from(Environment.test, RegionName.from("us-east-1"));
-    private static final Zone stagingZone = Zone.from(Environment.staging, RegionName.from("us-east-3"));
+    private static final Zone testZone = new Zone(Environment.test, RegionName.from("us-east-1"));
+    private static final Zone stagingZone = new Zone(Environment.staging, RegionName.from("us-east-3"));
 
     @Test
     public void testGetReleaseStatus() throws Exception {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java
index af99ff9de15..a00665b77cb 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java
@@ -22,11 +22,11 @@ public class ZoneApiTest extends ControllerContainerTest {
 
     private static final String responseFiles = "src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/responses/";
     private static final List<Zone> zones = Arrays.asList(
-            Zone.from(Environment.prod, RegionName.from("us-north-1")),
-            Zone.from(Environment.dev, RegionName.from("us-north-2")),
-            Zone.from(Environment.test, RegionName.from("us-north-3")),
-            Zone.from(Environment.staging, RegionName.from("us-north-4"))
-                                                         );
+            new Zone(Environment.prod, RegionName.from("us-north-1")),
+            new Zone(Environment.dev, RegionName.from("us-north-2")),
+            new Zone(Environment.test, RegionName.from("us-north-3")),
+            new Zone(Environment.staging, RegionName.from("us-north-4"))
+    );
 
     private ContainerControllerTester tester;
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java
index f887a449149..63899d808f9 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java
@@ -27,11 +27,11 @@ public class ZoneApiTest extends ControllerContainerTest {
 
     private static final String responseFiles = "src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/responses/";
     private static final List<Zone> zones = Arrays.asList(
-            Zone.from(Environment.prod, RegionName.from("us-north-1")),
-            Zone.from(Environment.dev, RegionName.from("us-north-2")),
-            Zone.from(Environment.test, RegionName.from("us-north-3")),
-            Zone.from(Environment.staging, RegionName.from("us-north-4"))
-                                                         );
+            new Zone(Environment.prod, RegionName.from("us-north-1")),
+            new Zone(Environment.dev, RegionName.from("us-north-2")),
+            new Zone(Environment.test, RegionName.from("us-north-3")),
+            new Zone(Environment.staging, RegionName.from("us-north-4"))
+    );
 
     private ContainerControllerTester tester;
     private ConfigServerProxyMock proxy;