Simplify: Use Clock and Curator from ApplicationRepository

4 files changed, 19 insertions, 37 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
index 4ba27d91deb..5eb0f830ef6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
@@ -10,11 +10,9 @@ import com.yahoo.config.provision.Deployment;
 import com.yahoo.config.provision.TransientException;
 import com.yahoo.container.handler.VipStatus;
 import com.yahoo.container.jdisc.state.StateMonitor;
-import com.yahoo.vespa.config.server.application.ConfigConvergenceChecker;
 import com.yahoo.vespa.config.server.maintenance.ConfigServerMaintenance;
 import com.yahoo.vespa.config.server.rpc.RpcServer;
 import com.yahoo.vespa.config.server.version.VersionState;
-import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.yolean.Exceptions;
 import java.time.Clock;
 import java.time.Duration;
@@ -73,17 +71,14 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
     @SuppressWarnings("unused") //  Injected component
     @Inject
     public ConfigServerBootstrap(ApplicationRepository applicationRepository, RpcServer server,
-                                 VersionState versionState, StateMonitor stateMonitor, VipStatus vipStatus,
-                                 FlagSource flagSource, ConfigConvergenceChecker convergence) {
-        this(applicationRepository, server, versionState, stateMonitor, vipStatus, EXIT_JVM,
-             vipStatusMode(applicationRepository), flagSource, convergence, Clock.systemUTC());
+                                 VersionState versionState, StateMonitor stateMonitor, VipStatus vipStatus) {
+        this(applicationRepository, server, versionState, stateMonitor, vipStatus, EXIT_JVM, vipStatusMode(applicationRepository));
     }
 
     protected ConfigServerBootstrap(ApplicationRepository applicationRepository, RpcServer server,
                                     VersionState versionState, StateMonitor stateMonitor, VipStatus vipStatus,
                                     RedeployingApplicationsFails exitIfRedeployingApplicationsFails,
-                                    VipStatusMode vipStatusMode, FlagSource flagSource, ConfigConvergenceChecker convergence,
-                                    Clock clock) {
+                                    VipStatusMode vipStatusMode) {
         this.applicationRepository = applicationRepository;
         this.server = server;
         this.versionState = versionState;
@@ -93,13 +88,9 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
         this.maxDurationOfRedeployment = Duration.ofSeconds(configserverConfig.maxDurationOfBootstrap());
         this.sleepTimeWhenRedeployingFails = Duration.ofSeconds(configserverConfig.sleepTimeWhenRedeployingFails());
         this.exitIfRedeployingApplicationsFails = exitIfRedeployingApplicationsFails;
-        this.clock = clock;
+        this.clock = applicationRepository.clock();
         rpcServerExecutor = Executors.newSingleThreadExecutor(new DaemonThreadFactory("config server RPC server"));
-        configServerMaintenance = new ConfigServerMaintenance(configserverConfig,
-                                                              applicationRepository,
-                                                              applicationRepository.tenantRepository().getCurator(),
-                                                              flagSource,
-                                                              convergence);
+        configServerMaintenance = new ConfigServerMaintenance(applicationRepository);
         configServerMaintenance.startBeforeBootstrap();
         log.log(Level.FINE, () -> "VIP status mode: " + vipStatusMode);
         initializing(vipStatusMode);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java
index a6516ac361b..a4cc11bd22e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java
@@ -31,16 +31,12 @@ public class ConfigServerMaintenance {
     private final FlagSource flagSource;
     private final ConfigConvergenceChecker convergenceChecker;
 
-    public ConfigServerMaintenance(ConfigserverConfig configserverConfig,
-                                   ApplicationRepository applicationRepository,
-                                   Curator curator,
-                                   FlagSource flagSource,
-                                   ConfigConvergenceChecker convergenceChecker) {
-        this.configserverConfig = configserverConfig;
+    public ConfigServerMaintenance(ApplicationRepository applicationRepository) {
+        this.configserverConfig = applicationRepository.configserverConfig();
         this.applicationRepository = applicationRepository;
-        this.curator = curator;
-        this.flagSource = flagSource;
-        this.convergenceChecker = convergenceChecker;
+        this.curator = applicationRepository.tenantRepository().getCurator();
+        this.flagSource = applicationRepository.flagSource();
+        this.convergenceChecker = applicationRepository.configConvergenceChecker();
     }
 
     public void startBeforeBootstrap() {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
index c8c5bd8cf48..9b6ef7ce197 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
@@ -18,22 +18,18 @@ import com.yahoo.container.handler.VipStatus;
 import com.yahoo.container.jdisc.state.StateMonitor;
 import com.yahoo.docproc.jdisc.metric.NullMetric;
 import com.yahoo.path.Path;
-import com.yahoo.test.ManualClock;
 import com.yahoo.text.Utf8;
-import com.yahoo.vespa.config.server.application.ConfigConvergenceChecker;
 import com.yahoo.vespa.config.server.deploy.DeployTester;
 import com.yahoo.vespa.config.server.rpc.RpcServer;
 import com.yahoo.vespa.config.server.version.VersionState;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
-import com.yahoo.vespa.flags.InMemoryFlagSource;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
-import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
@@ -58,9 +54,6 @@ import static org.junit.Assert.assertTrue;
  */
 public class ConfigServerBootstrapTest {
 
-    private final MockCurator curator = new MockCurator();
-    private final ManualClock clock = new ManualClock();
-
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
@@ -183,12 +176,12 @@ public class ConfigServerBootstrapTest {
     }
 
     private Bootstrapper createBootstrapper(DeployTester tester, RpcServer rpcServer, VipStatusMode vipStatusMode) throws IOException {
-        VersionState versionState = createVersionState();
+        VersionState versionState = createVersionState(tester.curator());
         assertTrue(versionState.isUpgraded());
 
         StateMonitor stateMonitor = StateMonitor.createForTesting();
         VipStatus vipStatus = createVipStatus(stateMonitor);
-        return new Bootstrapper(tester.applicationRepository(), rpcServer, versionState, stateMonitor, vipStatus, vipStatusMode, clock);
+        return new Bootstrapper(tester.applicationRepository(), rpcServer, versionState, stateMonitor, vipStatus, vipStatusMode);
     }
 
     private void waitUntil(BooleanSupplier booleanSupplier, String messageIfWaitingFails) throws InterruptedException {
@@ -241,7 +234,7 @@ public class ConfigServerBootstrapTest {
                              new NullMetric());
     }
 
-    private VersionState createVersionState() throws IOException {
+    private VersionState createVersionState(Curator curator) throws IOException {
         return new VersionState(temporaryFolder.newFile(), curator);
     }
 
@@ -276,10 +269,8 @@ public class ConfigServerBootstrapTest {
                             VersionState versionState,
                             StateMonitor stateMonitor,
                             VipStatus vipStatus,
-                            VipStatusMode vipStatusMode,
-                            Clock clock) {
-            super(applicationRepository, server, versionState, stateMonitor, vipStatus, CONTINUE, vipStatusMode,
-                  new InMemoryFlagSource(), new ConfigConvergenceChecker(), clock);
+                            VipStatusMode vipStatusMode) {
+            super(applicationRepository, server, versionState, stateMonitor, vipStatus, CONTINUE, vipStatusMode);
         }
 
         @Override
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 4b03847571f..62bb4a77916 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
@@ -172,6 +172,10 @@ public class DeployTester {
         return applicationRepository;
     }
 
+    public Curator curator() {
+        return tenantRepository.getCurator();
+    }
+
     private static HostProvisioner createProvisioner() {
         return new InMemoryProvisioner(9, false);
     }