Revert "Jonmv/reapply zk 3.9.1"

1 files changed, 0 insertions, 26 deletions

diff --git a/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java b/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java
deleted file mode 100644
index 78de6c61e17..00000000000
--- a/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.yahoo.vespa.zookeeper.tls;
-
-import com.yahoo.security.tls.ConfigFileBasedTlsContext;
-import com.yahoo.security.tls.TlsContext;
-import com.yahoo.security.tls.TransportSecurityUtils;
-import com.yahoo.vespa.defaults.Defaults;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Optional;
-
-/**
- * @author jonmv
- */
-public class VespaZookeeperTlsContextUtils {
-
-    private static final Path ZOOKEEPER_TLS_CONFIG_FILE = Path.of(Defaults.getDefaults().underVespaHome("var/zookeeper/conf/tls.conf.json"));
-    private static final TlsContext tlsContext = Files.exists(ZOOKEEPER_TLS_CONFIG_FILE)
-                                                 ? new ConfigFileBasedTlsContext(ZOOKEEPER_TLS_CONFIG_FILE, TransportSecurityUtils.getInsecureAuthorizationMode())
-                                                 : TransportSecurityUtils.getSystemTlsContext().orElse(null);
-
-    public static Optional<TlsContext> tlsContext() {
-        return Optional.ofNullable(tlsContext);
-    }
-
-}