diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-17 01:03:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-17 01:03:51 +0200 |
| commit | aab6f6789c6529fc106aeb7249cf7ba3db63715f (patch) | |
| tree | 7c6c7c26af95fcf9513a91b76f79d8edae037d03 | |
| parent | ec278bedb5a787309d11d356018ad5e2afc0862a (diff) | |
| parent | d9b6c2bae8de6708625a05b4ad6224fb36f8cb7e (diff) | |
Merge pull request #10999 from vespa-engine/hmusum/add-constructor-for-testing
Add constructor without ZooKeeperServer argument, for testing
| -rw-r--r-- | zkfacade/abi-spec.json | 1 | ||||
| -rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java | 5 | ||||
| -rw-r--r-- | zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/zkfacade/abi-spec.json b/zkfacade/abi-spec.json index 7547a29fd6c..27027287d39 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 void <init>(com.yahoo.cloud.config.ConfigserverConfig)", "public void <init>(com.yahoo.cloud.config.ConfigserverConfig, com.yahoo.vespa.zookeeper.ZooKeeperServer)", "protected void <init>(java.lang.String, java.lang.String, java.util.function.Function)", "public java.lang.String connectionSpec()", 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 a543d43abcd..dc51c82b5e6 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java @@ -64,6 +64,11 @@ public class Curator implements AutoCloseable { return new Curator(connectionSpec, connectionSpec); } + // For testing + public Curator(ConfigserverConfig configserverConfig) { + this(configserverConfig, createConnectionSpec(configserverConfig)); + } + // Depend on ZooKeeperServer to make sure it is started first // TODO: Move zookeeperserver config out of configserverconfig (requires update of controller services.xml as well) @Inject diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java index 566df91dfb0..a8342dfe5bc 100644 --- a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java +++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java @@ -99,7 +99,7 @@ public class CuratorTest { } private Curator createCurator(ConfigserverConfig configserverConfig) { - return new Curator(configserverConfig, null); + return new Curator(configserverConfig); } private static class PortAllocator { |