From ac60f415adbe59864ca76d39cb6a602b3c5c76d8 Mon Sep 17 00:00:00 2001
From: ehlxr <ehlxr.me@gmail.com>
Date: Thu, 4 Feb 2021 10:56:12 +0800
Subject: [PATCH] update at 2021-02-04 10:56:12 by ehlxr

---
 .../InterProcessReadWriteLockTest.java        | 19 ++++++++++---------
 .../ehlxr/zkrwlock/{ => v2}/ZkLock.java       |  2 +-
 .../github/ehlxr/zkrwlock/ZkRWLockTest.java   |  3 +--
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename src/{test => main}/java/io/github/ehlxr/zkrwlock/InterProcessReadWriteLockTest.java (94%)
 rename src/main/java/io/github/ehlxr/zkrwlock/{ => v2}/ZkLock.java (99%)

diff --git a/src/test/java/io/github/ehlxr/zkrwlock/InterProcessReadWriteLockTest.java b/src/main/java/io/github/ehlxr/zkrwlock/InterProcessReadWriteLockTest.java
similarity index 94%
rename from src/test/java/io/github/ehlxr/zkrwlock/InterProcessReadWriteLockTest.java
rename to src/main/java/io/github/ehlxr/zkrwlock/InterProcessReadWriteLockTest.java
index 03497b8..5400f33 100644
--- a/src/test/java/io/github/ehlxr/zkrwlock/InterProcessReadWriteLockTest.java
+++ b/src/main/java/io/github/ehlxr/zkrwlock/InterProcessReadWriteLockTest.java
@@ -31,8 +31,6 @@ import org.apache.curator.framework.recipes.locks.InterProcessLock;
 import org.apache.curator.framework.recipes.locks.InterProcessMutex;
 import org.apache.curator.framework.recipes.locks.InterProcessReadWriteLock;
 import org.apache.curator.retry.RetryOneTime;
-import org.junit.Before;
-import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CyclicBarrier;
@@ -45,15 +43,13 @@ import java.util.stream.IntStream;
  * @since 2021-02-03 22:42.
  */
 public class InterProcessReadWriteLockTest {
-    private static CuratorFramework ZK_CLIENT;
+    private static final CuratorFramework ZK_CLIENT;
 
-    @Before
-    public void init() {
+    static {
         ZK_CLIENT = CuratorFrameworkFactory.builder()
                 .connectString("localhost:2181")
                 .sessionTimeoutMs(2000000)
                 .retryPolicy(new RetryOneTime(10000))
-                // 命名空间，用该客户端操作的东西都在该节点之下
                 .namespace("lock")
                 .build();
 
@@ -64,7 +60,14 @@ public class InterProcessReadWriteLockTest {
         }
     }
 
-    @Test
+    public static void main(String[] args) throws Exception {
+        InterProcessReadWriteLockTest interProcessReadWriteLockTest = new InterProcessReadWriteLockTest();
+
+        interProcessReadWriteLockTest.reentrantReadLockTest();
+        interProcessReadWriteLockTest.wwTest();
+        interProcessReadWriteLockTest.rwLockTest();
+    }
+
     public void reentrantReadLockTest() {
         int num = 2;
         // CountDownLatch latch = new CountDownLatch(num);
@@ -95,7 +98,6 @@ public class InterProcessReadWriteLockTest {
         // latch.await();
     }
 
-    @Test
     public void rwLockTest() throws Exception {
         /*
          * 读线程不互斥
@@ -152,7 +154,6 @@ public class InterProcessReadWriteLockTest {
         pool.shutdown();
     }
 
-    @Test
     public void wwTest() {
         int num = 5;
         // CountDownLatch latch = new CountDownLatch(num);
diff --git a/src/main/java/io/github/ehlxr/zkrwlock/ZkLock.java b/src/main/java/io/github/ehlxr/zkrwlock/v2/ZkLock.java
similarity index 99%
rename from src/main/java/io/github/ehlxr/zkrwlock/ZkLock.java
rename to src/main/java/io/github/ehlxr/zkrwlock/v2/ZkLock.java
index 1fb61b8..3315284 100644
--- a/src/main/java/io/github/ehlxr/zkrwlock/ZkLock.java
+++ b/src/main/java/io/github/ehlxr/zkrwlock/v2/ZkLock.java
@@ -1,4 +1,4 @@
-package io.github.ehlxr.zkrwlock;
+package io.github.ehlxr.zkrwlock.v2;
 
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
diff --git a/src/test/java/io/github/ehlxr/zkrwlock/ZkRWLockTest.java b/src/test/java/io/github/ehlxr/zkrwlock/ZkRWLockTest.java
index a076fb2..230980d 100644
--- a/src/test/java/io/github/ehlxr/zkrwlock/ZkRWLockTest.java
+++ b/src/test/java/io/github/ehlxr/zkrwlock/ZkRWLockTest.java
@@ -24,12 +24,11 @@
 
 package io.github.ehlxr.zkrwlock;
 
+import io.github.ehlxr.zkrwlock.v2.ZkLock;
 import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.IntStream;
 
 /**