Inline watcher and rename class

5 files changed, 15 insertions, 33 deletions

diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/LoggingWatcher.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/LoggingWatcher.java
deleted file mode 100644
index dfd99d38505..00000000000
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/LoggingWatcher.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.zookeeper;
-
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-class LoggingWatcher implements Watcher {
-
-    private static final Logger log = java.util.logging.Logger.getLogger(LoggingWatcher.class.getName());
-
-    @Override
-    public void process(WatchedEvent event) {
-        log.log(Level.INFO, event.toString());
-    }
-
-}
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZkAdminImpl.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
index 854ba9964e6..c85dd98ad8e 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZkAdminImpl.java
+++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
@@ -9,16 +9,17 @@ import java.nio.charset.StandardCharsets;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class ZkAdminImpl implements ZkAdmin {
+@SuppressWarnings("unused") // Created by injection
+public class VespaZooKeeperAdminImpl implements VespaZooKeeperAdmin {
 
-    private static final Logger log = java.util.logging.Logger.getLogger(ZkAdminImpl.class.getName());
+    private static final Logger log = java.util.logging.Logger.getLogger(VespaZooKeeperAdminImpl.class.getName());
 
     @Override
     public void reconfigure(String connectionSpec, String joiningServers, String leavingServers) throws ReconfigException {
         try {
             ZooKeeperAdmin zooKeeperAdmin = new ZooKeeperAdmin(connectionSpec,
                                                                (int) sessionTimeout().toMillis(),
-                                                               new LoggingWatcher());
+                                                               (event) -> log.log(Level.INFO, event.toString()));
             long fromConfig = -1;
             // Using string parameters because the List variant of reconfigure fails to join empty lists (observed on 3.5.6, fixed in 3.7.0)
             byte[] appliedConfig = zooKeeperAdmin.reconfigure(joiningServers, leavingServers, null, fromConfig, null);
diff --git a/zookeeper-server/zookeeper-server-common/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..7dcb9d2ec11 100644
--- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
+++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
@@ -38,11 +38,11 @@ public class Reconfigurer extends AbstractComponent {
     private ZooKeeperRunner zooKeeperRunner;
     private ZookeeperServerConfig activeConfig;
 
-    protected final ZkAdmin zkAdmin;
+    protected final VespaZooKeeperAdmin vespaZooKeeperAdmin;
 
     @Inject
-    public Reconfigurer(ZkAdmin zkAdmin) {
-        this.zkAdmin = zkAdmin;
+    public Reconfigurer(VespaZooKeeperAdmin vespaZooKeeperAdmin) {
+        this.vespaZooKeeperAdmin = vespaZooKeeperAdmin;
         log.log(Level.FINE, "Created ZooKeeperReconfigurer");
     }
 
@@ -95,7 +95,7 @@ public class Reconfigurer extends AbstractComponent {
         for (int attempts = 1; Instant.now().isBefore(end); attempts++) {
             try {
                 Instant reconfigStarted = Instant.now();
-                zkAdmin.reconfigure(connectionSpec, joiningServers, leavingServers);
+                vespaZooKeeperAdmin.reconfigure(connectionSpec, joiningServers, leavingServers);
                 Instant reconfigEnded = Instant.now();
                 log.log(Level.INFO, "Reconfiguration completed in " +
                                     Duration.between(reconfigTriggered, reconfigEnded) +
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZkAdmin.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdmin.java
index fb62f662566..1a7bf483ac5 100644
--- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZkAdmin.java
+++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdmin.java
@@ -8,7 +8,7 @@ import java.time.Duration;
  *
  * @author hmusum
  */
-public interface ZkAdmin {
+public interface VespaZooKeeperAdmin {
 
     void reconfigure(String connectionSpec, String joiningServers, String leavingServers) throws ReconfigException;
 
diff --git a/zookeeper-server/zookeeper-server-common/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 1907daf6c2d..020c84f74fb 100644
--- a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java
+++ b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java
@@ -36,7 +36,7 @@ public class ReconfigurerTest {
     public void setup() throws IOException {
         cfgFile = folder.newFile();
         idFile = folder.newFile("myid");
-        reconfigurer = new TestableReconfigurer(new TestableZkAdmin());
+        reconfigurer = new TestableReconfigurer(new TestableVespaZooKeeperAdmin());
     }
 
     @Test
@@ -71,7 +71,7 @@ public class ReconfigurerTest {
 
     @Test
     public void testReconfigureFailsWithReconfigInProgressThenSucceeds() {
-        reconfigurer = new TestableReconfigurer(new TemporarilyFailZkAdmin());
+        reconfigurer = new TestableReconfigurer(new TemporarilyFailVespaZooKeeperAdmin());
         ZookeeperServerConfig initialConfig = createConfig(3, true);
         reconfigurer.startOrReconfigure(initialConfig);
         assertSame(initialConfig, reconfigurer.activeConfig());
@@ -121,9 +121,9 @@ public class ReconfigurerTest {
 
     private static class TestableReconfigurer extends Reconfigurer implements VespaZooKeeperServer{
 
-        private final TestableZkAdmin zkReconfigurer;
+        private final TestableVespaZooKeeperAdmin zkReconfigurer;
 
-        TestableReconfigurer(TestableZkAdmin zkReconfigurer) {
+        TestableReconfigurer(TestableVespaZooKeeperAdmin zkReconfigurer) {
             super(zkReconfigurer);
             this.zkReconfigurer = zkReconfigurer;
             HostName.setHostNameForTestingOnly("node1");
@@ -159,7 +159,7 @@ public class ReconfigurerTest {
 
     }
 
-    private static class TestableZkAdmin implements ZkAdmin {
+    private static class TestableVespaZooKeeperAdmin implements VespaZooKeeperAdmin {
 
         String connectionSpec;
         String joiningServers;
@@ -177,7 +177,7 @@ public class ReconfigurerTest {
     }
 
     // Fails 3 times with KeeperException.ReconfigInProgress(), then succeeds
-    private static class TemporarilyFailZkAdmin extends TestableZkAdmin {
+    private static class TemporarilyFailVespaZooKeeperAdmin extends TestableVespaZooKeeperAdmin {
 
         private int attempts = 0;