Prepare for supporting zokeeper client config file

2 files changed, 9 insertions, 7 deletions

diff --git a/zkfacade/abi-spec.json b/zkfacade/abi-spec.json
index 9cc49d20262..efe6fbdaa08 100644
--- a/zkfacade/abi-spec.json
+++ b/zkfacade/abi-spec.json
@@ -67,6 +67,7 @@
     ],
     "methods": [
       "public static com.yahoo.vespa.curator.Curator create(java.lang.String)",
+      "public static com.yahoo.vespa.curator.Curator create(java.lang.String, java.util.Optional)",
       "public void <init>(com.yahoo.cloud.config.ConfigserverConfig)",
       "public void <init>(com.yahoo.cloud.config.ConfigserverConfig, com.yahoo.vespa.zookeeper.VespaZooKeeperServer)",
       "protected void <init>(java.lang.String, java.lang.String, java.util.function.Function)",
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
index 0e20710298f..b76bad5b97b 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
@@ -18,12 +18,11 @@ import org.apache.curator.framework.recipes.cache.NodeCacheListener;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
 import org.apache.curator.framework.recipes.locks.InterProcessLock;
 import org.apache.curator.framework.recipes.locks.InterProcessMutex;
-import org.apache.curator.framework.state.ConnectionState;
-import org.apache.curator.framework.state.ConnectionStateListener;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.data.Stat;
 
+import java.io.File;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
@@ -59,6 +58,11 @@ public class Curator implements AutoCloseable {
 
     /** Creates a curator instance from a comma-separated string of ZooKeeper host:port strings */
     public static Curator create(String connectionSpec) {
+        return Curator.create(connectionSpec, Optional.empty());
+    }
+
+    /** Creates a curator instance from a comma-separated string of ZooKeeper host:port strings */
+    public static Curator create(String connectionSpec, Optional<File> clientConfigFile) {
         return new Curator(connectionSpec, connectionSpec);
     }
 
@@ -174,11 +178,8 @@ public class Curator implements AutoCloseable {
 
     // To avoid getting warning in log, see ticket 6389740
     private void addFakeListener() {
-        curatorFramework.getConnectionStateListenable().addListener(new ConnectionStateListener() {
-            @Override
-            public void stateChanged(CuratorFramework curatorFramework, ConnectionState connectionState) {
-                // empty, not needed now
-            }
+        curatorFramework.getConnectionStateListenable().addListener((curatorFramework, connectionState) -> {
+            // empty, not needed now
         });
     }