diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-10-24 13:43:54 +0200 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2019-10-24 13:43:54 +0200 |
| commit | 907dfbc0842202a75be87a126698da8cece031d1 (patch) | |
| tree | d43c05320df90473fc4823d71b9ef3271cd71d3d /clustercontroller-apps | |
| parent | d36f55c5e067ebe8e929a23f236f8498144e785f (diff) | |
Create VespaZooKeeperServer interface and use where appropriate
Diffstat (limited to 'clustercontroller-apps')
2 files changed, 2 insertions, 3 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 4bc09898361..4091363128e 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 @@ -11,7 +11,6 @@ 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.ZooKeeperServer; import java.util.LinkedHashMap; import java.util.Map; 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 index cbb1eb41eac..baad012a234 100644 --- 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 @@ -1,7 +1,7 @@ // 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.ZooKeeperServer; +import com.yahoo.vespa.zookeeper.VespaZooKeeperServer; /** * ZooKeeper provider that ensures we are running our own instance of zookeeper. @@ -10,7 +10,7 @@ import com.yahoo.vespa.zookeeper.ZooKeeperServer; */ public class StandaloneZooKeeperProvider implements ZooKeeperProvider { - public StandaloneZooKeeperProvider(ZooKeeperServer server) { + public StandaloneZooKeeperProvider(VespaZooKeeperServer server) { } } |