Merge pull request #15832 from vespa-engine/revert-15831-revert-15824-revert-15821-revert-15812-hmuusum/remove-unnecessary-dependency

Stop depending on ZooKeeperProvider, take 3

5 files changed, 11 insertions, 59 deletions

diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java
index 9020765f777..ff7cbbf83da 100644
--- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java
+++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.apps.clustercontroller;
 
 import com.google.inject.Inject;
@@ -11,6 +11,7 @@ import com.yahoo.vespa.clustercontroller.core.RemoteClusterControllerTaskSchedul
 import com.yahoo.vespa.clustercontroller.core.restapiv2.ClusterControllerStateRestAPI;
 import com.yahoo.vespa.clustercontroller.core.status.StatusHandler;
 import com.yahoo.vespa.curator.Curator;
+import com.yahoo.vespa.zookeeper.VespaZooKeeperServer;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -30,12 +31,12 @@ public class ClusterController extends AbstractComponent
     private final Map<String, StatusHandler.ContainerStatusPageServer> status = new TreeMap<>();
 
     /**
-     * Dependency injection constructor for controller. {@link ZooKeeperProvider} argument given
+     * Dependency injection constructor for controller. {@link VespaZooKeeperServer} argument given
      * to ensure that zookeeper has started before we start polling it.
      */
     @SuppressWarnings("unused")
     @Inject
-    public ClusterController(ZooKeeperProvider zooKeeperProvider) {
+    public ClusterController(VespaZooKeeperServer ignored) {
         this();
     }
 
@@ -43,7 +44,6 @@ public class ClusterController extends AbstractComponent
         metricWrapper = new JDiscMetricWrapper(null);
     }
 
-
     public void setOptions(FleetControllerOptions options, Metric metricImpl) throws Exception {
         metricWrapper.updateMetricImplementation(metricImpl);
         verifyThatZooKeeperWorks(options);
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/DummyZooKeeperProvider.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/DummyZooKeeperProvider.java
deleted file mode 100644
index f961297643e..00000000000
--- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/DummyZooKeeperProvider.java
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.clustercontroller.apps.clustercontroller;
-
-/**
- * A dummy zookeeper provider when we do not run our own zookeeper instance.
- *
- * @author Ulf Lilleengen
- */
-public class DummyZooKeeperProvider implements ZooKeeperProvider {
-}
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StandaloneZooKeeperProvider.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StandaloneZooKeeperProvider.java
deleted file mode 100644
index baad012a234..00000000000
--- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StandaloneZooKeeperProvider.java
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.clustercontroller.apps.clustercontroller;
-
-import com.yahoo.vespa.zookeeper.VespaZooKeeperServer;
-
-/**
- * ZooKeeper provider that ensures we are running our own instance of zookeeper.
- *
- * @author Ulf Lilleengen
- */
-public class StandaloneZooKeeperProvider implements ZooKeeperProvider {
-
-    public StandaloneZooKeeperProvider(VespaZooKeeperServer server) {
-    }
-
-}
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ZooKeeperProvider.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ZooKeeperProvider.java
deleted file mode 100644
index bb18bcc65d6..00000000000
--- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ZooKeeperProvider.java
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.clustercontroller.apps.clustercontroller;
-
-/**
- * Abstraction we can depend on providing us with a zookeeper server being up.
- *
- * @author Ulf Lilleengen
- */
-public interface ZooKeeperProvider {
-}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index 14fbeb17aaf..b2aa1e6b704 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -54,23 +54,11 @@ public class ClusterControllerContainer extends Container implements
                    "com.yahoo.vespa.clustercontroller.apps.clustercontroller.StateRestApiV2Handler",
                    "/cluster/v2/*",
                    CLUSTERCONTROLLER_BUNDLE);
-        if (runStandaloneZooKeeper) {
-            addComponent("clustercontroller-zkrunner",
-                         "com.yahoo.vespa.zookeeper.VespaZooKeeperServerImpl",
-                         ZOOKEEPER_SERVER_BUNDLE);
-            addComponent("clustercontroller-zkprovider",
-                         "com.yahoo.vespa.clustercontroller.apps.clustercontroller.StandaloneZooKeeperProvider",
-                         CLUSTERCONTROLLER_BUNDLE);
-        } else {
-            // TODO bjorncs/jonmv: remove extraneous ZooKeeperProvider layer
-            addComponent(
-                    "clustercontroller-zkrunner",
-                    "com.yahoo.vespa.zookeeper.DummyVespaZooKeeperServer",
-                    ZOOKEEPER_SERVER_BUNDLE);
-            addComponent("clustercontroller-zkprovider",
-                         "com.yahoo.vespa.clustercontroller.apps.clustercontroller.DummyZooKeeperProvider",
-                         CLUSTERCONTROLLER_BUNDLE);
-        }
+        addComponent("clustercontroller-zookeeper-server",
+                     runStandaloneZooKeeper
+                             ? "com.yahoo.vespa.zookeeper.VespaZooKeeperServerImpl"
+                             : "com.yahoo.vespa.zookeeper.DummyVespaZooKeeperServer",
+                     ZOOKEEPER_SERVER_BUNDLE);
         addComponent(new AccessLogComponent(AccessLogComponent.AccessLogType.jsonAccessLog, "controller", isHosted));
 
         // TODO: Why are bundles added here instead of in the cluster?
@@ -96,7 +84,7 @@ public class ClusterControllerContainer extends Container implements
         return ContainerServiceType.CLUSTERCONTROLLER_CONTAINER;
     }
 
-    private void addHandler(Handler h, String path) {
+    private void addHandler(Handler<?> h, String path) {
         h.addServerBindings(SystemBindingPattern.fromHttpPath(path));
         super.addHandler(h);
     }
@@ -116,7 +104,7 @@ public class ClusterControllerContainer extends Container implements
     }
 
     private void addHandler(String id, String className, String path, ComponentSpecification bundle) {
-        addHandler(new Handler(createComponentModel(id, className, bundle)), path);
+        addHandler(new Handler<>(createComponentModel(id, className, bundle)), path);
     }
 
     private ReindexingContext reindexingContext() {