Create VespaZooKeeperServer interface and use where appropriate

3 files changed, 20 insertions, 8 deletions

diff --git a/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java b/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java
new file mode 100644
index 00000000000..5a1f31a75c3
--- /dev/null
+++ b/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java
@@ -0,0 +1,11 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.zookeeper;
+
+/**
+ * Interface for a component that writes zookeeper config and starts a zookeeper server.
+ *
+ * @author Harald Musum
+ */
+public interface VespaZooKeeperServer {
+
+}
diff --git a/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java b/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java
index 252dc6697b0..5b4c0c11e80 100644
--- a/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
+++ b/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java
@@ -18,16 +18,17 @@ import java.util.stream.Collectors;
  * Writes zookeeper config and starts zookeeper server.
  *
  * @author Ulf Lilleengen
+ * @author Harald Musum
  */
-public class ZooKeeperServer extends AbstractComponent implements Runnable {
+public class VespaZooKeeperServerImpl extends AbstractComponent implements Runnable, VespaZooKeeperServer {
 
-    private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(ZooKeeperServer.class.getName());
+    private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(VespaZooKeeperServerImpl.class.getName());
     private static final String ZOOKEEPER_JMX_LOG4J_DISABLE = "zookeeper.jmx.log4j.disable";
     static final String ZOOKEEPER_JUTE_MAX_BUFFER = "jute.maxbuffer";
     private final Thread zkServerThread;
     private final ZookeeperServerConfig zookeeperServerConfig;
 
-    ZooKeeperServer(ZookeeperServerConfig zookeeperServerConfig, boolean startServer) {
+    VespaZooKeeperServerImpl(ZookeeperServerConfig zookeeperServerConfig, boolean startServer) {
         this.zookeeperServerConfig = zookeeperServerConfig;
         System.setProperty("zookeeper.jmx.log4j.disable", "true");
         System.setProperty("zookeeper.snapshot.trust.empty", Boolean.valueOf(zookeeperServerConfig.trustEmptySnapshot()).toString());
@@ -41,7 +42,7 @@ public class ZooKeeperServer extends AbstractComponent implements Runnable {
     }
 
     @Inject
-    public ZooKeeperServer(ZookeeperServerConfig zookeeperServerConfig) {
+    public VespaZooKeeperServerImpl(ZookeeperServerConfig zookeeperServerConfig) {
         this(zookeeperServerConfig, true);
     }
 
diff --git a/zookeeper-server/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java b/zookeeper-server/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java
index 3f33892fd45..1081c5fda61 100644
--- a/zookeeper-server/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java
+++ b/zookeeper-server/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java
@@ -17,7 +17,7 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 /**
  * Tests the zookeeper server.
  */
-public class ZooKeeperServerTest {
+public class VespaZooKeeperServerImplTest {
 
     @Rule
     public TemporaryFolder folder = new TemporaryFolder();
@@ -53,7 +53,7 @@ public class ZooKeeperServerTest {
     }
 
     private void createServer(ZookeeperServerConfig.Builder builder) {
-        new ZooKeeperServer(new ZookeeperServerConfig(builder), false);
+        new VespaZooKeeperServerImpl(new ZookeeperServerConfig(builder), false);
     }
 
     @Test(expected = RuntimeException.class)
@@ -77,12 +77,12 @@ public class ZooKeeperServerTest {
         builder.myidFile(idFile.getAbsolutePath());
 
         createServer(builder);
-        assertThat(System.getProperty(ZooKeeperServer.ZOOKEEPER_JUTE_MAX_BUFFER), is("" + new ZookeeperServerConfig(builder).juteMaxBuffer()));
+        assertThat(System.getProperty(VespaZooKeeperServerImpl.ZOOKEEPER_JUTE_MAX_BUFFER), is("" + new ZookeeperServerConfig(builder).juteMaxBuffer()));
 
         final int max_buffer = 1;
         builder.juteMaxBuffer(max_buffer);
         createServer(builder);
-        assertThat(System.getProperty(ZooKeeperServer.ZOOKEEPER_JUTE_MAX_BUFFER), is("" + max_buffer));
+        assertThat(System.getProperty(VespaZooKeeperServerImpl.ZOOKEEPER_JUTE_MAX_BUFFER), is("" + max_buffer));
     }
 
     private ZookeeperServerConfig.Server.Builder newServer(int id, String hostName, int electionPort, int quorumPort) {