Move more code to zookeeper-server-common

6 files changed, 30 insertions, 46 deletions

diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java
index b9cc573d06f..92181e5c2a0 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java
+++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java
@@ -4,12 +4,7 @@ package com.yahoo.vespa.zookeeper;
 import com.google.inject.Inject;
 import com.yahoo.cloud.config.ZookeeperServerConfig;
 import com.yahoo.component.AbstractComponent;
-import org.apache.zookeeper.server.admin.AdminServer;
-import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
-import org.apache.zookeeper.server.quorum.QuorumPeerMain;
 
-import java.io.File;
-import java.io.IOException;
 import java.nio.file.Path;
 
 /**
@@ -25,24 +20,7 @@ public class ReconfigurableVespaZooKeeperServer extends AbstractComponent implem
     }
 
     public void start(Path path) {
-        String[] args = new String[]{ path.toFile().getAbsolutePath()};
-        new Server().initializeAndRun(args);
-    }
-
-    /**
-     * Extends QuorumPeerMain to be able to call initializeAndRun()
-     */
-    static class Server extends QuorumPeerMain {
-
-        @Override
-        protected void initializeAndRun(String[] args) {
-            try {
-                super.initializeAndRun(args);
-            } catch (QuorumPeerConfig.ConfigException | IOException | AdminServer.AdminServerException e) {
-                throw new RuntimeException("Exception when initializing or running ZooKeeper server", e);
-            }
-        }
-
+        new Server().start(path);
     }
 
 }
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Server.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Server.java
new file mode 100644
index 00000000000..2770e98bde4
--- /dev/null
+++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Server.java
@@ -0,0 +1,28 @@
+package com.yahoo.vespa.zookeeper;
+
+import org.apache.zookeeper.server.admin.AdminServer;
+import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
+import org.apache.zookeeper.server.quorum.QuorumPeerMain;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+/**
+ * Extends QuorumPeerMain to be able to call initializeAndRun()
+ */
+class Server extends QuorumPeerMain {
+
+    public void start(Path path) {
+        initializeAndRun(new String[]{ path.toFile().getAbsolutePath()});
+    }
+
+    @Override
+    protected void initializeAndRun(String[] args) {
+        try {
+            super.initializeAndRun(args);
+        } catch (QuorumPeerConfig.ConfigException | IOException | AdminServer.AdminServerException e) {
+            throw new RuntimeException("Exception when initializing or running ZooKeeper server", e);
+        }
+    }
+
+}
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java
index abcf91527c6..2125ed12c5e 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java
+++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java
@@ -4,11 +4,7 @@ package com.yahoo.vespa.zookeeper;
 import com.google.inject.Inject;
 import com.yahoo.cloud.config.ZookeeperServerConfig;
 import com.yahoo.component.AbstractComponent;
-import org.apache.zookeeper.server.admin.AdminServer;
-import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
-import org.apache.zookeeper.server.quorum.QuorumPeerMain;
 
-import java.io.IOException;
 import java.nio.file.Path;
 
 /**
@@ -33,25 +29,7 @@ public class VespaZooKeeperServerImpl extends AbstractComponent implements Vespa
     }
 
     public void start(Path path) {
-        String[] args = new String[]{ path.toFile().getAbsolutePath()};
-        new Server().initializeAndRun(args);
+        new Server().start(path);
     }
 
-    /**
-     * Extends QuorumPeerMain to be able to call initializeAndRun()
-     */
-    static class Server extends QuorumPeerMain {
-
-        @Override
-        protected void initializeAndRun(String[] args) {
-            try {
-                super.initializeAndRun(args);
-            } catch (QuorumPeerConfig.ConfigException | IOException | AdminServer.AdminServerException e) {
-                throw new RuntimeException("Exception when initializing or running ZooKeeper server", e);
-            }
-        }
-
-    }
-
-
 }
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
index 3466b0a8d22..3466b0a8d22 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
+++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
index 492cfffa1ad..492cfffa1ad 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
+++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java
index a93cc40d322..a93cc40d322 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java
+++ b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java