优化 solon-java25 的 ScopeLocal 适配

Author: noear

UPDATE_LOG.md

@@ -0,0 +1,4 @@
+
+### v3.8.1
+
+* 优化 `solon-java25` 的 ScopeLocal 适配

src/main/java/org/noear/solon/util/ScopeLocalJdk25.java

@@ -24,26 +24,29 @@ public T get() {
     }
 
     @Override
-    public void with(T value, Runnable runnable) {
-        ref.where(ref, value).run(runnable);
+    public <X extends Throwable> void with(T value, RunnableTx<X> runnable) throws X {
+        ref.where(ref, value).call(() -> {
+            runnable.run();
+            return null;
+        });
     }
 
     @Override
-    public <R> R with(T value, Supplier<R> callable) {
-        return ref.where(ref, value).call(callable::get);
+    public <R, X extends Throwable> R with(T value, CallableTx<? extends R, X> callable) throws X {
+        return ref.where(ref, value).call(callable::call);
     }
 
     @Override
-    public <X extends Throwable> void withOrThrow(T value, RunnableTx<X> runnable) throws X {
+    public <X extends Throwable> void with(T value, ConsumerTx<T, X> consumer) throws X {
         ref.where(ref, value).call(() -> {
-            runnable.run();
+            consumer.accept(ref.get());
             return null;
         });
     }
 
     @Override
-    public <R, X extends Throwable> R withOrThrow(T value, CallableTx<? extends R, X> callable) throws X {
-        return ref.where(ref, value).call(callable::call);
+    public <R, X extends Throwable> R with(T value, FunctionTx<T, ? extends R, X> function) throws X {
+        return ref.where(ref, value).call(() -> function.apply(ref.get()));
     }
 
     @Override
@@ -56,4 +59,4 @@ public ScopeLocal<T> set(T value) {
     public void remove() {
         log.error("ScopeLocal.remove is invalid, please use ScopeLocal.with");
     }
-}
+}