[curator] branch master updated: CURATOR-662: Export getLockPath for locks from InterProcessReadWriteLock (#448)

[eolivelli]

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/curator.git


The following commit(s) were added to refs/heads/master by this push:
     new 17f3f360 CURATOR-662: Export getLockPath for locks from 
InterProcessReadWriteLock (#448)
17f3f360 is described below

commit 17f3f3603eb078c40ea35fd9d386b1dada57aa1b
Author: Kezhu Wang <kez...@gmail.com>
AuthorDate: Fri Mar 3 15:36:49 2023 +0800

    CURATOR-662: Export getLockPath for locks from InterProcessReadWriteLock 
(#448)
    
    With protected `getLockPath`, clients have to inherit them to use
    `getLockPath`, it is cumbersome and nonsense.
---
 .../recipes/locks/InterProcessReadWriteLock.java   |  4 +-
 .../locks/TestInterProcessReadWriteLock.java       | 77 +---------------------
 2 files changed, 4 insertions(+), 77 deletions(-)

diff --git 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessReadWriteLock.java
 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessReadWriteLock.java
index a1ea94db..e4376a54 100644
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessReadWriteLock.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessReadWriteLock.java
@@ -127,7 +127,7 @@ public class InterProcessReadWriteLock
         }
 
         @Override
-        protected String getLockPath()
+        public String getLockPath()
         {
             return super.getLockPath();
         }
@@ -172,7 +172,7 @@ public class InterProcessReadWriteLock
         }
 
         @Override
-        protected String getLockPath()
+        public String getLockPath()
         {
             return super.getLockPath();
         }
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessReadWriteLock.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessReadWriteLock.java
index b54ae50a..f248e8d8 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessReadWriteLock.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessReadWriteLock.java
@@ -366,79 +366,6 @@ public class TestInterProcessReadWriteLock extends 
BaseClassForTests
         }
     }
 
-    public static class LockPathInterProcessReadWriteLock extends 
InterProcessReadWriteLock
-    {
-        private final WriteLock writeLock;
-        private final ReadLock readLock;
-
-        public LockPathInterProcessReadWriteLock(CuratorFramework client, 
String basePath)
-        {
-            this(client, basePath, null);
-        }
-
-        public LockPathInterProcessReadWriteLock(CuratorFramework client, 
String basePath, byte[] lockData)
-        {
-            this(client, basePath, lockData, new WriteLock(client, basePath, 
lockData));
-        }
-
-        private LockPathInterProcessReadWriteLock(
-            CuratorFramework client,
-            String basePath,
-            byte[] lockData,
-            WriteLock writeLock
-        )
-        {
-            this(writeLock, new ReadLock(client, basePath, lockData, 
writeLock));
-        }
-
-        private LockPathInterProcessReadWriteLock(WriteLock writeLock, 
ReadLock readLock)
-        {
-            super(writeLock, readLock);
-            this.writeLock = writeLock;
-            this.readLock = readLock;
-        }
-
-        @Override
-        public WriteLock writeLock()
-        {
-            return writeLock;
-        }
-
-        @Override
-        public ReadLock readLock()
-        {
-            return readLock;
-        }
-
-        public static class WriteLock extends 
InterProcessReadWriteLock.WriteLock
-        {
-            private WriteLock(CuratorFramework client, String basePath, byte[] 
lockData)
-            {
-                super(client, basePath, lockData);
-            }
-
-            @Override
-            public String getLockPath()
-            {
-                return super.getLockPath();
-            }
-        }
-
-        public static class ReadLock extends InterProcessReadWriteLock.ReadLock
-        {
-            private ReadLock(CuratorFramework client, String basePath, byte[] 
lockData, WriteLock writeLock)
-            {
-                super(client, basePath, lockData, writeLock);
-            }
-
-            @Override
-            public String getLockPath()
-            {
-                return super.getLockPath();
-            }
-        }
-    }
-
     @Test
     public void testLockPath() throws Exception
     {
@@ -448,8 +375,8 @@ public class TestInterProcessReadWriteLock extends 
BaseClassForTests
         {
             client1.start();
             client2.start();
-            LockPathInterProcessReadWriteLock lock1 = new 
LockPathInterProcessReadWriteLock(client1, "/lock");
-            LockPathInterProcessReadWriteLock lock2 = new 
LockPathInterProcessReadWriteLock(client2, "/lock");
+            InterProcessReadWriteLock lock1 = new 
InterProcessReadWriteLock(client1, "/lock");
+            InterProcessReadWriteLock lock2 = new 
InterProcessReadWriteLock(client2, "/lock");
             lock1.writeLock().acquire();
             KillSession.kill(client1.getZookeeperClient().getZooKeeper());
             lock2.readLock().acquire();