diff --git a/jar/PDConcurrent.jar b/jar/PDConcurrent.jar index ae60b4c11e9f435e917231bbe5ecbc67b4458075..44d5ac4b15a80191a04c99d129008c17e0c9b8e6 100644 Binary files a/jar/PDConcurrent.jar and b/jar/PDConcurrent.jar differ diff --git a/jar/PDConcurrent_all.jar b/jar/PDConcurrent_all.jar index e2554b07403f9edca5efb5c39de7639aad759061..694f2e77ed35f6256f4e246bc8ff25bc819fc340 100644 Binary files a/jar/PDConcurrent_all.jar and b/jar/PDConcurrent_all.jar differ diff --git a/jar/PDConcurrent_bin.jar b/jar/PDConcurrent_bin.jar index b505829e940cda7ee47ffd980a01b0cfb5b9d6d0..45dc635c2b744d5c38890a643fb8d26c8b4d16e5 100644 Binary files a/jar/PDConcurrent_bin.jar and b/jar/PDConcurrent_bin.jar differ diff --git a/jar/PDConcurrent_sources.jar b/jar/PDConcurrent_sources.jar index a8a8271e7a8200bb21780a73b8e6d962fbd50135..6930165b92b7973260fd2ca1cdbdee6dd6582978 100644 Binary files a/jar/PDConcurrent_sources.jar and b/jar/PDConcurrent_sources.jar differ diff --git a/src/main/java/fybug/nulll/pdconcurrent/i/AbstractRWSyLock.java b/src/main/java/fybug/nulll/pdconcurrent/i/AbstractRWSyLock.java index 92c61fc2e703896cdcdeef7f17ab59c7c8e4be4d..def8a4db98d751fe548156b4493d5653c0d4e41f 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/i/AbstractRWSyLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/i/AbstractRWSyLock.java @@ -121,7 +121,7 @@ class AbstractRWSyLock extends AbstractSyLock { * * @implSpec 在此处实现上锁功能,实现时应该支持根据上下文选择是否使用可以被线程中断的上锁方式 */ - protected abstract + public abstract void lock(@NotNull LockType lockType); /** @@ -133,7 +133,7 @@ class AbstractRWSyLock extends AbstractSyLock { * * @implSpec 在此处实现尝试上锁功能,实现时应该支持上下文参数 */ - protected abstract + public abstract boolean trylock(@NotNull LockType lockType); /** diff --git a/src/main/java/fybug/nulll/pdconcurrent/i/AbstractSyLock.java b/src/main/java/fybug/nulll/pdconcurrent/i/AbstractSyLock.java index 130072ed6207e938ded65812d37dcb1f08998015..962c6b87a16c92e2567b42fb75c14ebd394d2a71 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/i/AbstractSyLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/i/AbstractSyLock.java @@ -168,9 +168,8 @@ class AbstractSyLock implements SyLock { * @param lockThreadContext 新的默认上下文参数 */ public - void setDefaultLockThreadContext(@NotNull LockThreadContext lockThreadContext) { - this.defaultLockThreadContext = lockThreadContext; - } + void setDefaultLockThreadContext(@NotNull LockThreadContext lockThreadContext) + { this.defaultLockThreadContext = lockThreadContext; } /** 获取当前默认上下文参数 */ @NotNull diff --git a/src/main/java/fybug/nulll/pdconcurrent/lock/ObjLock.java b/src/main/java/fybug/nulll/pdconcurrent/lock/ObjLock.java index 6cf8caee6258fb0392e41b741c2c300fd8de6f6a..9bc4cbf770df4104f8a58174ab7ccd323dd0d7b2 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/lock/ObjLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/lock/ObjLock.java @@ -71,7 +71,7 @@ class ObjLock extends AbstractSyLock { * @since ObjLock 0.1.3 */ @SuppressWarnings("unchecked") - public + protected R lockimpl(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable tryFunction catchby, @Nullable Function finaby) throws E1 diff --git a/src/main/java/fybug/nulll/pdconcurrent/lock/RWLock.java b/src/main/java/fybug/nulll/pdconcurrent/lock/RWLock.java index 8ddae39fc843df6b8519dd22c5a3579e56b61d68..74e4054fa65753674c6bc5d4d7eaeefcd680dcd0 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/lock/RWLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/lock/RWLock.java @@ -155,7 +155,7 @@ class RWLock extends AbstractRWSyLock { */ @SneakyThrows @Override - protected + public void lock(@NotNull LockType lockType) { var c = getLockThreadContext(); // 检查锁类型进行上锁,并更新对应锁计数 @@ -194,7 +194,7 @@ class RWLock extends AbstractRWSyLock { @SuppressWarnings("ConstantValue") @SneakyThrows @Override - protected + public boolean trylock(@NotNull LockType lockType) { // 是否成功 boolean success = false; diff --git a/src/main/java/fybug/nulll/pdconcurrent/lock/ReLock.java b/src/main/java/fybug/nulll/pdconcurrent/lock/ReLock.java index 4cfc5fe0c510a5b94cc50d13c653b3ee8a2ff135..ea9665901f37afba2861ef976184641fba26b0d7 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/lock/ReLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/lock/ReLock.java @@ -77,7 +77,7 @@ class ReLock extends AbstractRWSyLock { */ @SneakyThrows @Override - protected + public void lock(@NotNull LockType lockType) { var c = getLockThreadContext(); if ( lockType != LockType.NOLOCK ) { @@ -100,7 +100,7 @@ class ReLock extends AbstractRWSyLock { */ @SneakyThrows @Override - protected + public boolean trylock(@NotNull LockType lockType) { var c = getLockThreadContext(); var t = c.getTryTimeout();