Abstract infrastructure modules and refactor existing modules (opengo…

…ofy#1305)

agents/threadpool/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/registry/AgentThreadPoolExecutorHolder.java

@@ -19,7 +19,6 @@
 
 import cn.hippo4j.agent.core.logging.api.ILog;
 import cn.hippo4j.agent.core.logging.api.LogManager;
-import cn.hippo4j.common.config.ExecutorProperties;
 import lombok.Data;
 
 import java.util.Properties;

agents/threadpool/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/registry/AgentThreadPoolInstanceRegistry.java

@@ -19,7 +19,6 @@
 
 import cn.hippo4j.agent.core.logging.api.ILog;
 import cn.hippo4j.agent.core.logging.api.LogManager;
-import cn.hippo4j.common.config.ExecutorProperties;
 
 import java.util.Map;
 import java.util.Optional;

agents/threadpool/hippo4j-agent-plugin/spring-plugins/spring-boot-1.x-plugin/src/main/java/cn/hippo4j/agent/plugin/spring/boot/v1/interceptor/EventPublishingFinishedInterceptor.java

@@ -24,8 +24,8 @@
 import cn.hippo4j.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
 import cn.hippo4j.agent.plugin.spring.boot.v1.DynamicThreadPoolChangeHandlerSpring1x;
 import cn.hippo4j.agent.plugin.spring.common.support.SpringPropertiesLoader;
-import cn.hippo4j.agent.plugin.spring.common.support.IDynamicThreadPoolChangeHandlerSpring;
 import cn.hippo4j.agent.plugin.spring.common.support.SpringThreadPoolRegisterSupport;
+import cn.hippo4j.threadpool.dynamic.api.ThreadPoolDynamicRefresh;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -54,9 +54,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA
             return ret;
         }
         SpringPropertiesLoader.loadSpringProperties(context.getEnvironment());
-        IDynamicThreadPoolChangeHandlerSpring handlerSpring1x = new DynamicThreadPoolChangeHandlerSpring1x(context);
-        handlerSpring1x.registerApolloConfigHandler();
-
+        ThreadPoolDynamicRefresh dynamicRefreshSpring1x = new DynamicThreadPoolChangeHandlerSpring1x(context);
+        dynamicRefreshSpring1x.registerListener();
         return ret;
     }
 

agents/threadpool/hippo4j-agent-plugin/spring-plugins/spring-boot-2.x-plugin/src/main/java/cn/hippo4j/agent/plugin/spring/boot/v2/interceptor/EventPublishingStartedInterceptor.java

@@ -24,8 +24,8 @@
 import cn.hippo4j.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
 import cn.hippo4j.agent.plugin.spring.boot.v2.DynamicThreadPoolChangeHandlerSpring2x;
 import cn.hippo4j.agent.plugin.spring.common.support.SpringPropertiesLoader;
-import cn.hippo4j.agent.plugin.spring.common.support.IDynamicThreadPoolChangeHandlerSpring;
 import cn.hippo4j.agent.plugin.spring.common.support.SpringThreadPoolRegisterSupport;
+import cn.hippo4j.threadpool.dynamic.api.ThreadPoolDynamicRefresh;
 import org.springframework.context.ConfigurableApplicationContext;
 
 import java.lang.reflect.Method;
@@ -51,8 +51,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA
             return ret;
         }
         SpringPropertiesLoader.loadSpringProperties(context.getEnvironment());
-        IDynamicThreadPoolChangeHandlerSpring handler = new DynamicThreadPoolChangeHandlerSpring2x(context);
-        handler.registerApolloConfigHandler();
+        ThreadPoolDynamicRefresh dynamicRefresh = new DynamicThreadPoolChangeHandlerSpring2x(context);
+        dynamicRefresh.registerListener();
 
         return ret;
     }

agents/threadpool/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/pom.xml

@@ -41,6 +41,13 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>cn.hippo4j</groupId>
+            <artifactId>hippo4j-threadpool-dynamic-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

agents/threadpool/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/src/main/java/cn/hippo4j/agent/plugin/spring/common/support/AbstractDynamicThreadPoolChangeHandlerSpring.java

@@ -21,7 +21,7 @@
 import cn.hippo4j.agent.core.registry.AgentThreadPoolInstanceRegistry;
 import cn.hippo4j.agent.core.util.ThreadPoolPropertyKey;
 import cn.hippo4j.agent.plugin.spring.common.conf.SpringBootConfig;
-import cn.hippo4j.common.config.ExecutorProperties;
+import cn.hippo4j.common.model.executor.ExecutorProperties;
 import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
 import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum;
 import cn.hippo4j.common.executor.support.ResizableCapacityLinkedBlockingQueue;
@@ -32,6 +32,7 @@
 import cn.hippo4j.config.springboot.starter.parser.ConfigParserHandler;
 import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
 import cn.hippo4j.message.request.ChangeParameterNotifyRequest;
+import cn.hippo4j.threadpool.dynamic.api.ThreadPoolDynamicRefresh;
 import com.ctrip.framework.apollo.ConfigChangeListener;
 import com.ctrip.framework.apollo.ConfigFile;
 import com.ctrip.framework.apollo.ConfigService;
@@ -59,7 +60,7 @@
 /**
  * Abstract dynamic thread poo change handler spring
  */
-public abstract class AbstractDynamicThreadPoolChangeHandlerSpring implements IDynamicThreadPoolChangeHandlerSpring {
+public abstract class AbstractDynamicThreadPoolChangeHandlerSpring implements ThreadPoolDynamicRefresh {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractDynamicThreadPoolChangeHandlerSpring.class);
 
@@ -69,7 +70,7 @@ public AbstractDynamicThreadPoolChangeHandlerSpring(ConfigurableApplicationConte
         this.applicationContext = context;
     }
 
-    public void registerApolloConfigHandler() {
+    public void registerListener() {
 
         List<String> apolloNamespaces = SpringBootConfig.Spring.Dynamic.Thread_Pool.Apollo.NAMESPACE;
         String namespace = apolloNamespaces.get(0);

docs/deploy.sh

@@ -16,7 +16,6 @@ git add -A
 git commit -m "auto commit"
 
 # github
-git branch -m master main
 GIT_SSH_COMMAND="ssh -i ~/.ssh/hippo4j" git remote add origin [email protected]:hippo4j/hippo4j.github.io.git
 GIT_SSH_COMMAND="ssh -i ~/.ssh/hippo4j" git push -u origin main -f