From 2be46dfce90f7a725e814aabb69cc2d547e40d42 Mon Sep 17 00:00:00 2001 From: jaysunxiao Date: Sat, 10 Jul 2021 11:39:04 +0800 Subject: [PATCH] =?UTF-8?q?perf[orm]:=20=E7=AE=80=E5=8C=96=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zfoo/net/base/bio/chat/BioServerTest.java | 3 +- .../netty/echoserver1/EchoServerTest.java | 2 -- .../netty/echoserver2/EchoClientHandler.java | 2 +- .../net/zookeeper/ZookeeperConstantTest.java | 29 ------------------- .../base/create/CreateNodeASyncTest.java | 3 +- .../base/create/CreateNodeSyncAuthTest.java | 3 +- .../base/create/CreateNodeSyncTest.java | 3 +- .../base/delete/DeleteNodeASyncTest.java | 3 +- .../base/delete/DeleteNodeSyncTest.java | 3 +- .../base/query/GetChildrenASyncTest.java | 3 +- .../base/query/GetChildrenSyncTest.java | 4 +-- .../base/query/GetDataASyncTest.java | 4 +-- .../zookeeper/base/query/GetDataSyncTest.java | 4 +-- .../base/query/NodeExistsASyncTest.java | 4 +-- .../base/query/NodeExistsSyncTest.java | 4 +-- .../base/update/UpdateNodeASyncTest.java | 4 +-- .../base/update/UpdateNodeSyncTest.java | 4 +-- .../curator/cache/PathCacheTest.java | 4 +-- .../curator/cache/TreeCacheTest.java | 4 +-- .../curator/create/CreateNodeASyncTest.java | 4 +-- .../curator/create/CreateNodeAuthTest.java | 6 ++-- .../curator/create/CreateNodeSyncTest.java | 3 +- .../curator/delete/DeleteNodeTest.java | 4 +-- .../curator/query/GetChildrenTest.java | 4 +-- .../zookeeper/curator/query/GetDataTest.java | 4 +-- .../curator/query/NodeExistsTest.java | 6 ++-- .../curator/update/UpdateDataTest.java | 3 +- .../atomicint/DistributedAtomicIntTest.java | 4 +-- .../DistributedBarrierTest.java | 4 +-- .../distributedlock/DistributedLockTest.java | 4 +-- .../nodecache/NodeChildrenListenerTest.java | 4 +-- .../recipes/nodecache/NodeListenerTest.java | 4 +-- 32 files changed, 52 insertions(+), 92 deletions(-) delete mode 100644 net/src/test/java/com/zfoo/net/zookeeper/ZookeeperConstantTest.java diff --git a/net/src/test/java/com/zfoo/net/base/bio/chat/BioServerTest.java b/net/src/test/java/com/zfoo/net/base/bio/chat/BioServerTest.java index 6f198b8a..93d206b7 100644 --- a/net/src/test/java/com/zfoo/net/base/bio/chat/BioServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/bio/chat/BioServerTest.java @@ -120,8 +120,7 @@ public class BioServerTest { Thread clienThread = new Thread(serverChannel); listClient.add(serverChannel); clienThread.start(); - System.out - .println("server started! Connect to client successfully"); + System.out.println("server started! Connect to client successfully"); } } catch (IOException e) { diff --git a/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoServerTest.java b/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoServerTest.java index 86a8fcd3..1bdbb216 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoServerTest.java +++ b/net/src/test/java/com/zfoo/net/base/netty/echoserver1/EchoServerTest.java @@ -49,7 +49,6 @@ public class EchoServerTest { EventLoopGroup bossGroup = new NioEventLoopGroup();//服务端接受客户端连接 EventLoopGroup workerGroup = new NioEventLoopGroup();//SocketChannel的网络读写 try { - System.out.println("sdfs"); ServerBootstrap bootstrap = new ServerBootstrap(); bootstrap.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class) .option(ChannelOption.SO_BACKLOG, 100).handler(new LoggingHandler(LogLevel.INFO)) @@ -59,7 +58,6 @@ public class EchoServerTest { ChannelFuture future = bootstrap.bind(port).sync(); //等待服务端监听端口关闭 future.channel().closeFuture().sync(); - System.out.println("sdfs"); } catch (InterruptedException e) { e.printStackTrace(); } finally { diff --git a/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoClientHandler.java b/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoClientHandler.java index 394e8842..b705b923 100644 --- a/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoClientHandler.java +++ b/net/src/test/java/com/zfoo/net/base/netty/echoserver2/EchoClientHandler.java @@ -23,7 +23,7 @@ public class EchoClientHandler extends ChannelInboundHandlerAdapter { @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { - System.out.println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh"); + System.out.println(StringUtils.format("received msg [{}]", msg)); } @Override diff --git a/net/src/test/java/com/zfoo/net/zookeeper/ZookeeperConstantTest.java b/net/src/test/java/com/zfoo/net/zookeeper/ZookeeperConstantTest.java deleted file mode 100644 index c19fa8a2..00000000 --- a/net/src/test/java/com/zfoo/net/zookeeper/ZookeeperConstantTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zfoo.net.zookeeper; - -/** - * 引子和趣闻： - * Zookeeper名字的由来是比较有趣的，下面的片段摘抄自《从PAXOS到ZOOKEEPER分布式一致性原理与实践》一书： - * Zookeeper最早起源于雅虎的研究院的一个研究小组。在当时，研究人员发现，在雅虎内部很多大型的系统需要依赖一个类似的系统进行分布式协调， - * 但是这些系统往往存在分布式单点问题。所以雅虎的开发人员就试图开发一个通用的无单点问题的分布式协调框架。 - * 在立项初期，考虑到很多项目都是用动物的名字来命名的(例如著名的Pig项目)，雅虎的工程师希望给这个项目也取一个动物的名字。 - * 时任研究院的首席科学家Raghu Ramakrishnan开玩笑说：再这样下去，我们这儿就变成动物园了。 - * 此话一出，大家纷纷表示就叫动物园管理员吧——因为各个以动物命名的分布式组件放在一起，雅虎的整个分布式系统看上去就像一个大型的动物园了， - * 而Zookeeper正好用来进行分布式环境的协调——于是，Zookeeper的名字由此诞生了。 - *

- * Curator无疑是Zookeeper客户端中的瑞士军刀，它译作"馆长"或者''管理者''，不知道是不是开发小组有意而为之， - * 笔者猜测有可能这样命名的原因是说明Curator就是Zookeeper的馆长(脑洞有点大：Curator就是动物园的园长)。 - *

- * curator-framework：对zookeeper的底层api的一些封装 - * curator-client：提供一些客户端的操作，例如重试策略等 - * curator-recipes：封装了一些高级特性，如：Cache事件监听、选举、分布式锁、分布式计数器、分布式Barrier等 - * - * @author jaysunxiao - * @version 1.0 - * @since 2018-04-03 15:29 - */ - -public abstract class ZookeeperConstantTest { - - public static String URL = "localhost:2181"; - -} diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeASyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeASyncTest.java index 7310298c..6b5f247a 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeASyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeASyncTest.java @@ -1,6 +1,5 @@ package com.zfoo.net.zookeeper.base.create; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; import org.apache.zookeeper.*; import org.apache.zookeeper.Watcher.Event.EventType; import org.apache.zookeeper.Watcher.Event.KeeperState; @@ -20,7 +19,7 @@ public class CreateNodeASyncTest { // 异步创建一个节点 @Test public void test() throws IOException, InterruptedException { - ZooKeeper zookeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new CreateNodeASyncWatcher()); + ZooKeeper zookeeper = new ZooKeeper("localhost:2181", 5000, new CreateNodeASyncWatcher()); System.out.println(zookeeper.getState()); diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeSyncAuthTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeSyncAuthTest.java index 4cb5e01c..b88b978a 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeSyncAuthTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeSyncAuthTest.java @@ -1,6 +1,5 @@ package com.zfoo.net.zookeeper.base.create; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; import org.apache.zookeeper.*; import org.apache.zookeeper.Watcher.Event.EventType; import org.apache.zookeeper.Watcher.Event.KeeperState; @@ -26,7 +25,7 @@ public class CreateNodeSyncAuthTest { @Test public void test() throws IOException, InterruptedException { - zookeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new CreateNodeSyncAuthWatcher()); + zookeeper = new ZooKeeper("localhost:2181", 5000, new CreateNodeSyncAuthWatcher()); System.out.println(zookeeper.getState()); Thread.sleep(Integer.MAX_VALUE); } diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeSyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeSyncTest.java index e1b30b14..1442a800 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeSyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/create/CreateNodeSyncTest.java @@ -1,6 +1,5 @@ package com.zfoo.net.zookeeper.base.create; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; import org.apache.zookeeper.*; import org.apache.zookeeper.Watcher.Event.EventType; import org.apache.zookeeper.Watcher.Event.KeeperState; @@ -21,7 +20,7 @@ public class CreateNodeSyncTest { @Test public void test() throws IOException, InterruptedException, KeeperException { // 这个创建zookeeper的链接是异步的 - ZooKeeper zookeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new CreateNodeSyncWatcher()); + ZooKeeper zookeeper = new ZooKeeper("localhost:2181", 5000, new CreateNodeSyncWatcher()); System.out.println(zookeeper.getState()); diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/delete/DeleteNodeASyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/delete/DeleteNodeASyncTest.java index 770968df..f2e302f8 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/delete/DeleteNodeASyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/delete/DeleteNodeASyncTest.java @@ -1,6 +1,5 @@ package com.zfoo.net.zookeeper.base.delete; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; import org.apache.zookeeper.AsyncCallback; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -21,7 +20,7 @@ public class DeleteNodeASyncTest { @Test public void test() throws IOException, InterruptedException { - ZooKeeper zooKeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new DeleteNodeASyncWatcher()); + ZooKeeper zooKeeper = new ZooKeeper("localhost:2181", 5000, new DeleteNodeASyncWatcher()); System.out.println(zooKeeper.getState().toString()); connectedSemaphore.await(); diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/delete/DeleteNodeSyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/delete/DeleteNodeSyncTest.java index 00f4c38b..c40014a4 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/delete/DeleteNodeSyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/delete/DeleteNodeSyncTest.java @@ -1,6 +1,5 @@ package com.zfoo.net.zookeeper.base.delete; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -20,7 +19,7 @@ public class DeleteNodeSyncTest { @Test public void test() throws IOException, InterruptedException, KeeperException { - ZooKeeper zooKeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new DeleteNodeSyncWatcher()); + ZooKeeper zooKeeper = new ZooKeeper("localhost:2181", 5000, new DeleteNodeSyncWatcher()); System.out.println(zooKeeper.getState().toString()); connectedSemaphore.await(); diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetChildrenASyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetChildrenASyncTest.java index c3d585b4..f05be635 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetChildrenASyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetChildrenASyncTest.java @@ -1,6 +1,5 @@ package com.zfoo.net.zookeeper.base.query; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; import org.apache.zookeeper.AsyncCallback; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -21,7 +20,7 @@ public class GetChildrenASyncTest { @Test public void test() throws IOException, InterruptedException { - zooKeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new GetChildrenASyncWatcher()); + zooKeeper = new ZooKeeper("localhost:2181", 5000, new GetChildrenASyncWatcher()); System.out.println(zooKeeper.getState().toString()); Thread.sleep(Integer.MAX_VALUE); } diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetChildrenSyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetChildrenSyncTest.java index 10d5eb84..905bd771 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetChildrenSyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetChildrenSyncTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.base.query; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -22,7 +22,7 @@ public class GetChildrenSyncTest { @Test public void test() throws IOException, InterruptedException, KeeperException { - zk = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new GetChildrenSyncWatcher()); + zk = new ZooKeeper("localhost:2181", 5000, new GetChildrenSyncWatcher()); System.out.println(zk.getState().toString()); connectedSemaphore.await(); diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetDataASyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetDataASyncTest.java index 914c48c6..583f5afd 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetDataASyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetDataASyncTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.base.query; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.zookeeper.*; import org.apache.zookeeper.Watcher.Event.EventType; import org.apache.zookeeper.Watcher.Event.KeeperState; @@ -21,7 +21,7 @@ public class GetDataASyncTest { // ZooKeeper API 获取节点数据内容，使用异步(async)接口。 @Test public void test() throws IOException, InterruptedException, KeeperException { - zk = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new GetDataASyncWatcher()); + zk = new ZooKeeper("localhost:2181", 5000, new GetDataASyncWatcher()); System.out.println(zk.getState().toString()); String path = "/node_test"; diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetDataSyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetDataSyncTest.java index b11c2b5f..fec8a34c 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetDataSyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/query/GetDataSyncTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.base.query; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -22,7 +22,7 @@ public class GetDataSyncTest { @Test public void test() throws IOException, InterruptedException { - zooKeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new GetDataASyncWatcher()); + zooKeeper = new ZooKeeper("localhost:2181", 5000, new GetDataASyncWatcher()); System.out.println(zooKeeper.getState().toString()); Thread.sleep(Integer.MAX_VALUE); } diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/query/NodeExistsASyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/query/NodeExistsASyncTest.java index 8671898e..983c8528 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/query/NodeExistsASyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/query/NodeExistsASyncTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.base.query; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.zookeeper.AsyncCallback; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -21,7 +21,7 @@ public class NodeExistsASyncTest { @Test public void test() throws IOException, InterruptedException { - zooKeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new NodeExistsASynccWatcher()); + zooKeeper = new ZooKeeper("localhost:2181", 5000, new NodeExistsASynccWatcher()); System.out.println(zooKeeper.getState().toString()); Thread.sleep(Integer.MAX_VALUE); } diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/query/NodeExistsSyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/query/NodeExistsSyncTest.java index c917ec9a..7f6cfe1b 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/query/NodeExistsSyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/query/NodeExistsSyncTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.base.query; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; import org.apache.zookeeper.Watcher.Event.EventType; @@ -19,7 +19,7 @@ public class NodeExistsSyncTest { @Test public void test() throws IOException, InterruptedException { - zooKeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new NodeExistsSyncWatcher()); + zooKeeper = new ZooKeeper("localhost:2181", 5000, new NodeExistsSyncWatcher()); System.out.println(zooKeeper.getState().toString()); Thread.sleep(Integer.MAX_VALUE); } diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/update/UpdateNodeASyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/update/UpdateNodeASyncTest.java index e9e0dc42..0849cfc8 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/update/UpdateNodeASyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/update/UpdateNodeASyncTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.base.update; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.zookeeper.AsyncCallback; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -21,7 +21,7 @@ public class UpdateNodeASyncTest { @Test public void test() throws IOException, InterruptedException { - zooKeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new UpdateNodeASyncWatcher()); + zooKeeper = new ZooKeeper("localhost:2181", 5000, new UpdateNodeASyncWatcher()); System.out.println(zooKeeper.getState().toString()); Thread.sleep(Integer.MAX_VALUE); } diff --git a/net/src/test/java/com/zfoo/net/zookeeper/base/update/UpdateNodeSyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/base/update/UpdateNodeSyncTest.java index c8f403af..9b5c7285 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/base/update/UpdateNodeSyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/base/update/UpdateNodeSyncTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.base.update; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -20,7 +20,7 @@ public class UpdateNodeSyncTest { @Test public void test() throws IOException, InterruptedException { - zooKeeper = new ZooKeeper(ZookeeperConstantTest.URL, 5000, new UpdateNodeSyncWatcher()); + zooKeeper = new ZooKeeper("localhost:2181", 5000, new UpdateNodeSyncWatcher()); System.out.println(zooKeeper.getState().toString()); Thread.sleep(Integer.MAX_VALUE); } diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/PathCacheTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/PathCacheTest.java index 78495b90..44d802e2 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/PathCacheTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/PathCacheTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.curator.cache; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import com.zfoo.util.ThreadUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -20,7 +20,7 @@ import org.junit.Test; public class PathCacheTest { private static CuratorFramework curator = CuratorFrameworkFactory.builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .retryPolicy(new ExponentialBackoffRetry(1000, 3)) // .retryPolicy(new RetryNTimes(1, 1000)) diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/TreeCacheTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/TreeCacheTest.java index c082266f..33761948 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/TreeCacheTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/cache/TreeCacheTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.curator.cache; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import com.zfoo.util.ThreadUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -21,7 +21,7 @@ import org.junit.Test; public class TreeCacheTest { private static CuratorFramework curator = CuratorFrameworkFactory.builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .retryPolicy(new ExponentialBackoffRetry(1000, 3)) // .retryPolicy(new RetryNTimes(1, 1000)) diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeASyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeASyncTest.java index 686aceed..ec8f5206 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeASyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeASyncTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.curator.create; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.api.BackgroundCallback; @@ -23,7 +23,7 @@ import java.util.concurrent.Executors; public class CreateNodeASyncTest { private static CuratorFramework curator = CuratorFrameworkFactory.builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .retryPolicy(new ExponentialBackoffRetry(1000, 3)) .build(); diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeAuthTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeAuthTest.java index e86c43f0..2b596737 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeAuthTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeAuthTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.curator.create; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -25,7 +25,7 @@ public class CreateNodeAuthTest { CuratorFramework curator = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .connectionTimeoutMs(5000) .retryPolicy(retryPolicy) @@ -58,7 +58,7 @@ public class CreateNodeAuthTest { CuratorFramework curator = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .authorization("digest", "jaysunxiao:123456".getBytes()) // 授权访问 .connectionTimeoutMs(5000) diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeSyncTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeSyncTest.java index 3ca45dd0..abd94372 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeSyncTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/create/CreateNodeSyncTest.java @@ -1,6 +1,5 @@ package com.zfoo.net.zookeeper.curator.create; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -24,7 +23,7 @@ public class CreateNodeSyncTest { CuratorFramework client = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .connectionTimeoutMs(5000) .retryPolicy(retryPolicy) diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/delete/DeleteNodeTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/delete/DeleteNodeTest.java index beed07f4..c31426e2 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/delete/DeleteNodeTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/delete/DeleteNodeTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.curator.delete; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -17,7 +17,7 @@ public class DeleteNodeTest { CuratorFramework client = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .connectionTimeoutMs(5000) .retryPolicy(retryPolicy) diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/query/GetChildrenTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/query/GetChildrenTest.java index 52fa1c3c..918822cc 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/query/GetChildrenTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/query/GetChildrenTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.curator.query; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -19,7 +19,7 @@ public class GetChildrenTest { CuratorFramework client = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .connectionTimeoutMs(5000) .retryPolicy(retryPolicy) diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/query/GetDataTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/query/GetDataTest.java index ffbca0f5..1dae8d2f 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/query/GetDataTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/query/GetDataTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.curator.query; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -18,7 +18,7 @@ public class GetDataTest { CuratorFramework client = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .connectionTimeoutMs(5000) .retryPolicy(retryPolicy) diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/query/NodeExistsTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/query/NodeExistsTest.java index 40a23672..bf2e07a2 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/query/NodeExistsTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/query/NodeExistsTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.curator.query; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -25,7 +25,7 @@ public class NodeExistsTest { CuratorFramework client = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .connectionTimeoutMs(5000) .retryPolicy(retryPolicy) @@ -53,7 +53,7 @@ public class NodeExistsTest { CuratorFramework client = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .connectionTimeoutMs(5000) .retryPolicy(retryPolicy) diff --git a/net/src/test/java/com/zfoo/net/zookeeper/curator/update/UpdateDataTest.java b/net/src/test/java/com/zfoo/net/zookeeper/curator/update/UpdateDataTest.java index 302223dd..b6220256 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/curator/update/UpdateDataTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/curator/update/UpdateDataTest.java @@ -1,6 +1,5 @@ package com.zfoo.net.zookeeper.curator.update; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -18,7 +17,7 @@ public class UpdateDataTest { CuratorFramework client = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .connectionTimeoutMs(5000) .retryPolicy(retryPolicy) diff --git a/net/src/test/java/com/zfoo/net/zookeeper/recipes/atomicint/DistributedAtomicIntTest.java b/net/src/test/java/com/zfoo/net/zookeeper/recipes/atomicint/DistributedAtomicIntTest.java index 03b24fb1..4e4fd505 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/recipes/atomicint/DistributedAtomicIntTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/recipes/atomicint/DistributedAtomicIntTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.recipes.atomicint; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.atomic.AtomicValue; @@ -24,7 +24,7 @@ public class DistributedAtomicIntTest { static String distatomicint_path = "/node_test"; static CuratorFramework curator = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .retryPolicy(new ExponentialBackoffRetry(1000, 3)) .build(); diff --git a/net/src/test/java/com/zfoo/net/zookeeper/recipes/distributedbarrier/DistributedBarrierTest.java b/net/src/test/java/com/zfoo/net/zookeeper/recipes/distributedbarrier/DistributedBarrierTest.java index 22ca1e70..669c171f 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/recipes/distributedbarrier/DistributedBarrierTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/recipes/distributedbarrier/DistributedBarrierTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.recipes.distributedbarrier; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.barriers.DistributedBarrier; @@ -30,7 +30,7 @@ public class DistributedBarrierTest { CuratorFramework client = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .retryPolicy(new ExponentialBackoffRetry(1000, 3)) .build(); client.start(); diff --git a/net/src/test/java/com/zfoo/net/zookeeper/recipes/distributedlock/DistributedLockTest.java b/net/src/test/java/com/zfoo/net/zookeeper/recipes/distributedlock/DistributedLockTest.java index 67fd7f9f..1d8f96ac 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/recipes/distributedlock/DistributedLockTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/recipes/distributedlock/DistributedLockTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.recipes.distributedlock; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.locks.InterProcessMutex; @@ -25,7 +25,7 @@ public class DistributedLockTest { static String lock_path = "/node"; static CuratorFramework curator = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .retryPolicy(new ExponentialBackoffRetry(1000, 3)) .build(); diff --git a/net/src/test/java/com/zfoo/net/zookeeper/recipes/nodecache/NodeChildrenListenerTest.java b/net/src/test/java/com/zfoo/net/zookeeper/recipes/nodecache/NodeChildrenListenerTest.java index 50028c25..672936e6 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/recipes/nodecache/NodeChildrenListenerTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/recipes/nodecache/NodeChildrenListenerTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.recipes.nodecache; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -20,7 +20,7 @@ public class NodeChildrenListenerTest { CuratorFramework client = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .connectionTimeoutMs(5000) .retryPolicy(retryPolicy) diff --git a/net/src/test/java/com/zfoo/net/zookeeper/recipes/nodecache/NodeListenerTest.java b/net/src/test/java/com/zfoo/net/zookeeper/recipes/nodecache/NodeListenerTest.java index 98480da3..183d5366 100644 --- a/net/src/test/java/com/zfoo/net/zookeeper/recipes/nodecache/NodeListenerTest.java +++ b/net/src/test/java/com/zfoo/net/zookeeper/recipes/nodecache/NodeListenerTest.java @@ -1,6 +1,6 @@ package com.zfoo.net.zookeeper.recipes.nodecache; -import com.zfoo.net.zookeeper.ZookeeperConstantTest; + import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -27,7 +27,7 @@ public class NodeListenerTest { CuratorFramework curator = CuratorFrameworkFactory .builder() - .connectString(ZookeeperConstantTest.URL) + .connectString("localhost:2181") .sessionTimeoutMs(5000) .connectionTimeoutMs(5000) .retryPolicy(retryPolicy)