commit 388d02033270d7defeda0cf5a0a01be129a61774
author Amichai Rothman <amichai@apache.org> Wed Oct 21 14:13:08 2020 +0300
committer Amichai Rothman <amichai@apache.org> Wed Mar 10 00:56:34 2021 +0200
tree 1e4d5d8c266704114f537bc80f7d7d96806a9268
parent c3647206d76247e7985c727316f12a3542019e8e

Update some code that doesn't compile against zookeeper 3.6.x

discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyQuorumPeerMain.java

diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyQuorumPeerMain.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyQuorumPeerMain.java
index ca2ee1c..8b3badf 100644
--- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyQuorumPeerMain.java
+++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyQuorumPeerMain.java
@@ -18,8 +18,6 @@
  */
 package org.apache.aries.rsa.discovery.zookeeper.server;
 
-import java.io.IOException;
-
 import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
 import org.apache.zookeeper.server.quorum.QuorumPeerMain;
 
@@ -31,7 +29,7 @@
         this.config = config;
     }
 
-    public void startup() throws IOException {
+    public void startup() throws Exception {
         runFromConfig(config);
     }
 

discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyZooKeeperServerMain.java

diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyZooKeeperServerMain.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyZooKeeperServerMain.java
index a99275e..414a1f9 100644
--- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyZooKeeperServerMain.java
+++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/MyZooKeeperServerMain.java
@@ -18,8 +18,6 @@
  */
 package org.apache.aries.rsa.discovery.zookeeper.server;
 
-import java.io.IOException;
-
 import org.apache.zookeeper.server.ServerConfig;
 import org.apache.zookeeper.server.ZooKeeperServerMain;
 import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
@@ -35,7 +33,7 @@
         this.config = config;
     }
 
-    public void startup() throws IOException {
+    public void startup() throws Exception {
         ServerConfig serverConfig = new ServerConfig();
         serverConfig.readFrom(config);
         runFromConfig(serverConfig);

discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperServer.java

diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperServer.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperServer.java
index aa95a2e..235aa97 100644
--- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperServer.java
+++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperServer.java
@@ -18,9 +18,7 @@
  */
 package org.apache.aries.rsa.discovery.zookeeper.server;
 
-import java.io.IOException;
-
 interface ZookeeperServer {
-    void startup() throws IOException;
+    void startup() throws Exception;
     void shutdown();
 }

discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperStarterTest.java

diff --git a/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperStarterTest.java b/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperStarterTest.java
index 2833f7f..94c3fce 100644
--- a/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperStarterTest.java
+++ b/discovery/zookeeper/src/test/java/org/apache/aries/rsa/discovery/zookeeper/server/ZookeeperStarterTest.java
@@ -84,7 +84,7 @@
 
     private void verifyConfig(final File tempDir) {
         assertEquals(1234, config.getClientPortAddress().getPort());
-        assertTrue(config.getDataDir().contains(tempDir + File.separator + "zkdata"));
+        assertTrue(config.getDataDir().toString().contains(tempDir + File.separator + "zkdata"));
         assertEquals(2000, config.getTickTime());
         assertEquals(10, config.getInitLimit());
         assertEquals(5, config.getSyncLimit());