From 2b740b121f2f082b18e7c7283f6155e596ba5cc5 Mon Sep 17 00:00:00 2001 From: hengyunabc Date: Tue, 19 May 2020 02:36:29 +0800 Subject: [PATCH] clean code --- .../arthas/bytekit/asm/binding/Binding.java | 2 +- .../core/advisor/AdviceListenerAdapter.java | 43 ------------------- .../system/impl/GlobalJobControllerImpl.java | 9 +--- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 core/src/main/java/com/taobao/arthas/core/advisor/AdviceListenerAdapter.java diff --git a/bytekit/src/main/java/com/taobao/arthas/bytekit/asm/binding/Binding.java b/bytekit/src/main/java/com/taobao/arthas/bytekit/asm/binding/Binding.java index 7ae63cffe..24b99cdef 100644 --- a/bytekit/src/main/java/com/taobao/arthas/bytekit/asm/binding/Binding.java +++ b/bytekit/src/main/java/com/taobao/arthas/bytekit/asm/binding/Binding.java @@ -323,7 +323,7 @@ public abstract class Binding { public static class MethodInfoBindingParser implements BindingParser { @Override public Binding parse(Annotation annotation) { - return new MethodDeclarationBinding(); + return new MethodInfoBinding(); } } diff --git a/core/src/main/java/com/taobao/arthas/core/advisor/AdviceListenerAdapter.java b/core/src/main/java/com/taobao/arthas/core/advisor/AdviceListenerAdapter.java deleted file mode 100644 index d291c4b31..000000000 --- a/core/src/main/java/com/taobao/arthas/core/advisor/AdviceListenerAdapter.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.taobao.arthas.core.advisor; - -/** - * 通知监听适配器 - */ -public class AdviceListenerAdapter implements AdviceListener { - - - @Override - public void create() { - - } - - @Override - public void destroy() { - - } - - @Override - public void before( - ClassLoader loader, String className, String methodName, String methodDesc, - Object target, Object[] args) throws Throwable { - - } - - @Override - public void afterReturning( - ClassLoader loader, String className, String methodName, String methodDesc, - Object target, Object[] args, - Object returnObject) throws Throwable { - - } - - @Override - public void afterThrowing( - ClassLoader loader, String className, String methodName, String methodDesc, - Object target, Object[] args, - Throwable throwable) throws Throwable { - - } - -} - diff --git a/core/src/main/java/com/taobao/arthas/core/shell/system/impl/GlobalJobControllerImpl.java b/core/src/main/java/com/taobao/arthas/core/shell/system/impl/GlobalJobControllerImpl.java index b41aa1dc9..b32f8c879 100644 --- a/core/src/main/java/com/taobao/arthas/core/shell/system/impl/GlobalJobControllerImpl.java +++ b/core/src/main/java/com/taobao/arthas/core/shell/system/impl/GlobalJobControllerImpl.java @@ -4,7 +4,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.TimeUnit; @@ -23,15 +22,9 @@ import com.taobao.arthas.core.shell.system.Job; * @author gehui 2017年7月31日 上午11:55:41 */ public class GlobalJobControllerImpl extends JobControllerImpl { - - private Timer timer; private Map jobTimeoutTaskMap = new HashMap(); private static final Logger logger = LoggerFactory.getLogger(GlobalJobControllerImpl.class); - public GlobalJobControllerImpl() { - timer = ArthasBootstrap.getInstance().getTimer(); - } - @Override public void close(final Handler completionHandler) { if (completionHandler != null) { @@ -70,7 +63,7 @@ public class GlobalJobControllerImpl extends JobControllerImpl { } }; Date timeoutDate = new Date(System.currentTimeMillis() + (getJobTimeoutInSecond() * 1000)); - timer.schedule(jobTimeoutTask, timeoutDate); + ArthasBootstrap.getInstance().getTimer().schedule(jobTimeoutTask, timeoutDate); jobTimeoutTaskMap.put(job.id(), jobTimeoutTask); job.setTimeoutDate(timeoutDate);