aboutsummaryrefslogtreecommitdiffstats
path: root/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-03-14 14:15:28 +0100
committerHarald Musum <musum@verizonmedia.com>2021-03-14 14:15:28 +0100
commit341dbfac891cca16c11969f80ec38e6643de2e74 (patch)
treec42a76ad21a90d8da273433267984f6f12e66218 /zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client
parent1a5a0672dac03c7f947eb5d8517b95c60493226a (diff)
Add simple test of ZkClientConfigBuilder
Diffstat (limited to 'zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client')
-rw-r--r--zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java
index af75bd7aa5c..0320a76294a 100644
--- a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java
+++ b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java
@@ -30,9 +30,17 @@ public class ZkClientConfigBuilder {
public static final String SSL_ENABLED_CIPHERSUITES_PROPERTY = "zookeeper.ssl.ciphersuites";
public static final String SSL_CLIENTAUTH_PROPERTY = "zookeeper.ssl.clientAuth";
- private static final TlsContext tlsContext = getTlsContext().orElse(null);
+ private static final TlsContext defaultTlsContext = getTlsContext().orElse(null);
- public ZkClientConfigBuilder() {}
+ private final TlsContext tlsContext;
+
+ public ZkClientConfigBuilder() {
+ this(defaultTlsContext);
+ }
+
+ public ZkClientConfigBuilder(TlsContext tlsContext) {
+ this.tlsContext = tlsContext;
+ }
public ZKClientConfig toConfig(Path configFile) throws IOException, QuorumPeerConfig.ConfigException {
String configString = toConfigString();