LveD_kRHJ?5n*1
diff --git a/src/main/java/fybug/nulll/pdconcurrent/SyLock.java b/src/main/java/fybug/nulll/pdconcurrent/SyLock.java
index 32216c4..e21646b 100644
--- a/src/main/java/fybug/nulll/pdconcurrent/SyLock.java
+++ b/src/main/java/fybug/nulll/pdconcurrent/SyLock.java
@@ -1,7 +1,9 @@
package fybug.nulll.pdconcurrent;
import fybug.nulll.pdconcurrent.e.LockType;
-import fybug.nulll.pdconcurrent.i.ReadWriteLock;
-import fybug.nulll.pdconcurrent.i.TryReadWriteLock;
+import fybug.nulll.pdconcurrent.i.simple.ReadLockSimple;
+import fybug.nulll.pdconcurrent.i.simple.TryReadLockSimple;
+import fybug.nulll.pdconcurrent.i.simple.TryWriteLockSimple;
+import fybug.nulll.pdconcurrent.i.simple.WriteLockSimple;
import fybug.nulll.pdconcurrent.lock.ObjLock;
import fybug.nulll.pdconcurrent.lock.RWLock;
import fybug.nulll.pdconcurrent.lock.ReLock;
@@ -9,7 +11,7 @@ import jakarta.validation.constraints.NotNull;
/**
* 并发管理.
- * 通过传入回调的方式隐藏内部的并发管理方法，并支持复用内部的try块，通过传入的回调插入到catch，finally块中执行
+ * 通过传入回调的方式隐藏内部的并发管理方法，并支持复用内部的 try 块，通过传入的回调插入到 catch，finally 块中执行
* {@code lock()}方法用于根据传入的{@link LockType}申请不同的锁类型进行执行
* {@code read()}方法用于使用读锁执行，{@code write()}用于使用写锁执行，只有在使用读写锁实现{@link RWLock}才有区别。其余实现两个之间无区别
* {@code trylock()}类型的方法为尝试获取锁的实现，这意味着并不是一定能获取到锁，但也意味着不需要等待
@@ -18,11 +20,12 @@ import jakarta.validation.constraints.NotNull;
* 使用 {@code new**Lock()} 的方法获取不同并发管理的实例
*
* @author fybug
- * @version 0.1.2
+ * @version 0.1.3
* @since PDConcurrent 0.0.1
*/
+@SuppressWarnings("unused")
public
-interface SyLock extends ReadWriteLock, TryReadWriteLock {
+interface SyLock extends ReadLockSimple, WriteLockSimple, TryReadLockSimple, TryWriteLockSimple {
/**
* 获取传统并发实现
*
@@ -30,7 +33,6 @@ interface SyLock extends ReadWriteLock, TryReadWriteLock {
*
* @see ObjLock
*/
- @SuppressWarnings("unused")
@NotNull
static
ObjLock newObjLock() { return new ObjLock(); }
@@ -42,7 +44,6 @@ interface SyLock extends ReadWriteLock, TryReadWriteLock {
*
* @see ReLock
*/
- @SuppressWarnings("unused")
@NotNull
static
ReLock newReLock() { return new ReLock(); }
@@ -54,7 +55,6 @@ interface SyLock extends ReadWriteLock, TryReadWriteLock {
*
* @see RWLock
*/
- @SuppressWarnings("unused")
@NotNull
static
RWLock newRWLock() { return new RWLock(); }
diff --git a/src/main/java/fybug/nulll/pdconcurrent/i/Lock.java b/src/main/java/fybug/nulll/pdconcurrent/i/Lock.java
index 7c5a94f..de52725 100644
--- a/src/main/java/fybug/nulll/pdconcurrent/i/Lock.java
+++ b/src/main/java/fybug/nulll/pdconcurrent/i/Lock.java
@@ -10,15 +10,16 @@ import jakarta.validation.constraints.NotNull;
/**
* 基础锁管理.
- * 通过传入回调的方式隐藏内部的并发管理方法，并支持复用内部的try块，通过传入的回调插入到catch，finally块中执行
- * {@code lock()}方法用于根据传入的{@link LockType}申请不同的锁类型进行执行
+ * 通过传入回调的方式隐藏内部的并发管理方法，并支持复用内部的 try 块，通过传入的回调插入到 catch，finally 块中执行
+ * {@code lock()} 方法用于根据传入的 {@link LockType} 申请不同的锁类型进行执行
* 有可抛出异常的方法变体，可在传入的接口中抛出异常
*
* @author fybug
- * @version 0.0.1
+ * @version 0.0.2
* @see LockType
* @since i 0.0.1
*/
+public
interface Lock {
/**
* 使用锁执行指定回调
@@ -44,11 +45,6 @@ interface Lock {
* 使用锁执行指定回调
*
* {@link #lock(LockType, trySupplier, Function, Function)}的无返回变体
- *
- * @param lockType 锁类型
- * @param run 执行的回调
- * @param catchby 进入catch块后的回调，传入当前异常
- * @param finaby 进入finally块后的回调
*/
default
void lock(@NotNull LockType lockType, @NotNull tryRunnable run, @Nullable Consumer catchby,
@@ -85,33 +81,10 @@ interface Lock {
*/
R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function finaby) throws Exception;
- /**
- * 使用锁执行指定回调
- *
- * {@link #lock(LockType, trySupplier, Function)}的简易变体
- *
- * @param lockType 锁类型
- * @param run 带返回的回调
- * @param 要返回的数据类型
- *
- * @return 回调返回的内容，遇到异常不返回
- *
- * @throws Exception 异常类型根据实际运行时回调抛出决定
- */
- default
- R lock(@NotNull LockType lockType, @NotNull trySupplier run) throws Exception
- { return lock(lockType, run, null); }
-
/**
* 使用锁执行指定回调
*
* {@link #lock(LockType, trySupplier, Function)}的无返回变体
- *
- * @param lockType 锁类型
- * @param run 执行的回调
- * @param finaby 进入finally块后的回调
- *
- * @throws Exception 异常类型根据实际运行时回调抛出决定
*/
default
void lock(@NotNull LockType lockType, @NotNull tryRunnable run, @Nullable Runnable finaby) throws Exception {
@@ -123,18 +96,4 @@ interface Lock {
return null;
});
}
-
- /**
- * 使用锁执行指定回调
- *
- * {@link #lock(LockType, tryRunnable, Runnable)}的简易变体
- *
- * @param lockType 锁类型
- * @param run 执行的回调
- *
- * @throws Exception 异常类型根据实际运行时回调抛出决定
- */
- default
- void lock(@NotNull LockType lockType, @NotNull tryRunnable run) throws Exception
- { lock(lockType, run, null); }
}
diff --git a/src/main/java/fybug/nulll/pdconcurrent/i/ReadLock.java b/src/main/java/fybug/nulll/pdconcurrent/i/ReadLock.java
new file mode 100644
index 0000000..1824694
--- /dev/null
+++ b/src/main/java/fybug/nulll/pdconcurrent/i/ReadLock.java
@@ -0,0 +1,60 @@
+package fybug.nulll.pdconcurrent.i;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import fybug.nulll.pdconcurrent.e.LockType;
+import fybug.nulll.pdconcurrent.fun.tryRunnable;
+import fybug.nulll.pdconcurrent.fun.trySupplier;
+import fybug.nulll.pdconcurrent.i.simple.LockSimple;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+
+/**
+ *
并发管理读锁支持拓展.
+ * {@link Lock}的拓展，增加 {@code read()} 类方法用于隐藏 {@link LockType} 参数
+ *
+ * @author fybug
+ * @version 0.0.1
+ * @see LockType#READ
+ * @see Lock
+ * @since i 0.0.2
+ */
+@SuppressWarnings("unused")
+public
+interface ReadLock extends LockSimple {
+ /**
+ * 使用读锁执行指定回调
+ *
+ * {@link #lock(LockType, trySupplier, Function, Function)}指定读锁的变种
+ */
+ default
+ R read(@NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby)
+ { return lock(LockType.READ, run, catchby, finaby); }
+
+ /**
+ * 使用读锁执行指定回调
+ *
+ * {@link #lock(LockType, tryRunnable, Consumer, Runnable)}指定读锁的变种
+ */
+ default
+ void read(@NotNull tryRunnable run, @Nullable Consumer catchby, @Nullable Runnable finaby)
+ { lock(LockType.READ, run, catchby, finaby); }
+
+ /**
+ * 使用读锁执行指定回调
+ *
+ * {@link #lock(LockType, trySupplier, Function)}指定读锁的变种
+ */
+ default
+ R read(@NotNull trySupplier run, @Nullable Function finaby) throws Exception
+ { return lock(LockType.READ, run, finaby); }
+
+ /**
+ * 使用读锁执行指定回调
+ *
+ * {@link #lock(LockType, tryRunnable, Runnable)}指定读锁的变种
+ */
+ default
+ void read(@NotNull tryRunnable run, @Nullable Runnable finaby) throws Exception
+ { lock(LockType.READ, run, finaby); }
+}
diff --git a/src/main/java/fybug/nulll/pdconcurrent/i/ReadWriteLock.java b/src/main/java/fybug/nulll/pdconcurrent/i/ReadWriteLock.java
deleted file mode 100644
index 63a7d1e..0000000
--- a/src/main/java/fybug/nulll/pdconcurrent/i/ReadWriteLock.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package fybug.nulll.pdconcurrent.i;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import fybug.nulll.pdconcurrent.e.LockType;
-import fybug.nulll.pdconcurrent.fun.tryRunnable;
-import fybug.nulll.pdconcurrent.fun.trySupplier;
-import jakarta.annotation.Nullable;
-import jakarta.validation.constraints.NotNull;
-
-/**
- *
并发管理读写支持拓展.
- * {@link Lock}的拓展，增加{@code read()}、{@code write()}类方法用于隐藏{@link LockType}参数
- *
- * @author fybug
- * @version 0.0.1
- * @see LockType#READ
- * @see LockType#WRITE
- * @see Lock
- * @since i 0.0.1
- */
-@SuppressWarnings("unused")
-public
-interface ReadWriteLock extends Lock {
- /**
- * 使用读锁执行指定回调
- *
- * {@link #lock(LockType, trySupplier, Function, Function)}指定读锁的变种
- *
- * @param run 带返回的回调
- * @param catchby 进入catch块后的回调，传入当前异常
- * @param finaby 进入finally块后的回调，传入前两个回调的返回值
- * @param 要返回的数据类型
- *
- * @return 回调返回的内容
- */
- default
- R read(@NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby)
- { return lock(LockType.READ, run, catchby, finaby); }
-
- /**
- * 使用读锁执行指定回调
- *
- * {@link #lock(LockType, tryRunnable, Consumer, Runnable)}指定读锁的变种
- *
- * @param run 执行的回调
- * @param catchby 进入catch块后的回调，传入当前异常
- * @param finaby 进入finally块后的回调
- */
- default
- void read(@NotNull tryRunnable run, @Nullable Consumer catchby, @Nullable Runnable finaby)
- { lock(LockType.READ, run, catchby, finaby); }
-
- /**
- * 使用读锁执行指定回调
- *
- * {@link #lock(LockType, trySupplier, Function)}指定读锁的变种
- *
- * @param run 带返回的回调
- * @param finaby 进入finally块后的回调，传入前一个回调的返回值，遇到异常传入{@code null}
- * @param 要返回的数据类型
- *
- * @return 回调返回的内容，遇到异常不返回
- *
- * @throws Exception 异常类型根据实际运行时回调抛出决定
- */
- default
- R read(@NotNull trySupplier run, @Nullable Function finaby) throws Exception
- { return lock(LockType.READ, run, finaby); }
-
- /**
- * 使用读锁执行指定回调
- *
- * {@link #lock(LockType, trySupplier)}指定读锁的变种
- *
- * @param run 带返回的回调
- * @param 要返回的数据类型
- *
- * @return 回调返回的内容
- *
- * @throws Exception 异常类型根据实际运行时回调抛出决定
- */
- default
- R read(@NotNull trySupplier run) throws Exception
- { return lock(LockType.READ, run); }
-
- /**
- * 使用读锁执行指定回调
- *
- * {@link #lock(LockType, tryRunnable, Runnable)}指定读锁的变种
- *
- * @param run 执行的回调
- * @param finaby 进入finally块后的回调
- *
- * @throws Exception 异常类型根据实际运行时回调抛出决定
- */
- default
- void read(@NotNull tryRunnable run, @Nullable Runnable finaby) throws Exception
- { lock(LockType.READ, run, finaby); }
-
- /**
- * 使用读锁执行指定回调
- *
- * {@link #lock(LockType, tryRunnable)}指定读锁的变种
- *
- * @param run 执行的回调
- *
- * @throws Exception 异常类型根据实际运行时回调抛出决定
- */
- default
- void read(@NotNull tryRunnable run) throws Exception
- { lock(LockType.READ, run); }
-
-
- /**
- * 使用写锁执行指定回调
- *
- * {@link #lock(LockType, trySupplier, Function, Function)}指定写锁的变种
- *
- * @param run 带返回的回调
- * @param catchby 进入catch块后的回调，传入当前异常
- * @param finaby 进入finally块后的回调，传入前两个回调的返回值
- * @param 要返回的数据类型
- *
- * @return 回调返回的内容
- */
- default
- R write(@NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby)
- { return lock(LockType.WRITE, run, catchby, finaby); }
-
- /**
- * 使用写锁执行指定回调
- *
+