From a21ff82b88f7d634c158da7a86ba11f4e8390acb Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 21 Jan 2021 14:35:47 +0100 Subject: Move ConfigDefinitionRepo out of GlobalComponentRegistry --- .../server/InjectedGlobalComponentRegistryTest.java | 6 +----- .../vespa/config/server/TestComponentRegistry.java | 17 ++--------------- .../config/server/http/HttpGetConfigHandlerTest.java | 5 +---- .../config/server/http/HttpListConfigsHandlerTest.java | 5 +---- .../config/server/http/v2/HttpGetConfigHandlerTest.java | 5 +---- .../server/http/v2/HttpListConfigsHandlerTest.java | 5 +---- .../com/yahoo/vespa/config/server/rpc/RpcTester.java | 1 - .../config/server/session/SessionPreparerTest.java | 8 +++----- .../config/server/tenant/TenantRepositoryTest.java | 4 +++- .../config/server/tenant/TestTenantRepository.java | 13 +++++++++---- 10 files changed, 22 insertions(+), 47 deletions(-) (limited to 'configserver/src/test/java/com/yahoo') 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 96097decb5b..84fa6a9db18 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 @@ -2,7 +2,6 @@ package com.yahoo.vespa.config.server; import com.yahoo.cloud.config.ConfigserverConfig; -import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.vespa.config.server.filedistribution.FileServer; import com.yahoo.vespa.config.server.host.ConfigRequestHostLivenessTracker; import com.yahoo.vespa.config.server.host.HostRegistry; @@ -26,7 +25,6 @@ import static org.junit.Assert.assertThat; public class InjectedGlobalComponentRegistryTest { private RpcServer rpcServer; - private ConfigDefinitionRepo defRepo; private GlobalComponentRegistry globalComponentRegistry; @Rule @@ -43,15 +41,13 @@ public class InjectedGlobalComponentRegistryTest { hostRegistry, new ConfigRequestHostLivenessTracker(), new FileServer(temporaryFolder.newFolder("filereferences")), new NoopRpcAuthorizer(), new RpcRequestHandlerProvider()); - defRepo = new StaticConfigDefinitionRepo(); - globalComponentRegistry = new InjectedGlobalComponentRegistry(rpcServer, defRepo); + globalComponentRegistry = new InjectedGlobalComponentRegistry(rpcServer); } @Test public void testThatAllComponentsAreSetup() { assertThat(globalComponentRegistry.getReloadListener().hashCode(), is(rpcServer.hashCode())); assertThat(globalComponentRegistry.getTenantListener().hashCode(), is(rpcServer.hashCode())); - assertThat(globalComponentRegistry.getStaticConfigDefinitionRepo(), is(defRepo)); } } 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 346856d7502..987289e347c 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 @@ -1,7 +1,6 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server; -import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.vespa.config.server.application.TenantApplicationsTest; import com.yahoo.vespa.config.server.tenant.MockTenantListener; import com.yahoo.vespa.config.server.tenant.TenantListener; @@ -11,20 +10,15 @@ import com.yahoo.vespa.config.server.tenant.TenantListener; */ public class TestComponentRegistry implements GlobalComponentRegistry { - private final ConfigDefinitionRepo defRepo; private final ReloadListener reloadListener; private final TenantListener tenantListener; - private TestComponentRegistry(ConfigDefinitionRepo defRepo, - ReloadListener reloadListener, - TenantListener tenantListener) { + private TestComponentRegistry(ReloadListener reloadListener, TenantListener tenantListener) { this.reloadListener = reloadListener; this.tenantListener = tenantListener; - this.defRepo = defRepo; } public static class Builder { - private ConfigDefinitionRepo defRepo = new StaticConfigDefinitionRepo(); private ReloadListener reloadListener = new TenantApplicationsTest.MockReloadListener(); private final MockTenantListener tenantListener = new MockTenantListener(); @@ -33,13 +27,8 @@ public class TestComponentRegistry implements GlobalComponentRegistry { return this; } - public Builder configDefinitionRepo(ConfigDefinitionRepo configDefinitionRepo) { - this.defRepo = configDefinitionRepo; - return this; - } - public TestComponentRegistry build() { - return new TestComponentRegistry(defRepo, reloadListener, tenantListener); + return new TestComponentRegistry(reloadListener, tenantListener); } } @@ -47,7 +36,5 @@ public class TestComponentRegistry implements GlobalComponentRegistry { public TenantListener getTenantListener() { return tenantListener; } @Override public ReloadListener getReloadListener() { return reloadListener; } - @Override - public ConfigDefinitionRepo getStaticConfigDefinitionRepo() { return defRepo; } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java index 446257aa0f8..030ff243c21 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java @@ -9,7 +9,6 @@ import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.vespa.config.server.ApplicationRepository; import com.yahoo.vespa.config.server.MockProvisioner; import com.yahoo.vespa.config.server.TestComponentRegistry; -import com.yahoo.vespa.config.server.TestConfigDefinitionRepo; import com.yahoo.vespa.config.server.application.OrchestratorMock; import com.yahoo.vespa.config.server.session.PrepareParams; import com.yahoo.vespa.config.server.tenant.TenantRepository; @@ -55,9 +54,7 @@ public class HttpGetConfigHandlerTest { .configDefinitionsDir(temporaryFolder.newFolder().getAbsolutePath()) .fileReferencesDir(temporaryFolder.newFolder().getAbsolutePath()) .build(); - TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder() - .configDefinitionRepo(new TestConfigDefinitionRepo()) - .build(); + TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder().build(); TenantRepository tenantRepository = new TestTenantRepository.Builder() .withComponentRegistry(componentRegistry) .withConfigserverConfig(configserverConfig) diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java index 4c6c3ac7621..56a0049247a 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java @@ -10,7 +10,6 @@ import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.server.ApplicationRepository; import com.yahoo.vespa.config.server.MockProvisioner; import com.yahoo.vespa.config.server.TestComponentRegistry; -import com.yahoo.vespa.config.server.TestConfigDefinitionRepo; import com.yahoo.vespa.config.server.application.OrchestratorMock; import com.yahoo.vespa.config.server.http.HttpListConfigsHandler.ListConfigsResponse; import com.yahoo.vespa.config.server.session.PrepareParams; @@ -60,9 +59,7 @@ public class HttpListConfigsHandlerTest { .configDefinitionsDir(temporaryFolder.newFolder().getAbsolutePath()) .fileReferencesDir(temporaryFolder.newFolder().getAbsolutePath()) .build(); - TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder() - .configDefinitionRepo(new TestConfigDefinitionRepo()) - .build(); + TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder().build(); TenantRepository tenantRepository = new TestTenantRepository.Builder() .withComponentRegistry(componentRegistry) .withConfigserverConfig(configserverConfig) diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java index a854afa6d3d..9bb66b0723c 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java @@ -11,7 +11,6 @@ import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.vespa.config.server.ApplicationRepository; import com.yahoo.vespa.config.server.MockProvisioner; import com.yahoo.vespa.config.server.TestComponentRegistry; -import com.yahoo.vespa.config.server.TestConfigDefinitionRepo; import com.yahoo.vespa.config.server.application.OrchestratorMock; import com.yahoo.vespa.config.server.http.HandlerTest; import com.yahoo.vespa.config.server.http.HttpConfigRequest; @@ -64,9 +63,7 @@ public class HttpGetConfigHandlerTest { .configDefinitionsDir(temporaryFolder.newFolder().getAbsolutePath()) .fileReferencesDir(temporaryFolder.newFolder().getAbsolutePath()) .build(); - TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder() - .configDefinitionRepo(new TestConfigDefinitionRepo()) - .build(); + TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder().build(); MockProvisioner provisioner = new MockProvisioner(); TenantRepository tenantRepository = new TestTenantRepository.Builder() .withComponentRegistry(componentRegistry) diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java index 9d67749cf5d..8a2f02629ea 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java @@ -13,7 +13,6 @@ import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.server.ApplicationRepository; import com.yahoo.vespa.config.server.MockProvisioner; import com.yahoo.vespa.config.server.TestComponentRegistry; -import com.yahoo.vespa.config.server.TestConfigDefinitionRepo; import com.yahoo.vespa.config.server.application.OrchestratorMock; import com.yahoo.vespa.config.server.http.HandlerTest; import com.yahoo.vespa.config.server.http.HttpErrorResponse; @@ -67,9 +66,7 @@ public class HttpListConfigsHandlerTest { .configDefinitionsDir(temporaryFolder.newFolder().getAbsolutePath()) .fileReferencesDir(temporaryFolder.newFolder().getAbsolutePath()) .build(); - TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder() - .configDefinitionRepo(new TestConfigDefinitionRepo()) - .build(); + TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder().build(); TenantRepository tenantRepository = new TestTenantRepository.Builder() .withComponentRegistry(componentRegistry) .withConfigserverConfig(configserverConfig) diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java index e79ed6cafcf..03ef4825b4c 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java @@ -87,7 +87,6 @@ public class RpcTester implements AutoCloseable { configserverConfig = new ConfigserverConfig(configBuilder); rpcServer = createRpcServer(configserverConfig); TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder() - .configDefinitionRepo(new TestConfigDefinitionRepo()) .reloadListener(rpcServer) .build(); tenantRepository = new TestTenantRepository.Builder() 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 6aeac108c54..4bb41a2c4de 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 @@ -23,8 +23,9 @@ import com.yahoo.security.KeyUtils; import com.yahoo.security.SignatureAlgorithm; import com.yahoo.security.X509CertificateBuilder; import com.yahoo.security.X509CertificateUtils; +import com.yahoo.vespa.config.server.MockProvisioner; import com.yahoo.vespa.config.server.MockSecretStore; -import com.yahoo.vespa.config.server.TestComponentRegistry; +import com.yahoo.vespa.config.server.TestConfigDefinitionRepo; import com.yahoo.vespa.config.server.TimeoutBudgetTest; import com.yahoo.vespa.config.server.application.PermanentApplicationPackage; import com.yahoo.vespa.config.server.deploy.DeployHandlerLogger; @@ -34,7 +35,6 @@ import com.yahoo.vespa.config.server.http.InvalidApplicationException; import com.yahoo.vespa.config.server.model.TestModelFactory; import com.yahoo.vespa.config.server.modelfactory.ModelFactoryRegistry; import com.yahoo.vespa.config.server.provision.HostProvisionerProvider; -import com.yahoo.vespa.config.server.MockProvisioner; import com.yahoo.vespa.config.server.tenant.ContainerEndpointsCache; import com.yahoo.vespa.config.server.tenant.EndpointCertificateMetadataStore; import com.yahoo.vespa.config.server.tenant.EndpointCertificateRetriever; @@ -89,7 +89,6 @@ public class SessionPreparerTest { private MockCurator curator; private ConfigCurator configCurator; private SessionPreparer preparer; - private TestComponentRegistry componentRegistry; private final MockSecretStore secretStore = new MockSecretStore(); private ConfigserverConfig configserverConfig; @@ -108,7 +107,6 @@ public class SessionPreparerTest { .configServerDBDir(folder.newFolder().getAbsolutePath()) .configDefinitionsDir(folder.newFolder().getAbsolutePath()) .build(); - componentRegistry = new TestComponentRegistry.Builder().build(); preparer = createPreparer(); } @@ -130,7 +128,7 @@ public class SessionPreparerTest { hostProvisionerProvider, new PermanentApplicationPackage(configserverConfig), configserverConfig, - componentRegistry.getStaticConfigDefinitionRepo(), + new TestConfigDefinitionRepo(), curator, zone, flagSource, 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 8c5b366609e..a520700f582 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 @@ -18,6 +18,7 @@ import com.yahoo.vespa.config.server.MockProvisioner; import com.yahoo.vespa.config.server.MockSecretStore; import com.yahoo.vespa.config.server.ServerCache; import com.yahoo.vespa.config.server.TestComponentRegistry; +import com.yahoo.vespa.config.server.TestConfigDefinitionRepo; import com.yahoo.vespa.config.server.application.Application; import com.yahoo.vespa.config.server.application.ApplicationSet; import com.yahoo.vespa.config.server.application.TenantApplications; @@ -226,7 +227,8 @@ public class TenantRepositoryTest { new ConfigServerDB(configserverConfig), Zone.defaultZone(), Clock.systemUTC(), - new ModelFactoryRegistry(List.of(new VespaModelFactory(new NullConfigModelRegistry())))); + new ModelFactoryRegistry(List.of(new VespaModelFactory(new NullConfigModelRegistry()))), + new TestConfigDefinitionRepo()); } @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 873c09f797b..1cb7789824b 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 @@ -5,10 +5,12 @@ import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.concurrent.InThreadExecutorService; import com.yahoo.concurrent.StripedExecutor; 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.ConfigServerDB; import com.yahoo.vespa.config.server.GlobalComponentRegistry; import com.yahoo.vespa.config.server.MockSecretStore; +import com.yahoo.vespa.config.server.TestConfigDefinitionRepo; import com.yahoo.vespa.config.server.filedistribution.FileDistributionFactory; import com.yahoo.vespa.config.server.host.HostRegistry; import com.yahoo.vespa.config.server.modelfactory.ModelFactoryRegistry; @@ -39,7 +41,8 @@ public class TestTenantRepository extends TenantRepository { ConfigserverConfig configserverConfig, Zone zone, Clock clock, - ModelFactoryRegistry modelFactoryRegistry) { + ModelFactoryRegistry modelFactoryRegistry, + ConfigDefinitionRepo configDefinitionRepo) { super(componentRegistry, hostRegistry, curator, @@ -54,12 +57,13 @@ public class TestTenantRepository extends TenantRepository { new ConfigServerDB(configserverConfig), zone, clock, - modelFactoryRegistry); + modelFactoryRegistry, + configDefinitionRepo); } public static class Builder { - Clock clock = Clock.systemUTC(); + ConfigDefinitionRepo configDefinitionRepo = new TestConfigDefinitionRepo(); GlobalComponentRegistry componentRegistry; HostRegistry hostRegistry = new HostRegistry(); Curator curator = new MockCurator(); @@ -139,7 +143,8 @@ public class TestTenantRepository extends TenantRepository { configserverConfig, zone, clock, - modelFactoryRegistry); + modelFactoryRegistry, + configDefinitionRepo); } } -- cgit v1.2.3