This is an automated email from the ASF dual-hosted git repository. amichai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 388d02033270d7defeda0cf5a0a01be129a61774 Author: Amichai Rothman <[email protected]> AuthorDate: Wed Oct 21 14:13:08 2020 +0300 Update some code that doesn't compile against zookeeper 3.6.x --- .../apache/aries/rsa/discovery/zookeeper/server/MyQuorumPeerMain.java | 4 +--- .../aries/rsa/discovery/zookeeper/server/MyZooKeeperServerMain.java | 4 +--- .../apache/aries/rsa/discovery/zookeeper/server/ZookeeperServer.java | 4 +--- .../aries/rsa/discovery/zookeeper/server/ZookeeperStarterTest.java | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) 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 @@ class MyQuorumPeerMain extends QuorumPeerMain implements ZookeeperServer { this.config = config; } - public void startup() throws IOException { + public void startup() throws Exception { runFromConfig(config); } 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 @@ class MyZooKeeperServerMain extends ZooKeeperServerMain implements ZookeeperServ this.config = config; } - public void startup() throws IOException { + public void startup() throws Exception { ServerConfig serverConfig = new ServerConfig(); serverConfig.readFrom(config); runFromConfig(serverConfig); 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(); } 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 @@ public class ZookeeperStarterTest { 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());
