Simplify (#7065)

3 files changed, 11 insertions, 27 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantListener.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantListener.java
index 8778d6a585c..b643a0664e8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantListener.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantListener.java
@@ -17,14 +17,14 @@ public interface TenantListener {
      * @param tenant name of newly created tenant.
      * @param provider provider of request and reload handlers for new tenant.
      */
-    public void onTenantCreate(TenantName tenant, TenantHandlerProvider provider);
+    void onTenantCreate(TenantName tenant, TenantHandlerProvider provider);
 
     /**
      * Called whenever a tenant is deleted.
      *
      * @param tenant name of deleted tenant.
      */
-    public void onTenantDelete(TenantName tenant);
+    void onTenantDelete(TenantName tenant);
 
     /**
      * Called when all tenants have been loaded at startup.
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 5f00499598a..58bd1485dad 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
@@ -27,7 +27,6 @@ import java.time.Clock;
 import java.util.Collections;
 import java.util.Optional;
 
-import static com.yahoo.vespa.config.server.SuperModelRequestHandlerTest.emptyNodeFlavors;
 
 /**
  * @author Ulf Lilleengen
@@ -56,7 +55,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
                                   ModelFactoryRegistry modelFactoryRegistry,
                                   PermanentApplicationPackage permanentApplicationPackage,
                                   FileDistributionFactory fileDistributionFactory,
-                                  SuperModelGenerationCounter superModelGenerationCounter,
                                   HostRegistries hostRegistries,
                                   ConfigserverConfig configserverConfig,
                                   SessionPreparer sessionPreparer,
@@ -72,7 +70,7 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
         this.configserverConfig = configserverConfig;
         this.reloadListener = reloadListener;
         this.tenantListener = tenantListener;
-        this.superModelGenerationCounter = superModelGenerationCounter;
+        this.superModelGenerationCounter = new SuperModelGenerationCounter(curator);
         this.defRepo = defRepo;
         this.permanentApplicationPackage = permanentApplicationPackage;
         this.hostRegistries = hostRegistries;
@@ -88,7 +86,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
     public static class Builder {
 
         private Curator curator = new MockCurator();
-        private Optional<ConfigCurator> configCurator = Optional.empty();
         private Metrics metrics = Metrics.createTestMetrics();
         private ConfigserverConfig configserverConfig = new ConfigserverConfig(
                 new ConfigserverConfig.Builder()
@@ -115,11 +112,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
             return this;
         }
 
-        public Builder configCurator(ConfigCurator configCurator) {
-            this.configCurator = Optional.ofNullable(configCurator);
-            return this;
-        }
-
         public Builder metrics(Metrics metrics) {
             this.metrics = metrics;
             return this;
@@ -155,21 +147,16 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
                     .orElse(new PermanentApplicationPackage(configserverConfig));
             FileDistributionFactory fileDistributionFactory = this.fileDistributionFactory
                     .orElse(new MockFileDistributionFactory(configserverConfig));
-            HostProvisionerProvider hostProvisionerProvider = hostProvisioner.isPresent() ?
-                    HostProvisionerProvider.withProvisioner(hostProvisioner.get()) :
-                    HostProvisionerProvider.empty();
+            HostProvisionerProvider hostProvisionerProvider = hostProvisioner.
+                    map(HostProvisionerProvider::withProvisioner).orElseGet(HostProvisionerProvider::empty);
             SessionPreparer sessionPreparer = new SessionPreparer(modelFactoryRegistry, fileDistributionFactory,
                                                                   hostProvisionerProvider, permApp,
                                                                   configserverConfig, defRepo, curator,
                                                                   zone);
-            return new TestComponentRegistry(curator, configCurator.orElse(ConfigCurator.create(curator)),
-                                             metrics, modelFactoryRegistry,
-                                             permApp,
-                                             fileDistributionFactory,
-                                             new SuperModelGenerationCounter(curator),
-                                             hostRegistries, configserverConfig, sessionPreparer,
-                                             hostProvisioner, defRepo, reloadListener,
-                                             tenantListener, zone, clock);
+            return new TestComponentRegistry(curator, ConfigCurator.create(curator), metrics, modelFactoryRegistry,
+                                             permApp, fileDistributionFactory, hostRegistries, configserverConfig,
+                                             sessionPreparer, hostProvisioner, defRepo, reloadListener, tenantListener,
+                                             zone, clock);
         }
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index 75a2d2f778d..b4e3f2374be 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -43,7 +43,6 @@ import com.yahoo.vespa.config.server.session.SessionTest;
 import com.yahoo.vespa.config.server.session.SessionZooKeeperClient;
 import com.yahoo.vespa.config.server.tenant.TenantBuilder;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
-import com.yahoo.vespa.config.server.zookeeper.ConfigCurator;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.model.VespaModelFactory;
@@ -80,7 +79,6 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
     private static final String activatedMessage = " for tenant '" + tenantName + "' activated.";
 
     private final Clock clock = Clock.systemUTC();
-    private ConfigCurator configCurator;
     private Curator curator;
     private RemoteSessionRepo remoteSessionRepo;
     private LocalSessionRepo localRepo;
@@ -99,14 +97,12 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
         remoteSessionRepo = new RemoteSessionRepo(tenantName);
         applicationRepo = new MemoryTenantApplications();
         curator = new MockCurator();
-        configCurator = ConfigCurator.create(curator);
         localRepo = new LocalSessionRepo(clock, curator);
         pathPrefix = "/application/v2/tenant/" + tenantName + "/session/";
         hostProvisioner = new MockProvisioner();
         modelFactory = new VespaModelFactory(new NullConfigModelRegistry());
         componentRegistry = new TestComponentRegistry.Builder()
                 .curator(curator)
-                .configCurator(configCurator)
                 .modelFactoryRegistry(new ModelFactoryRegistry(Collections.singletonList(modelFactory)))
                 .build();
         TenantBuilder tenantBuilder = TenantBuilder.create(componentRegistry, tenantName)
@@ -218,7 +214,8 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
 
     private RemoteSession createRemoteSession(long sessionId, Session.Status status, SessionZooKeeperClient zkClient, Clock clock) throws IOException {
         zkClient.writeStatus(status);
-        ZooKeeperClient zkC = new ZooKeeperClient(configCurator, new BaseDeployLogger(), false, TenantRepository.getSessionsPath(tenantName).append(String.valueOf(sessionId)));
+        ZooKeeperClient zkC = new ZooKeeperClient(componentRegistry.getConfigCurator(), new BaseDeployLogger(), false,
+                                                  TenantRepository.getSessionsPath(tenantName).append(String.valueOf(sessionId)));
         zkC.write(Collections.singletonMap(modelFactory.getVersion(), new MockFileRegistry()));
         zkC.write(AllocatedHosts.withHosts(Collections.emptySet()));
         RemoteSession session = new RemoteSession(tenantName, sessionId, componentRegistry, zkClient, clock);