Move Zone out of GlobalComponentRegistry

7 files changed, 23 insertions, 36 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistryTest.java
index c5b1cd32d56..d5eac29f81d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistryTest.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.config.server;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.model.NullConfigModelRegistry;
 import com.yahoo.config.model.api.ConfigDefinitionRepo;
-import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.server.filedistribution.FileServer;
 import com.yahoo.vespa.config.server.host.ConfigRequestHostLivenessTracker;
 import com.yahoo.vespa.config.server.host.HostRegistry;
@@ -34,7 +33,6 @@ public class InjectedGlobalComponentRegistryTest {
     private ConfigDefinitionRepo defRepo;
     private GlobalComponentRegistry globalComponentRegistry;
     private ModelFactoryRegistry modelFactoryRegistry;
-    private Zone zone;
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -52,12 +50,10 @@ public class InjectedGlobalComponentRegistryTest {
                                   new FileServer(temporaryFolder.newFolder("filereferences")),
                                   new NoopRpcAuthorizer(), new RpcRequestHandlerProvider());
         defRepo = new StaticConfigDefinitionRepo();
-        zone = Zone.defaultZone();
         globalComponentRegistry =
                 new InjectedGlobalComponentRegistry(modelFactoryRegistry,
                                                     rpcServer,
-                                                    defRepo,
-                                                    zone);
+                                                    defRepo);
     }
 
     @Test
@@ -66,7 +62,6 @@ public class InjectedGlobalComponentRegistryTest {
         assertThat(globalComponentRegistry.getReloadListener().hashCode(), is(rpcServer.hashCode()));
         assertThat(globalComponentRegistry.getTenantListener().hashCode(), is(rpcServer.hashCode()));
         assertThat(globalComponentRegistry.getStaticConfigDefinitionRepo(), is(defRepo));
-        assertThat(globalComponentRegistry.getZone(), is(zone));
     }
 
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java
index defc4826bd3..0502868876f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.config.server;
 
 import com.yahoo.config.model.NullConfigModelRegistry;
 import com.yahoo.config.model.api.ConfigDefinitionRepo;
-import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.server.application.TenantApplicationsTest;
 import com.yahoo.vespa.config.server.modelfactory.ModelFactoryRegistry;
 import com.yahoo.vespa.config.server.tenant.MockTenantListener;
@@ -22,20 +21,17 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
     private final ReloadListener reloadListener;
     private final TenantListener tenantListener;
     private final ModelFactoryRegistry modelFactoryRegistry;
-    private final Zone zone;
     private final Clock clock;
 
     private TestComponentRegistry(ModelFactoryRegistry modelFactoryRegistry,
                                   ConfigDefinitionRepo defRepo,
                                   ReloadListener reloadListener,
                                   TenantListener tenantListener,
-                                  Zone zone,
                                   Clock clock) {
         this.reloadListener = reloadListener;
         this.tenantListener = tenantListener;
         this.defRepo = defRepo;
         this.modelFactoryRegistry = modelFactoryRegistry;
-        this.zone = zone;
         this.clock = clock;
     }
 
@@ -44,7 +40,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
         private ReloadListener reloadListener = new TenantApplicationsTest.MockReloadListener();
         private final MockTenantListener tenantListener = new MockTenantListener();
         private ModelFactoryRegistry modelFactoryRegistry = new ModelFactoryRegistry(Collections.singletonList(new VespaModelFactory(new NullConfigModelRegistry())));
-        private Zone zone = Zone.defaultZone();
         private Clock clock = Clock.systemUTC();
 
         public Builder modelFactoryRegistry(ModelFactoryRegistry modelFactoryRegistry) {
@@ -52,11 +47,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
             return this;
         }
 
-        public Builder zone(Zone zone) {
-            this.zone = zone;
-            return this;
-        }
-
         public Builder clock(Clock clock) {
             this.clock = clock;
             return this;
@@ -77,7 +67,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
                                              defRepo,
                                              reloadListener,
                                              tenantListener,
-                                             zone,
                                              clock);
         }
     }
@@ -91,10 +80,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
     @Override
     public ModelFactoryRegistry getModelFactoryRegistry() { return modelFactoryRegistry; }
     @Override
-    public Zone getZone() {
-        return zone;
-    }
-    @Override
     public Clock getClock() { return clock;}
 
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
index 011c9da5409..fa44497ee38 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
@@ -285,15 +285,15 @@ public class DeployTester {
 
             TestComponentRegistry.Builder testComponentRegistryBuilder = new TestComponentRegistry.Builder()
                     .clock(clock)
-                    .modelFactoryRegistry(new ModelFactoryRegistry(modelFactories))
-                    .zone(zone);
+                    .modelFactoryRegistry(new ModelFactoryRegistry(modelFactories));
 
             TestTenantRepository.Builder builder = new TestTenantRepository.Builder()
                     .withComponentRegistry(testComponentRegistryBuilder.build())
                     .withConfigserverConfig(configserverConfig)
                     .withCurator(curator)
                     .withMetrics(Optional.ofNullable(metrics).orElse(Metrics.createTestMetrics()))
-                    .withFileDistributionFactory(new MockFileDistributionFactory(configserverConfig));
+                    .withFileDistributionFactory(new MockFileDistributionFactory(configserverConfig))
+                    .withZone(zone);
 
             if (configserverConfig.hostedVespa()) builder.withHostProvisionerProvider(HostProvisionerProvider.withProvisioner(provisioner, true));
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
index 675c85006d4..4d4a06dd05c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
@@ -54,7 +54,6 @@ public class HostHandlerTest {
                 .fileReferencesDir(temporaryFolder.newFolder().getAbsolutePath())
                 .build();
         TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder()
-                .zone(zone)
                 .build();
         TenantRepository tenantRepository = new TestTenantRepository.Builder()
                 .withComponentRegistry(componentRegistry)
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index 9939856d4db..6aeac108c54 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -14,6 +14,7 @@ import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.CertificateNotReadyException;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.TenantName;
+import com.yahoo.config.provision.Zone;
 import com.yahoo.config.provision.exception.LoadBalancerServiceException;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
@@ -80,6 +81,7 @@ public class SessionPreparerTest {
     private static final File invalidTestApp = new File("src/test/apps/illegalApp");
     private static final Version version123 = new Version(1, 2, 3);
     private static final Version version321 = new Version(3, 2, 1);
+    private static final Zone zone = Zone.defaultZone();
     private final KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC, 256);
     private final X509Certificate certificate = X509CertificateBuilder.fromKeypair(keyPair, new X500Principal("CN=subject"),
             Instant.now(), Instant.now().plus(1, ChronoUnit.DAYS), SignatureAlgorithm.SHA512_WITH_ECDSA, BigInteger.valueOf(12345)).build();
@@ -130,7 +132,7 @@ public class SessionPreparerTest {
                 configserverConfig,
                 componentRegistry.getStaticConfigDefinitionRepo(),
                 curator,
-                componentRegistry.getZone(),
+                zone,
                 flagSource,
                 secretStore);
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
index fe325488601..ba88421bf1c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
@@ -8,10 +8,7 @@ import com.yahoo.concurrent.StripedExecutor;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
-import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.InstanceName;
-import com.yahoo.config.provision.RegionName;
-import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.server.ConfigServerDB;
@@ -205,9 +202,7 @@ public class TenantRepositoryTest {
     }
 
     private GlobalComponentRegistry createComponentRegistry() {
-        return new TestComponentRegistry.Builder()
-                .zone(new Zone(SystemName.cd, Environment.prod, RegionName.from("foo")))
-                .build();
+        return new TestComponentRegistry.Builder().build();
     }
 
     private static class FailingDuringBootstrapTenantRepository extends TenantRepository {
@@ -224,7 +219,8 @@ public class TenantRepositoryTest {
                   new MockSecretStore(),
                   HostProvisionerProvider.withProvisioner(new MockProvisioner(), false),
                   configserverConfig,
-                  new ConfigServerDB(configserverConfig));
+                  new ConfigServerDB(configserverConfig),
+                  Zone.defaultZone());
         }
 
         @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TestTenantRepository.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TestTenantRepository.java
index 2cf79224bca..a8b7dc27131 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TestTenantRepository.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TestTenantRepository.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.config.server.tenant;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.concurrent.InThreadExecutorService;
 import com.yahoo.concurrent.StripedExecutor;
+import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.server.ConfigServerDB;
 import com.yahoo.vespa.config.server.GlobalComponentRegistry;
 import com.yahoo.vespa.config.server.MockSecretStore;
@@ -29,7 +30,8 @@ public class TestTenantRepository extends TenantRepository {
                                 FileDistributionFactory fileDistributionFactory,
                                 FlagSource flagSource,
                                 HostProvisionerProvider hostProvisionerProvider,
-                                ConfigserverConfig configserverConfig) {
+                                ConfigserverConfig configserverConfig,
+                                Zone zone) {
         super(componentRegistry,
               hostRegistry,
               curator,
@@ -41,7 +43,8 @@ public class TestTenantRepository extends TenantRepository {
               new MockSecretStore(),
               hostProvisionerProvider,
               configserverConfig,
-              new ConfigServerDB(configserverConfig));
+              new ConfigServerDB(configserverConfig),
+              zone);
     }
 
     public static class Builder {
@@ -54,6 +57,7 @@ public class TestTenantRepository extends TenantRepository {
         FlagSource flagSource = new InMemoryFlagSource();
         HostProvisionerProvider hostProvisionerProvider = HostProvisionerProvider.empty();
         ConfigserverConfig configserverConfig = new ConfigserverConfig.Builder().build();
+        Zone zone = Zone.defaultZone();
 
         public Builder withFlagSource(FlagSource flagSource) {
             this.flagSource = flagSource;
@@ -95,6 +99,11 @@ public class TestTenantRepository extends TenantRepository {
             return this;
         }
 
+        public Builder withZone(Zone zone) {
+            this.zone = zone;
+            return this;
+        }
+
         public TenantRepository build() {
             if (fileDistributionFactory == null)
                 fileDistributionFactory = new FileDistributionFactory(configserverConfig);
@@ -105,7 +114,8 @@ public class TestTenantRepository extends TenantRepository {
                                             fileDistributionFactory,
                                             flagSource,
                                             hostProvisionerProvider,
-                                            configserverConfig);
+                                            configserverConfig,
+                                            zone);
         }
 
     }