提交 268b3500 编写于 作者: oldratlee's avatar oldratlee 🔥

= code cleanup

- rename private methods
- inline private on-shot methods
- extract common local var
- add more final modifier for vars
上级 9728bf6e
......@@ -538,7 +538,7 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
* @since 2.3.1
*/
public static <R> R runSupplierWithCaptured(@NonNull Object captured, @NonNull Supplier<R> bizLogic) {
Object backup = replay(captured);
final Object backup = replay(captured);
try {
return bizLogic.get();
} finally {
......@@ -557,7 +557,7 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
* @since 2.9.0
*/
public static <R> R runSupplierWithClear(@NonNull Supplier<R> bizLogic) {
Object backup = clear();
final Object backup = clear();
try {
return bizLogic.get();
} finally {
......@@ -579,7 +579,7 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
* @since 2.3.1
*/
public static <R> R runCallableWithCaptured(@NonNull Object captured, @NonNull Callable<R> bizLogic) throws Exception {
Object backup = replay(captured);
final Object backup = replay(captured);
try {
return bizLogic.call();
} finally {
......@@ -599,7 +599,7 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
* @since 2.9.0
*/
public static <R> R runCallableWithClear(@NonNull Callable<R> bizLogic) throws Exception {
Object backup = clear();
final Object backup = clear();
try {
return bizLogic.call();
} finally {
......
......@@ -52,12 +52,12 @@ public final class TtlCallable<V> implements Callable<V>, TtlWrapper<Callable<V>
*/
@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 {
......
......@@ -50,7 +50,7 @@ public abstract class TtlRecursiveAction extends ForkJoinTask<Void> implements T
* Implements execution conventions for RecursiveActions.
*/
protected final boolean exec() {
Object backup = replay(captured);
final Object backup = replay(captured);
try {
compute();
return true;
......
......@@ -58,7 +58,7 @@ public abstract class TtlRecursiveTask<V> extends ForkJoinTask<V> 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;
......
......@@ -49,12 +49,12 @@ public final class TtlRunnable implements Runnable, TtlWrapper<Runnable>, 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 {
......
......@@ -45,12 +45,12 @@ public final class TtlTimerTask extends TimerTask implements TtlWrapper<TimerTas
*/
@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 {
timerTask.run();
} finally {
......
......@@ -122,7 +122,7 @@ public final class TtlAgent {
* @see Logger#STDERR
* @see Logger#STDOUT
*/
public static void premain(String agentArgs, @NonNull Instrumentation inst) {
public static void premain(final String agentArgs, @NonNull final Instrumentation inst) {
kvs = splitCommaColonStringToKV(agentArgs);
Logger.setLoggerImplType(getLogImplTypeFromAgentArgs(kvs));
......@@ -184,7 +184,7 @@ public final class TtlAgent {
* @since 2.10.1
*/
public static boolean isDisableInheritableForThreadPool() {
return isOptionSetOrFalse(kvs, TTL_AGENT_DISABLE_INHERITABLE_FOR_THREAD_POOL);
return isBooleanOptionSet(kvs, TTL_AGENT_DISABLE_INHERITABLE_FOR_THREAD_POOL, false);
}
/**
......@@ -193,22 +193,14 @@ public final class TtlAgent {
* @since 2.10.1
*/
public static boolean isEnableTimerTask() {
return isOptionSetOrTrue(kvs, TTL_AGENT_ENABLE_TIMER_TASK_KEY);
return isBooleanOptionSet(kvs, TTL_AGENT_ENABLE_TIMER_TASK_KEY, true);
}
private static boolean isOptionSetOrFalse(@Nullable final Map<String, String> kvs, @NonNull String key) {
return isOptionSetOrFalse(kvs, key, false);
}
private static boolean isOptionSetOrTrue(@Nullable final Map<String, String> kvs, @NonNull String key) {
return isOptionSetOrFalse(kvs, key, true);
}
private static boolean isOptionSetOrFalse(@Nullable final Map<String, String> kvs, @NonNull String key, boolean defaultValue) {
private static boolean isBooleanOptionSet(@Nullable final Map<String, String> 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<String, String> splitCommaColonStringToKV(@Nullable String commaColonString) {
Map<String, String> ret = new HashMap<String, String>();
static Map<String, String> splitCommaColonStringToKV(@Nullable final String commaColonString) {
final Map<String, String> ret = new HashMap<String, String>();
if (commaColonString == null || commaColonString.trim().length() == 0) return ret;
final String[] splitKvArray = commaColonString.trim().split("\\s*,\\s*");
......
......@@ -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<String> EXECUTOR_CLASS_NAMES = new HashSet<String>();
private static final Set<String> EXECUTOR_CLASS_NAMES = new HashSet<String>();
private static final Map<String, String> PARAM_TYPE_NAME_TO_DECORATE_METHOD_CLASS = new HashMap<String, String>();
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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册