refactor:修改获取XxlJob注解方法的方式

xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java

@@ -7,14 +7,18 @@ import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.handler.annotation.JobHandler;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.handler.impl.MethodJobHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.MethodIntrospector;
+import org.springframework.core.annotation.AnnotatedElementUtils;
 
 import java.lang.reflect.Method;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -23,6 +27,7 @@ import java.util.Map;
  * @author xuxueli 2018-11-01 09:24:52
  */
 public class XxlJobSpringExecutor extends XxlJobExecutor implements ApplicationContextAware, InitializingBean, DisposableBean {
+    private static final Logger logger = LoggerFactory.getLogger(XxlJobSpringExecutor.class);
 
 
     // start
@@ -75,60 +80,74 @@ public class XxlJobSpringExecutor extends XxlJobExecutor implements ApplicationC
         if (applicationContext == null) {
             return;
         }
-
         // init job handler from method
         String[] beanDefinitionNames = applicationContext.getBeanDefinitionNames();
         for (String beanDefinitionName : beanDefinitionNames) {
             Object bean = applicationContext.getBean(beanDefinitionName);
-            Method[] methods = bean.getClass().getDeclaredMethods();
-            for (Method method: methods) {
-                XxlJob xxlJob = AnnotationUtils.findAnnotation(method, XxlJob.class);
-                if (xxlJob != null) {
-
-                    // name
-                    String name = xxlJob.value();
-                    if (name.trim().length() == 0) {
-                        throw new RuntimeException("xxl-job method-jobhandler name invalid, for[" + bean.getClass() + "#"+ method.getName() +"] .");
-                    }
-                    if (loadJobHandler(name) != null) {
-                        throw new RuntimeException("xxl-job jobhandler[" + name + "] naming conflicts.");
-                    }
 
-                    // execute method
+            Map<Method, XxlJob> annotatedMethods = new HashMap<>();
-                    if (!(method.getParameterTypes()!=null && method.getParameterTypes().length==1 && method.getParameterTypes()[0].isAssignableFrom(String.class))) {
+            try {
-                        throw new RuntimeException("xxl-job method-jobhandler param-classtype invalid, for[" + bean.getClass() + "#"+ method.getName() +"] , " +
+                annotatedMethods = MethodIntrospector.selectMethods(bean.getClass(),
-                                "The correct method format like \" public ReturnT<String> execute(String param) \" .");
+                        new MethodIntrospector.MetadataLookup<XxlJob>() {
-                    }
+                            @Override
-                    if (!method.getReturnType().isAssignableFrom(ReturnT.class)) {
+                            public XxlJob inspect(Method method) {
-                        throw new RuntimeException("xxl-job method-jobhandler return-classtype invalid, for[" + bean.getClass() + "#"+ method.getName() +"] , " +
+                                return AnnotatedElementUtils.findMergedAnnotation(method, XxlJob.class);
-                                "The correct method format like \" public ReturnT<String> execute(String param) \" .");
+                            }
-                    }
+                        });
-                    method.setAccessible(true);
+            } catch (Throwable ex) {
-
+                if (logger.isDebugEnabled()) {
-                    // init and destory
+                    logger.debug("Could not resolve methods for bean with name '" + beanDefinitionName + "'", ex);
-                    Method initMethod = null;
+                }
-                    Method destroyMethod = null;
+            }
-
+
-                    if(xxlJob.init().trim().length() > 0) {
+            for (Map.Entry<Method, XxlJob> methodXxlJobEntry : annotatedMethods.entrySet()) {
-                        try {
+                Method method = methodXxlJobEntry.getKey();
-                            initMethod = bean.getClass().getDeclaredMethod(xxlJob.init());
+                XxlJob xxlJob = methodXxlJobEntry.getValue();
-                            initMethod.setAccessible(true);
+                if (xxlJob == null) {
-                        } catch (NoSuchMethodException e) {
+                    continue;
-                            throw new RuntimeException("xxl-job method-jobhandler initMethod invalid, for[" + bean.getClass() + "#"+ method.getName() +"] .");
+                }
-                        }
+                String name = xxlJob.value();
+                if (name.trim().length() == 0) {
+                    throw new RuntimeException("xxl-job method-jobhandler name invalid, for[" + bean.getClass() + "#" + method.getName() + "] .");
+                }
+                if (loadJobHandler(name) != null) {
+                    throw new RuntimeException("xxl-job jobhandler[" + name + "] naming conflicts.");
+                }
+
+                // execute method
+                if (!(method.getParameterTypes().length == 1 && method.getParameterTypes()[0].isAssignableFrom(String.class))) {
+                    throw new RuntimeException("xxl-job method-jobhandler param-classtype invalid, for[" + bean.getClass() + "#" + method.getName() + "] , " +
+                            "The correct method format like \" public ReturnT<String> execute(String param) \" .");
+                }
+                if (!method.getReturnType().isAssignableFrom(ReturnT.class)) {
+                    throw new RuntimeException("xxl-job method-jobhandler return-classtype invalid, for[" + bean.getClass() + "#" + method.getName() + "] , " +
+                            "The correct method format like \" public ReturnT<String> execute(String param) \" .");
+                }
+                method.setAccessible(true);
+
+                // init and destory
+                Method initMethod = null;
+                Method destroyMethod = null;
+
+                if (xxlJob.init().trim().length() > 0) {
+                    try {
+                        initMethod = bean.getClass().getDeclaredMethod(xxlJob.init());
+                        initMethod.setAccessible(true);
+                    } catch (NoSuchMethodException e) {
+                        throw new RuntimeException("xxl-job method-jobhandler initMethod invalid, for[" + bean.getClass() + "#" + method.getName() + "] .");
                     }
-                    if(xxlJob.destroy().trim().length() > 0) {
+                }
-                        try {
+                if (xxlJob.destroy().trim().length() > 0) {
-                            destroyMethod = bean.getClass().getDeclaredMethod(xxlJob.destroy());
+                    try {
-                            destroyMethod.setAccessible(true);
+                        destroyMethod = bean.getClass().getDeclaredMethod(xxlJob.destroy());
-                        } catch (NoSuchMethodException e) {
+                        destroyMethod.setAccessible(true);
-                            throw new RuntimeException("xxl-job method-jobhandler destroyMethod invalid, for[" + bean.getClass() + "#"+ method.getName() +"] .");
+                    } catch (NoSuchMethodException e) {
-                        }
+                        throw new RuntimeException("xxl-job method-jobhandler destroyMethod invalid, for[" + bean.getClass() + "#" + method.getName() + "] .");
                     }
-
-                    // registry jobhandler
-                    registJobHandler(name, new MethodJobHandler(bean, method, initMethod, destroyMethod));
                 }
+
+                // registry jobhandler
+                registJobHandler(name, new MethodJobHandler(bean, method, initMethod, destroyMethod));
             }
         }
     }