diff --git a/examples/threadpool-example/example-core/src/main/java/cn/hippo4j/example/core/handler/CustomerClientNetworkService.java b/examples/threadpool-example/example-core/src/main/java/cn/hippo4j/example/core/handler/CustomerClientNetworkService.java
index 3070a043..d01f01bb 100644
--- a/examples/threadpool-example/example-core/src/main/java/cn/hippo4j/example/core/handler/CustomerClientNetworkService.java
+++ b/examples/threadpool-example/example-core/src/main/java/cn/hippo4j/example/core/handler/CustomerClientNetworkService.java
@@ -17,7 +17,7 @@
package cn.hippo4j.example.core.handler;
-import cn.hippo4j.common.api.ClientNetworkService;
+import cn.hippo4j.core.api.ClientNetworkService;
import org.springframework.core.env.ConfigurableEnvironment;
/**
diff --git a/examples/threadpool-example/server/adapter-stream-rocketmq/src/main/resources/META-INF/services/cn.hippo4j.common.api.ClientNetworkService b/examples/threadpool-example/server/adapter-stream-rocketmq/src/main/resources/META-INF/services/cn.hippo4j.core.api.ClientNetworkService
similarity index 100%
rename from examples/threadpool-example/server/adapter-stream-rocketmq/src/main/resources/META-INF/services/cn.hippo4j.common.api.ClientNetworkService
rename to examples/threadpool-example/server/adapter-stream-rocketmq/src/main/resources/META-INF/services/cn.hippo4j.core.api.ClientNetworkService
diff --git a/examples/threadpool-example/server/server/src/main/resources/META-INF/services/cn.hippo4j.common.api.ClientNetworkService b/examples/threadpool-example/server/server/src/main/resources/META-INF/services/cn.hippo4j.core.api.ClientNetworkService
similarity index 100%
rename from examples/threadpool-example/server/server/src/main/resources/META-INF/services/cn.hippo4j.common.api.ClientNetworkService
rename to examples/threadpool-example/server/server/src/main/resources/META-INF/services/cn.hippo4j.core.api.ClientNetworkService
diff --git a/infra/common/pom.xml b/infra/common/pom.xml
index 767eb6ee..20f67cbb 100644
--- a/infra/common/pom.xml
+++ b/infra/common/pom.xml
@@ -14,14 +14,24 @@
com.fasterxml.jackson.corejackson-databind
-
- org.springframework.boot
- spring-boot-starter
- org.projectlomboklombok
+
+ com.github.ben-manes.caffeine
+ caffeine
+
+
+ com.github.dozermapper
+ dozer-core
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ true
+
+
org.springframework.bootspring-boot-starter-test
@@ -37,22 +47,11 @@
mockito-inlinetest
-
- com.github.ben-manes.caffeine
- caffeine
-
-
- com.github.dozermapper
- dozer-core
-
-
- org.springframework.boot
- spring-boot-configuration-processor
- org.apache.tomcat.embedtomcat-embed-coretest
+
diff --git a/infra/common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java b/infra/common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java
index 9bda7204..fba4248e 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java
@@ -28,9 +28,9 @@ public interface ClientCloseHookExecute {
/**
* Client close hook function execution.
*
- * @param req
+ * @param requestParam
*/
- void closeHook(ClientCloseHookReq req);
+ void closeHook(ClientCloseHookReq requestParam);
/**
* Client close hook req.
diff --git a/infra/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java
index 933863ac..5928d2cc 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java
@@ -17,7 +17,7 @@
package cn.hippo4j.common.executor.support;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import lombok.Getter;
import java.util.Collection;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java
index 98272da1..651530d0 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java
@@ -17,12 +17,10 @@
package cn.hippo4j.common.executor.support;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import lombok.Getter;
-import java.util.Collection;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.stream.Stream;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderInstantiationException.java b/infra/common/src/main/java/cn/hippo4j/common/extension/spi/ServiceLoaderInstantiationException.java
similarity index 96%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderInstantiationException.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/spi/ServiceLoaderInstantiationException.java
index 239817d1..f45b5009 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderInstantiationException.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/spi/ServiceLoaderInstantiationException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.support;
+package cn.hippo4j.common.extension.spi;
/**
* Service loader instantiation exception.
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderRegistry.java b/infra/common/src/main/java/cn/hippo4j/common/extension/spi/ServiceLoaderRegistry.java
similarity index 96%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderRegistry.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/spi/ServiceLoaderRegistry.java
index 37d4a43d..5d6e7434 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ServiceLoaderRegistry.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/spi/ServiceLoaderRegistry.java
@@ -15,9 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.support;
-
-import cn.hippo4j.common.extension.annotation.SingletonSPI;
+package cn.hippo4j.common.extension.spi;
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
@@ -31,7 +29,6 @@ import java.util.stream.Collectors;
/**
* Dynamic thread-pool SPI service loader.
*/
-@Deprecated
public class ServiceLoaderRegistry {
/**
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/annotation/SingletonSPI.java b/infra/common/src/main/java/cn/hippo4j/common/extension/spi/SingletonSPI.java
similarity index 94%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/annotation/SingletonSPI.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/spi/SingletonSPI.java
index 7f1620ba..664e3cb4 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/annotation/SingletonSPI.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/spi/SingletonSPI.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.annotation;
+package cn.hippo4j.common.extension.spi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -27,6 +27,5 @@ import java.lang.annotation.Target;
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
public @interface SingletonSPI {
}
diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
index 3dee268f..cfcc3ae7 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
@@ -17,9 +17,6 @@
package cn.hippo4j.common.toolkit;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
import java.util.Collection;
import java.util.Map;
@@ -65,7 +62,7 @@ public class Assert {
}
public static void notEmpty(Collection> collection, String message) {
- if (CollectionUtils.isEmpty(collection)) {
+ if (CollectionUtil.isEmpty(collection)) {
throw new IllegalArgumentException(message);
}
}
@@ -76,7 +73,7 @@ public class Assert {
}
public static void notEmpty(Map, ?> map, String message) {
- if (CollectionUtils.isEmpty(map)) {
+ if (CollectionUtil.isEmpty(map)) {
throw new IllegalArgumentException(message);
}
}
@@ -86,13 +83,13 @@ public class Assert {
}
public static void notEmpty(String str, String message) {
- if (StringUtils.isEmpty(str)) {
+ if (StringUtil.isEmpty(str)) {
throw new IllegalArgumentException(message);
}
}
public static void notEmpty(String str) {
- if (StringUtils.isEmpty(str)) {
+ if (StringUtil.isEmpty(str)) {
notEmpty(str, "[Assertion failed] - this string must not be empty");
}
}
@@ -108,7 +105,7 @@ public class Assert {
}
public static void hasText(String text, String message) {
- if (!StringUtils.hasText(text)) {
+ if (!StringUtil.hasText(text)) {
throw new IllegalArgumentException(message);
}
}
diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
index cea1792e..f694c038 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
@@ -18,7 +18,6 @@
package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.constant.Constants;
-import org.springframework.util.StringUtils;
import static cn.hippo4j.common.constant.Constants.GROUP_KEY_DELIMITER;
@@ -55,7 +54,7 @@ public class GroupKey {
urlEncode(dataId, sb);
sb.append(GROUP_KEY_DELIMITER);
urlEncode(group, sb);
- if (!StringUtils.isEmpty(datumStr)) {
+ if (!StringUtil.isEmpty(datumStr)) {
sb.append(GROUP_KEY_DELIMITER);
urlEncode(datumStr, sb);
}
diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
index 6f6c2efe..89181f01 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
@@ -20,7 +20,6 @@ package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.web.exception.IllegalException;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.springframework.cglib.core.ReflectUtils;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
@@ -308,17 +307,20 @@ public class ReflectUtil {
}
/**
- *
* @param clazz
* @param methodName
* @param parameterTypes
* @return
*/
- public static Method findDeclaredMethod(Class clazz, String methodName, Class[] parameterTypes) {
- try {
- return ReflectUtils.findDeclaredMethod(clazz, methodName, parameterTypes);
- } catch (NoSuchMethodException e) {
- throw new RuntimeException(e);
+ public static Method findDeclaredMethod(Class clazz, String methodName, Class[] parameterTypes) throws NoSuchMethodException {
+ Class cl = clazz;
+ while (cl != null) {
+ try {
+ return cl.getDeclaredMethod(methodName, parameterTypes);
+ } catch (NoSuchMethodException e) {
+ cl = cl.getSuperclass();
+ }
}
+ throw new NoSuchMethodException(methodName);
}
}
diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
index 1134b34b..d7f105a4 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
@@ -362,4 +362,30 @@ public class StringUtil {
}
return str.substring(0, pos);
}
+
+ /**
+ * Determine whether it is a string.
+ *
+ * @param str string
+ * @return String returns true, non-string returns false
+ */
+ public static boolean hasText(String str) {
+ return (str != null && !str.isEmpty() && containsText(str));
+ }
+
+ /**
+ * Whether to contain a string.
+ *
+ * @param str str
+ * @return String returns true, non-string returns false
+ */
+ private static boolean containsText(CharSequence str) {
+ int strLen = str.length();
+ for (int i = 0; i < strLen; i++) {
+ if (!Character.isWhitespace(str.charAt(i))) {
+ return true;
+ }
+ }
+ return false;
+ }
}
diff --git a/infra/common/src/main/resources/META-INF/spring.factories b/infra/common/src/main/resources/META-INF/spring.factories
index 520aa9cd..097c5c2e 100644
--- a/infra/common/src/main/resources/META-INF/spring.factories
+++ b/infra/common/src/main/resources/META-INF/spring.factories
@@ -1 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.common.extension.support.ExtensionAutoConfiguration
\ No newline at end of file
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.core.extension.support.ExtensionAutoConfiguration
\ No newline at end of file
diff --git a/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue b/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue
deleted file mode 100644
index 0df513e2..00000000
--- a/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue
+++ /dev/null
@@ -1 +0,0 @@
-cn.hippo4j.common.spi.MyArrayBlockingQueue
\ No newline at end of file
diff --git a/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.extension.spi.IOldSpi b/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.extension.spi.IOldSpi
deleted file mode 100644
index 29dcbcac..00000000
--- a/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.extension.spi.IOldSpi
+++ /dev/null
@@ -1 +0,0 @@
-cn.hippo4j.common.extension.spi.IOldSpiImplA
\ No newline at end of file
diff --git a/starters/threadpool/adapter/alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/alibaba/dubbo/AlibabaDubboAdapterAutoConfiguration.java b/starters/threadpool/adapter/alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/alibaba/dubbo/AlibabaDubboAdapterAutoConfiguration.java
index 03d9fcfb..dc7cfb38 100644
--- a/starters/threadpool/adapter/alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/alibaba/dubbo/AlibabaDubboAdapterAutoConfiguration.java
+++ b/starters/threadpool/adapter/alibaba-dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/alibaba/dubbo/AlibabaDubboAdapterAutoConfiguration.java
@@ -18,7 +18,7 @@
package cn.hippo4j.springboot.starter.adapter.alibaba.dubbo;
import cn.hippo4j.adapter.alibaba.dubbo.AlibabaDubboThreadPoolAdapter;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git a/starters/threadpool/adapter/dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/DubboAdapterAutoConfiguration.java b/starters/threadpool/adapter/dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/DubboAdapterAutoConfiguration.java
index badf3efd..632ba19d 100644
--- a/starters/threadpool/adapter/dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/DubboAdapterAutoConfiguration.java
+++ b/starters/threadpool/adapter/dubbo/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/DubboAdapterAutoConfiguration.java
@@ -18,7 +18,7 @@
package cn.hippo4j.springboot.starter.adapter.dubbo;
import cn.hippo4j.adapter.dubbo.DubboThreadPoolAdapter;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git a/starters/threadpool/adapter/dubbox/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/DubboxAdapterAutoConfiguration.java b/starters/threadpool/adapter/dubbox/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/DubboxAdapterAutoConfiguration.java
index ff760c53..51095944 100644
--- a/starters/threadpool/adapter/dubbox/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/DubboxAdapterAutoConfiguration.java
+++ b/starters/threadpool/adapter/dubbox/src/main/java/cn/hippo4j/springboot/starter/adapter/dubbo/DubboxAdapterAutoConfiguration.java
@@ -19,7 +19,7 @@ package cn.hippo4j.springboot.starter.adapter.dubbo;
import cn.hippo4j.adapter.dubbo.DubboThreadPoolAdapter;
import cn.hippo4j.adapter.dubbo.DubboxThreadPoolAdapter;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git a/starters/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/springboot/starter/adapter/hystrix/HystrixAdapterAutoConfiguration.java b/starters/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/springboot/starter/adapter/hystrix/HystrixAdapterAutoConfiguration.java
index f8492a04..5fd67420 100644
--- a/starters/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/springboot/starter/adapter/hystrix/HystrixAdapterAutoConfiguration.java
+++ b/starters/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/springboot/starter/adapter/hystrix/HystrixAdapterAutoConfiguration.java
@@ -20,7 +20,7 @@ package cn.hippo4j.springboot.starter.adapter.hystrix;
import cn.hippo4j.adapter.hystrix.HystrixThreadPoolAdapter4Config;
import cn.hippo4j.adapter.hystrix.HystrixThreadPoolAdapter4Server;
import cn.hippo4j.adapter.hystrix.ThreadPoolAdapterScheduler;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
diff --git a/starters/threadpool/adapter/kafka/src/main/java/cn/hippo4j/springboot/starter/adapter/kafka/KafkaAdapterAutoConfiguration.java b/starters/threadpool/adapter/kafka/src/main/java/cn/hippo4j/springboot/starter/adapter/kafka/KafkaAdapterAutoConfiguration.java
index 24107d28..5a5b194f 100644
--- a/starters/threadpool/adapter/kafka/src/main/java/cn/hippo4j/springboot/starter/adapter/kafka/KafkaAdapterAutoConfiguration.java
+++ b/starters/threadpool/adapter/kafka/src/main/java/cn/hippo4j/springboot/starter/adapter/kafka/KafkaAdapterAutoConfiguration.java
@@ -18,7 +18,7 @@
package cn.hippo4j.springboot.starter.adapter.kafka;
import cn.hippo4j.adapter.kafka.KafkaThreadPoolAdapter;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/starters/threadpool/adapter/rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/RabbitMQAdapterAutoConfiguration.java b/starters/threadpool/adapter/rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/RabbitMQAdapterAutoConfiguration.java
index aec28c6d..85ea6a7f 100644
--- a/starters/threadpool/adapter/rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/RabbitMQAdapterAutoConfiguration.java
+++ b/starters/threadpool/adapter/rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/RabbitMQAdapterAutoConfiguration.java
@@ -20,7 +20,7 @@ package cn.hippo4j.springboot.starter.adapter.rabbitmq;
import java.util.Map;
import cn.hippo4j.adapter.rabbitmq.RabbitMQThreadPoolAdapter;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import lombok.RequiredArgsConstructor;
import org.springframework.amqp.rabbit.connection.AbstractConnectionFactory;
diff --git a/starters/threadpool/adapter/rocketmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rocketmq/RocketMQAdapterAutoConfiguration.java b/starters/threadpool/adapter/rocketmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rocketmq/RocketMQAdapterAutoConfiguration.java
index 02b73d71..bffc969f 100644
--- a/starters/threadpool/adapter/rocketmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rocketmq/RocketMQAdapterAutoConfiguration.java
+++ b/starters/threadpool/adapter/rocketmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rocketmq/RocketMQAdapterAutoConfiguration.java
@@ -18,7 +18,7 @@
package cn.hippo4j.springboot.starter.adapter.rocketmq;
import cn.hippo4j.adapter.rocketmq.RocketMQThreadPoolAdapter;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git a/starters/threadpool/adapter/stream-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQAdapterAutoConfiguration.java b/starters/threadpool/adapter/stream-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQAdapterAutoConfiguration.java
index 4d87afb9..a4c42221 100644
--- a/starters/threadpool/adapter/stream-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQAdapterAutoConfiguration.java
+++ b/starters/threadpool/adapter/stream-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQAdapterAutoConfiguration.java
@@ -18,7 +18,7 @@
package cn.hippo4j.springboot.starter.adapter.springcloud.stream.rabbitmq;
import cn.hippo4j.adapter.springcloud.stream.rabbitmq.SpringCloudStreamRabbitMQThreadPoolAdapter;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git a/starters/threadpool/adapter/stream-rocketmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQAdapterAutoConfiguration.java b/starters/threadpool/adapter/stream-rocketmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQAdapterAutoConfiguration.java
index 61d8ced8..0fd74718 100644
--- a/starters/threadpool/adapter/stream-rocketmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQAdapterAutoConfiguration.java
+++ b/starters/threadpool/adapter/stream-rocketmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQAdapterAutoConfiguration.java
@@ -18,7 +18,7 @@
package cn.hippo4j.springboot.starter.adapter.springcloud.stream.rocketmq;
import cn.hippo4j.adapter.springcloud.stream.rocketmq.SpringCloudStreamRocketMQThreadPoolAdapter;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git a/starters/threadpool/adapter/web/src/main/java/cn/hippo4j/springboot/starter/adapter/web/WebAdapterConfiguration.java b/starters/threadpool/adapter/web/src/main/java/cn/hippo4j/springboot/starter/adapter/web/WebAdapterConfiguration.java
index 2765b2f7..af82973d 100644
--- a/starters/threadpool/adapter/web/src/main/java/cn/hippo4j/springboot/starter/adapter/web/WebAdapterConfiguration.java
+++ b/starters/threadpool/adapter/web/src/main/java/cn/hippo4j/springboot/starter/adapter/web/WebAdapterConfiguration.java
@@ -19,7 +19,7 @@ package cn.hippo4j.springboot.starter.adapter.web;
import cn.hippo4j.adapter.web.WebThreadPoolHandlerChoose;
import cn.hippo4j.adapter.web.WebThreadPoolRunStateHandler;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
import cn.hippo4j.core.toolkit.inet.InetUtils;
import lombok.RequiredArgsConstructor;
diff --git a/starters/threadpool/config-spring-boot-1x/src/main/java/cn/hippo4j/config/springboot1x/starter/web/AbstractWebThreadPoolService1x.java b/starters/threadpool/config-spring-boot-1x/src/main/java/cn/hippo4j/config/springboot1x/starter/web/AbstractWebThreadPoolService1x.java
index f0213907..19acda1e 100644
--- a/starters/threadpool/config-spring-boot-1x/src/main/java/cn/hippo4j/config/springboot1x/starter/web/AbstractWebThreadPoolService1x.java
+++ b/starters/threadpool/config-spring-boot-1x/src/main/java/cn/hippo4j/config/springboot1x/starter/web/AbstractWebThreadPoolService1x.java
@@ -19,7 +19,7 @@ package cn.hippo4j.config.springboot1x.starter.web;
import cn.hippo4j.adapter.web.AbstractWebThreadPoolService;
import cn.hippo4j.adapter.web.IWebThreadPoolHandlerSupport;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.embedded.EmbeddedServletContainer;
import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java
index 0d748f7e..70a0f707 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java
@@ -18,8 +18,8 @@
package cn.hippo4j.config.springboot.starter.config;
import cn.hippo4j.adapter.web.WebThreadPoolService;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.config.springboot.starter.monitor.ThreadPoolMonitorExecutor;
import cn.hippo4j.config.springboot.starter.notify.ConfigModeNotifyConfigBuilder;
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/monitor/ThreadPoolMonitorExecutor.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/monitor/ThreadPoolMonitorExecutor.java
index 5b91d02d..985da755 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/monitor/ThreadPoolMonitorExecutor.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/monitor/ThreadPoolMonitorExecutor.java
@@ -25,9 +25,9 @@ import java.util.Optional;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
import cn.hippo4j.config.springboot.starter.config.MonitorProperties;
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/AbstractConfigThreadPoolDynamicRefresh.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/AbstractConfigThreadPoolDynamicRefresh.java
index f9501559..73940f69 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/AbstractConfigThreadPoolDynamicRefresh.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/AbstractConfigThreadPoolDynamicRefresh.java
@@ -18,7 +18,7 @@
package cn.hippo4j.config.springboot.starter.refresher;
import cn.hippo4j.common.api.ThreadPoolDynamicRefresh;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
import cn.hippo4j.config.springboot.starter.parser.ConfigParserHandler;
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/NacosCloudRefresherHandler.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/NacosCloudRefresherHandler.java
index 47aae1ed..739e4d06 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/NacosCloudRefresherHandler.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/NacosCloudRefresherHandler.java
@@ -17,7 +17,7 @@
package cn.hippo4j.config.springboot.starter.refresher;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.config.listener.Listener;
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java
index f3a78962..2b518447 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java
@@ -20,7 +20,7 @@ package cn.hippo4j.config.springboot.starter.refresher.event;
import cn.hippo4j.adapter.base.ThreadPoolAdapter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.config.springboot.starter.config.AdapterExecutorProperties;
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/PlatformsRefreshListener.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/PlatformsRefreshListener.java
index 8191b0b5..5c726b97 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/PlatformsRefreshListener.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/PlatformsRefreshListener.java
@@ -17,7 +17,7 @@
package cn.hippo4j.config.springboot.starter.refresher.event;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
import cn.hippo4j.common.config.ExecutorProperties;
import cn.hippo4j.config.springboot.starter.notify.ConfigModeNotifyConfigBuilder;
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java
index 0baf43b3..ca068146 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java
@@ -20,7 +20,7 @@ package cn.hippo4j.config.springboot.starter.refresher.event;
import cn.hippo4j.adapter.web.WebThreadPoolHandlerChoose;
import cn.hippo4j.adapter.web.WebThreadPoolService;
import cn.hippo4j.common.api.ThreadPoolConfigChange;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/support/DynamicThreadPoolPostProcessor.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/support/DynamicThreadPoolPostProcessor.java
index c50a2403..25326184 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/support/DynamicThreadPoolPostProcessor.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/support/DynamicThreadPoolPostProcessor.java
@@ -17,7 +17,7 @@
package cn.hippo4j.config.springboot.starter.support;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java
index 5b9ee75a..dd3d21d3 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java
@@ -20,10 +20,10 @@ package cn.hippo4j.springboot.starter.config;
import cn.hippo4j.adapter.base.ThreadPoolAdapterBeanContainer;
import cn.hippo4j.adapter.web.WebThreadPoolHandlerChoose;
import cn.hippo4j.common.api.ThreadDetailState;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
import cn.hippo4j.common.api.ThreadPoolConfigChange;
import cn.hippo4j.common.api.ThreadPoolDynamicRefresh;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.core.config.UtilAutoConfiguration;
import cn.hippo4j.core.enable.MarkerConfiguration;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/ThreadPoolAdapterController.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/ThreadPoolAdapterController.java
index f697ea55..187f721e 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/ThreadPoolAdapterController.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/ThreadPoolAdapterController.java
@@ -20,8 +20,8 @@ package cn.hippo4j.springboot.starter.controller;
import cn.hippo4j.adapter.base.ThreadPoolAdapter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.api.ClientNetworkService;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.core.api.ClientNetworkService;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.common.web.base.Results;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DiscoveryClient.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DiscoveryClient.java
index ce01cbcd..c706be4d 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DiscoveryClient.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DiscoveryClient.java
@@ -18,7 +18,7 @@
package cn.hippo4j.springboot.starter.core;
import cn.hippo4j.common.api.ClientCloseHookExecute;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.model.InstanceInfo;
import cn.hippo4j.common.web.base.Result;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java
index 5460d96b..62b64bff 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java
@@ -21,7 +21,7 @@ import cn.hippo4j.adapter.base.ThreadPoolAdapter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterCacheConfig;
import cn.hippo4j.adapter.base.ThreadPoolAdapterRegisterAction;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.core.toolkit.IdentifyUtil;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java
index b908c3e6..7efc1411 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java
@@ -17,10 +17,10 @@
package cn.hippo4j.springboot.starter.monitor;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
import cn.hippo4j.common.monitor.Message;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.ThreadUtil;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/provider/InstanceInfoProviderFactory.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/provider/InstanceInfoProviderFactory.java
index 02b8f047..697557d1 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/provider/InstanceInfoProviderFactory.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/provider/InstanceInfoProviderFactory.java
@@ -17,9 +17,9 @@
package cn.hippo4j.springboot.starter.provider;
-import cn.hippo4j.common.api.ClientNetworkService;
+import cn.hippo4j.core.api.ClientNetworkService;
import cn.hippo4j.common.model.InstanceInfo;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import cn.hippo4j.common.toolkit.ContentUtil;
import cn.hippo4j.core.toolkit.IdentifyUtil;
import cn.hippo4j.core.toolkit.inet.InetUtils;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java
index c507d12d..7ad8ca19 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java
@@ -17,7 +17,7 @@
package cn.hippo4j.springboot.starter.remote;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
import cn.hippo4j.common.toolkit.StringUtil;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java
index c3bd82e1..0b7bbbdb 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java
@@ -17,7 +17,7 @@
package cn.hippo4j.springboot.starter.support;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.enums.EnableEnum;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
diff --git a/threadpool/adapter/base/pom.xml b/threadpool/adapter/base/pom.xml
index 2c253278..939675d7 100644
--- a/threadpool/adapter/base/pom.xml
+++ b/threadpool/adapter/base/pom.xml
@@ -12,7 +12,7 @@
cn.hippo4j
- hippo4j-threadpool-infra-common
+ hippo4j-threadpool-core${project.version}
diff --git a/threadpool/adapter/base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterBeanContainer.java b/threadpool/adapter/base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterBeanContainer.java
index a87b4743..1338dc5c 100644
--- a/threadpool/adapter/base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterBeanContainer.java
+++ b/threadpool/adapter/base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterBeanContainer.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.base;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import org.springframework.beans.factory.InitializingBean;
import java.util.Map;
diff --git a/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/HystrixThreadPoolAdapter4Server.java b/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/HystrixThreadPoolAdapter4Server.java
index 4a187a47..fbd5b94a 100644
--- a/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/HystrixThreadPoolAdapter4Server.java
+++ b/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/HystrixThreadPoolAdapter4Server.java
@@ -21,7 +21,7 @@ import cn.hippo4j.adapter.base.ThreadPoolAdapter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterCacheConfig;
import cn.hippo4j.adapter.base.ThreadPoolAdapterRegisterAction;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.event.ApplicationStartedEvent;
diff --git a/threadpool/adapter/kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java b/threadpool/adapter/kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java
index 1a2be842..44c8cace 100644
--- a/threadpool/adapter/kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java
+++ b/threadpool/adapter/kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java
@@ -20,8 +20,9 @@ package cn.hippo4j.adapter.kafka;
import cn.hippo4j.adapter.base.ThreadPoolAdapter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.ReflectUtil;
+import cn.hippo4j.core.config.ApplicationContextHolder;
+import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.event.ApplicationStartedEvent;
import org.springframework.cglib.core.Constants;
@@ -147,6 +148,7 @@ public class KafkaThreadPoolAdapter implements ThreadPoolAdapter, ApplicationLis
* @return true success
* @since org.springframework.kafka.listener.ConcurrentMessageListenerContainer#doStart()
*/
+ @SneakyThrows
private static boolean addConsumer(String threadPoolKey, ConcurrentMessageListenerContainer concurrentContainer, int originalCoreSize, Integer concurrency) {
ContainerProperties containerProperties = concurrentContainer.getContainerProperties();
TopicPartitionOffset[] topicPartitions = containerProperties.getTopicPartitions();
diff --git a/threadpool/adapter/rocketmq/src/main/java/cn/hippo4j/adapter/rocketmq/RocketMQThreadPoolAdapter.java b/threadpool/adapter/rocketmq/src/main/java/cn/hippo4j/adapter/rocketmq/RocketMQThreadPoolAdapter.java
index 3fa91856..2334f0e3 100644
--- a/threadpool/adapter/rocketmq/src/main/java/cn/hippo4j/adapter/rocketmq/RocketMQThreadPoolAdapter.java
+++ b/threadpool/adapter/rocketmq/src/main/java/cn/hippo4j/adapter/rocketmq/RocketMQThreadPoolAdapter.java
@@ -20,9 +20,9 @@ package cn.hippo4j.adapter.rocketmq;
import cn.hippo4j.adapter.base.ThreadPoolAdapter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.ReflectUtil;
import cn.hippo4j.common.toolkit.ThreadPoolExecutorUtil;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
import org.apache.rocketmq.client.impl.consumer.ConsumeMessageService;
diff --git a/threadpool/adapter/stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java b/threadpool/adapter/stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java
index d5b3326c..144dcfb2 100644
--- a/threadpool/adapter/stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java
+++ b/threadpool/adapter/stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java
@@ -20,9 +20,9 @@ package cn.hippo4j.adapter.springcloud.stream.rabbitmq;
import cn.hippo4j.adapter.base.ThreadPoolAdapter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.ReflectUtil;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
diff --git a/threadpool/adapter/stream-rocketmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQThreadPoolAdapter.java b/threadpool/adapter/stream-rocketmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQThreadPoolAdapter.java
index 12769cf3..10b11eab 100644
--- a/threadpool/adapter/stream-rocketmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQThreadPoolAdapter.java
+++ b/threadpool/adapter/stream-rocketmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQThreadPoolAdapter.java
@@ -20,10 +20,10 @@ package cn.hippo4j.adapter.springcloud.stream.rocketmq;
import cn.hippo4j.adapter.base.ThreadPoolAdapter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.ReflectUtil;
import cn.hippo4j.common.toolkit.ThreadPoolExecutorUtil;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import com.alibaba.cloud.stream.binder.rocketmq.consuming.RocketMQListenerBindingContainer;
import com.alibaba.cloud.stream.binder.rocketmq.integration.RocketMQInboundChannelAdapter;
import lombok.extern.slf4j.Slf4j;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/DefaultAbstractWebThreadPoolService.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/DefaultAbstractWebThreadPoolService.java
index 4d472c23..337a247c 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/DefaultAbstractWebThreadPoolService.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/DefaultAbstractWebThreadPoolService.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.web;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.web.context.WebServerApplicationContext;
import org.springframework.boot.web.server.WebServer;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebIpAndPortHolder.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebIpAndPortHolder.java
index dbe23f28..c2b4f2e2 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebIpAndPortHolder.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebIpAndPortHolder.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.web;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.model.WebIpAndPortInfo;
import cn.hippo4j.common.toolkit.Assert;
import cn.hippo4j.common.toolkit.StringUtil;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java
index 1d94d379..71ef1fbe 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.web;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.web.exception.ServiceException;
import lombok.extern.slf4j.Slf4j;
diff --git a/threadpool/core/pom.xml b/threadpool/core/pom.xml
index fac63720..5002327f 100644
--- a/threadpool/core/pom.xml
+++ b/threadpool/core/pom.xml
@@ -15,6 +15,10 @@
hippo4j-threadpool-infra-common${project.version}
+
+ org.springframework.boot
+ spring-boot-starter
+ org.springframework.bootspring-boot-starter-test
diff --git a/infra/common/src/main/java/cn/hippo4j/common/api/ClientNetworkService.java b/threadpool/core/src/main/java/cn/hippo4j/core/api/ClientNetworkService.java
similarity index 97%
rename from infra/common/src/main/java/cn/hippo4j/common/api/ClientNetworkService.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/api/ClientNetworkService.java
index 6db7b13d..28cf420f 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/api/ClientNetworkService.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/api/ClientNetworkService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.api;
+package cn.hippo4j.core.api;
import org.springframework.core.env.ConfigurableEnvironment;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/api/ThreadPoolCheckAlarm.java b/threadpool/core/src/main/java/cn/hippo4j/core/api/ThreadPoolCheckAlarm.java
similarity index 99%
rename from infra/common/src/main/java/cn/hippo4j/common/api/ThreadPoolCheckAlarm.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/api/ThreadPoolCheckAlarm.java
index 5c07bd98..25e32097 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/api/ThreadPoolCheckAlarm.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/api/ThreadPoolCheckAlarm.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.api;
+package cn.hippo4j.core.api;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java b/threadpool/core/src/main/java/cn/hippo4j/core/config/ApplicationContextHolder.java
similarity index 98%
rename from infra/common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/config/ApplicationContextHolder.java
index 5c2eb3fe..e58fba14 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/config/ApplicationContextHolder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.config;
+package cn.hippo4j.core.config;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/manage/GlobalThreadPoolManage.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/manage/GlobalThreadPoolManage.java
index 4b189fec..90e89567 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/manage/GlobalThreadPoolManage.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/manage/GlobalThreadPoolManage.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.executor.manage;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterWrapper;
import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/DynamicThreadPoolAdapterChoose.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/DynamicThreadPoolAdapterChoose.java
index 528eaa5e..9dc940e9 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/DynamicThreadPoolAdapterChoose.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/DynamicThreadPoolAdapterChoose.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.executor.support.adpter;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
import cn.hippo4j.core.executor.support.spi.DynamicThreadPoolAdapterSPI;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/IExtension.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/IExtension.java
similarity index 95%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/IExtension.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/IExtension.java
index cae01c93..9e28efcb 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/IExtension.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/IExtension.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension;
+package cn.hippo4j.core.extension;
/**
* Top level interface of extension-point.
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/IExtensionRequest.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/IExtensionRequest.java
similarity index 96%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/IExtensionRequest.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/IExtensionRequest.java
index 1ad5e14e..9414b670 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/IExtensionRequest.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/IExtensionRequest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension;
+package cn.hippo4j.core.extension;
/**
* Top level interface of extension-point request obj.
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/annotation/Realization.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/annotation/Realization.java
similarity index 96%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/annotation/Realization.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/annotation/Realization.java
index 98da0631..b67a58ca 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/annotation/Realization.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/annotation/Realization.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.annotation;
+package cn.hippo4j.core.extension.annotation;
import org.springframework.stereotype.Component;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/config/ExtensionRegisterBootstrap.java
similarity index 91%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/config/ExtensionRegisterBootstrap.java
index d1ee6baf..c3fc0f07 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/config/ExtensionRegisterBootstrap.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.config;
+package cn.hippo4j.core.extension.config;
-import cn.hippo4j.common.extension.IExtension;
-import cn.hippo4j.common.extension.annotation.Realization;
-import cn.hippo4j.common.extension.support.ExtensionRegistry;
+import cn.hippo4j.core.extension.IExtension;
+import cn.hippo4j.core.extension.annotation.Realization;
+import cn.hippo4j.core.extension.support.ExtensionRegistry;
import org.springframework.aop.scope.ScopedProxyUtils;
import org.springframework.beans.BeansException;
import org.springframework.boot.ApplicationArguments;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/AllMatch.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/AllMatch.java
similarity index 92%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/reducer/AllMatch.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/AllMatch.java
index f1f37e7f..604bf0e4 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/AllMatch.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/AllMatch.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.reducer;
+package cn.hippo4j.core.extension.reducer;
-import cn.hippo4j.common.extension.IExtension;
-import cn.hippo4j.common.extension.support.ReduceType;
+import cn.hippo4j.core.extension.IExtension;
+import cn.hippo4j.core.extension.support.ReduceType;
import cn.hippo4j.common.toolkit.CollectionUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/AnyMatch.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/AnyMatch.java
similarity index 92%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/reducer/AnyMatch.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/AnyMatch.java
index 66305b00..3f19fd55 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/AnyMatch.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/AnyMatch.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.reducer;
+package cn.hippo4j.core.extension.reducer;
-import cn.hippo4j.common.extension.IExtension;
-import cn.hippo4j.common.extension.support.ReduceType;
+import cn.hippo4j.core.extension.IExtension;
+import cn.hippo4j.core.extension.support.ReduceType;
import cn.hippo4j.common.toolkit.CollectionUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/FirstOf.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/FirstOf.java
similarity index 91%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/reducer/FirstOf.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/FirstOf.java
index c7aa6981..a148ae91 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/FirstOf.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/FirstOf.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.reducer;
+package cn.hippo4j.core.extension.reducer;
-import cn.hippo4j.common.extension.IExtension;
-import cn.hippo4j.common.extension.support.ReduceType;
+import cn.hippo4j.core.extension.IExtension;
+import cn.hippo4j.core.extension.support.ReduceType;
import lombok.NonNull;
import java.util.Objects;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/None.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/None.java
similarity index 92%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/reducer/None.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/None.java
index 3280a832..db2c1fcc 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/None.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/None.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.reducer;
+package cn.hippo4j.core.extension.reducer;
-import cn.hippo4j.common.extension.support.ReduceType;
+import cn.hippo4j.core.extension.support.ReduceType;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducer.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/Reducer.java
similarity index 83%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducer.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/Reducer.java
index 2f3414ec..1fc2c2d3 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducer.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/Reducer.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.reducer;
+package cn.hippo4j.core.extension.reducer;
-import cn.hippo4j.common.extension.IExtension;
-import cn.hippo4j.common.extension.IExtensionRequest;
-import cn.hippo4j.common.extension.support.ExtensionCallback;
-import cn.hippo4j.common.extension.support.ReduceType;
+import cn.hippo4j.core.extension.IExtension;
+import cn.hippo4j.core.extension.IExtensionRequest;
+import cn.hippo4j.core.extension.support.ExtensionCallback;
+import cn.hippo4j.core.extension.support.ReduceType;
import lombok.Getter;
import lombok.Setter;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducers.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/Reducers.java
similarity index 97%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducers.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/Reducers.java
index b3ea7186..f2937205 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/reducer/Reducers.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/reducer/Reducers.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.reducer;
+package cn.hippo4j.core.extension.reducer;
import lombok.NonNull;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionAutoConfiguration.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionAutoConfiguration.java
similarity index 90%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionAutoConfiguration.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionAutoConfiguration.java
index 78736976..67975b85 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionAutoConfiguration.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionAutoConfiguration.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.support;
+package cn.hippo4j.core.extension.support;
-import cn.hippo4j.common.extension.config.ExtensionRegisterBootstrap;
+import cn.hippo4j.core.extension.config.ExtensionRegisterBootstrap;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionCallback.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionCallback.java
similarity index 95%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionCallback.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionCallback.java
index 5c71fcb5..b083351f 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionCallback.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionCallback.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.support;
+package cn.hippo4j.core.extension.support;
import java.util.function.Function;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionInvoker.java
similarity index 90%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionInvoker.java
index 24d0465a..fd7a0100 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionInvoker.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.support;
+package cn.hippo4j.core.extension.support;
-import cn.hippo4j.common.extension.IExtension;
-import cn.hippo4j.common.extension.reducer.Reducer;
-import cn.hippo4j.common.extension.reducer.Reducers;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
+import cn.hippo4j.core.extension.IExtension;
+import cn.hippo4j.core.extension.reducer.Reducer;
+import cn.hippo4j.core.extension.reducer.Reducers;
import cn.hippo4j.common.toolkit.Assert;
import cn.hippo4j.common.toolkit.CollectionUtil;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionRegistry.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionRegistry.java
similarity index 95%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionRegistry.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionRegistry.java
index b835446c..33178c5a 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ExtensionRegistry.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionRegistry.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.support;
+package cn.hippo4j.core.extension.support;
-import cn.hippo4j.common.extension.IExtension;
-import cn.hippo4j.common.extension.annotation.Realization;
+import cn.hippo4j.core.extension.IExtension;
+import cn.hippo4j.core.extension.annotation.Realization;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.logtracing.LogMessage;
import lombok.extern.slf4j.Slf4j;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/support/IExtensionRegistry.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/IExtensionRegistry.java
similarity index 91%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/support/IExtensionRegistry.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/support/IExtensionRegistry.java
index d1ffa3e2..9f3b5ae9 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/support/IExtensionRegistry.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/IExtensionRegistry.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.support;
+package cn.hippo4j.core.extension.support;
-import cn.hippo4j.common.extension.IExtension;
+import cn.hippo4j.core.extension.IExtension;
import java.util.List;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ReduceType.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ReduceType.java
similarity index 95%
rename from infra/common/src/main/java/cn/hippo4j/common/extension/support/ReduceType.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ReduceType.java
index 7a4fe9e4..f2ab125e 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/extension/support/ReduceType.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ReduceType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.support;
+package cn.hippo4j.core.extension.support;
public enum ReduceType {
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java b/threadpool/core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java
index 0b026412..521a3e47 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java
@@ -70,7 +70,7 @@ public class DynamicThreadPoolBannerHandler implements InitializingBean {
while (padding.length() < STRAP_LINE_SIZE - (bannerVersion.length() + DYNAMIC_THREAD_POOL.length())) {
padding.append(" ");
}
- log.info(AnsiOutput.toString("\n", banner, AnsiColor.GREEN, DYNAMIC_THREAD_POOL, AnsiColor.DEFAULT,
+ System.out.println(AnsiOutput.toString(banner, AnsiColor.GREEN, DYNAMIC_THREAD_POOL, AnsiColor.DEFAULT,
padding.toString(), AnsiStyle.FAINT, bannerVersion, "\n\n", HIPPO4J_GITHUB, "\n", HIPPO4J_SITE, "\n"));
}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPlugin.java
index b1bb2c78..7c1ec674 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPlugin.java
@@ -17,8 +17,8 @@
package cn.hippo4j.core.plugin.impl;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
import cn.hippo4j.core.plugin.RejectedAwarePlugin;
import lombok.NonNull;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
index be5726d3..2d949a13 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
@@ -17,8 +17,8 @@
package cn.hippo4j.core.plugin.impl;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.core.plugin.PluginRuntime;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java b/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java
index 263cbcc3..ff6a1fb1 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java
@@ -17,8 +17,8 @@
package cn.hippo4j.core.proxy;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/DynamicThreadPoolAnnotationUtil.java b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/DynamicThreadPoolAnnotationUtil.java
index d4555505..7d1788da 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/DynamicThreadPoolAnnotationUtil.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/DynamicThreadPoolAnnotationUtil.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.toolkit;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/FileUtil.java
similarity index 91%
rename from infra/common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/toolkit/FileUtil.java
index 6df46504..f14bdfd4 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/FileUtil.java
@@ -15,18 +15,13 @@
* limitations under the License.
*/
-package cn.hippo4j.common.toolkit;
+package cn.hippo4j.core.toolkit;
import cn.hippo4j.common.web.exception.IllegalException;
import lombok.SneakyThrows;
import org.springframework.core.io.ClassPathResource;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/IdentifyUtil.java b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/IdentifyUtil.java
index 5874f5b7..3f6551b6 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/IdentifyUtil.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/IdentifyUtil.java
@@ -17,9 +17,9 @@
package cn.hippo4j.core.toolkit;
-import cn.hippo4j.common.api.ClientNetworkService;
-import cn.hippo4j.common.config.ApplicationContextHolder;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.core.api.ClientNetworkService;
+import cn.hippo4j.core.config.ApplicationContextHolder;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.IdUtil;
import cn.hippo4j.common.toolkit.Joiner;
diff --git a/infra/common/src/test/java/cn/hippo4j/common/extension/ExtensionInvokerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/extension/ExtensionInvokerTest.java
similarity index 78%
rename from infra/common/src/test/java/cn/hippo4j/common/extension/ExtensionInvokerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/extension/ExtensionInvokerTest.java
index 78dd68e7..673c3464 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/extension/ExtensionInvokerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/extension/ExtensionInvokerTest.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension;
+package cn.hippo4j.core.extension;
-import cn.hippo4j.common.extension.anymatch.AnyMatchExtImplA;
-import cn.hippo4j.common.extension.anymatch.AnyMatchExtImplB;
-import cn.hippo4j.common.extension.anymatch.IAnyMatchExtension;
-import cn.hippo4j.common.extension.firstof.FirstOfExtImplA;
-import cn.hippo4j.common.extension.firstof.FirstOfExtImplB;
-import cn.hippo4j.common.extension.firstof.IFirstOfExtension;
-import cn.hippo4j.common.extension.reducer.Reducers;
-import cn.hippo4j.common.extension.spi.IOldSpi;
-import cn.hippo4j.common.extension.support.ExtensionInvoker;
-import cn.hippo4j.common.extension.support.ExtensionRegistry;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
+import cn.hippo4j.core.extension.anymatch.AnyMatchExtImplA;
+import cn.hippo4j.core.extension.anymatch.AnyMatchExtImplB;
+import cn.hippo4j.core.extension.anymatch.IAnyMatchExtension;
+import cn.hippo4j.core.extension.firstof.FirstOfExtImplA;
+import cn.hippo4j.core.extension.firstof.FirstOfExtImplB;
+import cn.hippo4j.core.extension.firstof.IFirstOfExtension;
+import cn.hippo4j.core.extension.reducer.Reducers;
+import cn.hippo4j.core.extension.spi.IOldSpi;
+import cn.hippo4j.core.extension.support.ExtensionInvoker;
+import cn.hippo4j.core.extension.support.ExtensionRegistry;
import org.assertj.core.util.Lists;
import org.junit.Before;
import org.junit.Test;
@@ -50,6 +50,7 @@ public class ExtensionInvokerTest {
ServiceLoaderRegistry.register(IOldSpi.class);
}
+
@Test
public void test() {
diff --git a/infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplA.java b/threadpool/core/src/test/java/cn/hippo4j/core/extension/anymatch/AnyMatchExtImplA.java
similarity index 90%
rename from infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplA.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/extension/anymatch/AnyMatchExtImplA.java
index 75829c75..b9492a6e 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplA.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/extension/anymatch/AnyMatchExtImplA.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.anymatch;
+package cn.hippo4j.core.extension.anymatch;
-import cn.hippo4j.common.extension.annotation.Realization;
+import cn.hippo4j.core.extension.annotation.Realization;
@Realization
public class AnyMatchExtImplA implements IAnyMatchExtension {
diff --git a/infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplB.java b/threadpool/core/src/test/java/cn/hippo4j/core/extension/anymatch/AnyMatchExtImplB.java
similarity index 90%
rename from infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplB.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/extension/anymatch/AnyMatchExtImplB.java
index 8aef4d5d..74a8d844 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/AnyMatchExtImplB.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/extension/anymatch/AnyMatchExtImplB.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.anymatch;
+package cn.hippo4j.core.extension.anymatch;
-import cn.hippo4j.common.extension.annotation.Realization;
+import cn.hippo4j.core.extension.annotation.Realization;
@Realization
public class AnyMatchExtImplB implements IAnyMatchExtension {
diff --git a/infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/IAnyMatchExtension.java b/threadpool/core/src/test/java/cn/hippo4j/core/extension/anymatch/IAnyMatchExtension.java
similarity index 90%
rename from infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/IAnyMatchExtension.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/extension/anymatch/IAnyMatchExtension.java
index 94d9adec..8d4f3caf 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/extension/anymatch/IAnyMatchExtension.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/extension/anymatch/IAnyMatchExtension.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.anymatch;
+package cn.hippo4j.core.extension.anymatch;
-import cn.hippo4j.common.extension.IExtension;
+import cn.hippo4j.core.extension.IExtension;
public interface IAnyMatchExtension extends IExtension {
diff --git a/infra/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplA.java b/threadpool/core/src/test/java/cn/hippo4j/core/extension/firstof/FirstOfExtImplA.java
similarity index 90%
rename from infra/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplA.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/extension/firstof/FirstOfExtImplA.java
index b5a17c87..a702e28d 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplA.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/extension/firstof/FirstOfExtImplA.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.firstof;
+package cn.hippo4j.core.extension.firstof;
-import cn.hippo4j.common.extension.annotation.Realization;
+import cn.hippo4j.core.extension.annotation.Realization;
@Realization
public class FirstOfExtImplA implements IFirstOfExtension {
diff --git a/infra/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplB.java b/threadpool/core/src/test/java/cn/hippo4j/core/extension/firstof/FirstOfExtImplB.java
similarity index 90%
rename from infra/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplB.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/extension/firstof/FirstOfExtImplB.java
index 7128541a..9fb0ad87 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/extension/firstof/FirstOfExtImplB.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/extension/firstof/FirstOfExtImplB.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.firstof;
+package cn.hippo4j.core.extension.firstof;
-import cn.hippo4j.common.extension.annotation.Realization;
+import cn.hippo4j.core.extension.annotation.Realization;
@Realization
public class FirstOfExtImplB implements IFirstOfExtension {
diff --git a/infra/common/src/test/java/cn/hippo4j/common/extension/firstof/IFirstOfExtension.java b/threadpool/core/src/test/java/cn/hippo4j/core/extension/firstof/IFirstOfExtension.java
similarity index 90%
rename from infra/common/src/test/java/cn/hippo4j/common/extension/firstof/IFirstOfExtension.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/extension/firstof/IFirstOfExtension.java
index f7c8c333..ff720d5c 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/extension/firstof/IFirstOfExtension.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/extension/firstof/IFirstOfExtension.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.firstof;
+package cn.hippo4j.core.extension.firstof;
-import cn.hippo4j.common.extension.IExtension;
+import cn.hippo4j.core.extension.IExtension;
public interface IFirstOfExtension extends IExtension {
diff --git a/infra/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpi.java b/threadpool/core/src/test/java/cn/hippo4j/core/extension/spi/IOldSpi.java
similarity index 90%
rename from infra/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpi.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/extension/spi/IOldSpi.java
index 7391d6f1..e90facc6 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpi.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/extension/spi/IOldSpi.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.spi;
+package cn.hippo4j.core.extension.spi;
-import cn.hippo4j.common.extension.IExtension;
+import cn.hippo4j.core.extension.IExtension;
public interface IOldSpi extends IExtension {
diff --git a/infra/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpiImplA.java b/threadpool/core/src/test/java/cn/hippo4j/core/extension/spi/IOldSpiImplA.java
similarity index 95%
rename from infra/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpiImplA.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/extension/spi/IOldSpiImplA.java
index d161b024..d17fd13d 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/extension/spi/IOldSpiImplA.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/extension/spi/IOldSpiImplA.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.spi;
+package cn.hippo4j.core.extension.spi;
public class IOldSpiImplA implements IOldSpi {
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
index 8c1f1c65..c4494d72 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.plugin.impl;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
index 92c7e310..1680442b 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.plugin.impl;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandlerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandlerTest.java
index 54f36bc4..663ef699 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandlerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandlerTest.java
@@ -17,8 +17,8 @@
package cn.hippo4j.core.proxy;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/infra/common/src/test/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoaderTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/spi/DynamicThreadPoolServiceLoaderTest.java
similarity index 97%
rename from infra/common/src/test/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoaderTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/spi/DynamicThreadPoolServiceLoaderTest.java
index ddd3f317..86b0e5ae 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoaderTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/spi/DynamicThreadPoolServiceLoaderTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.common.spi;
+package cn.hippo4j.core.spi;
import java.util.Collection;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import org.junit.Test;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/infra/common/src/test/java/cn/hippo4j/common/spi/MyArrayBlockingQueue.java b/threadpool/core/src/test/java/cn/hippo4j/core/spi/MyArrayBlockingQueue.java
similarity index 97%
rename from infra/common/src/test/java/cn/hippo4j/common/spi/MyArrayBlockingQueue.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/spi/MyArrayBlockingQueue.java
index 47408032..153d0c74 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/spi/MyArrayBlockingQueue.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/spi/MyArrayBlockingQueue.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.spi;
+package cn.hippo4j.core.spi;
import cn.hippo4j.common.executor.support.CustomBlockingQueue;
diff --git a/infra/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPI.java b/threadpool/core/src/test/java/cn/hippo4j/core/spi/TestInterfaceSPI.java
similarity index 90%
rename from infra/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPI.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/spi/TestInterfaceSPI.java
index 2851f7e9..1fc9368e 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPI.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/spi/TestInterfaceSPI.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.spi;
+package cn.hippo4j.core.spi;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
/**
* test {@link ServiceLoaderRegistry}
diff --git a/infra/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPIImpl.java b/threadpool/core/src/test/java/cn/hippo4j/core/spi/TestInterfaceSPIImpl.java
similarity index 90%
rename from infra/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPIImpl.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/spi/TestInterfaceSPIImpl.java
index fc8b2779..85a8fda6 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/spi/TestInterfaceSPIImpl.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/spi/TestInterfaceSPIImpl.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.spi;
+package cn.hippo4j.core.spi;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
/**
* test {@link ServiceLoaderRegistry}
diff --git a/infra/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPI.java b/threadpool/core/src/test/java/cn/hippo4j/core/spi/TestSingletonInterfaceSPI.java
similarity index 85%
rename from infra/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPI.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/spi/TestSingletonInterfaceSPI.java
index e530d6bb..8fe82bad 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPI.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/spi/TestSingletonInterfaceSPI.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.common.spi;
+package cn.hippo4j.core.spi;
-import cn.hippo4j.common.extension.annotation.SingletonSPI;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.SingletonSPI;
/**
* test {@link ServiceLoaderRegistry}
diff --git a/infra/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPIImpl.java b/threadpool/core/src/test/java/cn/hippo4j/core/spi/TestSingletonInterfaceSPIImpl.java
similarity index 90%
rename from infra/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPIImpl.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/spi/TestSingletonInterfaceSPIImpl.java
index 6aeb275f..8398109f 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/spi/TestSingletonInterfaceSPIImpl.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/spi/TestSingletonInterfaceSPIImpl.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.common.spi;
+package cn.hippo4j.core.spi;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
/**
* test {@link ServiceLoaderRegistry}
diff --git a/infra/common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/toolkit/FileUtilTest.java
similarity index 98%
rename from infra/common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/toolkit/FileUtilTest.java
index b3b15b2e..3160c0bc 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/toolkit/FileUtilTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/toolkit/FileUtilTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.common.toolkit;
+package cn.hippo4j.core.toolkit;
-import org.junit.Test;
import org.junit.Assert;
+import org.junit.Test;
import java.nio.charset.StandardCharsets;
import java.util.List;
diff --git a/threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue b/threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue
new file mode 100644
index 00000000..e897895b
--- /dev/null
+++ b/threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue
@@ -0,0 +1 @@
+cn.hippo4j.core.spi.MyArrayBlockingQueue
\ No newline at end of file
diff --git a/threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.core.extension.spi.IOldSpi b/threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.core.extension.spi.IOldSpi
new file mode 100644
index 00000000..730cea11
--- /dev/null
+++ b/threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.core.extension.spi.IOldSpi
@@ -0,0 +1 @@
+cn.hippo4j.core.extension.spi.IOldSpiImplA
\ No newline at end of file
diff --git a/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestInterfaceSPI b/threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.core.spi.TestInterfaceSPI
similarity index 94%
rename from infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestInterfaceSPI
rename to threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.core.spi.TestInterfaceSPI
index 66d393f8..2e4b0c6e 100644
--- a/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestInterfaceSPI
+++ b/threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.core.spi.TestInterfaceSPI
@@ -15,4 +15,4 @@
# limitations under the License.
#
-cn.hippo4j.common.spi.TestInterfaceSPIImpl
\ No newline at end of file
+cn.hippo4j.core.spi.TestInterfaceSPIImpl
\ No newline at end of file
diff --git a/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestSingletonInterfaceSPI b/threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.core.spi.TestSingletonInterfaceSPI
similarity index 93%
rename from infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestSingletonInterfaceSPI
rename to threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.core.spi.TestSingletonInterfaceSPI
index bcfaa43b..86a6cfe6 100644
--- a/infra/common/src/test/resources/META-INF/services/cn.hippo4j.common.spi.TestSingletonInterfaceSPI
+++ b/threadpool/core/src/test/resources/META-INF/services/cn.hippo4j.core.spi.TestSingletonInterfaceSPI
@@ -15,4 +15,4 @@
# limitations under the License.
#
-cn.hippo4j.common.spi.TestSingletonInterfaceSPIImpl
\ No newline at end of file
+cn.hippo4j.core.spi.TestSingletonInterfaceSPIImpl
\ No newline at end of file
diff --git a/infra/common/src/test/resources/test/test_utf8.txt b/threadpool/core/src/test/resources/test/test_utf8.txt
similarity index 100%
rename from infra/common/src/test/resources/test/test_utf8.txt
rename to threadpool/core/src/test/resources/test/test_utf8.txt
diff --git a/threadpool/message/src/main/java/cn/hippo4j/message/platform/DingSendMessageHandler.java b/threadpool/message/src/main/java/cn/hippo4j/message/platform/DingSendMessageHandler.java
index c92ea715..e915f622 100644
--- a/threadpool/message/src/main/java/cn/hippo4j/message/platform/DingSendMessageHandler.java
+++ b/threadpool/message/src/main/java/cn/hippo4j/message/platform/DingSendMessageHandler.java
@@ -19,11 +19,11 @@ package cn.hippo4j.message.platform;
import cn.hippo4j.common.toolkit.Assert;
import cn.hippo4j.common.toolkit.CollectionUtil;
-import cn.hippo4j.common.toolkit.FileUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.Singleton;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.http.HttpUtil;
+import cn.hippo4j.core.toolkit.FileUtil;
import cn.hippo4j.message.dto.NotifyConfigDTO;
import cn.hippo4j.message.enums.NotifyPlatformEnum;
import cn.hippo4j.message.platform.base.AbstractRobotSendMessageHandler;
diff --git a/threadpool/message/src/main/java/cn/hippo4j/message/platform/LarkSendMessageHandler.java b/threadpool/message/src/main/java/cn/hippo4j/message/platform/LarkSendMessageHandler.java
index 6de50aab..dce2e378 100644
--- a/threadpool/message/src/main/java/cn/hippo4j/message/platform/LarkSendMessageHandler.java
+++ b/threadpool/message/src/main/java/cn/hippo4j/message/platform/LarkSendMessageHandler.java
@@ -18,11 +18,11 @@
package cn.hippo4j.message.platform;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.common.toolkit.FileUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.Singleton;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.http.HttpUtil;
+import cn.hippo4j.core.toolkit.FileUtil;
import cn.hippo4j.message.dto.NotifyConfigDTO;
import cn.hippo4j.message.enums.NotifyPlatformEnum;
import cn.hippo4j.message.enums.NotifyTypeEnum;
diff --git a/threadpool/message/src/main/java/cn/hippo4j/message/platform/WeChatSendMessageHandler.java b/threadpool/message/src/main/java/cn/hippo4j/message/platform/WeChatSendMessageHandler.java
index c502fc4f..48e191f4 100644
--- a/threadpool/message/src/main/java/cn/hippo4j/message/platform/WeChatSendMessageHandler.java
+++ b/threadpool/message/src/main/java/cn/hippo4j/message/platform/WeChatSendMessageHandler.java
@@ -18,10 +18,10 @@
package cn.hippo4j.message.platform;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.common.toolkit.FileUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.Singleton;
import cn.hippo4j.common.toolkit.http.HttpUtil;
+import cn.hippo4j.core.toolkit.FileUtil;
import cn.hippo4j.message.enums.NotifyPlatformEnum;
import cn.hippo4j.message.platform.base.AbstractRobotSendMessageHandler;
import cn.hippo4j.message.platform.base.RobotMessageActualContent;
diff --git a/threadpool/message/src/main/java/cn/hippo4j/message/service/DefaultThreadPoolCheckAlarmHandler.java b/threadpool/message/src/main/java/cn/hippo4j/message/service/DefaultThreadPoolCheckAlarmHandler.java
index de770758..d5098b4c 100644
--- a/threadpool/message/src/main/java/cn/hippo4j/message/service/DefaultThreadPoolCheckAlarmHandler.java
+++ b/threadpool/message/src/main/java/cn/hippo4j/message/service/DefaultThreadPoolCheckAlarmHandler.java
@@ -17,7 +17,7 @@
package cn.hippo4j.message.service;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
import cn.hippo4j.common.toolkit.CalculateUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
diff --git a/threadpool/message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java b/threadpool/message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java
index 30493e82..21db2221 100644
--- a/threadpool/message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java
+++ b/threadpool/message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java
@@ -19,7 +19,7 @@ package cn.hippo4j.message.service;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.message.api.NotifyConfigBuilder;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.message.dto.AlarmControlDTO;
import cn.hippo4j.message.dto.NotifyConfigDTO;
import cn.hippo4j.message.enums.NotifyTypeEnum;
diff --git a/threadpool/monitor/base/src/main/java/cn/hippo4j/monitor/base/AbstractAdapterThreadPoolMonitor.java b/threadpool/monitor/base/src/main/java/cn/hippo4j/monitor/base/AbstractAdapterThreadPoolMonitor.java
index adf1ca1c..ec5918c9 100644
--- a/threadpool/monitor/base/src/main/java/cn/hippo4j/monitor/base/AbstractAdapterThreadPoolMonitor.java
+++ b/threadpool/monitor/base/src/main/java/cn/hippo4j/monitor/base/AbstractAdapterThreadPoolMonitor.java
@@ -19,7 +19,7 @@ package cn.hippo4j.monitor.base;
import cn.hippo4j.adapter.base.ThreadPoolAdapter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import java.util.Map;
diff --git a/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/DynamicThreadPoolElasticSearchMonitorHandler.java b/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/DynamicThreadPoolElasticSearchMonitorHandler.java
index f476ae1c..e45f3d15 100644
--- a/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/DynamicThreadPoolElasticSearchMonitorHandler.java
+++ b/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/DynamicThreadPoolElasticSearchMonitorHandler.java
@@ -17,11 +17,11 @@
package cn.hippo4j.monitor.elasticsearch;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
import cn.hippo4j.common.toolkit.BeanUtil;
-import cn.hippo4j.common.toolkit.FileUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
+import cn.hippo4j.core.toolkit.FileUtil;
import cn.hippo4j.monitor.base.AbstractDynamicThreadPoolMonitor;
import cn.hippo4j.monitor.base.MonitorTypeEnum;
import cn.hippo4j.monitor.elasticsearch.model.ElasticSearchThreadPoolRunStateInfo;
diff --git a/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/ElasticSearchClientHolder.java b/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/ElasticSearchClientHolder.java
index ba428722..b1b2a16e 100644
--- a/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/ElasticSearchClientHolder.java
+++ b/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/ElasticSearchClientHolder.java
@@ -17,7 +17,7 @@
package cn.hippo4j.monitor.elasticsearch;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpHost;
diff --git a/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java b/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java
index b5e20608..aeaa4f22 100644
--- a/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java
+++ b/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java
@@ -18,7 +18,7 @@
package cn.hippo4j.monitor.micrometer;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.monitor.base.AbstractAdapterThreadPoolMonitor;
diff --git a/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java b/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java
index 19dac923..748f8068 100644
--- a/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java
+++ b/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java
@@ -17,7 +17,7 @@
package cn.hippo4j.monitor.micrometer;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.CollectionUtil;
diff --git a/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java b/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java
index 078cb8c1..f61eda61 100644
--- a/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java
+++ b/threadpool/monitor/micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java
@@ -17,7 +17,7 @@
package cn.hippo4j.monitor.micrometer;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.CollectionUtil;
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/Client.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/Client.java
index c4efcd25..c3da92b0 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/Client.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/Client.java
@@ -45,7 +45,7 @@ import java.io.Closeable;
* The client implements Closeable and supports automatic shutdown, However, you can manually
* disable it when you want to use it
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface Client extends Closeable {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/ClientConnection.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/ClientConnection.java
index e3fb241c..cc30b3be 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/ClientConnection.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/ClientConnection.java
@@ -24,7 +24,7 @@ import cn.hippo4j.rpc.model.Response;
/**
* Applicable to client connections
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface ClientConnection extends Connection {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java
index b98228c7..880181cb 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java
@@ -39,7 +39,7 @@ import java.util.concurrent.locks.LockSupport;
/**
* Client implemented using netty
*
- * @since 1.5.1
+ * @since 2.0.0
*/
@Slf4j
public class NettyClientConnection implements ClientConnection {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/RPCClient.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/RPCClient.java
index f9eb8eea..527f380d 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/RPCClient.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/RPCClient.java
@@ -26,7 +26,7 @@ import java.io.IOException;
* The client, which provides a closing mechanism, maintains a persistent connection if not closed
* Delegate the method to the {@link ClientConnection} for implementation
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class RPCClient implements Client {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/CompactObjectOutputStream.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/CompactObjectOutputStream.java
index 36c34f9c..5cab9229 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/CompactObjectOutputStream.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/CompactObjectOutputStream.java
@@ -25,7 +25,7 @@ import java.io.OutputStream;
/**
* object OutputStream
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class CompactObjectOutputStream extends ObjectOutputStream {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/NettyEncoder.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/NettyEncoder.java
index 3197b3a7..8c5ce752 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/NettyEncoder.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/NettyEncoder.java
@@ -30,7 +30,7 @@ import java.io.Serializable;
* this is a encoder, For custom gluing and unpacking
* {@link io.netty.handler.codec.serialization.ObjectEncoder}
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class NettyEncoder extends MessageToByteEncoder {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/ClassRegistry.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/ClassRegistry.java
index d01f510e..227f19e1 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/ClassRegistry.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/ClassRegistry.java
@@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* the registration center for Client and Server
*
- * @since 1.5.1
+ * @since 2.0.0
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class ClassRegistry {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DefaultInstance.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DefaultInstance.java
index 44b9a6f4..d04adbe3 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DefaultInstance.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DefaultInstance.java
@@ -28,7 +28,7 @@ import java.util.ServiceLoader;
* Load through the ServiceLoader first. If the load fails, load directly through the instantiation.
* If it is an interface, throw an exception. This is not elegant implementation
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class DefaultInstance implements Instance {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DiscoveryAdapter.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DiscoveryAdapter.java
index 119fde6e..6ec4e7da 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DiscoveryAdapter.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DiscoveryAdapter.java
@@ -23,7 +23,7 @@ import java.net.InetSocketAddress;
* The adaptation layer of different service centers is used to know
* the host of different services through the registration center
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface DiscoveryAdapter {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/Instance.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/Instance.java
index 83f649f0..8d1c92c3 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/Instance.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/Instance.java
@@ -20,7 +20,7 @@ package cn.hippo4j.rpc.discovery;
/**
* Instance interface to get an instance
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface Instance {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/ServerPort.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/ServerPort.java
index 82e240a7..71e835c4 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/ServerPort.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/ServerPort.java
@@ -20,7 +20,7 @@ package cn.hippo4j.rpc.discovery;
/**
* Gets the top-level interface of the instance port
*
- * @since 1.5.1
+ * @since 2.0.0
*/
@FunctionalInterface
public interface ServerPort {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/SpringContextInstance.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/SpringContextInstance.java
index fa25d4c9..324c0705 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/SpringContextInstance.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/SpringContextInstance.java
@@ -17,23 +17,23 @@
package cn.hippo4j.rpc.discovery;
-import cn.hippo4j.common.config.ApplicationContextHolder;
-
/**
* Adapter Spring, The requested object is managed by spring
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class SpringContextInstance implements Instance {
@Override
public Object getInstance(Class> cls) {
- return ApplicationContextHolder.getBean(cls);
+ // return ApplicationContextHolder.getBean(cls);
+ return null;
}
@Override
public Object getInstance(String name) {
- return ApplicationContextHolder.getInstance().getBean(name);
+ // return ApplicationContextHolder.getInstance().getBean(name);
+ return null;
}
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/CoderException.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/CoderException.java
index e891772c..c55117d3 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/CoderException.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/CoderException.java
@@ -21,7 +21,7 @@ package cn.hippo4j.rpc.exception;
* During decoding and encoding, if an exception occurs, an exception of type {@link CoderException} is thrown,
* which is not different from a {@link RuntimeException}, but is more explicit about the type of exception
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class CoderException extends RuntimeException {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/ConnectionException.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/ConnectionException.java
index aaf6edd2..2ac45233 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/ConnectionException.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/ConnectionException.java
@@ -22,7 +22,7 @@ package cn.hippo4j.rpc.exception;
* {@link ConnectionException} is thrown, which is not different from {@link RuntimeException}, but is more explicit
* about the type of exception
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class ConnectionException extends RuntimeException {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/TimeOutException.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/TimeOutException.java
index 43d51057..a6ed5b77 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/TimeOutException.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/TimeOutException.java
@@ -21,7 +21,7 @@ package cn.hippo4j.rpc.exception;
* If there is a timeout between the server and the client, you will get a {@link TimeOutException},
* which is not different from {@link RuntimeException}, but it will be more explicit about the type of exception, right
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class TimeOutException extends RuntimeException {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractNettyHandlerManager.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractNettyHandlerManager.java
index a3d5eae2..85f7289d 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractNettyHandlerManager.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractNettyHandlerManager.java
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
/**
* Processor manager for ChannelHandler in netty
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public abstract class AbstractNettyHandlerManager implements HandlerManager {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractNettyTakeHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractNettyTakeHandler.java
index 3bc02728..c1740b5b 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractNettyTakeHandler.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractNettyTakeHandler.java
@@ -29,7 +29,7 @@ import java.util.Optional;
/**
* the abstract base of {@link ConnectHandler} and {@link ChannelInboundHandlerAdapter}
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public abstract class AbstractNettyTakeHandler extends ChannelInboundHandlerAdapter implements ConnectHandler {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ConnectHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ConnectHandler.java
index 35c900fc..d8650e7c 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ConnectHandler.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ConnectHandler.java
@@ -25,7 +25,7 @@ import cn.hippo4j.rpc.model.Response;
* must be specified, such as serialization and parsing, requesting and receiving
* requests, and so on
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface ConnectHandler {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/Connection.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/Connection.java
index 943b4f54..5f93bab7 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/Connection.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/Connection.java
@@ -27,7 +27,7 @@ import java.io.Closeable;
* connection and the connection channel together, so creating {@link Connection} is
* very resource intensive, for which caching is recommended
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface Connection extends Closeable {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java
index fbc72bc4..5c583eee 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java
@@ -26,7 +26,7 @@ import lombok.Getter;
* Manage the Handler used in the processing.
* The Handler must be able to exist multiple times and be invoked once in a single execution
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface HandlerManager {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java
index 42d5fbaf..26a195d9 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java
@@ -33,7 +33,7 @@ import java.util.List;
/**
* Processing by the client connection pool handler to clean the buffer and define new connection properties
*
- * @since 1.5.1
+ * @since 2.0.0
*/
@Slf4j
public class NettyClientPoolHandler extends AbstractNettyHandlerManager implements ChannelPoolHandler {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java
index b1852bd5..dca66b90 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java
@@ -25,7 +25,7 @@ import io.netty.channel.ChannelHandlerContext;
/**
* Interconnect with the netty mediation layer
*
- * @since 1.5.1
+ * @since 2.0.0
*/
@ChannelHandler.Sharable
public class NettyClientTakeHandler extends AbstractNettyTakeHandler implements ConnectHandler {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyServerTakeHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyServerTakeHandler.java
index e0951c03..c83846c7 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyServerTakeHandler.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyServerTakeHandler.java
@@ -32,7 +32,7 @@ import java.lang.reflect.Method;
/**
* netty adaptation layer
*
- * @since 1.5.1
+ * @since 2.0.0
*/
@ChannelHandler.Sharable
public class NettyServerTakeHandler extends AbstractNettyTakeHandler implements ConnectHandler {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/DefaultRequest.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/DefaultRequest.java
index a49ad075..d615e2ea 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/DefaultRequest.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/DefaultRequest.java
@@ -26,7 +26,7 @@ import java.util.Objects;
* default request
* Use the fully qualified name key of the interface and override equals and hashCode
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public final class DefaultRequest implements Request {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/DefaultResponse.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/DefaultResponse.java
index 1f4d46ae..0ba5e799 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/DefaultResponse.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/DefaultResponse.java
@@ -26,7 +26,7 @@ import java.util.Objects;
* default request
* Use the fully qualified name key of the interface and override equals and hashCode
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class DefaultResponse implements Response {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/Request.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/Request.java
index 128d069e..83d4feae 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/Request.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/Request.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
/**
* request
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface Request extends Serializable {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/Response.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/Response.java
index a7b2642a..cd7ada9c 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/Response.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/model/Response.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
/**
* Response
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface Response extends Serializable {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java
index 65a8c2b6..224163eb 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java
@@ -45,7 +45,7 @@ import java.util.List;
/**
* adapter to the netty server
*
- * @since 1.5.1
+ * @since 2.0.0
*/
@Slf4j
public class NettyServerConnection extends AbstractNettyHandlerManager implements ServerConnection {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/RPCServer.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/RPCServer.java
index b50c0f85..1136937e 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/RPCServer.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/RPCServer.java
@@ -25,7 +25,7 @@ import java.io.IOException;
/**
* Server Implementation
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class RPCServer implements Server {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/Server.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/Server.java
index 5c346525..4583e4a0 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/Server.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/Server.java
@@ -22,7 +22,7 @@ import java.io.Closeable;
/**
* the service for RPC, Explain the role of the service in the request
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface Server extends Closeable {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/ServerConnection.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/ServerConnection.java
index a1a830ca..a72d2318 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/ServerConnection.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/ServerConnection.java
@@ -23,7 +23,7 @@ import cn.hippo4j.rpc.handler.Connection;
/**
* This applies to server-side connections
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface ServerConnection extends Connection {
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/ClientFactoryBean.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/ClientFactoryBean.java
deleted file mode 100644
index 37b63596..00000000
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/ClientFactoryBean.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cn.hippo4j.rpc.support;
-
-import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.rpc.client.Client;
-import cn.hippo4j.rpc.discovery.DiscoveryAdapter;
-import cn.hippo4j.rpc.exception.ConnectionException;
-import cn.hippo4j.rpc.handler.NettyClientPoolHandler;
-import io.netty.channel.ChannelHandler;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-
-import java.net.InetSocketAddress;
-import java.util.Optional;
-
-/**
- * A FactoryBean that builds interfaces to invoke proxy objects
- * is responsible for managing the entire life cycle of the proxy objects
- *
APPLICATION START
- * When the application is started, the request initiator needs to complete the proxy of the calling interface,
- * which ensures that the method can be requested to the server side when the method is called, rather than simply
- * request an interface that cannot be instantiated. The classes involved in adding proxy to the interface are:
- *
- *
{@link NettyClientSupport}
- *
{@link NettyProxyCenter}
- *
{@link NettyClientPoolHandler}
- *
- *
AND SPRING
- * In order to fully integrate {@link ClientFactoryBean} into the life cycle of spring beans,
- * {@link ClientFactoryBean} also needs to implement the following interfaces:
- *
- *
{@link InitializingBean}
- *
{@link ApplicationContextAware}
- *
{@link DisposableBean}
- *
- *
- * @since 1.5.1
- * @deprecated With {@link cn.hippo4j.config.service.ThreadPoolAdapterService} structure, FactoryBean is not the best choice
- */
-@Deprecated
-public class ClientFactoryBean implements FactoryBean