增加项目单测

adapter/adapter-common/pom.xml

@@ -9,5 +9,4 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dynamic-tp-adapter-common</artifactId>
-
 </project>

adapter/adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/AbstractDtpAdapter.java

@@ -22,6 +22,7 @@
 import com.github.dadiyang.equator.GetterBaseEquator;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.eventbus.Subscribe;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.apache.commons.collections4.CollectionUtils;
@@ -31,9 +32,10 @@
 import org.dromara.dynamictp.common.entity.ThreadPoolStats;
 import org.dromara.dynamictp.common.entity.TpExecutorProps;
 import org.dromara.dynamictp.common.entity.TpMainFields;
+import org.dromara.dynamictp.common.event.CustomContextRefreshedEvent;
+import org.dromara.dynamictp.common.manager.ContextManagerHelper;
+import org.dromara.dynamictp.common.manager.EventBusManager;
 import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.common.spring.ApplicationContextHolder;
-import org.dromara.dynamictp.common.spring.OnceApplicationContextEventListener;
 import org.dromara.dynamictp.common.util.ReflectionUtil;
 import org.dromara.dynamictp.common.util.StreamUtil;
 import org.dromara.dynamictp.core.aware.AwareManager;
@@ -44,7 +46,6 @@
 import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
 import org.dromara.dynamictp.core.support.task.wrapper.TaskWrapper;
 import org.dromara.dynamictp.core.support.task.wrapper.TaskWrappers;
-import org.springframework.context.event.ContextRefreshedEvent;
 
 import java.util.Collections;
 import java.util.List;
@@ -67,16 +68,20 @@
  * @since 1.0.6
  */
 @Slf4j
-public abstract class AbstractDtpAdapter extends OnceApplicationContextEventListener implements DtpAdapter {
+public abstract class AbstractDtpAdapter implements DtpAdapter {
 
     private static final Equator EQUATOR = new GetterBaseEquator();
 
     protected final Map<String, ExecutorWrapper> executors = Maps.newHashMap();
 
-    @Override
-    protected void onContextRefreshedEvent(ContextRefreshedEvent event) {
+    public AbstractDtpAdapter() {
+        EventBusManager.register(this);
+    }
+
+    @Subscribe
+    public synchronized void onContextRefreshedEvent(CustomContextRefreshedEvent event) {
         try {
-            DtpProperties dtpProperties = ApplicationContextHolder.getBean(DtpProperties.class);
+            DtpProperties dtpProperties = ContextManagerHelper.getBean(DtpProperties.class);
             initialize();
             afterInitialize();
             refresh(dtpProperties);
@@ -163,12 +168,8 @@ protected TpMainFields getTpMainFields(ExecutorWrapper executorWrapper, TpExecut
 
     protected void enhanceOriginExecutor(String tpName, ThreadPoolExecutor executor, String fieldName, Object targetObj) {
         ThreadPoolExecutorProxy proxy = new ThreadPoolExecutorProxy(executor);
-        try {
-            ReflectionUtil.setFieldValue(fieldName, targetObj, proxy);
-            putAndFinalize(tpName, executor, proxy);
-        } catch (IllegalAccessException e) {
-            log.error("DynamicTp adapter, enhance {} failed.", tpName, e);
-        }
+        ReflectionUtil.setFieldValue(fieldName, targetObj, proxy);
+        putAndFinalize(tpName, executor, proxy);
     }
 
     protected void putAndFinalize(String tpName, ExecutorService origin, Executor targetForWrapper) {
@@ -220,3 +221,4 @@ private void doRefreshPoolSize(ExecutorAdapter<?> executor, TpExecutorProps prop
         }
     }
 }
+

adapter/adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/DtpAdapterListener.java

@@ -17,21 +17,19 @@
 
 package org.dromara.dynamictp.adapter.common;
 
-import org.dromara.dynamictp.common.spring.ApplicationContextHolder;
+import com.google.common.eventbus.Subscribe;
 import org.dromara.dynamictp.common.event.AlarmCheckEvent;
 import org.dromara.dynamictp.common.event.CollectEvent;
 import org.dromara.dynamictp.common.event.RefreshEvent;
+import org.dromara.dynamictp.common.manager.ContextManagerHelper;
+import org.dromara.dynamictp.common.manager.EventBusManager;
 import org.dromara.dynamictp.common.properties.DtpProperties;
 import org.dromara.dynamictp.core.handler.CollectorHandler;
 import org.dromara.dynamictp.core.notifier.manager.AlarmManager;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.event.GenericApplicationListener;
-import org.springframework.core.ResolvableType;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
-import org.springframework.util.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import java.util.EventObject;
 
 import static org.dromara.dynamictp.common.constant.DynamicTpConst.SCHEDULE_NOTIFY_ITEMS;
 
@@ -42,62 +40,37 @@
  * @since 1.0.6
  */
 @Slf4j
-public class DtpAdapterListener implements GenericApplicationListener {
+public class DtpAdapterListener {
 
-    @Override
-    public boolean supportsEventType(ResolvableType resolvableType) {
-        Class<?> type = resolvableType.getRawClass();
-        if (type != null) {
-            return RefreshEvent.class.isAssignableFrom(type)
-                    || CollectEvent.class.isAssignableFrom(type)
-                    || AlarmCheckEvent.class.isAssignableFrom(type);
-        }
-        return false;
+    public DtpAdapterListener() {
+        EventBusManager.register(this);
     }
 
-    @Override
-    public void onApplicationEvent(@NonNull ApplicationEvent event) {
+    @Subscribe
+    public void handleRefreshedEvent(EventObject event) {
         try {
             if (event instanceof RefreshEvent) {
-                doRefresh(((RefreshEvent) event).getDtpProperties());
+                RefreshEvent refreshEvent = (RefreshEvent) event;
+                doRefresh(refreshEvent.getDtpProperties());
             } else if (event instanceof CollectEvent) {
-                doCollect(((CollectEvent) event).getDtpProperties());
+                CollectEvent collectEvent = (CollectEvent) event;
+                doCollect(collectEvent.getDtpProperties());
             } else if (event instanceof AlarmCheckEvent) {
-                doAlarmCheck(((AlarmCheckEvent) event).getDtpProperties());
+                AlarmCheckEvent alarmCheckEvent = (AlarmCheckEvent) event;
+                doAlarmCheck(alarmCheckEvent.getDtpProperties());
             }
         } catch (Exception e) {
             log.error("DynamicTp adapter, event handle failed.", e);
         }
     }
 
-    /**
-     * Compatible with lower versions of spring.
-     *
-     * @param sourceType sourceType
-     * @return true if support
-     */
-    @Override
-    public boolean supportsSourceType(@Nullable Class<?> sourceType) {
-        return true;
-    }
-
-    /**
-     * Compatible with lower versions of spring.
-     *
-     * @return order
-     */
-    @Override
-    public int getOrder() {
-        return LOWEST_PRECEDENCE;
-    }
-
     /**
      * Do collect thread pool stats.
      * @param dtpProperties dtpProperties
      */
     protected void doCollect(DtpProperties dtpProperties) {
-        val handlerMap = ApplicationContextHolder.getBeansOfType(DtpAdapter.class);
-        if (CollectionUtils.isEmpty(handlerMap)) {
+        val handlerMap = ContextManagerHelper.getBeansOfType(DtpAdapter.class);
+        if (MapUtils.isEmpty(handlerMap)) {
             return;
         }
         handlerMap.forEach((k, v) -> v.getMultiPoolStats().forEach(ps ->
@@ -109,8 +82,8 @@ protected void doCollect(DtpProperties dtpProperties) {
      * @param dtpProperties dtpProperties
      */
     protected void doRefresh(DtpProperties dtpProperties) {
-        val handlerMap = ApplicationContextHolder.getBeansOfType(DtpAdapter.class);
-        if (CollectionUtils.isEmpty(handlerMap)) {
+        val handlerMap = ContextManagerHelper.getBeansOfType(DtpAdapter.class);
+        if (MapUtils.isEmpty(handlerMap)) {
             return;
         }
         handlerMap.forEach((k, v) -> v.refresh(dtpProperties));
@@ -121,8 +94,8 @@ protected void doRefresh(DtpProperties dtpProperties) {
      * @param dtpProperties dtpProperties
      */
     protected void doAlarmCheck(DtpProperties dtpProperties) {
-        val handlerMap = ApplicationContextHolder.getBeansOfType(DtpAdapter.class);
-        if (CollectionUtils.isEmpty(handlerMap)) {
+        val handlerMap = ContextManagerHelper.getBeansOfType(DtpAdapter.class);
+        if (MapUtils.isEmpty(handlerMap)) {
             return;
         }
         handlerMap.forEach((k, v) -> {

adapter/adapter-dubbo/src/main/java/org/dromara/dynamictp/adapter/dubbo/alibaba/AlibabaDubboDtpAdapter.java

@@ -23,8 +23,8 @@
 import lombok.val;
 import org.apache.commons.collections4.CollectionUtils;
 import org.dromara.dynamictp.adapter.common.AbstractDtpAdapter;
+import org.dromara.dynamictp.common.manager.ContextManagerHelper;
 import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.common.spring.ApplicationContextHolder;
 import org.dromara.dynamictp.jvmti.JVMTI;
 import org.springframework.beans.factory.InitializingBean;
 
@@ -59,7 +59,7 @@ public void afterPropertiesSet() throws Exception {
             while (!registered.get()) {
                 try {
                     Thread.sleep(1000);
-                    DtpProperties dtpProperties = ApplicationContextHolder.getBean(DtpProperties.class);
+                    DtpProperties dtpProperties = ContextManagerHelper.getBean(DtpProperties.class);
                     initialize();
                     afterInitialize();
                     refresh(dtpProperties);

adapter/adapter-dubbo/src/main/java/org/dromara/dynamictp/adapter/dubbo/apache/ApacheDubboDtpAdapter.java

@@ -32,12 +32,13 @@
 import org.apache.dubbo.remoting.transport.dispatcher.WrappedChannelHandler;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.dromara.dynamictp.adapter.common.AbstractDtpAdapter;
+import org.dromara.dynamictp.common.manager.ContextManagerHelper;
 import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.common.spring.ApplicationContextHolder;
 import org.dromara.dynamictp.common.util.ReflectionUtil;
 import org.dromara.dynamictp.core.support.ThreadPoolExecutorProxy;
 import org.dromara.dynamictp.jvmti.JVMTI;
 import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
 
 import java.util.Map;
 import java.util.Objects;
@@ -57,7 +58,7 @@
  */
 @Slf4j
 @SuppressWarnings("all")
-public class ApacheDubboDtpAdapter extends AbstractDtpAdapter {
+public class ApacheDubboDtpAdapter extends AbstractDtpAdapter implements ApplicationListener<ApplicationEvent> {
 
     private static final String TP_PREFIX = "dubboTp";
 
@@ -69,7 +70,7 @@ public class ApacheDubboDtpAdapter extends AbstractDtpAdapter {
     public void onApplicationEvent(ApplicationEvent event) {
         if (event instanceof ServiceBeanExportedEvent) {
             try {
-                DtpProperties dtpProperties = ApplicationContextHolder.getBean(DtpProperties.class);
+                DtpProperties dtpProperties = ContextManagerHelper.getBean(DtpProperties.class);
                 initialize();
                 afterInitialize();
                 refresh(dtpProperties);

adapter/adapter-hystrix/src/main/java/org/dromara/dynamictp/adapter/hystrix/DtpMetricsPublisherThreadPool.java

@@ -25,7 +25,7 @@
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.dromara.dynamictp.common.entity.TpExecutorProps;
-import org.dromara.dynamictp.common.spring.ApplicationContextHolder;
+import org.dromara.dynamictp.common.manager.ContextManagerHelper;
 import org.dromara.dynamictp.common.util.ReflectionUtil;
 
 import java.util.Objects;
@@ -70,7 +70,7 @@ public DtpMetricsPublisherThreadPool(
     @Override
     public void initialize() {
         metricsPublisherForThreadPool.initialize();
-        HystrixDtpAdapter hystrixTpHandler = ApplicationContextHolder.getBean(HystrixDtpAdapter.class);
+        HystrixDtpAdapter hystrixTpHandler = ContextManagerHelper.getBean(HystrixDtpAdapter.class);
         hystrixTpHandler.cacheMetricsPublisher(threadPoolKey.name(), this);
         hystrixTpHandler.register(threadPoolKey.name(), metrics);
     }
@@ -80,37 +80,33 @@ public void refreshProperties(TpExecutorProps props) {
             return;
         }
 
-        try {
-            if (!Objects.equals(threadPoolProperties.coreSize().get(), props.getCorePoolSize())) {
-                val corePoolSize = getProperty(threadPoolKey, "coreSize",
-                        props.getCorePoolSize(), DEFAULT_CORE_SIZE);
-                ReflectionUtil.setFieldValue(HystrixThreadPoolProperties.class,
-                        "corePoolSize", threadPoolProperties, corePoolSize);
-            }
-
-            if (!Objects.equals(threadPoolProperties.maximumSize().get(), props.getMaximumPoolSize())) {
-                val maxPoolSize = getProperty(threadPoolKey, "maximumSize",
-                        props.getMaximumPoolSize(), DEFAULT_MAXIMUM_SIZE);
-                ReflectionUtil.setFieldValue(HystrixThreadPoolProperties.class,
-                        "maximumPoolSize", threadPoolProperties, maxPoolSize);
-            }
-
-            val keepAliveTimeMinutes = (int) TimeUnit.SECONDS.toMinutes(props.getKeepAliveTime());
-            if (!Objects.equals(threadPoolProperties.keepAliveTimeMinutes().get(), keepAliveTimeMinutes)) {
-                val keepAliveTimeProperty = getProperty(threadPoolKey,
-                        "keepAliveTimeMinutes", keepAliveTimeMinutes, DEFAULT_KEEP_ALIVE_TIME_MINUTES);
-                ReflectionUtil.setFieldValue(HystrixThreadPoolProperties.class,
-                        "keepAliveTime", threadPoolProperties, keepAliveTimeProperty);
-            }
-
-            if (init.compareAndSet(false, true)) {
-                val allowSetMax = getProperty(threadPoolKey,
-                        "allowMaximumSizeToDivergeFromCoreSize", true, true);
-                ReflectionUtil.setFieldValue(HystrixThreadPoolProperties.class,
-                        "allowMaximumSizeToDivergeFromCoreSize", threadPoolProperties, allowSetMax);
-            }
-        } catch (IllegalAccessException e) {
-            log.error("DynamicTp hystrix adapter, reset hystrix threadPool properties failed.", e);
+        if (!Objects.equals(threadPoolProperties.coreSize().get(), props.getCorePoolSize())) {
+            val corePoolSize = getProperty(threadPoolKey, "coreSize",
+                    props.getCorePoolSize(), DEFAULT_CORE_SIZE);
+            ReflectionUtil.setFieldValue(HystrixThreadPoolProperties.class,
+                    "corePoolSize", threadPoolProperties, corePoolSize);
+        }
+
+        if (!Objects.equals(threadPoolProperties.maximumSize().get(), props.getMaximumPoolSize())) {
+            val maxPoolSize = getProperty(threadPoolKey, "maximumSize",
+                    props.getMaximumPoolSize(), DEFAULT_MAXIMUM_SIZE);
+            ReflectionUtil.setFieldValue(HystrixThreadPoolProperties.class,
+                    "maximumPoolSize", threadPoolProperties, maxPoolSize);
+        }
+
+        val keepAliveTimeMinutes = (int) TimeUnit.SECONDS.toMinutes(props.getKeepAliveTime());
+        if (!Objects.equals(threadPoolProperties.keepAliveTimeMinutes().get(), keepAliveTimeMinutes)) {
+            val keepAliveTimeProperty = getProperty(threadPoolKey,
+                    "keepAliveTimeMinutes", keepAliveTimeMinutes, DEFAULT_KEEP_ALIVE_TIME_MINUTES);
+            ReflectionUtil.setFieldValue(HystrixThreadPoolProperties.class,
+                    "keepAliveTime", threadPoolProperties, keepAliveTimeProperty);
+        }
+
+        if (init.compareAndSet(false, true)) {
+            val allowSetMax = getProperty(threadPoolKey,
+                    "allowMaximumSizeToDivergeFromCoreSize", true, true);
+            ReflectionUtil.setFieldValue(HystrixThreadPoolProperties.class,
+                    "allowMaximumSizeToDivergeFromCoreSize", threadPoolProperties, allowSetMax);
         }
     }
 

adapter/adapter-hystrix/src/main/java/org/dromara/dynamictp/adapter/hystrix/HystrixDtpAdapter.java

@@ -30,8 +30,8 @@
 import org.dromara.dynamictp.adapter.common.AbstractDtpAdapter;
 import org.dromara.dynamictp.common.entity.NotifyPlatform;
 import org.dromara.dynamictp.common.entity.TpExecutorProps;
+import org.dromara.dynamictp.common.manager.ContextManagerHelper;
 import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.common.spring.ApplicationContextHolder;
 import org.dromara.dynamictp.common.util.StreamUtil;
 import org.dromara.dynamictp.core.support.ExecutorWrapper;
 
@@ -81,7 +81,7 @@ public void register(String poolName, HystrixThreadPoolMetrics metrics) {
             return;
         }
 
-        DtpProperties dtpProperties = ApplicationContextHolder.getBean(DtpProperties.class);
+        DtpProperties dtpProperties = ContextManagerHelper.getBean(DtpProperties.class);
         val prop = StreamUtil.toMap(dtpProperties.getHystrixTp(), TpExecutorProps::getThreadPoolName);
         String tpName = TP_PREFIX + "#" + poolName;
         enhanceOriginExecutor(tpName, threadPoolExecutor, THREAD_POOL_FIELD, metrics);

adapter/adapter-motan/src/main/java/org/dromara/dynamictp/adapter/motan/MotanDtpAdapter.java

@@ -28,8 +28,8 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.dromara.dynamictp.adapter.common.AbstractDtpAdapter;
+import org.dromara.dynamictp.common.manager.ContextManagerHelper;
 import org.dromara.dynamictp.common.properties.DtpProperties;
-import org.dromara.dynamictp.common.spring.ApplicationContextHolder;
 import org.dromara.dynamictp.common.util.ReflectionUtil;
 
 import java.util.List;
@@ -65,7 +65,7 @@ protected String getTpPrefix() {
     protected void initialize() {
         super.initialize();
 
-        val beans = ApplicationContextHolder.getBeansOfType(ServiceConfigBean.class);
+        val beans = ContextManagerHelper.getBeansOfType(ServiceConfigBean.class);
         if (MapUtils.isEmpty(beans)) {
             log.warn("Cannot find beans of type ServiceConfigBean.");
             return;
@@ -89,12 +89,8 @@ protected void initialize() {
                 if (Objects.nonNull(executor)) {
                     StandardThreadExecutorProxy proxy = new StandardThreadExecutorProxy(executor);
                     String tpName = TP_PREFIX + "#" + nettyServer.getUrl().getPort();
-                    try {
-                        ReflectionUtil.setFieldValue(EXECUTOR_FIELD, nettyServer, proxy);
-                        putAndFinalize(tpName, executor, proxy);
-                    } catch (IllegalAccessException ex) {
-                        log.error("DynamicTp adapter, enhance {} failed.", tpName, ex);
-                    }
+                    ReflectionUtil.setFieldValue(EXECUTOR_FIELD, nettyServer, proxy);
+                    putAndFinalize(tpName, executor, proxy);
                 }
             });
         });