Change 'TlsContext' interface to return `X509SslContext'

2 files changed, 4 insertions, 19 deletions

diff --git a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java
index 76844ec1f8c..9cc71eab96e 100644
--- a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java
+++ b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/VespaSslContextProvider.java
@@ -1,7 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.zookeeper.client;
 
-import com.yahoo.security.tls.TlsContext;
 import com.yahoo.security.tls.TransportSecurityUtils;
 
 import javax.net.ssl.SSLContext;
@@ -14,7 +13,8 @@ import java.util.function.Supplier;
  */
 public class VespaSslContextProvider implements Supplier<SSLContext> {
 
-    private static final SSLContext sslContext = TransportSecurityUtils.getSystemTlsContext().map(TlsContext::context).orElse(null);
+    private static final SSLContext sslContext = TransportSecurityUtils.getSystemTlsContext()
+            .map(tc -> tc.sslContext().context()).orElse(null);
 
     @Override
     public SSLContext get() {
diff --git a/zookeeper-client-common/src/test/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilderTest.java b/zookeeper-client-common/src/test/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilderTest.java
index eae0ae48ab5..56bfe8381c2 100644
--- a/zookeeper-client-common/src/test/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilderTest.java
+++ b/zookeeper-client-common/src/test/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilderTest.java
@@ -1,14 +1,12 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.zookeeper.client;
 
+import com.yahoo.security.X509SslContext;
 import com.yahoo.security.tls.TlsContext;
 import org.apache.zookeeper.client.ZKClientConfig;
 import org.junit.jupiter.api.Test;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
-
 import java.util.List;
 
 import static com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder.CLIENT_CONNECTION_SOCKET;
@@ -49,10 +47,7 @@ public class ZkClientConfigBuilderTest {
 
     private static class MockTlsContext implements TlsContext {
 
-        @Override
-        public SSLContext context() {
-            return null;
-        }
+        @Override public X509SslContext sslContext() { return X509SslContext.getDefault(); }
 
         @Override
         public SSLParameters parameters() {
@@ -62,16 +57,6 @@ public class ZkClientConfigBuilderTest {
             parameters.setNeedClientAuth(true);
             return parameters;
         }
-
-        @Override
-        public SSLEngine createSslEngine() {
-            return null;
-        }
-
-        @Override
-        public SSLEngine createSslEngine(String peerHost, int peerPort) {
-            return null;
-        }
     }