diff --git a/src/main/java/com/alibaba/ttl/TransmittableThreadLocal.java b/src/main/java/com/alibaba/ttl/TransmittableThreadLocal.java index ed195906780b75f3af26946dd9fd08b59df1752f..789b795f8aaa0bfbf85e37d469d9c6da2e646445 100644 --- a/src/main/java/com/alibaba/ttl/TransmittableThreadLocal.java +++ b/src/main/java/com/alibaba/ttl/TransmittableThreadLocal.java @@ -538,7 +538,7 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple * @since 2.3.1 */ public static R runSupplierWithCaptured(@NonNull Object captured, @NonNull Supplier bizLogic) { - Object backup = replay(captured); + final Object backup = replay(captured); try { return bizLogic.get(); } finally { @@ -557,7 +557,7 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple * @since 2.9.0 */ public static R runSupplierWithClear(@NonNull Supplier bizLogic) { - Object backup = clear(); + final Object backup = clear(); try { return bizLogic.get(); } finally { @@ -579,7 +579,7 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple * @since 2.3.1 */ public static R runCallableWithCaptured(@NonNull Object captured, @NonNull Callable bizLogic) throws Exception { - Object backup = replay(captured); + final Object backup = replay(captured); try { return bizLogic.call(); } finally { @@ -599,7 +599,7 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple * @since 2.9.0 */ public static R runCallableWithClear(@NonNull Callable bizLogic) throws Exception { - Object backup = clear(); + final Object backup = clear(); try { return bizLogic.call(); } finally { diff --git a/src/main/java/com/alibaba/ttl/TtlCallable.java b/src/main/java/com/alibaba/ttl/TtlCallable.java index e97ac7e67ed207eaef5d368cfc980ba6674a5a41..05c9ce32f42bba7d132295a0eebf49677cde3c4c 100644 --- a/src/main/java/com/alibaba/ttl/TtlCallable.java +++ b/src/main/java/com/alibaba/ttl/TtlCallable.java @@ -52,12 +52,12 @@ public final class TtlCallable implements Callable, TtlWrapper */ @Override public V call() throws Exception { - Object captured = capturedRef.get(); + final Object captured = capturedRef.get(); if (captured == null || releaseTtlValueReferenceAfterCall && !capturedRef.compareAndSet(captured, null)) { throw new IllegalStateException("TTL value reference is released after call!"); } - Object backup = replay(captured); + final Object backup = replay(captured); try { return callable.call(); } finally { diff --git a/src/main/java/com/alibaba/ttl/TtlRecursiveAction.java b/src/main/java/com/alibaba/ttl/TtlRecursiveAction.java index 392d8462ef0396db0ec6b70f023b613a6e8080fa..96f1d5fcfd52d7443e6dece0c309538e16ffaaed 100644 --- a/src/main/java/com/alibaba/ttl/TtlRecursiveAction.java +++ b/src/main/java/com/alibaba/ttl/TtlRecursiveAction.java @@ -50,7 +50,7 @@ public abstract class TtlRecursiveAction extends ForkJoinTask implements T * Implements execution conventions for RecursiveActions. */ protected final boolean exec() { - Object backup = replay(captured); + final Object backup = replay(captured); try { compute(); return true; diff --git a/src/main/java/com/alibaba/ttl/TtlRecursiveTask.java b/src/main/java/com/alibaba/ttl/TtlRecursiveTask.java index 1fb25ae4ccade96fa2fdeacd9cfd3f92267128ad..830253e1f3896c602e950f0d1f0b2ac0d207d966 100644 --- a/src/main/java/com/alibaba/ttl/TtlRecursiveTask.java +++ b/src/main/java/com/alibaba/ttl/TtlRecursiveTask.java @@ -58,7 +58,7 @@ public abstract class TtlRecursiveTask extends ForkJoinTask implements Ttl * Implements execution conventions for RecursiveTask. */ protected final boolean exec() { - Object backup = replay(captured); + final Object backup = replay(captured); try { result = compute(); return true; diff --git a/src/main/java/com/alibaba/ttl/TtlRunnable.java b/src/main/java/com/alibaba/ttl/TtlRunnable.java index 0341077ec102001e198d0e7515cdeb9114e50bd5..6ce9ddcdd6b65c92027c752ece649e05183d6325 100644 --- a/src/main/java/com/alibaba/ttl/TtlRunnable.java +++ b/src/main/java/com/alibaba/ttl/TtlRunnable.java @@ -49,12 +49,12 @@ public final class TtlRunnable implements Runnable, TtlWrapper, TtlEnh */ @Override public void run() { - Object captured = capturedRef.get(); + final Object captured = capturedRef.get(); if (captured == null || releaseTtlValueReferenceAfterRun && !capturedRef.compareAndSet(captured, null)) { throw new IllegalStateException("TTL value reference is released after run!"); } - Object backup = replay(captured); + final Object backup = replay(captured); try { runnable.run(); } finally { diff --git a/src/main/java/com/alibaba/ttl/TtlTimerTask.java b/src/main/java/com/alibaba/ttl/TtlTimerTask.java index ea9197616ce9ca7f5986077140291d8190a58e83..069c0e7e5421f80d6912938a7a5b0343966f6e9a 100644 --- a/src/main/java/com/alibaba/ttl/TtlTimerTask.java +++ b/src/main/java/com/alibaba/ttl/TtlTimerTask.java @@ -45,12 +45,12 @@ public final class TtlTimerTask extends TimerTask implements TtlWrapper kvs, @NonNull String key) { - return isOptionSetOrFalse(kvs, key, false); - } - - private static boolean isOptionSetOrTrue(@Nullable final Map kvs, @NonNull String key) { - return isOptionSetOrFalse(kvs, key, true); - } - - private static boolean isOptionSetOrFalse(@Nullable final Map kvs, @NonNull String key, boolean defaultValue) { + private static boolean isBooleanOptionSet(@Nullable final Map kvs, @NonNull String key, boolean defaultValue) { if (null == kvs) return defaultValue; - final boolean hasEnableKey = kvs.containsKey(key); - if (!hasEnableKey) return defaultValue; + final boolean containsKey = kvs.containsKey(key); + if (!containsKey) return defaultValue; return !"false".equalsIgnoreCase(kvs.get(key)); } @@ -217,8 +209,8 @@ public final class TtlAgent { * Split to {@code json} like String({@code "k1:v1,k2:v2"}) to KV map({@code "k1"->"v1", "k2"->"v2"}). */ @NonNull - static Map splitCommaColonStringToKV(@Nullable String commaColonString) { - Map ret = new HashMap(); + static Map splitCommaColonStringToKV(@Nullable final String commaColonString) { + final Map ret = new HashMap(); if (commaColonString == null || commaColonString.trim().length() == 0) return ret; final String[] splitKvArray = commaColonString.trim().split("\\s*,\\s*"); diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/internal/transformlet/impl/TtlExecutorTransformlet.java b/src/main/java/com/alibaba/ttl/threadpool/agent/internal/transformlet/impl/TtlExecutorTransformlet.java index 0c33789623039fd09c419f6da105a4c6f450e4c2..a447423618649cab1378e956dbea3db59d9c40cd 100644 --- a/src/main/java/com/alibaba/ttl/threadpool/agent/internal/transformlet/impl/TtlExecutorTransformlet.java +++ b/src/main/java/com/alibaba/ttl/threadpool/agent/internal/transformlet/impl/TtlExecutorTransformlet.java @@ -33,7 +33,7 @@ import static com.alibaba.ttl.threadpool.agent.internal.transformlet.impl.Utils. public class TtlExecutorTransformlet implements JavassistTransformlet { private static final Logger logger = Logger.getLogger(TtlExecutorTransformlet.class); - private static Set EXECUTOR_CLASS_NAMES = new HashSet(); + private static final Set EXECUTOR_CLASS_NAMES = new HashSet(); private static final Map PARAM_TYPE_NAME_TO_DECORATE_METHOD_CLASS = new HashMap(); private static final String THREAD_POOL_EXECUTOR_CLASS_NAME = "java.util.concurrent.ThreadPoolExecutor"; @@ -57,9 +57,8 @@ public class TtlExecutorTransformlet implements JavassistTransformlet { @Override public void doTransform(@NonNull final ClassInfo classInfo) throws IOException, NotFoundException, CannotCompileException { + final CtClass clazz = classInfo.getCtClass(); if (EXECUTOR_CLASS_NAMES.contains(classInfo.getClassName())) { - final CtClass clazz = classInfo.getCtClass(); - for (CtMethod method : clazz.getDeclaredMethods()) { updateSubmitMethodsOfExecutorClass_decorateToTtlWrapperAndSetAutoWrapperAttachment(method); } @@ -68,8 +67,6 @@ public class TtlExecutorTransformlet implements JavassistTransformlet { classInfo.setModified(); } else { - final CtClass clazz = classInfo.getCtClass(); - if (clazz.isPrimitive() || clazz.isArray() || clazz.isInterface() || clazz.isAnnotation()) { return; }