The data may be inaccurate when the project is initially
+ * launched because registration is done asynchronously.
+ *
+ * @return thread-pool size
+ */
+ public static Integer getThreadPoolExecutorSize() {
+ return listThreadPoolExecutorId().size();
+ }
+}
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java b/infra/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java
rename to infra/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java
similarity index 99%
rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java
rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java
index 933863ac..c55e85f8 100644
--- a/threadpool/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;
@@ -173,7 +173,6 @@ public enum BlockingQueueTypeEnum {
*
* @param the class of the objects in the BlockingQueue
* @return a BlockingQueue view of the specified T
- * @throws NotSupportedException
*/
abstract BlockingQueue of();
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java
rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java
rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java
similarity index 98%
rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java
rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java
index 98272da1..0f8c0c69 100644
--- a/threadpool/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,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/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java
rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java
rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java
rename to infra/common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java b/infra/common/src/main/java/cn/hippo4j/common/extension/design/AbstractSubjectCenter.java
similarity index 95%
rename from threadpool/common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/design/AbstractSubjectCenter.java
index 125aa7c5..be8d4242 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/design/AbstractSubjectCenter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.design.observer;
+package cn.hippo4j.common.extension.design;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.StringUtil;
@@ -140,6 +140,11 @@ public class AbstractSubjectCenter {
/**
* Clear config cache.
*/
- CLEAR_CONFIG_CACHE
+ CLEAR_CONFIG_CACHE,
+
+ /**
+ * Thread-pool dynamic refresh.
+ */
+ THREAD_POOL_DYNAMIC_REFRESH
}
}
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/design/builder/Builder.java b/infra/common/src/main/java/cn/hippo4j/common/extension/design/Builder.java
similarity index 95%
rename from threadpool/common/src/main/java/cn/hippo4j/common/design/builder/Builder.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/design/Builder.java
index 358a6ee1..2c0a30cf 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/design/builder/Builder.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/design/Builder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.design.builder;
+package cn.hippo4j.common.extension.design;
import java.io.Serializable;
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/design/observer/Observer.java b/infra/common/src/main/java/cn/hippo4j/common/extension/design/Observer.java
similarity index 95%
rename from threadpool/common/src/main/java/cn/hippo4j/common/design/observer/Observer.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/design/Observer.java
index 08b99581..30d9297c 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/design/observer/Observer.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/design/Observer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.design.observer;
+package cn.hippo4j.common.extension.design;
/**
* Observer.
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java b/infra/common/src/main/java/cn/hippo4j/common/extension/design/ObserverMessage.java
similarity index 86%
rename from threadpool/common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/design/ObserverMessage.java
index 912b6b64..38759155 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/design/ObserverMessage.java
@@ -15,12 +15,17 @@
* limitations under the License.
*/
-package cn.hippo4j.common.design.observer;
+package cn.hippo4j.common.extension.design;
/**
* Message notifying observer.
*/
public interface ObserverMessage {
+ /**
+ * Message method definition
+ *
+ * @return Different message formats
+ */
T message();
}
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/enums/DelEnum.java b/infra/common/src/main/java/cn/hippo4j/common/extension/enums/DelEnum.java
similarity index 96%
rename from threadpool/common/src/main/java/cn/hippo4j/common/enums/DelEnum.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/enums/DelEnum.java
index 70267d32..763ced85 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/enums/DelEnum.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/enums/DelEnum.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.enums;
+package cn.hippo4j.common.extension.enums;
/**
* Del enum.
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java b/infra/common/src/main/java/cn/hippo4j/common/extension/enums/EnableEnum.java
similarity index 97%
rename from threadpool/common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/enums/EnableEnum.java
index 15e74c4f..624e1df5 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/enums/EnableEnum.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.enums;
+package cn.hippo4j.common.extension.enums;
import java.util.Objects;
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java b/infra/common/src/main/java/cn/hippo4j/common/extension/enums/VerifyEnum.java
similarity index 97%
rename from threadpool/common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/enums/VerifyEnum.java
index feb78f25..b14b177f 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/enums/VerifyEnum.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.enums;
+package cn.hippo4j.common.extension.enums;
/**
* Enumeration of thread pool audit status.
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/enums/WebContainerEnum.java b/infra/common/src/main/java/cn/hippo4j/common/extension/enums/WebContainerEnum.java
similarity index 96%
rename from threadpool/common/src/main/java/cn/hippo4j/common/enums/WebContainerEnum.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/enums/WebContainerEnum.java
index cbdddb21..179dbccb 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/enums/WebContainerEnum.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/enums/WebContainerEnum.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.enums;
+package cn.hippo4j.common.extension.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/function/Matcher.java b/infra/common/src/main/java/cn/hippo4j/common/extension/function/Matcher.java
similarity index 95%
rename from threadpool/common/src/main/java/cn/hippo4j/common/function/Matcher.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/function/Matcher.java
index a6377d2d..4371aa4e 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/function/Matcher.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/function/Matcher.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.function;
+package cn.hippo4j.common.extension.function;
/**
* Matcher.
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java b/infra/common/src/main/java/cn/hippo4j/common/extension/function/NoArgsConsumer.java
similarity index 95%
rename from threadpool/common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java
rename to infra/common/src/main/java/cn/hippo4j/common/extension/function/NoArgsConsumer.java
index cc4adc7c..b6452d14 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/extension/function/NoArgsConsumer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.function;
+package cn.hippo4j.common.extension.function;
/**
* No args consumer.
diff --git a/threadpool/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 threadpool/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/threadpool/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/threadpool/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 95%
rename from threadpool/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..5a698ce6 100644
--- a/threadpool/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,8 +29,7 @@ import java.util.stream.Collectors;
/**
* Dynamic thread-pool SPI service loader.
*/
-@Deprecated
-public class ServiceLoaderRegistry {
+public final class ServiceLoaderRegistry {
/**
* safe container。
diff --git a/threadpool/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 threadpool/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/threadpool/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/threadpool/common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ManyThreadPoolRunStateInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/ManyThreadPoolRunStateInfo.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ManyThreadPoolRunStateInfo.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/ManyThreadPoolRunStateInfo.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/web/base/Result.java b/infra/common/src/main/java/cn/hippo4j/common/model/Result.java
similarity index 97%
rename from threadpool/common/src/main/java/cn/hippo4j/common/web/base/Result.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/Result.java
index 73237e14..878b1926 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/web/base/Result.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/model/Result.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.web.base;
+package cn.hippo4j.common.model;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java b/infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolRunStateInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolRunStateInfo.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/ThreadPoolRunStateInfo.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/ThreadPoolRunStateInfo.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/TokenInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/TokenInfo.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/TokenInfo.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/TokenInfo.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/WebIpAndPortInfo.java b/infra/common/src/main/java/cn/hippo4j/common/model/WebIpAndPortInfo.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/WebIpAndPortInfo.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/WebIpAndPortInfo.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/config/ExecutorNotifyProperties.java b/infra/common/src/main/java/cn/hippo4j/common/model/executor/ExecutorNotifyProperties.java
similarity index 96%
rename from threadpool/common/src/main/java/cn/hippo4j/common/config/ExecutorNotifyProperties.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/executor/ExecutorNotifyProperties.java
index 647c6d9b..da3cb3c1 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/config/ExecutorNotifyProperties.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/model/executor/ExecutorNotifyProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.config;
+package cn.hippo4j.common.model.executor;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/config/ExecutorProperties.java b/infra/common/src/main/java/cn/hippo4j/common/model/executor/ExecutorProperties.java
similarity index 98%
rename from threadpool/common/src/main/java/cn/hippo4j/common/config/ExecutorProperties.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/executor/ExecutorProperties.java
index fb33a0dd..5aff08b8 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/config/ExecutorProperties.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/model/executor/ExecutorProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.config;
+package cn.hippo4j.common.model.executor;
import cn.hippo4j.common.api.IExecutorProperties;
import lombok.AllArgsConstructor;
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java b/infra/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterWrapper.java b/infra/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterWrapper.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterWrapper.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterWrapper.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterCoreNotifyParameter.java b/infra/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterCoreNotifyParameter.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterCoreNotifyParameter.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterCoreNotifyParameter.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterServerNotifyParameter.java b/infra/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterServerNotifyParameter.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterServerNotifyParameter.java
rename to infra/common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterServerNotifyParameter.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java
similarity index 92%
rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java
rename to infra/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java
index a96e8df8..51f47037 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java
@@ -30,17 +30,17 @@ import java.util.List;
public abstract class AbstractMessage implements Message {
/**
- * groupKey: tenant + item + tpId + identify
+ * GroupKey: tenant + item + threadPoolId + identify
*/
private String groupKey;
/**
- * messageTypeEnum
+ * Message type enum
*/
private MessageTypeEnum messageType;
/**
- * message
+ * Message
*/
private List messages;
}
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/Message.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/Message.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/Message.java
rename to infra/common/src/main/java/cn/hippo4j/common/monitor/Message.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java
rename to infra/common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java
rename to infra/common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java
rename to infra/common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java b/infra/common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java
rename to infra/common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java
diff --git a/infra/common/src/main/java/cn/hippo4j/common/propertie/EnvironmentProperties.java b/infra/common/src/main/java/cn/hippo4j/common/propertie/EnvironmentProperties.java
new file mode 100644
index 00000000..c874df49
--- /dev/null
+++ b/infra/common/src/main/java/cn/hippo4j/common/propertie/EnvironmentProperties.java
@@ -0,0 +1,44 @@
+/*
+ * 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.common.propertie;
+
+/**
+ * Configurable environment properties.
+ */
+public final class EnvironmentProperties {
+
+ /**
+ * spring.profiles.active
+ */
+ public static String active = "UNKNOWN";
+
+ /**
+ * spring.dynamic.thread-pool.item-id
+ */
+ public static String itemId;
+
+ /**
+ * spring.application.name
+ */
+ public static String applicationName;
+
+ /**
+ * spring.dynamic.thread-pool.check-state-interval
+ */
+ public static Long checkStateInterval;
+}
diff --git a/agents/threadpool/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/src/main/java/cn/hippo4j/agent/plugin/spring/common/support/IDynamicThreadPoolChangeHandlerSpring.java b/infra/common/src/main/java/cn/hippo4j/common/propertie/IdentifyProperties.java
similarity index 75%
rename from agents/threadpool/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/src/main/java/cn/hippo4j/agent/plugin/spring/common/support/IDynamicThreadPoolChangeHandlerSpring.java
rename to infra/common/src/main/java/cn/hippo4j/common/propertie/IdentifyProperties.java
index 5aebf5a3..0382e6b7 100644
--- a/agents/threadpool/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/src/main/java/cn/hippo4j/agent/plugin/spring/common/support/IDynamicThreadPoolChangeHandlerSpring.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/propertie/IdentifyProperties.java
@@ -15,10 +15,18 @@
* limitations under the License.
*/
-package cn.hippo4j.agent.plugin.spring.common.support;
+package cn.hippo4j.common.propertie;
-public interface IDynamicThreadPoolChangeHandlerSpring {
+import lombok.Setter;
- void registerApolloConfigHandler();
+/**
+ * Identify properties.
+ */
+public class IdentifyProperties {
+ /**
+ * The unique identifier of the client, initialized when the project starts
+ */
+ @Setter
+ public static String IDENTIFY;
}
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
similarity index 98%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
index 16a32e28..4290fe7b 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
@@ -17,7 +17,7 @@
package cn.hippo4j.common.toolkit;
-import cn.hippo4j.common.function.Matcher;
+import cn.hippo4j.common.extension.function.Matcher;
import java.lang.reflect.Array;
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
similarity index 92%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
index 3dee268f..cfcc3ae7 100644
--- a/threadpool/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/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java
similarity index 94%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java
index 1de806a3..5fed71f2 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java
@@ -17,7 +17,6 @@
package cn.hippo4j.common.toolkit;
-import cn.hippo4j.common.web.exception.IllegalException;
import com.github.dozermapper.core.DozerBeanMapperBuilder;
import com.github.dozermapper.core.Mapper;
import lombok.AccessLevel;
@@ -40,7 +39,7 @@ import java.util.Set;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class BeanUtil {
- protected static Mapper BEAN_MAPPER_BUILDER;
+ protected static final Mapper BEAN_MAPPER_BUILDER;
static {
BEAN_MAPPER_BUILDER = DozerBeanMapperBuilder.buildDefault();
@@ -93,7 +92,7 @@ public class BeanUtil {
T newInstance = clazz.newInstance();
return mapToBean(map, newInstance, toCamelCase);
} catch (InstantiationException | IllegalAccessException e) {
- throw new IllegalException("do not create instance for " + clazz.getName(), e);
+ throw new RuntimeException("do not create instance for " + clazz.getName(), e);
}
}
@@ -139,7 +138,7 @@ public class BeanUtil {
PropertyDescriptor descriptor = new PropertyDescriptor(propertiesName, o);
return descriptor.getReadMethod();
} catch (IntrospectionException e) {
- throw new IllegalException("not find getter for" + propertiesName + "in" + o.getName(), e);
+ throw new RuntimeException("not find getter for" + propertiesName + "in" + o.getName(), e);
}
}
@@ -158,7 +157,7 @@ public class BeanUtil {
PropertyDescriptor descriptor = new PropertyDescriptor(propertiesName, o);
return descriptor.getWriteMethod();
} catch (IntrospectionException e) {
- throw new IllegalException("not find setter for" + propertiesName + "in" + o.getName(), e);
+ throw new RuntimeException("not find setter for" + propertiesName + "in" + o.getName(), e);
}
}
}
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/BooleanUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/BooleanUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/BooleanUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/BooleanUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/CalculateUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/CalculateUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/CalculateUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/CalculateUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ClassUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ClassUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ClassUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ClassUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
similarity index 96%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
index 5a1fbbca..9e3c1792 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
@@ -17,6 +17,8 @@
package cn.hippo4j.common.toolkit;
+import cn.hippo4j.common.constant.MagicNumberConstants;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -164,7 +166,7 @@ public class CollectionUtil {
private static int computeArrayListCapacity(int arraySize) {
checkNonnegative(arraySize);
// TODO(kevinb): Figure out the right behavior, and document it
- return saturatedCast(5L + arraySize + (arraySize / 10));
+ return saturatedCast(MagicNumberConstants.LONG_5 + arraySize + (arraySize / MagicNumberConstants.INDEX_10));
}
private static void checkNonnegative(int value) {
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java
similarity index 95%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java
index c9d79fb1..7188acba 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java
@@ -17,7 +17,7 @@
package cn.hippo4j.common.toolkit;
-import cn.hippo4j.common.function.NoArgsConsumer;
+import cn.hippo4j.common.extension.function.NoArgsConsumer;
/**
* Condition util.
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/DateUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/DateUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/DateUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/DateUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
similarity index 96%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
index cea1792e..f694c038 100644
--- a/threadpool/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/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java
similarity index 98%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java
index 5c6b00fb..6f45c9a3 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java
@@ -19,6 +19,7 @@ package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.constant.Constants;
import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -47,6 +48,7 @@ import java.util.zip.GZIPOutputStream;
*
* @author nacos
*/
+@Slf4j
public class IoUtil {
/**
@@ -98,7 +100,7 @@ public class IoUtil {
try (GZIPOutputStream gzip = new GZIPOutputStream(out)) {
gzip.write(str.getBytes(encoding));
} catch (Exception e) {
- e.printStackTrace();
+ log.error("gzip write is fail: {}", e.getMessage());
}
return out.toByteArray();
}
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Joiner.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/Joiner.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Joiner.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/Joiner.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java
similarity index 98%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java
index 6a15ca92..3d2c3fef 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java
@@ -181,11 +181,7 @@ public class MapUtil {
* @return
*/
private static boolean checkKey(String key, String filters) {
- if (key.contains(filters)) {
- return true;
- } else {
- return false;
- }
+ return key.contains(filters);
}
/**
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MemoryUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/MemoryUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MemoryUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/MemoryUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java
similarity index 96%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java
index 3be85745..fe8f0d3c 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java
@@ -24,18 +24,18 @@ import java.util.Map;
import cn.hippo4j.common.monitor.AbstractMessage;
import cn.hippo4j.common.monitor.Message;
import cn.hippo4j.common.monitor.MessageWrapper;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
/**
* Message convert.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class MessageConvert {
/**
* {@link Message} to {@link MessageWrapper}.
- *
- * @param message
- * @return
*/
public static MessageWrapper convert(Message message) {
MessageWrapper wrapper = new MessageWrapper();
@@ -54,9 +54,6 @@ public class MessageConvert {
/**
* {@link MessageWrapper} to {@link Message}.
- *
- * @param messageWrapper
- * @return
*/
@SneakyThrows
public static Message convert(MessageWrapper messageWrapper) {
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
similarity index 93%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
index 6f6c2efe..25ed782c 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
@@ -17,10 +17,8 @@
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;
@@ -64,7 +62,7 @@ public class ReflectUtil {
result = field.get(obj);
} catch (IllegalAccessException e) {
String exceptionMsg = String.format("IllegalAccess for %s.%s", field.getDeclaringClass(), field.getName());
- throw new IllegalException(exceptionMsg, e);
+ throw new RuntimeException(exceptionMsg, e);
}
return result;
}
@@ -118,7 +116,7 @@ public class ReflectUtil {
return field.getName();
}
- public static void setFieldValue(Object obj, String fieldName, Object value) throws IllegalException {
+ public static void setFieldValue(Object obj, String fieldName, Object value) throws RuntimeException {
Assert.notNull(obj);
Assert.notBlank(fieldName);
final Field field = getField((obj instanceof Class) ? (Class) obj : obj.getClass(), fieldName);
@@ -126,7 +124,7 @@ public class ReflectUtil {
setFieldValue(obj, field, value);
}
- public static void setFieldValue(Object obj, Field field, Object value) throws IllegalException {
+ public static void setFieldValue(Object obj, Field field, Object value) throws RuntimeException {
Assert.notNull(field, "Field in [" + obj + "] not exist !");
final Class fieldType = field.getType();
if (null != value) {
@@ -143,7 +141,7 @@ public class ReflectUtil {
try {
field.set(obj instanceof Class ? null : obj, value);
} catch (IllegalAccessException e) {
- throw new IllegalException("IllegalAccess for " + obj + "." + field.getName(), e);
+ throw new RuntimeException("IllegalAccess for " + obj + "." + field.getName(), e);
}
}
@@ -184,7 +182,7 @@ public class ReflectUtil {
return clazz.getMethod(methodName, arguments);
}
} catch (NoSuchMethodException e) {
- throw new IllegalException(e);
+ throw new RuntimeException(e);
}
return null;
}
@@ -248,12 +246,12 @@ public class ReflectUtil {
try {
Method method = ReflectUtil.getMethodByName(obj.getClass(), methodName);
if (method == null) {
- throw new IllegalException(methodName + "method not exists");
+ throw new RuntimeException(methodName + "method not exists");
}
ReflectUtil.setAccessible(method);
return (T) method.invoke(obj, arguments);
} catch (IllegalAccessException | InvocationTargetException e) {
- throw new IllegalException(e);
+ throw new RuntimeException(e);
}
}
@@ -270,7 +268,7 @@ public class ReflectUtil {
try {
return (T) method.invoke(obj, arguments);
} catch (IllegalAccessException | InvocationTargetException e) {
- throw new IllegalException(e);
+ throw new RuntimeException(e);
}
}
@@ -284,7 +282,7 @@ public class ReflectUtil {
try {
return cls.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
- throw new IllegalException(e);
+ throw new RuntimeException(e);
}
}
@@ -308,17 +306,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/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
similarity index 92%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
index 1134b34b..7c74e2cc 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
@@ -17,6 +17,8 @@
package cn.hippo4j.common.toolkit;
+import cn.hippo4j.common.constant.MagicNumberConstants;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -354,12 +356,38 @@ public class StringUtil {
return EMPTY;
}
int pos = str.indexOf(symbol);
- if (-1 == pos) {
+ if (MagicNumberConstants.INDEX_NEGATIVE_1 == pos) {
return str;
}
- if (0 == pos) {
+ if (MagicNumberConstants.INDEX_0 == pos) {
return EMPTY;
}
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/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ThreadPoolExecutorUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ThreadPoolExecutorUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ThreadPoolExecutorUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ThreadPoolExecutorUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java
similarity index 99%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java
index b59c509d..79d315d5 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java
@@ -34,7 +34,7 @@ import java.util.TreeMap;
*
* @author liaochuntao
*/
-public class Header {
+public final class Header {
public static final Header EMPTY = Header.newInstance();
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpClientResponse.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpClientResponse.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpClientResponse.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpClientResponse.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java
similarity index 98%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java
index 138b6076..2f8a475e 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java
+++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/HttpUtil.java
@@ -26,7 +26,6 @@ import cn.hippo4j.common.toolkit.IoUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.logtracing.LogMessage;
-import cn.hippo4j.common.web.exception.ServiceException;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
@@ -262,7 +261,7 @@ public class HttpUtil {
.kv("method", method)
.kv("json", json)
.kv2String("headers", JSONUtil.toJSONString(headers)));
- throw new ServiceException("Invalid http json body, please check it again.");
+ throw new RuntimeException("Invalid http json body, please check it again.");
}
return execute(url, method, json, headers);
}
@@ -319,7 +318,7 @@ public class HttpUtil {
JdkHttpClientResponse response = new JdkHttpClientResponse(connection);
if (!HttpResponseCode.isOk(response.getStatusCode())) {
String msg = String.format("HttpPost response code error. [code] %s [url] %s [body] %s", response.getStatusCode(), connection.getURL(), response.getBodyString());
- throw new ServiceException(msg);
+ throw new RuntimeException(msg);
}
return response;
} catch (Throwable ex) {
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/JdkHttpClientResponse.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/JdkHttpClientResponse.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/http/JdkHttpClientResponse.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/http/JdkHttpClientResponse.java
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/logtracing/LogMessage.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/logtracing/LogMessage.java
similarity index 100%
rename from threadpool/common/src/main/java/cn/hippo4j/common/toolkit/logtracing/LogMessage.java
rename to infra/common/src/main/java/cn/hippo4j/common/toolkit/logtracing/LogMessage.java
diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/MockitoTests.java b/infra/common/src/test/java/cn/hippo4j/common/MockitoTests.java
similarity index 87%
rename from threadpool/common/src/test/java/cn/hippo4j/common/MockitoTests.java
rename to infra/common/src/test/java/cn/hippo4j/common/MockitoTests.java
index 7673709d..c86d5054 100644
--- a/threadpool/common/src/test/java/cn/hippo4j/common/MockitoTests.java
+++ b/infra/common/src/test/java/cn/hippo4j/common/MockitoTests.java
@@ -17,25 +17,25 @@
package cn.hippo4j.common;
+import java.util.List;
+
import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.List;
+import org.mockito.junit.MockitoJUnitRunner;
-@ExtendWith(MockitoExtension.class)
-class MockitoTests {
+@RunWith(MockitoJUnitRunner.class)
+public class MockitoTests {
@Mock
List list;
@Test
- void mockTests() {
+ public void mockTests() {
Mockito.when(list.get(1)).thenReturn("mock success.");
Assertions.assertEquals("mock success.", list.get(1));
try (final MockedStatic mockStatic = Mockito.mockStatic(StringUtils.class)) {
diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java b/infra/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java
similarity index 98%
rename from threadpool/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java
rename to infra/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java
index f25e3721..4fdd4dfc 100644
--- a/threadpool/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java
+++ b/infra/common/src/test/java/cn/hippo4j/common/executor/ExecutorFactoryTest.java
@@ -17,7 +17,6 @@
package cn.hippo4j.common.executor;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
import cn.hippo4j.common.toolkit.MapUtil;
import cn.hippo4j.common.toolkit.ReflectUtil;
import org.junit.Assert;
diff --git a/infra/common/src/test/java/cn/hippo4j/common/executor/ThreadFactoryBuilderTest b/infra/common/src/test/java/cn/hippo4j/common/executor/ThreadFactoryBuilderTest
new file mode 100644
index 00000000..e1344100
--- /dev/null
+++ b/infra/common/src/test/java/cn/hippo4j/common/executor/ThreadFactoryBuilderTest
@@ -0,0 +1,81 @@
+/*
+ * 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.common.design.builder;
+
+import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import java.util.concurrent.ThreadFactory;
+import java.lang.Thread.UncaughtExceptionHandler;
+
+public class ThreadFactoryBuilderTest {
+
+ ThreadFactoryBuilder builder;
+ TestUncaughtExceptionHandler uncaughtExceptionHandler;
+ Thread thread;
+
+ @Before
+ public void buildThread() {
+ builder = ThreadFactoryBuilder.builder();
+ uncaughtExceptionHandler = new TestUncaughtExceptionHandler();
+ builder.uncaughtExceptionHandler(uncaughtExceptionHandler);
+ builder.prefix("my-thread-factory");
+ builder.daemon(true);
+ builder.priority(Thread.MAX_PRIORITY);
+ ThreadFactory threadFactory = builder.build();
+ thread = threadFactory.newThread(() -> {
+ System.out.println("Create a new thread.");
+ });
+ thread.start();
+ }
+
+ @Test
+ public void testName() {
+ Assert.assertEquals("my-thread-factory_0", thread.getName());
+ }
+
+ @Test
+ public void testIsDaemon() {
+ Assert.assertTrue(thread.isDaemon());
+ }
+
+ @Test
+ public void testExceptionHandler() {
+ Assert.assertEquals(uncaughtExceptionHandler, thread.getUncaughtExceptionHandler());
+ }
+
+ @Test
+ public void testPriority() {
+ Assert.assertEquals(Thread.MAX_PRIORITY, thread.getPriority());
+ }
+}
+
+class TestUncaughtExceptionHandler implements UncaughtExceptionHandler {
+
+ private volatile boolean exceptionCaught = false;
+
+ @Override
+ public void uncaughtException(Thread t, Throwable e) {
+ System.out.println("Exception caught by " + t.getName());
+ exceptionCaught = true;
+ }
+
+ public boolean isExceptionCaught() {
+ return exceptionCaught;
+ }
+}
diff --git a/infra/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolExecutorUtilTest b/infra/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolExecutorUtilTest
new file mode 100644
index 00000000..c3459d03
--- /dev/null
+++ b/infra/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolExecutorUtilTest
@@ -0,0 +1,89 @@
+/*
+ * 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.common.executor;
+
+import cn.hippo4j.common.toolkit.ThreadPoolExecutorUtil;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class ThreadPoolExecutorUtilTest {
+
+ private ThreadPoolExecutor executor;
+ private int corePoolSize;
+ private int maxPoolSize;
+
+ @Before
+ public void testSafeSetPoolSize() {
+ corePoolSize = 2;
+ maxPoolSize = 4;
+ executor = new ThreadPoolExecutor(
+ corePoolSize,
+ maxPoolSize,
+ 1L,
+ TimeUnit.SECONDS,
+ new ArrayBlockingQueue<>(10)
+ );
+ }
+
+ @Test
+ public void testEquals(){
+ // Test when the new core pool size equals the original maximum pool size.
+ int newCorePoolSize1 = maxPoolSize;
+ int newMaxPoolSize1 = 6;
+ ThreadPoolExecutorUtil.safeSetPoolSize(executor, newCorePoolSize1, newMaxPoolSize1);
+ Assert.assertEquals(newCorePoolSize1, executor.getCorePoolSize());
+ Assert.assertEquals(newMaxPoolSize1, executor.getMaximumPoolSize());
+ }
+
+ @Test
+ public void testGreater(){
+ // Test when the new core pool size is greater than the original maximum pool size.
+ int newCorePoolSize2 = 8;
+ int newMaxPoolSize2 = 10;
+ ThreadPoolExecutorUtil.safeSetPoolSize(executor, newCorePoolSize2, newMaxPoolSize2);
+ Assert.assertEquals(newCorePoolSize2, executor.getCorePoolSize());
+ Assert.assertEquals(newMaxPoolSize2, executor.getMaximumPoolSize());
+ }
+
+ @Test
+ public void testLess(){
+ // Test when the new core pool size is less than the original maximum pool size.
+ int newCorePoolSize3 = 3;
+ int newMaxPoolSize3 = 5;
+ ThreadPoolExecutorUtil.safeSetPoolSize(executor, newCorePoolSize3, newMaxPoolSize3);
+ Assert.assertEquals(newCorePoolSize3, executor.getCorePoolSize());
+ Assert.assertEquals(newMaxPoolSize3, executor.getMaximumPoolSize());
+ }
+
+ @Test
+ public void testException(){
+ // Test when the new core pool size is greater than the new maximum pool size, which should throw an IllegalArgumentException.
+ int newCorePoolSize4 = 6;
+ int newMaxPoolSize4 = 4;
+ try {
+ ThreadPoolExecutorUtil.safeSetPoolSize(executor, newCorePoolSize4, newMaxPoolSize4);
+ } catch (IllegalArgumentException e) {
+ // Expected to throw an exception.
+ Assert.assertEquals("newCorePoolSize must be smaller than newMaximumPoolSize", e.getMessage());
+ }
+ }
+}
diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolManagerTest.java b/infra/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolManagerTest.java
similarity index 100%
rename from threadpool/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolManagerTest.java
rename to infra/common/src/test/java/cn/hippo4j/common/executor/ThreadPoolManagerTest.java
diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java b/infra/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java
similarity index 94%
rename from threadpool/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java
rename to infra/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java
index 3ba148f8..e208165f 100644
--- a/threadpool/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java
+++ b/infra/common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java
@@ -18,7 +18,7 @@
package cn.hippo4j.common.executor.support;
import org.junit.Assert;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
import java.util.Arrays;
import java.util.List;
@@ -34,7 +34,7 @@ public final class BlockingQueueTypeEnumTest {
private static final List BLOCKING_QUEUE_NAMES = Arrays.stream(BlockingQueueTypeEnum.values()).map(BlockingQueueTypeEnum::getName).collect(Collectors.toList());
@Test
- void assertCreateBlockingQueueNormal() {
+ public void testAssertCreateBlockingQueueNormal() {
// check legal param: name and capacity
for (String name : BLOCKING_QUEUE_NAMES) {
BlockingQueue
+
+ cn.hippo4j
+ hippo4j-threadpool-dynamic-api
+ ${project.version}
+
+
+ cn.hippo4j
+ hippo4j-threadpool-dynamic-mode-config
+ ${project.version}
+
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/ConfigHandlerConfiguration.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/ConfigHandlerConfiguration.java
index 1deac720..079d0f05 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/ConfigHandlerConfiguration.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/ConfigHandlerConfiguration.java
@@ -17,15 +17,9 @@
package cn.hippo4j.config.springboot.starter.config;
-import cn.hippo4j.config.springboot.starter.refresher.ApolloRefresherHandler;
-import cn.hippo4j.config.springboot.starter.refresher.BootstrapConfigPropertiesBinderAdapt;
-import cn.hippo4j.config.springboot.starter.refresher.ConsulRefresherHandler;
-import cn.hippo4j.config.springboot.starter.refresher.DefaultBootstrapConfigPropertiesBinderAdapt;
-import cn.hippo4j.config.springboot.starter.refresher.EtcdRefresherHandler;
-import cn.hippo4j.config.springboot.starter.refresher.NacosCloudRefresherHandler;
-import cn.hippo4j.config.springboot.starter.refresher.NacosRefresherHandler;
-import cn.hippo4j.config.springboot.starter.refresher.PolarisRefresherHandler;
-import cn.hippo4j.config.springboot.starter.refresher.ZookeeperRefresherHandler;
+import cn.hippo4j.config.springboot.starter.refresher.*;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.dynamic.mode.config.refresher.BootstrapConfigPropertiesBinderAdapter;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.nacos.api.config.ConfigService;
import com.tencent.polaris.configuration.api.core.ConfigFileService;
@@ -64,10 +58,13 @@ public class ConfigHandlerConfiguration {
@Bean
@ConditionalOnMissingBean
- public BootstrapConfigPropertiesBinderAdapt bootstrapConfigPropertiesBinderAdapt() {
- return new DefaultBootstrapConfigPropertiesBinderAdapt();
+ public BootstrapConfigPropertiesBinderAdapter bootstrapConfigPropertiesBinderAdapter() {
+ return new DefaultBootstrapConfigPropertiesBinderAdapter();
}
+ /**
+ * Embedded Nacos
+ */
@RequiredArgsConstructor
@ConditionalOnClass(value = ConfigService.class, name = NACOS_INJECTED_BEAN_NAME)
@ConditionalOnMissingClass(NACOS_CONFIG_MANAGER_KEY)
@@ -80,6 +77,9 @@ public class ConfigHandlerConfiguration {
}
}
+ /**
+ * Embedded Nacos Cloud
+ */
@ConditionalOnClass(NacosConfigProperties.class)
@ConditionalOnProperty(prefix = BootstrapConfigProperties.PREFIX, name = NACOS_DATA_ID_KEY)
static class EmbeddedNacosCloud {
@@ -90,6 +90,9 @@ public class ConfigHandlerConfiguration {
}
}
+ /**
+ * Embedded Apollo
+ */
@ConditionalOnClass(com.ctrip.framework.apollo.ConfigService.class)
@ConditionalOnProperty(prefix = BootstrapConfigProperties.PREFIX, name = APOLLO_NAMESPACE_KEY)
static class EmbeddedApollo {
@@ -100,6 +103,9 @@ public class ConfigHandlerConfiguration {
}
}
+ /**
+ * Embedded Consul
+ */
@ConditionalOnClass(ConsulConfigProperties.class)
@ConditionalOnProperty(prefix = BootstrapConfigProperties.PREFIX, name = CONSUL_DATA_KEY)
static class EmbeddedConsul {
@@ -110,6 +116,9 @@ public class ConfigHandlerConfiguration {
}
}
+ /**
+ * Embedded Zookeeper
+ */
@ConditionalOnClass(CuratorFramework.class)
@ConditionalOnProperty(prefix = BootstrapConfigProperties.PREFIX, name = ZOOKEEPER_CONNECT_STR_KEY)
static class EmbeddedZookeeper {
@@ -120,6 +129,9 @@ public class ConfigHandlerConfiguration {
}
}
+ /**
+ * Embedded Etcd
+ */
@ConditionalOnClass(Client.class)
@ConditionalOnProperty(prefix = BootstrapConfigProperties.PREFIX, name = ETCD)
static class EmbeddedEtcd {
@@ -130,6 +142,9 @@ public class ConfigHandlerConfiguration {
}
}
+ /**
+ * Polaris
+ */
@ConditionalOnClass(ConfigFileService.class)
@ConditionalOnProperty(prefix = BootstrapConfigProperties.PREFIX, name = POLARIS)
static class Polaris {
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..b1cc647a 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,6 @@
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.common.toolkit.StringUtil;
import cn.hippo4j.config.springboot.starter.monitor.ThreadPoolMonitorExecutor;
import cn.hippo4j.config.springboot.starter.notify.ConfigModeNotifyConfigBuilder;
@@ -30,18 +28,22 @@ import cn.hippo4j.config.springboot.starter.refresher.event.WebExecutorRefreshLi
import cn.hippo4j.config.springboot.starter.support.DynamicThreadPoolAdapterRegister;
import cn.hippo4j.config.springboot.starter.support.DynamicThreadPoolConfigService;
import cn.hippo4j.config.springboot.starter.support.DynamicThreadPoolPostProcessor;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.core.config.UtilAutoConfiguration;
import cn.hippo4j.core.enable.MarkerConfiguration;
-import cn.hippo4j.core.handler.DynamicThreadPoolBannerHandler;
-import cn.hippo4j.message.api.NotifyConfigBuilder;
+import cn.hippo4j.core.executor.handler.DynamicThreadPoolBannerHandler;
+import cn.hippo4j.core.extension.initialize.Hippo4jDynamicThreadPoolInitializer;
import cn.hippo4j.message.config.MessageConfiguration;
-import cn.hippo4j.message.service.AlarmControlHandler;
-import cn.hippo4j.message.service.DefaultThreadPoolCheckAlarmHandler;
-import cn.hippo4j.message.service.DefaultThreadPoolConfigChangeHandler;
-import cn.hippo4j.message.service.Hippo4jBaseSendMessageService;
-import cn.hippo4j.message.service.Hippo4jSendMessageService;
-import cn.hippo4j.message.service.WebThreadPoolConfigChangeHandler;
import cn.hippo4j.springboot.starter.adapter.web.WebAdapterConfiguration;
+import cn.hippo4j.threadpool.alarm.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.threadpool.alarm.handler.DefaultThreadPoolCheckAlarmHandler;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.message.api.NotifyConfigBuilder;
+import cn.hippo4j.threadpool.message.core.service.AlarmControlHandler;
+import cn.hippo4j.threadpool.message.core.service.DefaultThreadPoolConfigChangeHandler;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolBaseSendMessageService;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolSendMessageService;
+import cn.hippo4j.threadpool.message.core.service.WebThreadPoolConfigChangeHandler;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -69,7 +71,7 @@ import org.springframework.core.annotation.Order;
@AllArgsConstructor
@ConditionalOnBean(MarkerConfiguration.Marker.class)
@ConditionalOnProperty(prefix = BootstrapConfigProperties.PREFIX, value = "enable", matchIfMissing = true, havingValue = "true")
-@EnableConfigurationProperties(BootstrapConfigProperties.class)
+@EnableConfigurationProperties(SpringBootstrapConfigProperties.class)
@Import(ConfigHandlerConfiguration.class)
@ImportAutoConfiguration({WebAdapterConfiguration.class, UtilAutoConfiguration.class, MessageConfiguration.class})
public class DynamicThreadPoolAutoConfiguration {
@@ -90,13 +92,13 @@ public class DynamicThreadPoolAutoConfiguration {
@Bean
@ConditionalOnMissingBean
- public ThreadPoolCheckAlarm defaultThreadPoolCheckAlarmHandler(Hippo4jSendMessageService hippo4jSendMessageService) {
+ public ThreadPoolCheckAlarm defaultThreadPoolCheckAlarmHandler(ThreadPoolSendMessageService hippo4jSendMessageService) {
return new DefaultThreadPoolCheckAlarmHandler(hippo4jSendMessageService);
}
@Bean
@ConditionalOnMissingBean
- public DefaultThreadPoolConfigChangeHandler defaultThreadPoolConfigChangeHandler(Hippo4jSendMessageService hippo4jSendMessageService) {
+ public DefaultThreadPoolConfigChangeHandler defaultThreadPoolConfigChangeHandler(ThreadPoolSendMessageService hippo4jSendMessageService) {
return new DefaultThreadPoolConfigChangeHandler(hippo4jSendMessageService);
}
@@ -104,7 +106,7 @@ public class DynamicThreadPoolAutoConfiguration {
@ConditionalOnMissingBean
public WebThreadPoolConfigChangeHandler webThreadPoolConfigChangeHandler(BootstrapConfigProperties bootstrapConfigProperties,
WebThreadPoolService webThreadPoolService,
- Hippo4jSendMessageService hippo4jSendMessageService) {
+ ThreadPoolSendMessageService hippo4jSendMessageService) {
if (bootstrapConfigProperties.getWeb() != null && StringUtil.isBlank(bootstrapConfigProperties.getWeb().getThreadPoolId())) {
bootstrapConfigProperties.getWeb().setThreadPoolId(webThreadPoolService.getWebContainerType().getName());
}
@@ -125,8 +127,8 @@ public class DynamicThreadPoolAutoConfiguration {
@SuppressWarnings("all")
public DynamicThreadPoolRefreshListener hippo4jExecutorsListener(DefaultThreadPoolConfigChangeHandler threadPoolConfigChange,
ConfigModeNotifyConfigBuilder configModeNotifyConfigBuilder,
- Hippo4jBaseSendMessageService hippoBaseSendMessageService) {
- return new DynamicThreadPoolRefreshListener(threadPoolConfigChange, configModeNotifyConfigBuilder, hippoBaseSendMessageService);
+ ThreadPoolBaseSendMessageService threadPoolBaseSendMessageService) {
+ return new DynamicThreadPoolRefreshListener(threadPoolConfigChange, configModeNotifyConfigBuilder, threadPoolBaseSendMessageService);
}
@Bean
@@ -159,4 +161,9 @@ public class DynamicThreadPoolAutoConfiguration {
public DynamicThreadPoolConfigService dynamicThreadPoolConfigService() {
return new DynamicThreadPoolConfigService();
}
+
+ @Bean
+ public Hippo4jDynamicThreadPoolInitializer hippo4jDynamicThreadPoolInitializer() {
+ return new Hippo4jDynamicThreadPoolInitializer();
+ }
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/ServerConnection.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/SpringBootstrapConfigProperties.java
similarity index 66%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/ServerConnection.java
rename to starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/SpringBootstrapConfigProperties.java
index a1a830ca..5c99b900 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/ServerConnection.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/config/SpringBootstrapConfigProperties.java
@@ -15,21 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.rpc.server;
+package cn.hippo4j.config.springboot.starter.config;
-import cn.hippo4j.rpc.discovery.ServerPort;
-import cn.hippo4j.rpc.handler.Connection;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * This applies to server-side connections
- *
- * @since 1.5.1
+ * Spring bootstrap core properties.
*/
-public interface ServerConnection extends Connection {
-
- /**
- * Bind ports and process them
- */
- void bind(ServerPort port);
-
+@ConfigurationProperties(prefix = BootstrapConfigProperties.PREFIX)
+public class SpringBootstrapConfigProperties extends BootstrapConfigProperties {
}
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..ef9447cb 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
@@ -17,31 +17,28 @@
package cn.hippo4j.config.springboot.starter.monitor;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import cn.hippo4j.common.config.ApplicationContextHolder;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
+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;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.monitor.base.DynamicThreadPoolMonitor;
import cn.hippo4j.monitor.base.ThreadPoolMonitor;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.MonitorProperties;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-
import org.springframework.beans.factory.DisposableBean;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
-import static cn.hippo4j.core.executor.manage.GlobalThreadPoolManage.getThreadPoolNum;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
/**
* Thread-pool monitor executor.
@@ -82,8 +79,8 @@ public class ThreadPoolMonitorExecutor implements ApplicationRunner, DisposableB
monitor.getInitialDelay(),
monitor.getCollectInterval(),
TimeUnit.MILLISECONDS);
- if (GlobalThreadPoolManage.getThreadPoolNum() > 0) {
- log.info("Dynamic thread pool: [{}]. The dynamic thread pool starts data collection and reporting.", getThreadPoolNum());
+ if (ThreadPoolExecutorRegistry.getThreadPoolExecutorSize() > 0) {
+ log.info("Dynamic thread pool: [{}]. The dynamic thread pool starts data collection and reporting.", ThreadPoolExecutorRegistry.getThreadPoolExecutorSize());
}
}
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/notify/ConfigModeNotifyConfigBuilder.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/notify/ConfigModeNotifyConfigBuilder.java
index b12ab6ed..3bc9b193 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/notify/ConfigModeNotifyConfigBuilder.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/notify/ConfigModeNotifyConfigBuilder.java
@@ -19,16 +19,16 @@ package cn.hippo4j.config.springboot.starter.notify;
import cn.hippo4j.adapter.web.WebThreadPoolService;
import cn.hippo4j.common.api.IExecutorProperties;
-import cn.hippo4j.common.config.ExecutorNotifyProperties;
-import cn.hippo4j.common.config.ExecutorProperties;
+import cn.hippo4j.common.model.executor.ExecutorNotifyProperties;
+import cn.hippo4j.common.model.executor.ExecutorProperties;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
-import cn.hippo4j.config.springboot.starter.config.NotifyPlatformProperties;
-import cn.hippo4j.config.springboot.starter.config.WebExecutorProperties;
-import cn.hippo4j.message.api.NotifyConfigBuilder;
-import cn.hippo4j.message.dto.NotifyConfigDTO;
-import cn.hippo4j.message.service.AlarmControlHandler;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.NotifyPlatformProperties;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.WebExecutorProperties;
+import cn.hippo4j.threadpool.message.api.NotifyConfigBuilder;
+import cn.hippo4j.threadpool.message.api.NotifyConfigDTO;
+import cn.hippo4j.threadpool.message.core.service.AlarmControlHandler;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -53,6 +53,8 @@ public class ConfigModeNotifyConfigBuilder implements NotifyConfigBuilder {
private final WebThreadPoolService webThreadPoolService;
+ private static final int DEFAULT_INTERVAL = 5;
+
@Override
public Map> buildNotify() {
Map> resultMap = new HashMap<>();
@@ -145,7 +147,7 @@ public class ConfigModeNotifyConfigBuilder implements NotifyConfigBuilder {
.orElse(Optional.ofNullable(configProperties.getDefaultExecutor())
.map(ExecutorProperties::getNotify)
.map(ExecutorNotifyProperties::getInterval)
- .orElse(5));
+ .orElse(DEFAULT_INTERVAL));
}
private String buildReceive(IExecutorProperties executorProperties) {
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..67d82d98 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
@@ -17,71 +17,69 @@
package cn.hippo4j.config.springboot.starter.refresher;
-import cn.hippo4j.common.api.ThreadPoolDynamicRefresh;
-import cn.hippo4j.common.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.CollectionUtil;
-import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
-import cn.hippo4j.config.springboot.starter.parser.ConfigParserHandler;
-import cn.hippo4j.config.springboot.starter.refresher.event.Hippo4jConfigDynamicRefreshEvent;
+import cn.hippo4j.config.springboot.starter.refresher.event.ThreadPoolConfigDynamicRefreshEvent;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.core.executor.support.ThreadPoolBuilder;
+import cn.hippo4j.threadpool.dynamic.api.BootstrapPropertiesInterface;
+import cn.hippo4j.threadpool.dynamic.api.ThreadPoolDynamicRefresh;
+import cn.hippo4j.threadpool.dynamic.mode.config.parser.ConfigParserHandler;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.dynamic.mode.config.refresher.BootstrapConfigPropertiesBinderAdapter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
+import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
/**
- * Abstract core thread-pool dynamic refresh.
+ * Abstract config thread-pool dynamic refresh.
*/
@Slf4j
public abstract class AbstractConfigThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh, InitializingBean, ApplicationRunner {
- private final BootstrapConfigPropertiesBinderAdapt bootstrapConfigPropertiesBinderAdapt;
-
- protected BootstrapConfigProperties bootstrapConfigProperties;
+ private final BootstrapConfigPropertiesBinderAdapter bootstrapConfigPropertiesBinderAdapter;
+ protected BootstrapPropertiesInterface bootstrapConfigProperties;
protected final ExecutorService dynamicRefreshExecutorService = ThreadPoolBuilder.builder().singlePool("client.dynamic.refresh").build();
public AbstractConfigThreadPoolDynamicRefresh() {
- bootstrapConfigProperties = ApplicationContextHolder.getBean(BootstrapConfigProperties.class);
- bootstrapConfigPropertiesBinderAdapt = ApplicationContextHolder.getBean(BootstrapConfigPropertiesBinderAdapt.class);
+ bootstrapConfigProperties = ApplicationContextHolder.getBean(BootstrapPropertiesInterface.class);
+ bootstrapConfigPropertiesBinderAdapter = ApplicationContextHolder.getBean(BootstrapConfigPropertiesBinderAdapter.class);
}
- /**
- * Init register listener.
- */
- protected abstract void initRegisterListener();
-
@Override
public void dynamicRefresh(String configContent) {
- dynamicRefresh(configContent, null);
+ dynamicRefresh(configContent, new HashMap<>());
}
@Override
public void dynamicRefresh(String configContent, Map newValueChangeMap) {
try {
- Map configInfo = ConfigParserHandler.getInstance().parseConfig(configContent, bootstrapConfigProperties.getConfigFileType());
+ BootstrapConfigProperties actualBootstrapConfigProperties = (BootstrapConfigProperties) bootstrapConfigProperties;
+ Map configInfo = ConfigParserHandler.getInstance().parseConfig(configContent, actualBootstrapConfigProperties.getConfigFileType());
if (CollectionUtil.isNotEmpty(newValueChangeMap)) {
Optional.ofNullable(configInfo).ifPresent(each -> each.putAll(newValueChangeMap));
}
- BootstrapConfigProperties binderCoreProperties = bootstrapConfigPropertiesBinderAdapt.bootstrapCorePropertiesBinder(configInfo, bootstrapConfigProperties);
- publishDynamicThreadPoolEvent(binderCoreProperties);
+ BootstrapPropertiesInterface binderCoreProperties = bootstrapConfigPropertiesBinderAdapter.bootstrapCorePropertiesBinder(configInfo, bootstrapConfigProperties);
+ publishDynamicThreadPoolEvent((BootstrapConfigProperties) binderCoreProperties);
} catch (Exception ex) {
log.error("Hippo4j config mode dynamic refresh failed.", ex);
}
}
private void publishDynamicThreadPoolEvent(BootstrapConfigProperties configProperties) {
- ApplicationContextHolder.getInstance().publishEvent(new Hippo4jConfigDynamicRefreshEvent(this, configProperties));
+ ApplicationContextHolder.getInstance().publishEvent(new ThreadPoolConfigDynamicRefreshEvent(this, configProperties));
}
@Override
public void afterPropertiesSet() {
try {
- initRegisterListener();
+ registerListener();
} catch (Exception ex) {
log.error("Hippo4j failed to initialize register listener.", ex);
}
@@ -90,7 +88,7 @@ public abstract class AbstractConfigThreadPoolDynamicRefresh implements ThreadPo
@Override
public void run(ApplicationArguments args) {
try {
- publishDynamicThreadPoolEvent(bootstrapConfigProperties);
+ publishDynamicThreadPoolEvent((BootstrapConfigProperties) bootstrapConfigProperties);
} catch (Exception ex) {
log.error("Hippo4j failed to initialize update configuration.", ex);
}
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ApolloRefresherHandler.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ApolloRefresherHandler.java
index f70c956a..ff839d6e 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ApolloRefresherHandler.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ApolloRefresherHandler.java
@@ -17,7 +17,7 @@
package cn.hippo4j.config.springboot.starter.refresher;
-import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigFile;
@@ -42,13 +42,14 @@ public class ApolloRefresherHandler extends AbstractConfigThreadPoolDynamicRefre
private String namespace;
@Override
- public void initRegisterListener() {
+ public void registerListener() {
String[] apolloNamespaces = this.namespace.split(",");
this.namespace = apolloNamespaces[0];
- Config config = ConfigService.getConfig(String.format("%s.%s", namespace, bootstrapConfigProperties.getConfigFileType().getValue()));
+ BootstrapConfigProperties actualBootstrapConfigProperties = (BootstrapConfigProperties) bootstrapConfigProperties;
+ Config config = ConfigService.getConfig(String.format("%s.%s", namespace, actualBootstrapConfigProperties.getConfigFileType().getValue()));
ConfigChangeListener configChangeListener = configChangeEvent -> {
- String namespace = this.namespace.replaceAll("." + bootstrapConfigProperties.getConfigFileType().getValue(), "");
- ConfigFileFormat configFileFormat = ConfigFileFormat.fromString(bootstrapConfigProperties.getConfigFileType().getValue());
+ String namespace = this.namespace.replaceAll("." + actualBootstrapConfigProperties.getConfigFileType().getValue(), "");
+ ConfigFileFormat configFileFormat = ConfigFileFormat.fromString(actualBootstrapConfigProperties.getConfigFileType().getValue());
ConfigFile configFile = ConfigService.getConfigFile(namespace, configFileFormat);
Map newChangeValueMap = new HashMap<>();
configChangeEvent.changedKeys().stream().filter(each -> each.contains(BootstrapConfigProperties.PREFIX)).forEach(each -> {
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ConsulRefresherHandler.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ConsulRefresherHandler.java
index 51826680..ea2cca4e 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ConsulRefresherHandler.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ConsulRefresherHandler.java
@@ -39,6 +39,8 @@ import java.util.stream.Collectors;
@Slf4j
public class ConsulRefresherHandler extends AbstractConfigThreadPoolDynamicRefresh {
+ private static final int INITIAL_CAPACITY = 64;
+
@EventListener(EnvironmentChangeEvent.class)
public void refreshed(EnvironmentChangeEvent event) {
Map configInfo = extractLatestConfigInfo(event);
@@ -54,7 +56,7 @@ public class ConsulRefresherHandler extends AbstractConfigThreadPoolDynamicRefre
.map(propertySource -> (BootstrapPropertySource) propertySource).collect(Collectors.toList());
Optional> bootstrapPropertySource = bootstrapPropertySourceList.stream()
.filter(source -> source.getName().contains(activeProfile) && source.getPropertyNames().length != 0).findFirst();
- Map configInfo = new HashMap<>(64);
+ Map configInfo = new HashMap<>(INITIAL_CAPACITY);
if (bootstrapPropertySource.isPresent()) {
ConsulPropertySource consulPropertySource = (ConsulPropertySource) bootstrapPropertySource.get().getDelegate();
String[] propertyNames = consulPropertySource.getPropertyNames();
@@ -73,7 +75,7 @@ public class ConsulRefresherHandler extends AbstractConfigThreadPoolDynamicRefre
}
@Override
- protected void initRegisterListener() {
+ public void registerListener() {
// The listener has been registered by annotation.
}
}
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/DefaultBootstrapConfigPropertiesBinderAdapt.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/DefaultBootstrapConfigPropertiesBinderAdapter.java
similarity index 75%
rename from starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/DefaultBootstrapConfigPropertiesBinderAdapt.java
rename to starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/DefaultBootstrapConfigPropertiesBinderAdapter.java
index 684d6aad..af40d3e2 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/DefaultBootstrapConfigPropertiesBinderAdapt.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/DefaultBootstrapConfigPropertiesBinderAdapter.java
@@ -17,7 +17,9 @@
package cn.hippo4j.config.springboot.starter.refresher;
-import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.dynamic.api.BootstrapPropertiesInterface;
+import cn.hippo4j.threadpool.dynamic.mode.config.refresher.BootstrapConfigPropertiesBinderAdapter;
import org.springframework.boot.context.properties.bind.Bindable;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.ConfigurationPropertySource;
@@ -28,7 +30,7 @@ import java.util.Map;
/**
* Bootstrap core properties binder adapt.
*/
-public class DefaultBootstrapConfigPropertiesBinderAdapt implements BootstrapConfigPropertiesBinderAdapt {
+public class DefaultBootstrapConfigPropertiesBinderAdapter implements BootstrapConfigPropertiesBinderAdapter {
/**
* Bootstrap core properties binder.
@@ -38,7 +40,7 @@ public class DefaultBootstrapConfigPropertiesBinderAdapt implements BootstrapCon
* @return
*/
@Override
- public BootstrapConfigProperties bootstrapCorePropertiesBinder(Map configInfo, BootstrapConfigProperties bootstrapConfigProperties) {
+ public BootstrapPropertiesInterface bootstrapCorePropertiesBinder(Map configInfo, BootstrapPropertiesInterface bootstrapConfigProperties) {
ConfigurationPropertySource sources = new MapConfigurationPropertySource(configInfo);
Binder binder = new Binder(sources);
return binder.bind(BootstrapConfigProperties.PREFIX, Bindable.ofInstance(bootstrapConfigProperties)).get();
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/EtcdRefresherHandler.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/EtcdRefresherHandler.java
index af4a2080..b6979c9b 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/EtcdRefresherHandler.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/EtcdRefresherHandler.java
@@ -19,6 +19,7 @@ package cn.hippo4j.config.springboot.starter.refresher;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.StringUtil;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.Client;
import io.etcd.jetcd.ClientBuilder;
@@ -58,8 +59,9 @@ public class EtcdRefresherHandler extends AbstractConfigThreadPoolDynamicRefresh
@SneakyThrows(value = {InterruptedException.class, ExecutionException.class})
@Override
- public void initRegisterListener() {
- Map etcd = bootstrapConfigProperties.getEtcd();
+ public void registerListener() {
+ BootstrapConfigProperties actualBootstrapConfigProperties = (BootstrapConfigProperties) bootstrapConfigProperties;
+ Map etcd = actualBootstrapConfigProperties.getEtcd();
String key = etcd.get(KEY);
Charset charset = StringUtil.isBlank(etcd.get(CHARSET)) ? StandardCharsets.UTF_8 : Charset.forName(etcd.get(CHARSET));
initClient(etcd, charset);
@@ -115,4 +117,4 @@ public class EtcdRefresherHandler extends AbstractConfigThreadPoolDynamicRefresh
.build() : clientBuilder.build();
}
}
-}
\ No newline at end of file
+}
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..9dcd2eef 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,8 @@
package cn.hippo4j.config.springboot.starter.refresher;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+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;
@@ -46,8 +47,9 @@ public class NacosCloudRefresherHandler extends AbstractConfigThreadPoolDynamicR
@SneakyThrows(NacosException.class)
@Override
- public void initRegisterListener() {
- Map nacosConfig = bootstrapConfigProperties.getNacos();
+ public void registerListener() {
+ BootstrapConfigProperties actualBootstrapConfigProperties = (BootstrapConfigProperties) bootstrapConfigProperties;
+ Map nacosConfig = actualBootstrapConfigProperties.getNacos();
configService.addListener(nacosConfig.get(DATA_ID),
nacosConfig.get(GROUP), new Listener() {
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/NacosRefresherHandler.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/NacosRefresherHandler.java
index 0b795b23..88e53aae 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/NacosRefresherHandler.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/NacosRefresherHandler.java
@@ -17,6 +17,7 @@
package cn.hippo4j.config.springboot.starter.refresher;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
import com.alibaba.nacos.api.annotation.NacosInjected;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.config.listener.Listener;
@@ -46,9 +47,9 @@ public class NacosRefresherHandler extends AbstractConfigThreadPoolDynamicRefres
@SneakyThrows(NacosException.class)
@Override
- public void initRegisterListener() {
- Map nacosConfig = bootstrapConfigProperties.getNacos();
-
+ public void registerListener() {
+ BootstrapConfigProperties actualBootstrapConfigProperties = (BootstrapConfigProperties) bootstrapConfigProperties;
+ Map nacosConfig = actualBootstrapConfigProperties.getNacos();
configService.addListener(nacosConfig.get(DATA_ID), nacosConfig.get(GROUP),
new Listener() {
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/PolarisRefresherHandler.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/PolarisRefresherHandler.java
index ba485536..3f2a3f8b 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/PolarisRefresherHandler.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/PolarisRefresherHandler.java
@@ -54,7 +54,7 @@ public class PolarisRefresherHandler extends AbstractConfigThreadPoolDynamicRefr
private String fileName;
@Override
- public void initRegisterListener() {
+ public void registerListener() {
ConfigKVFile configFile = getConfigKVFile();
configFile.addChangeListener((ConfigKVFileChangeListener) event -> {
String content = configFile.getContent();
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ZookeeperRefresherHandler.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ZookeeperRefresherHandler.java
index 19326c7d..b83fc2eb 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ZookeeperRefresherHandler.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/ZookeeperRefresherHandler.java
@@ -17,8 +17,9 @@
package cn.hippo4j.config.springboot.starter.refresher;
-import cn.hippo4j.message.service.GlobalNotifyAlarmManage;
-import cn.hippo4j.message.service.ThreadPoolNotifyAlarm;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.message.core.service.GlobalNotifyAlarmManage;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolNotifyAlarm;
import lombok.extern.slf4j.Slf4j;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
@@ -41,21 +42,26 @@ import java.util.Map;
@Slf4j
public class ZookeeperRefresherHandler extends AbstractConfigThreadPoolDynamicRefresh {
- static final String ZK_CONNECT_STR = "zk-connect-str";
+ private static final String ZK_CONNECT_STR = "zk-connect-str";
- static final String ROOT_NODE = "root-node";
+ private static final String ROOT_NODE = "root-node";
- static final String CONFIG_VERSION = "config-version";
+ private static final String CONFIG_VERSION = "config-version";
- static final String NODE = "node";
+ private static final String NODE = "node";
private CuratorFramework curatorFramework;
+ private static final int BASE_SLEEP_TIME_MS = 1000;
+
+ private static final int MAX_RETRIES = 3;
+
@Override
- public void initRegisterListener() {
- Map zkConfigs = bootstrapConfigProperties.getZookeeper();
+ public void registerListener() {
+ BootstrapConfigProperties actualBootstrapConfigProperties = (BootstrapConfigProperties) bootstrapConfigProperties;
+ Map zkConfigs = actualBootstrapConfigProperties.getZookeeper();
curatorFramework = CuratorFrameworkFactory.newClient(zkConfigs.get(ZK_CONNECT_STR),
- new ExponentialBackoffRetry(1000, 3));
+ new ExponentialBackoffRetry(BASE_SLEEP_TIME_MS, MAX_RETRIES));
String nodePath = ZKPaths.makePath(ZKPaths.makePath(zkConfigs.get(ROOT_NODE),
zkConfigs.get(CONFIG_VERSION)), zkConfigs.get(NODE));
final ConnectionStateListener connectionStateListener = (client, newState) -> {
@@ -130,7 +136,8 @@ public class ZookeeperRefresherHandler extends AbstractConfigThreadPoolDynamicRe
* Register notify alarm manage.
*/
public void registerNotifyAlarmManage() {
- bootstrapConfigProperties.getExecutors().forEach(executorProperties -> {
+ BootstrapConfigProperties actualBootstrapConfigProperties = (BootstrapConfigProperties) bootstrapConfigProperties;
+ actualBootstrapConfigProperties.getExecutors().forEach(executorProperties -> {
ThreadPoolNotifyAlarm threadPoolNotifyAlarm = new ThreadPoolNotifyAlarm(
executorProperties.getAlarm(),
executorProperties.getCapacityAlarm(),
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AbstractRefreshListener.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AbstractRefreshListener.java
index 61d6fe08..e1d06c4e 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AbstractRefreshListener.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AbstractRefreshListener.java
@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
* Refresh listener abstract base class.
*/
@Slf4j
-public abstract class AbstractRefreshListener implements RefreshListener {
+public abstract class AbstractRefreshListener implements RefreshListener {
/**
* Matching nodes
@@ -55,4 +55,4 @@ public abstract class AbstractRefreshListener implements RefreshListener adapterExecutors;
+ public void onApplicationEvent(ThreadPoolConfigDynamicRefreshEvent event) {
+ List adapterExecutors = event.getBootstrapConfigProperties().getAdapterExecutors();
Map threadPoolAdapterMap = ApplicationContextHolder.getBeansOfType(ThreadPoolAdapter.class);
- if (CollectionUtil.isEmpty(adapterExecutors = event.getBootstrapConfigProperties().getAdapterExecutors()) || CollectionUtil.isEmpty(threadPoolAdapterMap)) {
+ if (CollectionUtil.isEmpty(adapterExecutors) || CollectionUtil.isEmpty(threadPoolAdapterMap)) {
return;
}
for (AdapterExecutorProperties each : adapterExecutors) {
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java
index 99f97ca0..25bb91e6 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java
@@ -18,22 +18,22 @@
package cn.hippo4j.config.springboot.starter.refresher.event;
import cn.hippo4j.common.api.ThreadPoolConfigChange;
+import cn.hippo4j.common.executor.ThreadPoolExecutorHolder;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum;
import cn.hippo4j.common.executor.support.ResizableCapacityLinkedBlockingQueue;
+import cn.hippo4j.common.model.executor.ExecutorProperties;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.ThreadPoolExecutorUtil;
-import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
-import cn.hippo4j.common.config.ExecutorProperties;
import cn.hippo4j.config.springboot.starter.notify.ConfigModeNotifyConfigBuilder;
-import cn.hippo4j.config.springboot.starter.support.GlobalCoreThreadPoolManage;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
-import cn.hippo4j.message.dto.NotifyConfigDTO;
-import cn.hippo4j.message.request.ChangeParameterNotifyRequest;
-import cn.hippo4j.message.service.GlobalNotifyAlarmManage;
-import cn.hippo4j.message.service.Hippo4jBaseSendMessageService;
-import cn.hippo4j.message.service.ThreadPoolNotifyAlarm;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.message.api.NotifyConfigDTO;
+import cn.hippo4j.threadpool.message.core.request.ChangeParameterNotifyRequest;
+import cn.hippo4j.threadpool.message.core.service.GlobalNotifyAlarmManage;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolBaseSendMessageService;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolNotifyAlarm;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.annotation.Order;
@@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit;
import static cn.hippo4j.common.constant.ChangeThreadPoolConstants.CHANGE_DELIMITER;
import static cn.hippo4j.common.constant.ChangeThreadPoolConstants.CHANGE_THREAD_POOL_TEXT;
-import static cn.hippo4j.config.springboot.starter.refresher.event.Hippo4jConfigDynamicRefreshEventOrder.EXECUTORS_LISTENER;
+import static cn.hippo4j.config.springboot.starter.refresher.event.ThreadPoolConfigDynamicRefreshEventOrder.EXECUTORS_LISTENER;
/**
* Dynamic thread-pool refresh listener.
@@ -63,7 +63,7 @@ public class DynamicThreadPoolRefreshListener extends AbstractRefreshListener executors = bindableConfigProperties.getExecutors();
for (ExecutorProperties properties : executors) {
@@ -87,8 +87,9 @@ public class DynamicThreadPoolRefreshListener extends AbstractRefreshListener changeKeys = new ArrayList<>();
Map> newDynamicThreadPoolNotifyMap =
configModeNotifyConfigBuilder.buildSingleNotifyConfig(executorProperties);
- Map> notifyConfigs = hippo4jBaseSendMessageService.getNotifyConfigs();
+ Map> notifyConfigs = threadPoolBaseSendMessageService.getNotifyConfigs();
if (CollectionUtil.isNotEmpty(notifyConfigs)) {
for (Map.Entry> each : newDynamicThreadPoolNotifyMap.entrySet()) {
if (checkNotifyConfig) {
@@ -186,7 +187,7 @@ public class DynamicThreadPoolRefreshListener extends AbstractRefreshListener {
@Override
- public void onApplicationEvent(Hippo4jConfigDynamicRefreshEvent threadPoolDynamicRefreshEvent) {
+ public void onApplicationEvent(ThreadPoolConfigDynamicRefreshEvent threadPoolDynamicRefreshEvent) {
BootstrapConfigProperties bindableConfigProperties = threadPoolDynamicRefreshEvent.getBootstrapConfigProperties();
List executors = bindableConfigProperties.getExecutors();
for (ExecutorProperties executorProperties : executors) {
String threadPoolId = executorProperties.getThreadPoolId();
- DynamicThreadPoolWrapper wrapper = GlobalThreadPoolManage.getExecutorService(threadPoolId);
- if (wrapper != null && !wrapper.isInitFlag()) {
- Hippo4jBaseSendMessageService sendMessageService = ApplicationContextHolder.getBean(Hippo4jBaseSendMessageService.class);
+ ThreadPoolExecutorHolder executorHolder = ThreadPoolExecutorRegistry.getHolder(threadPoolId);
+ ThreadPoolBaseSendMessageService sendMessageService = ApplicationContextHolder.getBean(ThreadPoolBaseSendMessageService.class);
+ /**
+ * TODO The logic here should be:
+ *
+ * 1. When the application starts, the thread pool parameters are not configured in the configuration center
+ * 2. After the application starts, put the relevant configuration into the configuration center
+ * 3. Use whether there is a thread pool notification as a judgment condition
+ */
+ List notifyConfigList = sendMessageService.getNotifyConfigs().get(threadPoolId);
+ if (executorHolder != null && CollectionUtil.isEmpty(notifyConfigList)) {
ConfigModeNotifyConfigBuilder configBuilder = ApplicationContextHolder.getBean(ConfigModeNotifyConfigBuilder.class);
Map> notifyConfig = configBuilder.buildSingleNotifyConfig(executorProperties);
sendMessageService.putPlatform(notifyConfig);
- wrapper.setInitFlag(Boolean.TRUE);
}
}
}
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/RefreshListener.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/RefreshListener.java
index bd072c04..7ed4386c 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/RefreshListener.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/RefreshListener.java
@@ -17,7 +17,7 @@
package cn.hippo4j.config.springboot.starter.refresher.event;
-import cn.hippo4j.common.function.Matcher;
+import cn.hippo4j.common.extension.function.Matcher;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/Hippo4jConfigDynamicRefreshEvent.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/ThreadPoolConfigDynamicRefreshEvent.java
similarity index 81%
rename from starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/Hippo4jConfigDynamicRefreshEvent.java
rename to starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/ThreadPoolConfigDynamicRefreshEvent.java
index 66d20194..253f7fc3 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/Hippo4jConfigDynamicRefreshEvent.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/ThreadPoolConfigDynamicRefreshEvent.java
@@ -17,7 +17,7 @@
package cn.hippo4j.config.springboot.starter.refresher.event;
-import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
import lombok.Getter;
import lombok.Setter;
import org.springframework.context.ApplicationEvent;
@@ -25,13 +25,13 @@ import org.springframework.context.ApplicationEvent;
/**
* Hippo-4j config dynamic refresh event.
*/
-public class Hippo4jConfigDynamicRefreshEvent extends ApplicationEvent {
+public class ThreadPoolConfigDynamicRefreshEvent extends ApplicationEvent {
@Getter
@Setter
private BootstrapConfigProperties bootstrapConfigProperties;
- public Hippo4jConfigDynamicRefreshEvent(Object source, BootstrapConfigProperties bootstrapConfigProperties) {
+ public ThreadPoolConfigDynamicRefreshEvent(Object source, BootstrapConfigProperties bootstrapConfigProperties) {
super(source);
this.bootstrapConfigProperties = bootstrapConfigProperties;
}
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/Hippo4jConfigDynamicRefreshEventOrder.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/ThreadPoolConfigDynamicRefreshEventOrder.java
similarity index 77%
rename from starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/Hippo4jConfigDynamicRefreshEventOrder.java
rename to starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/ThreadPoolConfigDynamicRefreshEventOrder.java
index 1b7106ad..15767d0c 100644
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/Hippo4jConfigDynamicRefreshEventOrder.java
+++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/ThreadPoolConfigDynamicRefreshEventOrder.java
@@ -20,13 +20,13 @@ package cn.hippo4j.config.springboot.starter.refresher.event;
/**
* Hippo-4j config dynamic refresh event order.
*/
-public interface Hippo4jConfigDynamicRefreshEventOrder {
+public class ThreadPoolConfigDynamicRefreshEventOrder {
- int WEB_EXECUTOR_LISTENER = 0;
+ public static final int WEB_EXECUTOR_LISTENER = 0;
- int PLATFORMS_LISTENER = 1;
+ public static final int PLATFORMS_LISTENER = 1;
- int EXECUTORS_LISTENER = 2;
+ public static final int EXECUTORS_LISTENER = 2;
- int ADAPTER_EXECUTORS_LISTENER = 3;
+ public static final int ADAPTER_EXECUTORS_LISTENER = 3;
}
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..4165b9dd 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,18 +20,18 @@ 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.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
-import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties;
-import cn.hippo4j.config.springboot.starter.config.WebExecutorProperties;
-import cn.hippo4j.message.request.WebChangeParameterNotifyRequest;
+import cn.hippo4j.core.config.ApplicationContextHolder;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
+import cn.hippo4j.threadpool.dynamic.mode.config.properties.WebExecutorProperties;
+import cn.hippo4j.threadpool.message.core.request.WebChangeParameterNotifyRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.annotation.Order;
import java.util.Objects;
-import static cn.hippo4j.config.springboot.starter.refresher.event.Hippo4jConfigDynamicRefreshEventOrder.WEB_EXECUTOR_LISTENER;
+import static cn.hippo4j.config.springboot.starter.refresher.event.ThreadPoolConfigDynamicRefreshEventOrder.WEB_EXECUTOR_LISTENER;
/**
* Web executor refresh listener.
@@ -53,7 +53,7 @@ public class WebExecutorRefreshListener extends AbstractRefreshListener Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getAlarm).orElse(true));
int activeAlarm = Optional.ofNullable(executorProperties.getActiveAlarm())
- .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getActiveAlarm).orElse(80));
+ .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getActiveAlarm).orElse(DEFAULT_ACTIVE_ALARM));
int capacityAlarm = Optional.ofNullable(executorProperties.getCapacityAlarm())
- .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getCapacityAlarm).orElse(80));
+ .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getCapacityAlarm).orElse(DEFAULT_CAPACITY_ALARM));
int interval = Optional.ofNullable(notify)
.map(ExecutorNotifyProperties::getInterval)
- .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getNotify).map(ExecutorNotifyProperties::getInterval).orElse(5));
+ .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getNotify).map(ExecutorNotifyProperties::getInterval).orElse(DEFAULT_INTERVAL));
String receive = Optional.ofNullable(notify)
.map(ExecutorNotifyProperties::getReceives)
- .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getNotify).map(ExecutorNotifyProperties::getReceives).orElse(""));
+ .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getNotify).map(ExecutorNotifyProperties::getReceives).orElse(DEFAULT_RECEIVES));
ThreadPoolNotifyAlarm threadPoolNotifyAlarm = new ThreadPoolNotifyAlarm(isAlarm, activeAlarm, capacityAlarm);
threadPoolNotifyAlarm.setInterval(interval);
threadPoolNotifyAlarm.setReceives(receive);
diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/support/GlobalCoreThreadPoolManage.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/support/GlobalCoreThreadPoolManage.java
deleted file mode 100644
index 7a8cacf2..00000000
--- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/support/GlobalCoreThreadPoolManage.java
+++ /dev/null
@@ -1,61 +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.config.springboot.starter.support;
-
-import cn.hippo4j.common.config.ExecutorProperties;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Global core thread-pool manage.
- */
-public class GlobalCoreThreadPoolManage {
-
- private static final Map EXECUTOR_PROPERTIES = new ConcurrentHashMap<>();
-
- /**
- * Get properties.
- *
- * @param threadPoolId
- * @return
- */
- public static ExecutorProperties getProperties(String threadPoolId) {
- return EXECUTOR_PROPERTIES.get(threadPoolId);
- }
-
- /**
- * Register.
- *
- * @param threadPoolId
- * @param executorProperties
- */
- public static void register(String threadPoolId, ExecutorProperties executorProperties) {
- EXECUTOR_PROPERTIES.put(threadPoolId, executorProperties);
- }
-
- /**
- * Refresh.
- *
- * @param threadPoolId
- * @param executorProperties
- */
- public static void refresh(String threadPoolId, ExecutorProperties executorProperties) {
- EXECUTOR_PROPERTIES.put(threadPoolId, executorProperties);
- }
-}
diff --git a/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-elasticsearch/src/main/java/cn/hippo4j/springboot/starter/monitor/elasticsearch/ElasticSearchMonitorAutoConfiguration.java b/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-elasticsearch/src/main/java/cn/hippo4j/springboot/starter/monitor/elasticsearch/ElasticSearchMonitorAutoConfiguration.java
index 73954005..c5b2e2f0 100644
--- a/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-elasticsearch/src/main/java/cn/hippo4j/springboot/starter/monitor/elasticsearch/ElasticSearchMonitorAutoConfiguration.java
+++ b/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-elasticsearch/src/main/java/cn/hippo4j/springboot/starter/monitor/elasticsearch/ElasticSearchMonitorAutoConfiguration.java
@@ -18,9 +18,11 @@
package cn.hippo4j.springboot.starter.monitor.elasticsearch;
import cn.hippo4j.common.constant.Constants;
+import cn.hippo4j.core.enable.MarkerConfiguration;
import cn.hippo4j.monitor.elasticsearch.AdapterThreadPoolElasticSearchMonitorHandler;
import cn.hippo4j.monitor.elasticsearch.DynamicThreadPoolElasticSearchMonitorHandler;
import cn.hippo4j.monitor.elasticsearch.WebThreadPoolElasticSearchMonitorHandler;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
@@ -30,6 +32,7 @@ import org.springframework.context.annotation.Configuration;
* Elastic-search monitor auto configuration.
*/
@Configuration
+@ConditionalOnBean(MarkerConfiguration.Marker.class)
@ConditionalOnExpression("'${spring.dynamic.thread-pool.monitor.collect-types:}'.contains('elasticsearch')")
@ConditionalOnProperty(prefix = Constants.CONFIGURATION_PROPERTIES_PREFIX, value = "enable", matchIfMissing = true, havingValue = "true")
public class ElasticSearchMonitorAutoConfiguration {
diff --git a/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-local-log/src/main/java/cn/hippo4j/springboot/starter/monitor/local/log/LocalLogMonitorAutoConfiguration.java b/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-local-log/src/main/java/cn/hippo4j/springboot/starter/monitor/local/log/LocalLogMonitorAutoConfiguration.java
index ae6e50d3..01394baa 100644
--- a/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-local-log/src/main/java/cn/hippo4j/springboot/starter/monitor/local/log/LocalLogMonitorAutoConfiguration.java
+++ b/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-local-log/src/main/java/cn/hippo4j/springboot/starter/monitor/local/log/LocalLogMonitorAutoConfiguration.java
@@ -19,6 +19,7 @@ package cn.hippo4j.springboot.starter.monitor.local.log;
import cn.hippo4j.adapter.web.WebThreadPoolService;
import cn.hippo4j.common.constant.Constants;
+import cn.hippo4j.core.enable.MarkerConfiguration;
import cn.hippo4j.monitor.local.log.AdapterThreadPoolLocalLogMonitorHandler;
import cn.hippo4j.monitor.local.log.DynamicThreadPoolLocalLogMonitorHandler;
import cn.hippo4j.monitor.local.log.WebThreadPoolLocalLogMonitorHandler;
@@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration;
* Local log monitor auto configuration.
*/
@Configuration
+@ConditionalOnBean(MarkerConfiguration.Marker.class)
@ConditionalOnExpression("'${spring.dynamic.thread-pool.monitor.collect-types:}'.contains('log')")
@ConditionalOnProperty(prefix = Constants.CONFIGURATION_PROPERTIES_PREFIX, value = "enable", matchIfMissing = true, havingValue = "true")
public class LocalLogMonitorAutoConfiguration {
diff --git a/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/java/cn/hippo4j/springboot/starter/monitor/micrometer/MicrometerMonitorAutoConfiguration.java b/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/java/cn/hippo4j/springboot/starter/monitor/micrometer/MicrometerMonitorAutoConfiguration.java
index 02ea862e..5946a2c1 100644
--- a/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/java/cn/hippo4j/springboot/starter/monitor/micrometer/MicrometerMonitorAutoConfiguration.java
+++ b/starters/threadpool/monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/java/cn/hippo4j/springboot/starter/monitor/micrometer/MicrometerMonitorAutoConfiguration.java
@@ -19,6 +19,7 @@ package cn.hippo4j.springboot.starter.monitor.micrometer;
import cn.hippo4j.adapter.web.WebThreadPoolService;
import cn.hippo4j.common.constant.Constants;
+import cn.hippo4j.core.enable.MarkerConfiguration;
import cn.hippo4j.monitor.micrometer.AdapterThreadPoolMicrometerMonitorHandler;
import cn.hippo4j.monitor.micrometer.DynamicThreadPoolMicrometerMonitorHandler;
import cn.hippo4j.monitor.micrometer.WebThreadPoolMicrometerMonitorHandler;
@@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration;
* Micrometer monitor auto configuration.
*/
@Configuration
+@ConditionalOnBean(MarkerConfiguration.Marker.class)
@ConditionalOnExpression("'${spring.dynamic.thread-pool.monitor.collect-types:}'.contains('micrometer')")
@ConditionalOnProperty(prefix = Constants.CONFIGURATION_PROPERTIES_PREFIX, value = "enable", matchIfMissing = true, havingValue = "true")
public class MicrometerMonitorAutoConfiguration {
diff --git a/starters/threadpool/monitor/pom.xml b/starters/threadpool/monitor/pom.xml
index 60706897..d1dad88c 100644
--- a/starters/threadpool/monitor/pom.xml
+++ b/starters/threadpool/monitor/pom.xml
@@ -4,7 +4,7 @@
4.0.0cn.hippo4j
- hippo4j-threadpool-spring-boot-starter
+ hippo4j-threadpool-starters${revision}hippo4j-threadpool-spring-boot-starter-monitor
diff --git a/starters/threadpool/pom.xml b/starters/threadpool/pom.xml
index 52bb274e..253da58c 100644
--- a/starters/threadpool/pom.xml
+++ b/starters/threadpool/pom.xml
@@ -7,7 +7,7 @@
hippo4j-starters${revision}
- hippo4j-threadpool-spring-boot-starter
+ hippo4j-threadpool-starterspom
diff --git a/starters/threadpool/server/pom.xml b/starters/threadpool/server/pom.xml
index 4d4f15cc..dd07cde8 100644
--- a/starters/threadpool/server/pom.xml
+++ b/starters/threadpool/server/pom.xml
@@ -4,10 +4,10 @@
4.0.0cn.hippo4j
- hippo4j-threadpool-spring-boot-starter
+ hippo4j-threadpool-starters${revision}
- hippo4j-threadpool-server-spring-boot-starter
+ hippo4j-threadpool-spring-boot-starter
@@ -25,7 +25,7 @@
cn.hippo4j
- hippo4j-threadpool-common
+ hippo4j-threadpool-infra-common${project.version}
@@ -76,5 +76,15 @@
hippo4j-threadpool-monitor-base${project.version}
+
+ cn.hippo4j
+ hippo4j-threadpool-dynamic-api
+ ${project.version}
+
+
+ cn.hippo4j
+ hippo4j-threadpool-kernel-alarm
+ ${project.version}
+
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/config/BootstrapProperties.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/config/BootstrapProperties.java
index ba348c75..0669aed1 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/config/BootstrapProperties.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/config/BootstrapProperties.java
@@ -18,7 +18,7 @@
package cn.hippo4j.springboot.starter.config;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.core.config.BootstrapPropertiesInterface;
+import cn.hippo4j.threadpool.dynamic.api.BootstrapPropertiesInterface;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
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..8e901da7 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,25 +20,18 @@ 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.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;
import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
import cn.hippo4j.core.executor.support.service.DynamicThreadPoolService;
-import cn.hippo4j.core.handler.DynamicThreadPoolBannerHandler;
+import cn.hippo4j.core.executor.handler.DynamicThreadPoolBannerHandler;
+import cn.hippo4j.core.extension.initialize.Hippo4jDynamicThreadPoolInitializer;
import cn.hippo4j.core.toolkit.IdentifyUtil;
import cn.hippo4j.core.toolkit.inet.InetUtils;
-import cn.hippo4j.message.api.NotifyConfigBuilder;
import cn.hippo4j.message.config.MessageConfiguration;
-import cn.hippo4j.message.service.AlarmControlHandler;
-import cn.hippo4j.message.service.DefaultThreadPoolCheckAlarmHandler;
-import cn.hippo4j.message.service.DefaultThreadPoolConfigChangeHandler;
-import cn.hippo4j.message.service.Hippo4jBaseSendMessageService;
-import cn.hippo4j.message.service.Hippo4jSendMessageService;
import cn.hippo4j.springboot.starter.adapter.web.WebAdapterConfiguration;
import cn.hippo4j.springboot.starter.controller.ThreadPoolAdapterController;
import cn.hippo4j.springboot.starter.controller.WebThreadPoolController;
@@ -63,6 +56,14 @@ import cn.hippo4j.springboot.starter.support.AdaptedThreadPoolDestroyPostProcess
import cn.hippo4j.springboot.starter.support.DynamicThreadPoolConfigService;
import cn.hippo4j.springboot.starter.support.DynamicThreadPoolPostProcessor;
import cn.hippo4j.springboot.starter.support.ThreadPoolPluginRegisterPostProcessor;
+import cn.hippo4j.threadpool.alarm.api.ThreadPoolCheckAlarm;
+import cn.hippo4j.threadpool.alarm.handler.DefaultThreadPoolCheckAlarmHandler;
+import cn.hippo4j.threadpool.dynamic.api.ThreadPoolDynamicRefresh;
+import cn.hippo4j.threadpool.message.api.NotifyConfigBuilder;
+import cn.hippo4j.threadpool.message.core.service.AlarmControlHandler;
+import cn.hippo4j.threadpool.message.core.service.DefaultThreadPoolConfigChangeHandler;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolBaseSendMessageService;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolSendMessageService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -126,9 +127,9 @@ public class DynamicThreadPoolAutoConfiguration {
public DynamicThreadPoolService dynamicThreadPoolConfigService(HttpAgent httpAgent,
ServerHealthCheck serverHealthCheck,
ServerModeNotifyConfigBuilder serverModeNotifyConfigBuilder,
- Hippo4jBaseSendMessageService hippo4jBaseSendMessageService,
+ ThreadPoolBaseSendMessageService threadPoolBaseSendMessageService,
DynamicThreadPoolSubscribeConfig dynamicThreadPoolSubscribeConfig) {
- return new DynamicThreadPoolConfigService(httpAgent, properties, serverModeNotifyConfigBuilder, hippo4jBaseSendMessageService, dynamicThreadPoolSubscribeConfig);
+ return new DynamicThreadPoolConfigService(httpAgent, properties, serverModeNotifyConfigBuilder, threadPoolBaseSendMessageService, dynamicThreadPoolSubscribeConfig);
}
@Bean
@@ -219,13 +220,13 @@ public class DynamicThreadPoolAutoConfiguration {
@Bean
@ConditionalOnMissingBean
- public ThreadPoolCheckAlarm defaultThreadPoolCheckAlarmHandler(Hippo4jSendMessageService hippo4jSendMessageService) {
+ public ThreadPoolCheckAlarm defaultThreadPoolCheckAlarmHandler(ThreadPoolSendMessageService hippo4jSendMessageService) {
return new DefaultThreadPoolCheckAlarmHandler(hippo4jSendMessageService);
}
@Bean
@ConditionalOnMissingBean
- public ThreadPoolConfigChange defaultThreadPoolConfigChangeHandler(Hippo4jSendMessageService hippo4jSendMessageService) {
+ public ThreadPoolConfigChange defaultThreadPoolConfigChangeHandler(ThreadPoolSendMessageService hippo4jSendMessageService) {
return new DefaultThreadPoolConfigChangeHandler(hippo4jSendMessageService);
}
@@ -249,4 +250,9 @@ public class DynamicThreadPoolAutoConfiguration {
public ThreadPoolPluginRegisterPostProcessor threadPoolPluginRegisterPostProcessor() {
return new ThreadPoolPluginRegisterPostProcessor();
}
+
+ @Bean
+ public Hippo4jDynamicThreadPoolInitializer hippo4jDynamicThreadPoolInitializer() {
+ return new Hippo4jDynamicThreadPoolInitializer();
+ }
}
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..7529630f 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,11 +20,10 @@ 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.common.model.Result;
+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;
import cn.hippo4j.core.toolkit.IdentifyUtil;
import cn.hippo4j.core.toolkit.inet.InetUtils;
import cn.hippo4j.springboot.starter.toolkit.CloudCommonIdUtil;
@@ -70,7 +69,7 @@ public class ThreadPoolAdapterController {
threadPoolState.setIdentify(IdentifyUtil.getIdentify());
return threadPoolState;
}).orElse(null);
- return Results.success(result);
+ return new Result().setCode(Result.SUCCESS_CODE).setData(result);
}
@PostMapping("/adapter/thread-pool/update")
@@ -79,6 +78,6 @@ public class ThreadPoolAdapterController {
requestParameter.getMark(), requestParameter.getThreadPoolKey(), requestParameter.getCorePoolSize(), requestParameter.getMaximumPoolSize());
ThreadPoolAdapter threadPoolAdapter = THREAD_POOL_ADAPTER_BEAN_CONTAINER.get(requestParameter.getMark());
Optional.ofNullable(threadPoolAdapter).ifPresent(each -> each.updateThreadPool(requestParameter));
- return Results.success();
+ return new Result().setCode(Result.SUCCESS_CODE);
}
}
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/WebThreadPoolController.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/WebThreadPoolController.java
index ba9d3353..ca48a8fe 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/WebThreadPoolController.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/WebThreadPoolController.java
@@ -19,11 +19,10 @@ package cn.hippo4j.springboot.starter.controller;
import cn.hippo4j.adapter.web.WebThreadPoolHandlerChoose;
import cn.hippo4j.adapter.web.WebThreadPoolService;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
@@ -48,20 +47,19 @@ public class WebThreadPoolController {
public Result getPoolBaseState(@RequestParam(value = "mark") String mark) {
WebThreadPoolService webThreadPoolService = webThreadPoolServiceChoose.choose();
if (webThreadPoolService != null && webThreadPoolService.getClass().getSimpleName().contains(mark)) {
- return Results.success(webThreadPoolService.simpleInfo());
+ return new Result().setCode(Result.SUCCESS_CODE).setData(webThreadPoolService.simpleInfo());
}
- return Results.success(null);
+ return new Result().setCode(Result.SUCCESS_CODE);
}
@GetMapping("/web/run/state")
public Result getPoolRunState() {
- ThreadPoolRunStateInfo result = webThreadPoolServiceChoose.choose().getWebRunStateInfo();
- return Results.success(result);
+ return new Result().setCode(Result.SUCCESS_CODE).setData(webThreadPoolServiceChoose.choose().getWebRunStateInfo());
}
@PostMapping("/web/update/pool")
public Result updateWebThreadPool(@RequestBody ThreadPoolParameterInfo threadPoolParameterInfo) {
webThreadPoolServiceChoose.choose().updateWebThreadPool(threadPoolParameterInfo);
- return Results.success();
+ return new Result().setCode(Result.SUCCESS_CODE);
}
}
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/WebThreadPoolRunStateController.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/WebThreadPoolRunStateController.java
index 6918f3d3..52e0bf96 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/WebThreadPoolRunStateController.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/controller/WebThreadPoolRunStateController.java
@@ -18,10 +18,9 @@
package cn.hippo4j.springboot.starter.controller;
import cn.hippo4j.common.api.ThreadDetailState;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
import cn.hippo4j.common.model.ThreadDetailStateInfo;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.CrossOrigin;
@@ -44,13 +43,11 @@ public class WebThreadPoolRunStateController {
@GetMapping("/run/state/{threadPoolId}")
public Result getPoolRunState(@PathVariable("threadPoolId") String threadPoolId) {
- ThreadPoolRunStateInfo result = threadPoolRunStateHandler.getPoolRunState(threadPoolId);
- return Results.success(result);
+ return new Result().setCode(Result.SUCCESS_CODE).setData(threadPoolRunStateHandler.getPoolRunState(threadPoolId));
}
@GetMapping("/run/thread/state/{threadPoolId}")
public Result> getThreadStateDetail(@PathVariable("threadPoolId") String threadPoolId) {
- List result = threadDetailState.getThreadDetailStateInfo(threadPoolId);
- return Results.success(result);
+ return new Result>().setCode(Result.SUCCESS_CODE).setData(threadDetailState.getThreadDetailStateInfo(threadPoolId));
}
}
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/BaseThreadDetailStateHandler.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/BaseThreadDetailStateHandler.java
index 72772f8b..99e56a13 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/BaseThreadDetailStateHandler.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/BaseThreadDetailStateHandler.java
@@ -18,11 +18,11 @@
package cn.hippo4j.springboot.starter.core;
import cn.hippo4j.common.api.ThreadDetailState;
+import cn.hippo4j.common.executor.ThreadPoolExecutorHolder;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.common.model.ThreadDetailStateInfo;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.ReflectUtil;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
-import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -44,8 +44,8 @@ public class BaseThreadDetailStateHandler implements ThreadDetailState {
@Override
public List getThreadDetailStateInfo(String threadPoolId) {
- DynamicThreadPoolWrapper dynamicThreadPoolWrapper = GlobalThreadPoolManage.getExecutorService(threadPoolId);
- ThreadPoolExecutor threadPoolExecutor = dynamicThreadPoolWrapper.getExecutor();
+ ThreadPoolExecutorHolder executorHolder = ThreadPoolExecutorRegistry.getHolder(threadPoolId);
+ ThreadPoolExecutor threadPoolExecutor = executorHolder.getExecutor();
return getThreadDetailStateInfo(threadPoolExecutor);
}
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/CacheData.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/CacheData.java
index 19813c49..436df96c 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/CacheData.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/CacheData.java
@@ -17,6 +17,7 @@
package cn.hippo4j.springboot.starter.core;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.springboot.starter.wrapper.ManagerListenerWrapper;
import cn.hippo4j.common.toolkit.ContentUtil;
@@ -57,7 +58,7 @@ public class CacheData {
this.tenantId = tenantId;
this.itemId = itemId;
this.threadPoolId = threadPoolId;
- this.content = ContentUtil.getPoolContent(GlobalThreadPoolManage.getPoolParameter(threadPoolId));
+ this.content = ContentUtil.getPoolContent(ThreadPoolExecutorRegistry.getHolder(threadPoolId).getParameterInfo());
this.md5 = getMd5String(content);
this.listeners = new CopyOnWriteArrayList<>();
}
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ClientWorker.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ClientWorker.java
index 8656c5ce..a75a7f6a 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ClientWorker.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ClientWorker.java
@@ -17,19 +17,20 @@
package cn.hippo4j.springboot.starter.core;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
import cn.hippo4j.common.toolkit.ContentUtil;
import cn.hippo4j.common.toolkit.GroupKey;
import cn.hippo4j.common.toolkit.IdUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
-import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.springboot.starter.remote.HttpAgent;
import cn.hippo4j.springboot.starter.remote.ServerHealthCheck;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.util.StringUtils;
+
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Collections;
@@ -42,6 +43,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+
import static cn.hippo4j.common.constant.Constants.CONFIG_LONG_POLL_TIMEOUT;
import static cn.hippo4j.common.constant.Constants.GROUP_KEY_DELIMITER_TRANSLATION;
import static cn.hippo4j.common.constant.Constants.WORD_SEPARATOR;
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..95818c8f 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,13 +18,11 @@
package cn.hippo4j.springboot.starter.core;
import cn.hippo4j.common.api.ClientCloseHookExecute;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.common.model.Result;
+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;
-import cn.hippo4j.common.web.base.Results;
-import cn.hippo4j.common.web.exception.ErrorCodeEnum;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
import cn.hippo4j.springboot.starter.remote.HttpAgent;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.DisposableBean;
@@ -48,10 +46,12 @@ public class DiscoveryClient implements DisposableBean {
private final ClientShutdown hippo4jClientShutdown;
private volatile long lastSuccessfulHeartbeatTimestamp = -1;
+ private final int delayTime = 30;
+
private static final String PREFIX = "DiscoveryClient_";
private final String appPathIdentifier;
-
- private final int delayTime = 30;
+ private final String SERVICE_ERROR_CODE = "3";
+ private final String SERVICE_NOT_FOUND_CODE = "404";
public DiscoveryClient(HttpAgent httpAgent, InstanceInfo instanceInfo, ClientShutdown hippo4jClientShutdown) {
this.httpAgent = httpAgent;
@@ -77,7 +77,7 @@ public class DiscoveryClient implements DisposableBean {
try {
registerResult = httpAgent.httpPostByDiscovery(urlPath, instanceInfo);
} catch (Exception ex) {
- registerResult = Results.failure(ErrorCodeEnum.SERVICE_ERROR);
+ registerResult = new Result().setCode(SERVICE_ERROR_CODE);
log.error("{}{} - registration failed: {}", PREFIX, appPathIdentifier, ex.getMessage());
}
if (log.isInfoEnabled()) {
@@ -145,7 +145,7 @@ public class DiscoveryClient implements DisposableBean {
.setLastDirtyTimestamp(instanceInfo.getLastDirtyTimestamp().toString())
.setStatus(instanceInfo.getStatus().toString());
renewResult = httpAgent.httpPostByDiscovery(BASE_PATH + "/apps/renew", instanceRenew);
- if (Objects.equals(ErrorCodeEnum.NOT_FOUND.getCode(), renewResult.getCode())) {
+ if (Objects.equals(SERVICE_NOT_FOUND_CODE, renewResult.getCode())) {
long timestamp = instanceInfo.setIsDirtyWithTime();
boolean success = register();
// TODO Abstract server registration logic
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java
index db646ff8..404f8a29 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java
@@ -17,10 +17,10 @@
package cn.hippo4j.springboot.starter.core;
-import cn.hippo4j.common.api.ThreadPoolDynamicRefresh;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.core.executor.support.ThreadPoolBuilder;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
+import cn.hippo4j.threadpool.dynamic.api.ThreadPoolDynamicRefresh;
import lombok.RequiredArgsConstructor;
import java.util.Arrays;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java
index 1e253b0f..f4def9f4 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java
@@ -18,18 +18,18 @@
package cn.hippo4j.springboot.starter.core;
import cn.hippo4j.common.api.ThreadPoolConfigChange;
-import cn.hippo4j.common.api.ThreadPoolDynamicRefresh;
-import cn.hippo4j.common.enums.EnableEnum;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum;
import cn.hippo4j.common.executor.support.ResizableCapacityLinkedBlockingQueue;
+import cn.hippo4j.common.extension.enums.EnableEnum;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.ThreadPoolExecutorUtil;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
-import cn.hippo4j.message.request.ChangeParameterNotifyRequest;
+import cn.hippo4j.threadpool.dynamic.api.ThreadPoolDynamicRefresh;
+import cn.hippo4j.threadpool.message.core.request.ChangeParameterNotifyRequest;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -55,7 +55,7 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh
public void dynamicRefresh(String content) {
ThreadPoolParameterInfo parameter = JSONUtil.parseObject(content, ThreadPoolParameterInfo.class);
String threadPoolId = parameter.getTpId();
- ThreadPoolExecutor executor = GlobalThreadPoolManage.getExecutorService(threadPoolId).getExecutor();
+ ThreadPoolExecutor executor = ThreadPoolExecutorRegistry.getHolder(threadPoolId).getExecutor();
refreshDynamicPool(parameter, executor);
}
@@ -75,7 +75,7 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh
originalExecuteTimeOut = dynamicExecutor.getExecuteTimeOut();
}
changePoolInfo(executor, parameter);
- ThreadPoolExecutor afterExecutor = GlobalThreadPoolManage.getExecutorService(threadPoolId).getExecutor();
+ ThreadPoolExecutor afterExecutor = ThreadPoolExecutorRegistry.getHolder(threadPoolId).getExecutor();
String originalRejected = rejectedExecutionHandler.getClass().getSimpleName();
Long executeTimeOut = Optional.ofNullable(parameter.getExecuteTimeOut()).orElse(0L);
ChangeParameterNotifyRequest changeNotifyRequest = ChangeParameterNotifyRequest.builder()
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..82f67457 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,9 +21,9 @@ 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.common.model.Result;
+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;
import cn.hippo4j.core.toolkit.inet.InetUtils;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
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..795521d7 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,14 +17,14 @@
package cn.hippo4j.springboot.starter.monitor;
-import cn.hippo4j.common.config.ApplicationContextHolder;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
+import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import cn.hippo4j.common.monitor.Message;
-import cn.hippo4j.common.extension.support.ServiceLoaderRegistry;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.ThreadUtil;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.monitor.base.MonitorTypeEnum;
import cn.hippo4j.monitor.base.ThreadPoolMonitor;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
@@ -49,8 +49,6 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import static cn.hippo4j.core.executor.manage.GlobalThreadPoolManage.getThreadPoolNum;
-
/**
* Dynamic thread pool collection and reporting event executor.
*
@@ -144,8 +142,8 @@ public class ReportingEventExecutor implements Runnable, CommandLineRunner, Disp
// Start reporting monitoring data thread.
ThreadUtil.newThread(this, "client.thread.reporting.task", Boolean.TRUE).start();
}
- if (GlobalThreadPoolManage.getThreadPoolNum() > 0) {
- log.info("Dynamic thread pool: [{}]. The dynamic thread pool starts data collection and reporting.", getThreadPoolNum());
+ if (ThreadPoolExecutorRegistry.getThreadPoolExecutorSize() > 0) {
+ log.info("Dynamic thread pool: [{}]. The dynamic thread pool starts data collection and reporting.", ThreadPoolExecutorRegistry.getThreadPoolExecutorSize());
}
}
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/collect/RunTimeInfoCollector.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/collect/RunTimeInfoCollector.java
index 31f4116e..c8b85771 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/collect/RunTimeInfoCollector.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/collect/RunTimeInfoCollector.java
@@ -17,13 +17,13 @@
package cn.hippo4j.springboot.starter.monitor.collect;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
import cn.hippo4j.common.monitor.AbstractMessage;
import cn.hippo4j.common.monitor.Message;
import cn.hippo4j.common.monitor.MessageTypeEnum;
import cn.hippo4j.common.monitor.RuntimeMessage;
import cn.hippo4j.common.toolkit.BeanUtil;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.core.executor.state.AbstractThreadPoolRuntime;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
import lombok.AllArgsConstructor;
@@ -45,7 +45,7 @@ public class RunTimeInfoCollector extends AbstractThreadPoolRuntime implements C
public Message collectMessage() {
AbstractMessage message = new RuntimeMessage();
List runtimeMessages = new ArrayList<>();
- List listThreadPoolId = GlobalThreadPoolManage.listThreadPoolId();
+ List listThreadPoolId = ThreadPoolExecutorRegistry.listThreadPoolExecutorId();
for (String each : listThreadPoolId) {
ThreadPoolRunStateInfo poolRunState = getPoolRunState(each);
RuntimeMessage runtimeMessage = BeanUtil.convert(poolRunState, RuntimeMessage.class);
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/notify/ServerModeNotifyConfigBuilder.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/notify/ServerModeNotifyConfigBuilder.java
index 3cfbe586..05e7a601 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/notify/ServerModeNotifyConfigBuilder.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/notify/ServerModeNotifyConfigBuilder.java
@@ -17,18 +17,18 @@
package cn.hippo4j.springboot.starter.notify;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.GroupKey;
import cn.hippo4j.common.toolkit.JSONUtil;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
-import cn.hippo4j.message.api.NotifyConfigBuilder;
-import cn.hippo4j.message.dto.NotifyConfigDTO;
-import cn.hippo4j.message.dto.ThreadPoolNotifyDTO;
-import cn.hippo4j.message.request.ThreadPoolNotifyRequest;
-import cn.hippo4j.message.service.AlarmControlHandler;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
import cn.hippo4j.springboot.starter.remote.HttpAgent;
+import cn.hippo4j.threadpool.message.api.NotifyConfigBuilder;
+import cn.hippo4j.threadpool.message.api.NotifyConfigDTO;
+import cn.hippo4j.threadpool.message.api.ThreadPoolNotifyDTO;
+import cn.hippo4j.threadpool.message.core.request.ThreadPoolNotifyRequest;
+import cn.hippo4j.threadpool.message.core.service.AlarmControlHandler;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -55,7 +55,7 @@ public class ServerModeNotifyConfigBuilder implements NotifyConfigBuilder {
@Override
public Map> buildNotify() {
- List threadPoolIds = GlobalThreadPoolManage.listThreadPoolId();
+ List threadPoolIds = ThreadPoolExecutorRegistry.listThreadPoolExecutorId();
if (CollectionUtil.isEmpty(threadPoolIds)) {
log.warn("The client does not have a dynamic thread pool instance configured.");
return new HashMap<>();
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/AbstractHealthCheck.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/AbstractHealthCheck.java
index 246f80ad..354ba94e 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/AbstractHealthCheck.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/AbstractHealthCheck.java
@@ -20,7 +20,7 @@ package cn.hippo4j.springboot.starter.remote;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.springboot.starter.event.ApplicationRefreshedEvent;
import cn.hippo4j.springboot.starter.core.ShutdownExecuteException;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.InitializingBean;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpAgent.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpAgent.java
index e2bf9db5..91de1849 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpAgent.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpAgent.java
@@ -17,7 +17,7 @@
package cn.hippo4j.springboot.starter.remote;
-import cn.hippo4j.common.web.base.Result;
+import cn.hippo4j.common.model.Result;
import java.util.Map;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpScheduledHealthCheck.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpScheduledHealthCheck.java
index 5b7139d6..2d842a04 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpScheduledHealthCheck.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpScheduledHealthCheck.java
@@ -17,7 +17,7 @@
package cn.hippo4j.springboot.starter.remote;
-import cn.hippo4j.common.web.base.Result;
+import cn.hippo4j.common.model.Result;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
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..498aedd4 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,12 +17,12 @@
package cn.hippo4j.springboot.starter.remote;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.http.HttpUtil;
-import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
import cn.hippo4j.springboot.starter.security.SecurityProxy;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/security/SecurityProxy.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/security/SecurityProxy.java
index c03d518a..83d6b3c2 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/security/SecurityProxy.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/security/SecurityProxy.java
@@ -18,11 +18,11 @@
package cn.hippo4j.springboot.starter.security;
import cn.hippo4j.common.constant.Constants;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.model.TokenInfo;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.http.HttpUtil;
-import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
import lombok.extern.slf4j.Slf4j;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/AdaptedThreadPoolDestroyPostProcessor.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/AdaptedThreadPoolDestroyPostProcessor.java
index 61b8418d..bad47f90 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/AdaptedThreadPoolDestroyPostProcessor.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/AdaptedThreadPoolDestroyPostProcessor.java
@@ -17,9 +17,9 @@
package cn.hippo4j.springboot.starter.support;
+import cn.hippo4j.common.executor.ThreadPoolExecutorHolder;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
-import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.core.executor.support.adpter.DynamicThreadPoolAdapter;
import cn.hippo4j.core.executor.support.adpter.DynamicThreadPoolAdapterChoose;
import lombok.RequiredArgsConstructor;
@@ -71,21 +71,23 @@ public class AdaptedThreadPoolDestroyPostProcessor implements DestructionAwareBe
@Override
public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException {
Optional.ofNullable(DynamicThreadPoolAdapterChoose.unwrap(bean))
- .map(DynamicThreadPoolExecutor::getThreadPoolId)
+ .map(each -> ((DynamicThreadPoolExecutor) each).getThreadPoolId())
// the internal thread pool is also managed by spring, no manual destruction required
.filter(applicationContext::containsBeanDefinition)
- .map(GlobalThreadPoolManage::getExecutorService)
- .ifPresent(executor -> destroyAdaptedThreadPoolExecutor(beanName, executor));
+ .map(ThreadPoolExecutorRegistry::getHolder)
+ .ifPresent(executorHolder -> destroyAdaptedThreadPoolExecutor(beanName, executorHolder));
}
- private void destroyAdaptedThreadPoolExecutor(String beanName, DynamicThreadPoolWrapper executor) {
+ private void destroyAdaptedThreadPoolExecutor(String beanName, ThreadPoolExecutorHolder executorHolder) {
try {
if (log.isDebugEnabled()) {
- log.debug("Destroy internal dynamic thread pool '{}' for bean '{}'", executor.getThreadPoolId(), beanName);
+ log.debug("Destroy internal dynamic thread pool '{}' for bean '{}'", executorHolder.getThreadPoolId(), beanName);
+ }
+ if (executorHolder.getExecutor() instanceof DynamicThreadPoolExecutor) {
+ ((DynamicThreadPoolExecutor) executorHolder.getExecutor()).destroy();
}
- executor.destroy();
} catch (Exception e) {
- log.warn("Failed to destroy internal dynamic thread pool '{}' for bean '{}'", executor.getThreadPoolId(), beanName);
+ log.warn("Failed to destroy internal dynamic thread pool '{}' for bean '{}'", executorHolder.getThreadPoolId(), beanName);
}
}
}
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolConfigService.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolConfigService.java
index f648b346..f28a0df5 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolConfigService.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolConfigService.java
@@ -17,6 +17,9 @@
package cn.hippo4j.springboot.starter.support;
+import cn.hippo4j.common.executor.ThreadPoolExecutorHolder;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterParameter;
import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterWrapper;
@@ -24,19 +27,15 @@ import cn.hippo4j.common.toolkit.Assert;
import cn.hippo4j.common.toolkit.BooleanUtil;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.exception.ServiceException;
-import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.core.executor.support.service.AbstractDynamicThreadPoolService;
-import cn.hippo4j.message.dto.NotifyConfigDTO;
-import cn.hippo4j.message.service.GlobalNotifyAlarmManage;
-import cn.hippo4j.message.service.Hippo4jBaseSendMessageService;
-import cn.hippo4j.message.service.ThreadPoolNotifyAlarm;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
import cn.hippo4j.springboot.starter.core.DynamicThreadPoolSubscribeConfig;
import cn.hippo4j.springboot.starter.notify.ServerModeNotifyConfigBuilder;
import cn.hippo4j.springboot.starter.remote.HttpAgent;
+import cn.hippo4j.threadpool.message.api.NotifyConfigDTO;
+import cn.hippo4j.threadpool.message.core.service.GlobalNotifyAlarmManage;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolBaseSendMessageService;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolNotifyAlarm;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -55,13 +54,9 @@ import static cn.hippo4j.common.constant.Constants.REGISTER_DYNAMIC_THREAD_POOL_
public class DynamicThreadPoolConfigService extends AbstractDynamicThreadPoolService {
private final HttpAgent httpAgent;
-
private final BootstrapProperties properties;
-
private final ServerModeNotifyConfigBuilder serverModeNotifyConfigBuilder;
-
- private final Hippo4jBaseSendMessageService hippo4jBaseSendMessageService;
-
+ private final ThreadPoolBaseSendMessageService threadPoolBaseSendMessageService;
private final DynamicThreadPoolSubscribeConfig dynamicThreadPoolSubscribeConfig;
@Override
@@ -80,7 +75,7 @@ public class DynamicThreadPoolConfigService extends AbstractDynamicThreadPoolSer
failDynamicThreadPoolRegisterWrapper(registerWrapper);
Result registerResult = httpAgent.httpPost(REGISTER_DYNAMIC_THREAD_POOL_PATH, registerWrapper);
if (registerResult == null || !registerResult.isSuccess()) {
- throw new ServiceException("Dynamic thread pool registration returns error."
+ throw new RuntimeException("Dynamic thread pool registration returns error."
+ Optional.ofNullable(registerResult).map(Result::getMessage).orElse(""));
}
} catch (Throwable ex) {
@@ -89,11 +84,9 @@ public class DynamicThreadPoolConfigService extends AbstractDynamicThreadPoolSer
}
ThreadPoolParameterInfo parameter = JSONUtil.parseObject(JSONUtil.toJSONString(registerParameter), ThreadPoolParameterInfo.class);
ThreadPoolExecutor dynamicThreadPoolExecutor = buildDynamicThreadPoolExecutor(registerParameter);
- DynamicThreadPoolWrapper dynamicThreadPoolWrapper = DynamicThreadPoolWrapper.builder()
- .threadPoolId(threadPoolId)
- .executor(dynamicThreadPoolExecutor)
- .build();
- GlobalThreadPoolManage.register(threadPoolId, parameter, dynamicThreadPoolWrapper);
+ ThreadPoolExecutorHolder executorHolder = new ThreadPoolExecutorHolder(threadPoolId, dynamicThreadPoolExecutor, null);
+ executorHolder.setParameterInfo(parameter);
+ ThreadPoolExecutorRegistry.putHolder(executorHolder);
return dynamicThreadPoolExecutor;
}
@@ -109,7 +102,7 @@ public class DynamicThreadPoolConfigService extends AbstractDynamicThreadPoolSer
registerParameter.getCapacityAlarm());
GlobalNotifyAlarmManage.put(registerParameter.getThreadPoolId(), threadPoolNotifyAlarm);
Map> builderNotify = serverModeNotifyConfigBuilder.getAndInitNotify(CollectionUtil.newArrayList(registerParameter.getThreadPoolId()));
- hippo4jBaseSendMessageService.putPlatform(builderNotify);
+ threadPoolBaseSendMessageService.putPlatform(builderNotify);
}
private void checkThreadPoolParameter(DynamicThreadPoolRegisterParameter registerParameter) {
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..e2ea8e8f 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,30 +17,31 @@
package cn.hippo4j.springboot.starter.support;
-import cn.hippo4j.common.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.enums.EnableEnum;
+import cn.hippo4j.common.executor.ThreadPoolExecutorHolder;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum;
+import cn.hippo4j.common.extension.enums.EnableEnum;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterParameter;
import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterWrapper;
import cn.hippo4j.common.toolkit.BooleanUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.ReflectUtil;
-import cn.hippo4j.common.web.base.Result;
+import cn.hippo4j.common.toolkit.ThreadPoolExecutorUtil;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.core.executor.DynamicThreadPool;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
-import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.core.executor.support.adpter.DynamicThreadPoolAdapterChoose;
import cn.hippo4j.core.toolkit.DynamicThreadPoolAnnotationUtil;
-import cn.hippo4j.common.toolkit.ThreadPoolExecutorUtil;
-import cn.hippo4j.message.service.GlobalNotifyAlarmManage;
-import cn.hippo4j.message.service.ThreadPoolNotifyAlarm;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
import cn.hippo4j.springboot.starter.core.DynamicThreadPoolSubscribeConfig;
import cn.hippo4j.springboot.starter.remote.HttpAgent;
+import cn.hippo4j.threadpool.message.core.service.GlobalNotifyAlarmManage;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolNotifyAlarm;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
@@ -53,14 +54,15 @@ import java.util.Optional;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import static cn.hippo4j.common.constant.Constants.INITIAL_CAPACITY;
-import static cn.hippo4j.common.constant.Constants.TP_ID;
-import static cn.hippo4j.common.constant.Constants.ITEM_ID;
-import static cn.hippo4j.common.constant.Constants.NAMESPACE;
+
import static cn.hippo4j.common.constant.Constants.ACTIVE_ALARM;
import static cn.hippo4j.common.constant.Constants.CAPACITY_ALARM;
import static cn.hippo4j.common.constant.Constants.EXECUTE_TIME_OUT;
import static cn.hippo4j.common.constant.Constants.HTTP_EXECUTE_TIMEOUT;
+import static cn.hippo4j.common.constant.Constants.INITIAL_CAPACITY;
+import static cn.hippo4j.common.constant.Constants.ITEM_ID;
+import static cn.hippo4j.common.constant.Constants.NAMESPACE;
+import static cn.hippo4j.common.constant.Constants.TP_ID;
/**
* Dynamic thread-pool post processor.
@@ -70,9 +72,7 @@ import static cn.hippo4j.common.constant.Constants.HTTP_EXECUTE_TIMEOUT;
public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor {
private final BootstrapProperties properties;
-
private final HttpAgent httpAgent;
-
private final DynamicThreadPoolSubscribeConfig dynamicThreadPoolSubscribeConfig;
@Override
@@ -97,42 +97,36 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor {
log.error("Failed to create dynamic thread pool in annotation mode.", ex);
return bean;
}
- DynamicThreadPoolExecutor dynamicThreadPoolExecutor;
- dynamicThreadPoolExecutor = DynamicThreadPoolAdapterChoose.unwrap(bean);
+ ThreadPoolExecutor dynamicThreadPoolExecutor = DynamicThreadPoolAdapterChoose.unwrap(bean);
if ((dynamicThreadPoolExecutor) == null) {
dynamicThreadPoolExecutor = (DynamicThreadPoolExecutor) bean;
}
- DynamicThreadPoolWrapper dynamicThreadPoolWrapper = new DynamicThreadPoolWrapper(dynamicThreadPoolExecutor.getThreadPoolId(), dynamicThreadPoolExecutor);
- ThreadPoolExecutor remoteThreadPoolExecutor = fillPoolAndRegister(dynamicThreadPoolWrapper);
+ ThreadPoolExecutor remoteThreadPoolExecutor = fillPoolAndRegister(((DynamicThreadPoolExecutor) dynamicThreadPoolExecutor).getThreadPoolId(), dynamicThreadPoolExecutor);
DynamicThreadPoolAdapterChoose.replace(bean, remoteThreadPoolExecutor);
- subscribeConfig(dynamicThreadPoolWrapper);
+ subscribeConfig(((DynamicThreadPoolExecutor) dynamicThreadPoolExecutor).getThreadPoolId());
return DynamicThreadPoolAdapterChoose.match(bean) ? bean : remoteThreadPoolExecutor;
}
- if (bean instanceof DynamicThreadPoolWrapper) {
- DynamicThreadPoolWrapper dynamicThreadPoolWrapper = (DynamicThreadPoolWrapper) bean;
- registerAndSubscribe(dynamicThreadPoolWrapper);
- }
return bean;
}
/**
* Register and subscribe.
*
- * @param dynamicThreadPoolWrapper dynamic thread-pool wrapper
+ * @param threadPoolId dynamic thread-pool id
+ * @param executor dynamic thread-pool executor
*/
- protected void registerAndSubscribe(DynamicThreadPoolWrapper dynamicThreadPoolWrapper) {
- fillPoolAndRegister(dynamicThreadPoolWrapper);
- subscribeConfig(dynamicThreadPoolWrapper);
+ protected void registerAndSubscribe(String threadPoolId, ThreadPoolExecutor executor) {
+ fillPoolAndRegister(threadPoolId, executor);
+ subscribeConfig(threadPoolId);
}
/**
* Fill the thread pool and register.
*
- * @param dynamicThreadPoolWrapper dynamic thread-pool wrapper
+ * @param threadPoolId dynamic thread-pool id
+ * @param executor dynamic thread-pool executor
*/
- protected ThreadPoolExecutor fillPoolAndRegister(DynamicThreadPoolWrapper dynamicThreadPoolWrapper) {
- String threadPoolId = dynamicThreadPoolWrapper.getThreadPoolId();
- ThreadPoolExecutor executor = dynamicThreadPoolWrapper.getExecutor();
+ protected ThreadPoolExecutor fillPoolAndRegister(String threadPoolId, ThreadPoolExecutor executor) {
Map queryStrMap = new HashMap<>(INITIAL_CAPACITY);
queryStrMap.put(TP_ID, threadPoolId);
queryStrMap.put(ITEM_ID, properties.getItemId());
@@ -172,7 +166,9 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor {
} catch (Exception ex) {
log.error("Failed to initialize thread pool configuration. error message: {}", ex.getMessage());
}
- GlobalThreadPoolManage.register(dynamicThreadPoolWrapper.getThreadPoolId(), threadPoolParameterInfo, dynamicThreadPoolWrapper);
+ ThreadPoolExecutorHolder executorHolder = new ThreadPoolExecutorHolder(threadPoolId, executor, null);
+ executorHolder.setParameterInfo(threadPoolParameterInfo);
+ ThreadPoolExecutorRegistry.putHolder(executorHolder);
return executor;
}
@@ -213,11 +209,9 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor {
/**
* Client dynamic thread pool subscription server configuration.
*
- * @param dynamicThreadPoolWrapper dynamic thread-pool wrapper
+ * @param threadPoolId thread-pool id
*/
- protected void subscribeConfig(DynamicThreadPoolWrapper dynamicThreadPoolWrapper) {
- if (dynamicThreadPoolWrapper.isSubscribeFlag()) {
- dynamicThreadPoolSubscribeConfig.subscribeConfig(dynamicThreadPoolWrapper.getThreadPoolId());
- }
+ protected void subscribeConfig(String threadPoolId) {
+ dynamicThreadPoolSubscribeConfig.subscribeConfig(threadPoolId);
}
}
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/ThreadPoolPluginRegisterPostProcessor.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/ThreadPoolPluginRegisterPostProcessor.java
index 262cd268..e5b9d2c7 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/ThreadPoolPluginRegisterPostProcessor.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/ThreadPoolPluginRegisterPostProcessor.java
@@ -18,11 +18,11 @@
package cn.hippo4j.springboot.starter.support;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
-import cn.hippo4j.core.plugin.manager.DefaultGlobalThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.GlobalThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginRegistrar;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginSupport;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultGlobalThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.GlobalThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginRegistrar;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginSupport;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.framework.autoproxy.AutoProxyUtils;
import org.springframework.beans.BeansException;
@@ -59,7 +59,7 @@ import java.util.Objects;
public class ThreadPoolPluginRegisterPostProcessor extends DefaultGlobalThreadPoolPluginManager implements BeanPostProcessor, ApplicationContextAware {
/**
- * application context
+ * Application context
*/
private ConfigurableListableBeanFactory beanFactory;
diff --git a/threadpool/adapter/base/pom.xml b/threadpool/adapter/base/pom.xml
index c9db0b08..939675d7 100644
--- a/threadpool/adapter/base/pom.xml
+++ b/threadpool/adapter/base/pom.xml
@@ -12,7 +12,7 @@
cn.hippo4j
- hippo4j-threadpool-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/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java b/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java
index 143b285e..e07dbe57 100644
--- a/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java
+++ b/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.hystrix;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
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/AbstractWebThreadPoolService.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java
index 03014af3..96a0b0c8 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.web;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
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/IWebThreadPoolHandlerSupport.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/IWebThreadPoolHandlerSupport.java
index 0b25afdd..8f850287 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/IWebThreadPoolHandlerSupport.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/IWebThreadPoolHandlerSupport.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.web;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
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..824fda84 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,8 +17,7 @@
package cn.hippo4j.adapter.web;
-import cn.hippo4j.common.config.ApplicationContextHolder;
-import cn.hippo4j.common.web.exception.ServiceException;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import lombok.extern.slf4j.Slf4j;
/**
@@ -37,7 +36,7 @@ public class WebThreadPoolHandlerChoose {
try {
webThreadPoolService = ApplicationContextHolder.getBean(WebThreadPoolService.class);
} catch (Exception ex) {
- throw new ServiceException("Web thread pool service bean not found.", ex);
+ throw new RuntimeException("Web thread pool service bean not found.", ex);
}
return webThreadPoolService;
}
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java
index 082c890f..b85f89b9 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.web;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java
index f82b3408..6307af4d 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java
@@ -19,7 +19,7 @@ package cn.hippo4j.adapter.web.jetty;
import cn.hippo4j.adapter.web.IWebThreadPoolHandlerSupport;
import cn.hippo4j.common.constant.ChangeThreadPoolConstants;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java
index 446a4b43..d04d2af3 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java
@@ -19,7 +19,7 @@ package cn.hippo4j.adapter.web.tomcat;
import cn.hippo4j.adapter.web.IWebThreadPoolHandlerSupport;
import cn.hippo4j.common.constant.ChangeThreadPoolConstants;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java
index 6917a26a..2d3d3c06 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java
@@ -19,7 +19,7 @@ package cn.hippo4j.adapter.web.undertow;
import cn.hippo4j.adapter.web.IWebThreadPoolHandlerSupport;
import cn.hippo4j.common.constant.ChangeThreadPoolConstants;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
@@ -55,6 +55,7 @@ public class UndertowWebThreadPoolHandlerSupport implements IWebThreadPoolHandle
this.executor = executor;
}
+ private final long noRejectCount = -1L;
@Override
public ThreadPoolBaseInfo simpleInfo() {
ThreadPoolBaseInfo poolBaseInfo = new ThreadPoolBaseInfo();
@@ -122,7 +123,7 @@ public class UndertowWebThreadPoolHandlerSupport implements IWebThreadPoolHandle
stateInfo.setPeakLoad(peakLoad);
long rejectCount = fieldObject instanceof DynamicThreadPoolExecutor
? ((DynamicThreadPoolExecutor) fieldObject).getRejectCountNum()
- : -1L;
+ : -noRejectCount;
stateInfo.setRejectCount(rejectCount);
stateInfo.setClientLastRefreshTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
stateInfo.setTimestamp(System.currentTimeMillis());
diff --git a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/NotSupportedException.java b/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/NotSupportedException.java
deleted file mode 100644
index f3996a05..00000000
--- a/threadpool/common/src/main/java/cn/hippo4j/common/executor/support/NotSupportedException.java
+++ /dev/null
@@ -1,37 +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.common.executor.support;
-
-import cn.hippo4j.common.web.exception.AbstractException;
-
-/**
- * This exception is thrown when a context implementation does not support the operation being invoked.
- */
-public class NotSupportedException extends AbstractException {
-
- /**
- * Constructs a new not supported exception with the specified detail message and
- * cause.
- *
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- */
- public NotSupportedException(String message) {
- super(message, null, null);
- }
-}
diff --git a/threadpool/common/src/test/java/cn/hippo4j/common/web/ResultsTest.java b/threadpool/common/src/test/java/cn/hippo4j/common/web/ResultsTest.java
deleted file mode 100644
index 44369db3..00000000
--- a/threadpool/common/src/test/java/cn/hippo4j/common/web/ResultsTest.java
+++ /dev/null
@@ -1,21 +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.common.web;
-
-public final class ResultsTest {
-}
diff --git a/threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue b/threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomBlockingQueue
deleted file mode 100644
index 0df513e2..00000000
--- a/threadpool/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/threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.extension.spi.IOldSpi b/threadpool/common/src/test/resources/META-INF/services/cn.hippo4j.common.extension.spi.IOldSpi
deleted file mode 100644
index 29dcbcac..00000000
--- a/threadpool/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/threadpool/console/package.json b/threadpool/console/package.json
index aa4202ab..505a900b 100755
--- a/threadpool/console/package.json
+++ b/threadpool/console/package.json
@@ -44,9 +44,11 @@
},
"dependencies": {
"axios": ">=0.18.1",
+ "buffer": "^6.0.3",
"clipboard": "2.0.4",
"codemirror": "5.45.0",
"core-js": "^3.26.0",
+ "crypto": "^1.0.1",
"echarts": "^5.2.2",
"element-ui": "^2.15.7",
"fuse.js": "3.4.4",
diff --git a/threadpool/console/src/store/modules/user.js b/threadpool/console/src/store/modules/user.js
index bae7a0c1..4b73f6b7 100755
--- a/threadpool/console/src/store/modules/user.js
+++ b/threadpool/console/src/store/modules/user.js
@@ -1,126 +1,131 @@
-import { login } from '@/api/user';
-import { getToken, setToken, removeToken } from '@/utils/auth';
-import router, { resetRouter } from '@/router';
+import {login} from '@/api/user';
+import {getToken, removeToken, setToken} from '@/utils/auth';
+import router, {resetRouter} from '@/router';
+import {genKey, encrypt} from '@/utils/aes-util';
const state = {
- token: getToken(),
- name: '',
- avatar: '',
- introduction: '',
- roles: [],
+ token: getToken(),
+ name: '',
+ avatar: '',
+ introduction: '',
+ roles: [],
};
const mutations = {
- SET_TOKEN: (state, token) => {
- state.token = token;
- },
- SET_INTRODUCTION: (state, introduction) => {
- state.introduction = introduction;
- },
- SET_NAME: (state, name) => {
- state.name = name;
- },
- SET_AVATAR: (state, avatar) => {
- state.avatar = avatar;
- },
- SET_ROLES: (state, roles) => {
- state.roles = roles;
- },
+ SET_TOKEN: (state, token) => {
+ state.token = token;
+ },
+ SET_INTRODUCTION: (state, introduction) => {
+ state.introduction = introduction;
+ },
+ SET_NAME: (state, name) => {
+ state.name = name;
+ },
+ SET_AVATAR: (state, avatar) => {
+ state.avatar = avatar;
+ },
+ SET_ROLES: (state, roles) => {
+ state.roles = roles;
+ },
};
const actions = {
- // user login
- login({ commit }, userInfo) {
- const { username, password } = userInfo;
- return new Promise((resolve, reject) => {
- login({ username: username.trim(), password: password, rememberMe: 1 })
- .then((response) => {
- const { data } = response;
- const { roles } = response;
- commit('SET_TOKEN', data);
- localStorage.setItem('roles', JSON.stringify(roles));
- localStorage.setItem('USER_ROLE', roles[0]);
- setToken(data);
- resolve();
- })
- .catch((error) => {
- alert('登录失败');
- reject(error);
+ // user login
+ login({commit}, userInfo) {
+ const {username, password} = userInfo;
+ return new Promise((resolve, reject) => {
+ let key = genKey();
+ let encodePassword = encrypt(password, key)
+ key = key.split("").reverse().join("")
+ login({username: username.trim(), password: encodePassword, tag: key, rememberMe: 1})
+ .then((response) => {
+ const {data} = response;
+ const {roles} = response;
+ commit('SET_TOKEN', data);
+ localStorage.setItem('roles', JSON.stringify(roles));
+ localStorage.setItem('USER_ROLE', roles[0]);
+ setToken(data);
+ resolve();
+ })
+ .catch((error) => {
+ // alert('登录失败');
+ reject(error);
+ });
});
- });
- },
-
- // get user info
- getInfo({ commit, state }) {
- return new Promise((resolve, reject) => {
- const data = {};
- data.roles = JSON.parse(localStorage.getItem('roles'));
- commit('SET_ROLES', data.roles);
- resolve(data);
- });
- },
-
- // user logout
- logout({ commit, state }) {
- // return new Promise((resolve, reject) => {
- // logout(state.token).then(() => {
- // commit('SET_TOKEN', '')
- // commit('SET_ROLES', [])
- // removeToken()
- // resetRouter()
- // resolve()
- // }).catch(error => {
- // reject(error)
- // })
- // })
- return new Promise((resolve) => {
- commit('SET_TOKEN', '');
- commit('SET_ROLES', []);
- removeToken();
- resetRouter();
- resolve();
- });
- },
-
- // remove token
- resetToken({ commit }) {
- return new Promise((resolve) => {
- commit('SET_TOKEN', '');
- commit('SET_ROLES', []);
- removeToken();
- resolve();
- });
- },
-
- // dynamically modify permissions
- changeRoles({ commit, dispatch }, role) {
- return new Promise(async (resolve) => {
- const token = role + '-token';
-
- commit('SET_TOKEN', token);
- setToken(token);
-
- const { roles } = await dispatch('getInfo');
-
- resetRouter();
-
- // generate accessible routes map based on roles
- const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true });
-
- // dynamically add accessible routes
- router.addRoutes(accessRoutes);
-
- // reset visited views and cached views
- dispatch('tagsView/delAllViews', null, { root: true });
-
- resolve();
- });
- },
+ },
+
+
+ // get user info
+ getInfo({commit, state}) {
+ return new Promise((resolve, reject) => {
+ const data = {};
+ data.roles = JSON.parse(localStorage.getItem('roles'));
+ commit('SET_ROLES', data.roles);
+ resolve(data);
+ });
+ },
+
+ // user logout
+ logout({commit, state}) {
+ // return new Promise((resolve, reject) => {
+ // logout(state.token).then(() => {
+ // commit('SET_TOKEN', '')
+ // commit('SET_ROLES', [])
+ // removeToken()
+ // resetRouter()
+ // resolve()
+ // }).catch(error => {
+ // reject(error)
+ // })
+ // })
+ return new Promise((resolve) => {
+ commit('SET_TOKEN', '');
+ commit('SET_ROLES', []);
+ removeToken();
+ resetRouter();
+ resolve();
+ });
+ },
+
+ // remove token
+ resetToken({commit}) {
+ return new Promise((resolve) => {
+ commit('SET_TOKEN', '');
+ commit('SET_ROLES', []);
+ removeToken();
+ resolve();
+ });
+ },
+
+ // dynamically modify permissions
+ changeRoles({commit, dispatch}, role) {
+ return new Promise(async (resolve) => {
+ const token = role + '-token';
+
+ commit('SET_TOKEN', token);
+ setToken(token);
+
+ const {roles} = await dispatch('getInfo');
+
+ resetRouter();
+
+ // generate accessible routes map based on roles
+ const accessRoutes = await dispatch('permission/generateRoutes', roles, {root: true});
+
+ // dynamically add accessible routes
+ router.addRoutes(accessRoutes);
+
+ // reset visited views and cached views
+ dispatch('tagsView/delAllViews', null, {root: true});
+
+ resolve();
+ });
+ },
};
export default {
- namespaced: true,
- state,
- mutations,
- actions,
+ namespaced: true,
+ state,
+ mutations,
+ actions,
};
diff --git a/threadpool/console/src/utils/aes-util.js b/threadpool/console/src/utils/aes-util.js
new file mode 100644
index 00000000..d4d78736
--- /dev/null
+++ b/threadpool/console/src/utils/aes-util.js
@@ -0,0 +1,37 @@
+import {Buffer} from 'buffer'
+import crypto from 'crypto'
+
+/**
+ * generate key
+ * @returns {string} key(length 16)
+ */
+export function genKey() {
+ let chars = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ let result = '';
+ for (let i = 16; i > 0; --i) result += chars[Math.floor(Math.random() * chars.length)];
+ return result;
+}
+
+/**
+ * encode message
+ * @param msg message
+ * @param key key
+ * @returns {string} encoded message
+ */
+export function encrypt(msg, key) {
+ try {
+ let pwd = Buffer.from(key)
+ let iv = crypto.randomBytes(12)
+ let cipher = crypto.createCipheriv('aes-128-gcm', pwd, iv)
+ let enc = cipher.update(msg, 'utf8', 'base64')
+ enc += cipher.final('base64')
+ let tags = cipher.getAuthTag()
+ enc = Buffer.from(enc, 'base64')
+ let totalLength = iv.length + enc.length + tags.length
+ let bufferMsg = Buffer.concat([iv, enc, tags], totalLength)
+ return bufferMsg.toString('base64')
+ } catch (e) {
+ console.log("Encrypt is error", e)
+ return null
+ }
+}
\ No newline at end of file
diff --git a/threadpool/console/src/views/login/index.vue b/threadpool/console/src/views/login/index.vue
index 086359a3..66ce2387 100755
--- a/threadpool/console/src/views/login/index.vue
+++ b/threadpool/console/src/views/login/index.vue
@@ -170,8 +170,8 @@ export default {
this.$router.push({ path: this.redirect || '/', query: this.otherQuery });
this.loading = false;
})
- .catch(() => {
- console.log('error catch.');
+ .catch((e) => {
+ console.log('error catch.',e);
this.loading = false;
});
} else {
diff --git a/threadpool/core/pom.xml b/threadpool/core/pom.xml
index e3538d46..1df9e3a9 100644
--- a/threadpool/core/pom.xml
+++ b/threadpool/core/pom.xml
@@ -12,7 +12,21 @@
cn.hippo4j
- hippo4j-threadpool-common
+ hippo4j-threadpool-infra-common
+ ${project.version}
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+ cn.hippo4j
+ hippo4j-threadpool-dynamic-api
+ ${project.version}
+
+
+ cn.hippo4j
+ hippo4j-threadpool-kernel-alarm${project.version}
diff --git a/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/enable/BeforeCheckConfiguration.java b/threadpool/core/src/main/java/cn/hippo4j/core/enable/BeforeCheckConfiguration.java
index bbcc377d..c6640d93 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/enable/BeforeCheckConfiguration.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/enable/BeforeCheckConfiguration.java
@@ -18,8 +18,8 @@
package cn.hippo4j.core.enable;
import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.core.config.BootstrapPropertiesInterface;
import cn.hippo4j.core.config.ConfigEmptyException;
+import cn.hippo4j.threadpool.dynamic.api.BootstrapPropertiesInterface;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -40,6 +40,7 @@ public class BeforeCheckConfiguration {
@Bean
public BeforeCheckConfiguration.BeforeCheck dynamicThreadPoolBeforeCheckBean(@Autowired(required = false) BootstrapPropertiesInterface properties,
ConfigurableEnvironment environment) {
+ // TODO test
boolean checkFlag = properties != null && Objects.equals(bootstrapPropertiesClassName, properties.getClass().getName()) && properties.getEnable();
if (checkFlag) {
String namespace = properties.getNamespace();
@@ -70,6 +71,9 @@ public class BeforeCheckConfiguration {
return new BeforeCheckConfiguration.BeforeCheck();
}
+ /**
+ * Before check.
+ */
public class BeforeCheck {
}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/enable/MarkerConfiguration.java b/threadpool/core/src/main/java/cn/hippo4j/core/enable/MarkerConfiguration.java
index de7c762e..f22ea7fd 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/enable/MarkerConfiguration.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/enable/MarkerConfiguration.java
@@ -31,6 +31,9 @@ public class MarkerConfiguration {
return new Marker();
}
+ /**
+ * Marker.
+ */
public class Marker {
}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolExecutor.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolExecutor.java
index a33c6b83..596cfd0b 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolExecutor.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolExecutor.java
@@ -18,12 +18,13 @@
package cn.hippo4j.core.executor;
import cn.hippo4j.common.toolkit.CollectionUtil;
-import cn.hippo4j.core.plugin.impl.TaskDecoratorPlugin;
-import cn.hippo4j.core.plugin.impl.TaskRejectCountRecordPlugin;
-import cn.hippo4j.core.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
-import cn.hippo4j.core.plugin.impl.ThreadPoolExecutorShutdownPlugin;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginRegistrar;
+import cn.hippo4j.core.executor.plugin.impl.TaskDecoratorPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectCountRecordPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginRegistrar;
+import cn.hippo4j.threadpool.alarm.handler.DefaultThreadPoolCheckAlarmHandler;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
@@ -40,8 +41,12 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
+import static cn.hippo4j.common.constant.Constants.NO_REJECT_COUNT_NUM;
+
/**
* Enhanced dynamic and monitored thread pool.
+ *
+ * @see DefaultThreadPoolCheckAlarmHandler#buildAlarmNotifyRequest
*/
@Slf4j
public class DynamicThreadPoolExecutor extends ExtensibleThreadPoolExecutor implements DisposableBean {
@@ -57,7 +62,17 @@ public class DynamicThreadPoolExecutor extends ExtensibleThreadPoolExecutor impl
*/
@Getter
@Setter
- public boolean waitForTasksToCompleteOnShutdown;
+ private boolean waitForTasksToCompleteOnShutdown;
+
+ /**
+ * The default await termination millis
+ */
+ private static final Long DEFAULT_AWAIT_TERMINATION_MILLIS = -1L;
+
+ /**
+ * The default execute timeout
+ */
+ private static final Long DEFAULT_EXECUTE_TIMEOUT = -1L;
/**
* Creates a new {@code DynamicThreadPoolExecutor} with the given initial parameters.
@@ -149,7 +164,7 @@ public class DynamicThreadPoolExecutor extends ExtensibleThreadPoolExecutor impl
public long getAwaitTerminationMillis() {
return getPluginOfType(ThreadPoolExecutorShutdownPlugin.PLUGIN_NAME, ThreadPoolExecutorShutdownPlugin.class)
.map(ThreadPoolExecutorShutdownPlugin::getAwaitTerminationMillis)
- .orElse(-1L);
+ .orElse(DEFAULT_AWAIT_TERMINATION_MILLIS);
}
/**
@@ -170,13 +185,14 @@ public class DynamicThreadPoolExecutor extends ExtensibleThreadPoolExecutor impl
* Get reject count num.
*
* @return reject count num
+ * @see DefaultThreadPoolCheckAlarmHandler#buildAlarmNotifyRequest
* @deprecated use {@link TaskRejectCountRecordPlugin}
*/
@Deprecated
public Long getRejectCountNum() {
return getPluginOfType(TaskRejectCountRecordPlugin.PLUGIN_NAME, TaskRejectCountRecordPlugin.class)
.map(TaskRejectCountRecordPlugin::getRejectCountNum)
- .orElse(-1L);
+ .orElse(NO_REJECT_COUNT_NUM);
}
/**
@@ -201,7 +217,7 @@ public class DynamicThreadPoolExecutor extends ExtensibleThreadPoolExecutor impl
public Long getExecuteTimeOut() {
return getPluginOfType(TaskTimeoutNotifyAlarmPlugin.PLUGIN_NAME, TaskTimeoutNotifyAlarmPlugin.class)
.map(TaskTimeoutNotifyAlarmPlugin::getExecuteTimeOut)
- .orElse(-1L);
+ .orElse(DEFAULT_EXECUTE_TIMEOUT);
}
/**
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolWrapper.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolWrapper.java
index 964d6318..969d7123 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolWrapper.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolWrapper.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.executor;
-import cn.hippo4j.core.provider.CommonDynamicThreadPoolProviderFactory;
+import cn.hippo4j.core.executor.provider.CommonDynamicThreadPoolProviderFactory;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -32,11 +32,14 @@ import java.util.concurrent.ThreadPoolExecutor;
/**
* Dynamic thread-pool wrapper.
+ *
+ * @deprecated 2.0.0
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
+@Deprecated
public class DynamicThreadPoolWrapper implements DisposableBean {
/**
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutor.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutor.java
index 3401dcd0..1cedb30a 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutor.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutor.java
@@ -17,13 +17,13 @@
package cn.hippo4j.core.executor;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginSupport;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginSupport;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NonNull;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandler.java
similarity index 87%
rename from threadpool/core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandler.java
index 0704c93e..49b78178 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandler.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.handler;
+package cn.hippo4j.core.executor.handler;
import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.core.config.BootstrapPropertiesInterface;
+import cn.hippo4j.threadpool.dynamic.api.BootstrapPropertiesInterface;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.boot.ansi.AnsiColor;
@@ -34,13 +34,13 @@ public class DynamicThreadPoolBannerHandler implements InitializingBean {
private final BootstrapPropertiesInterface properties;
- private final String DYNAMIC_THREAD_POOL = " :: Dynamic ThreadPool :: ";
+ private static final String DYNAMIC_THREAD_POOL = " :: Dynamic ThreadPool :: ";
- private final String HIPPO4J_GITHUB = "GitHub: https://github.com/opengoofy/hippo4j";
+ private static final String HIPPO4J_GITHUB = "GitHub: https://github.com/opengoofy/hippo4j";
- private final String HIPPO4J_SITE = "Site: https://www.hippo4j.cn";
+ private static final String HIPPO4J_SITE = "Site: https://www.hippo4j.cn";
- private final int STRAP_LINE_SIZE = 50;
+ private static final int STRAP_LINE_SIZE = 50;
private final String version;
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..40820e14 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,17 +17,10 @@
package cn.hippo4j.core.executor.manage;
-import cn.hippo4j.common.config.ApplicationContextHolder;
-import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterWrapper;
-import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.core.executor.support.service.DynamicThreadPoolService;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadPoolExecutor;
/**
@@ -35,78 +28,6 @@ import java.util.concurrent.ThreadPoolExecutor;
*/
public class GlobalThreadPoolManage {
- /**
- * Dynamic thread pool parameter container.
- */
- private static final Map POOL_PARAMETER = new ConcurrentHashMap();
-
- /**
- * Dynamic thread pool wrapper.
- */
- private static final Map EXECUTOR_MAP = new ConcurrentHashMap();
-
- /**
- * Get the dynamic thread pool wrapper class.
- *
- * @param threadPoolId thread-pool id
- * @return dynamic thread-pool wrapper
- */
- public static DynamicThreadPoolWrapper getExecutorService(String threadPoolId) {
- return EXECUTOR_MAP.get(threadPoolId);
- }
-
- /**
- * Get the dynamic thread pool wrapper class.
- *
- * @param threadPoolId thread-pool id
- * @return thread-pool executor
- */
- public static ThreadPoolExecutor getExecutor(String threadPoolId) {
- return Optional.ofNullable(EXECUTOR_MAP.get(threadPoolId)).map(each -> each.getExecutor()).orElse(null);
- }
-
- /**
- * Get dynamic thread pool parameters.
- *
- * @param threadPoolId thread-pool id
- * @return thread-pool parameter
- */
- public static ThreadPoolParameter getPoolParameter(String threadPoolId) {
- return POOL_PARAMETER.get(threadPoolId);
- }
-
- /**
- * Register dynamic thread pool wrapper and parameters.
- *
- * @param threadPoolId thread-pool id
- * @param threadPoolParameter thread-pool parameter
- * @param executor executor
- */
- public static void register(String threadPoolId, ThreadPoolParameter threadPoolParameter, DynamicThreadPoolWrapper executor) {
- registerPool(threadPoolId, executor);
- registerPoolParameter(threadPoolId, threadPoolParameter);
- }
-
- /**
- * Register dynamic thread pool.
- *
- * @param threadPoolId thread-pool id
- * @param executor executor
- */
- public static void registerPool(String threadPoolId, DynamicThreadPoolWrapper executor) {
- EXECUTOR_MAP.put(threadPoolId, executor);
- }
-
- /**
- * Register dynamic thread pool parameters.
- *
- * @param threadPoolId thread-pool id
- * @param threadPoolParameter thread-pool parameter
- */
- public static void registerPoolParameter(String threadPoolId, ThreadPoolParameter threadPoolParameter) {
- POOL_PARAMETER.put(threadPoolId, threadPoolParameter);
- }
-
/**
* Dynamically register thread pool records and notification records.
*
@@ -116,24 +37,4 @@ public class GlobalThreadPoolManage {
DynamicThreadPoolService dynamicThreadPoolService = ApplicationContextHolder.getBean(DynamicThreadPoolService.class);
return dynamicThreadPoolService.registerDynamicThreadPool(registerWrapper);
}
-
- /**
- * Get the dynamic thread pool identifier collection.
- *
- * @return thread-pool id list
- */
- public static List listThreadPoolId() {
- return new ArrayList<>(EXECUTOR_MAP.keySet());
- }
-
- /**
- * Get the number of dynamic thread pools.
- *
The data may be inaccurate when the project is initially
- * launched because registration is done asynchronously.
- *
- * @return thread-pool num
- */
- public static Integer getThreadPoolNum() {
- return listThreadPoolId().size();
- }
}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ExecuteAwarePlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ExecuteAwarePlugin.java
similarity index 97%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/ExecuteAwarePlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ExecuteAwarePlugin.java
index 41176b8d..da5f9165 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ExecuteAwarePlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ExecuteAwarePlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import java.util.concurrent.ThreadPoolExecutor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/PluginRuntime.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/PluginRuntime.java
similarity index 97%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/PluginRuntime.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/PluginRuntime.java
index 10515da1..522a473d 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/PluginRuntime.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/PluginRuntime.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/RejectedAwarePlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/RejectedAwarePlugin.java
similarity index 96%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/RejectedAwarePlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/RejectedAwarePlugin.java
index 00213a59..b7dd3928 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/RejectedAwarePlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/RejectedAwarePlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import java.util.concurrent.ThreadPoolExecutor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ShutdownAwarePlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ShutdownAwarePlugin.java
similarity index 97%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/ShutdownAwarePlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ShutdownAwarePlugin.java
index ab526cf5..2fb8f9be 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ShutdownAwarePlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ShutdownAwarePlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import java.util.List;
import java.util.concurrent.ThreadPoolExecutor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/TaskAwarePlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/TaskAwarePlugin.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/TaskAwarePlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/TaskAwarePlugin.java
index c846a74e..235613ef 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/TaskAwarePlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/TaskAwarePlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ThreadPoolPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ThreadPoolPlugin.java
similarity index 89%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/ThreadPoolPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ThreadPoolPlugin.java
index 8b20137d..06159075 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ThreadPoolPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ThreadPoolPlugin.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginRegistrar;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginSupport;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginRegistrar;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginSupport;
/**
*
A marker superinterface indicating that
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/AbstractTaskTimerPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/AbstractTaskTimerPlugin.java
similarity index 96%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/AbstractTaskTimerPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/AbstractTaskTimerPlugin.java
index 7733249c..f9e715f7 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/AbstractTaskTimerPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/AbstractTaskTimerPlugin.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
import cn.hippo4j.core.toolkit.SystemClock;
import java.util.Optional;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPlugin.java
similarity index 94%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPlugin.java
index 749121f2..93218dc0 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPlugin.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.PluginRuntime;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
import lombok.Getter;
import lombok.NonNull;
import org.springframework.core.task.TaskDecorator;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPlugin.java
similarity index 92%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPlugin.java
index 2d82402a..02f937cd 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPlugin.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
-import cn.hippo4j.core.plugin.PluginRuntime;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
import lombok.Getter;
import lombok.Setter;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPlugin.java
similarity index 90%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPlugin.java
index b1bb2c78..74801a86 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPlugin.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.threadpool.alarm.api.ThreadPoolCheckAlarm;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPlugin.java
similarity index 90%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPlugin.java
index 9753cbbd..56e61cf8 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPlugin.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.core.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -39,7 +39,14 @@ import java.util.stream.Collectors;
*/
public class TaskTimeRecordPlugin extends AbstractTaskTimerPlugin {
- private static final int MAXIMUM_CAPACITY = 1 << 30;
+ /**
+ * maximumCapacity: 1 << 30
+ */
+ private static final int MAXIMUM_CAPACITY = 1073741824;
+
+ /**
+ * pluginName.
+ */
public static final String PLUGIN_NAME = TaskTimeRecordPlugin.class.getSimpleName();
/**
@@ -50,7 +57,22 @@ public class TaskTimeRecordPlugin extends AbstractTaskTimerPlugin {
/**
* timers
*/
- public final Timer[] timerTable;
+ private final Timer[] timerTable;
+
+ /**
+ * The default time mills
+ */
+ private static final long DEFAULT_TIME_MILLS = -1L;
+
+ /**
+ * No task count
+ */
+ private static final long NO_TASK_COUNT = -1L;
+
+ /**
+ * All bits are values of 1
+ */
+ private static final int ALL_BIT_IS_ONE = -1;
/**
* Create a {@link TaskTimeRecordPlugin}
@@ -116,8 +138,8 @@ public class TaskTimeRecordPlugin extends AbstractTaskTimerPlugin {
// summarize data
long totalTaskTimeMillis = 0L;
- long maxTaskTimeMillis = -1L;
- long minTaskTimeMillis = -1L;
+ long maxTaskTimeMillis = DEFAULT_TIME_MILLS;
+ long minTaskTimeMillis = DEFAULT_TIME_MILLS;
long taskCount = 0L;
for (Summary summary : summaries) {
if (taskCount > 0) {
@@ -147,13 +169,8 @@ public class TaskTimeRecordPlugin extends AbstractTaskTimerPlugin {
* copy from {@link HashMap#tableSizeFor}
*/
static int tableSizeFor(int cap) {
- int n = cap - 1;
- n |= n >>> 1;
- n |= n >>> 2;
- n |= n >>> 4;
- n |= n >>> 8;
- n |= n >>> 16;
- return n >= MAXIMUM_CAPACITY ? MAXIMUM_CAPACITY : n + 1;
+ int n = ALL_BIT_IS_ONE >>> Integer.numberOfLeadingZeros(cap - 1);
+ return (n < 0) ? 1 : (n >= MAXIMUM_CAPACITY) ? MAXIMUM_CAPACITY : n + 1;
}
/**
@@ -267,7 +284,7 @@ public class TaskTimeRecordPlugin extends AbstractTaskTimerPlugin {
*/
public long getAvgTaskTimeMillis() {
long totalTaskCount = getTaskCount();
- return totalTaskCount > 0L ? getTotalTaskTimeMillis() / totalTaskCount : -1;
+ return totalTaskCount > 0L ? getTotalTaskTimeMillis() / totalTaskCount : NO_TASK_COUNT;
}
}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
similarity index 90%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
index be5726d3..ee43b3e3 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
-import cn.hippo4j.common.config.ApplicationContextHolder;
-import cn.hippo4j.core.plugin.PluginRuntime;
+import cn.hippo4j.core.config.ApplicationContextHolder;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
+import cn.hippo4j.threadpool.alarm.api.ThreadPoolCheckAlarm;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NonNull;
@@ -63,8 +63,8 @@ public class TaskTimeoutNotifyAlarmPlugin extends AbstractTaskTimerPlugin {
/**
* Create a {@link TaskTimeoutNotifyAlarmPlugin}.
*
- * @param threadPoolId thread pool id
- * @param executeTimeOut execute time out
+ * @param threadPoolId thread pool id
+ * @param executeTimeOut execute time out
* @param threadPoolExecutor thread pool executor
*/
public TaskTimeoutNotifyAlarmPlugin(String threadPoolId, Long executeTimeOut, ThreadPoolExecutor threadPoolExecutor) {
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
similarity index 96%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
index f6c5969f..ec07ef18 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.PluginRuntime;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@@ -51,7 +51,7 @@ public class ThreadPoolExecutorShutdownPlugin implements ShutdownAwarePlugin {
* Await termination millis
*/
@Setter
- public long awaitTerminationMillis;
+ private long awaitTerminationMillis;
/**
* Callback before pool shutdown.
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManager.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManager.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManager.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManager.java
index 77246371..2e075e64 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManager.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManager.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import lombok.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManager.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManager.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManager.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManager.java
index 790ed894..319e7ef5 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManager.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManager.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrar.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrar.java
similarity index 81%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrar.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrar.java
index 356782ee..3bfc911c 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrar.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrar.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
-import cn.hippo4j.core.plugin.impl.TaskDecoratorPlugin;
-import cn.hippo4j.core.plugin.impl.TaskRejectCountRecordPlugin;
-import cn.hippo4j.core.plugin.impl.TaskRejectNotifyAlarmPlugin;
-import cn.hippo4j.core.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
-import cn.hippo4j.core.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskDecoratorPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectCountRecordPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.impl.ThreadPoolExecutorShutdownPlugin;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManager.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManager.java
similarity index 93%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManager.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManager.java
index d2d18ea3..e41e38e9 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManager.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManager.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/GlobalThreadPoolPluginManager.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/GlobalThreadPoolPluginManager.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/GlobalThreadPoolPluginManager.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/GlobalThreadPoolPluginManager.java
index 62d2085d..b6c20d2d 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/GlobalThreadPoolPluginManager.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/GlobalThreadPoolPluginManager.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import java.util.Collection;
import java.util.Optional;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginManager.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginManager.java
similarity index 94%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginManager.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginManager.java
index 56027c2b..f5782108 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginManager.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginManager.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
-
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.PluginRuntime;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+package cn.hippo4j.core.executor.plugin.manager;
+
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import java.util.Collection;
import java.util.Optional;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginRegistrar.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginRegistrar.java
similarity index 92%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginRegistrar.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginRegistrar.java
index 5ba3e57c..c2898cdf 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginRegistrar.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginRegistrar.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
/**
* Registrar of {@link ThreadPoolPlugin}.
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupport.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupport.java
similarity index 94%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupport.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupport.java
index 31426421..89818bb2 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupport.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupport.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Collection;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/provider/CommonDynamicThreadPoolProviderFactory.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/provider/CommonDynamicThreadPoolProviderFactory.java
similarity index 74%
rename from threadpool/core/src/main/java/cn/hippo4j/core/provider/CommonDynamicThreadPoolProviderFactory.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/provider/CommonDynamicThreadPoolProviderFactory.java
index c7282947..b71b2674 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/provider/CommonDynamicThreadPoolProviderFactory.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/provider/CommonDynamicThreadPoolProviderFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.provider;
+package cn.hippo4j.core.executor.provider;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
@@ -28,6 +28,26 @@ import java.util.concurrent.TimeUnit;
*/
public class CommonDynamicThreadPoolProviderFactory {
+ /**
+ * Core pool size.
+ */
+ private static final int CORE_POOL_SIZE = 2;
+
+ /**
+ * Maximum pool size.
+ */
+ private static final int MAXIMUM_POOL_SIZE = 4;
+
+ /**
+ * Keep alive time.
+ */
+ private static final long KEEP_ALIVE_TIME = 60L;
+
+ /**
+ * Work queue capacity.
+ */
+ private static final int WORK_QUEUE_CAPACITY = 1024;
+
/**
* Get the public dynamic thread pool instance.
*
@@ -38,9 +58,9 @@ public class CommonDynamicThreadPoolProviderFactory {
DynamicThreadPoolExecutor dynamicThreadPoolExecutor = (DynamicThreadPoolExecutor) ThreadPoolBuilder.builder()
.dynamicPool()
.threadFactory(threadPoolId)
- .poolThreadSize(2, 4)
- .keepAliveTime(60L, TimeUnit.SECONDS)
- .workQueue(BlockingQueueTypeEnum.RESIZABLE_LINKED_BLOCKING_QUEUE, 1024)
+ .poolThreadSize(CORE_POOL_SIZE, MAXIMUM_POOL_SIZE)
+ .keepAliveTime(KEEP_ALIVE_TIME, TimeUnit.SECONDS)
+ .workQueue(BlockingQueueTypeEnum.RESIZABLE_LINKED_BLOCKING_QUEUE, WORK_QUEUE_CAPACITY)
.build();
return dynamicThreadPoolExecutor;
}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandler.java
similarity index 93%
rename from threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandler.java
index 263cbcc3..89357f23 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandler.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.proxy;
+package cn.hippo4j.core.executor.proxy;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
+import cn.hippo4j.threadpool.alarm.api.ThreadPoolCheckAlarm;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyUtil.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyUtil.java
similarity index 97%
rename from threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyUtil.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyUtil.java
index 10ce57b5..ddd9f136 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyUtil.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.proxy;
+package cn.hippo4j.core.executor.proxy;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntime.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntime.java
index 8d9ca68f..0066438e 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntime.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntime.java
@@ -17,11 +17,11 @@
package cn.hippo4j.core.executor.state;
+import cn.hippo4j.common.executor.ThreadPoolExecutorHolder;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
-import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
-import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.common.toolkit.CalculateUtil;
+import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -29,6 +29,8 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.ThreadPoolExecutor;
+import static cn.hippo4j.common.constant.Constants.NO_REJECT_COUNT_NUM;
+
/**
* Abstract threadPool runtime info.
*/
@@ -49,8 +51,8 @@ public abstract class AbstractThreadPoolRuntime {
* @return thread-pool run state info
*/
public ThreadPoolRunStateInfo getPoolRunState(String threadPoolId) {
- DynamicThreadPoolWrapper executorService = GlobalThreadPoolManage.getExecutorService(threadPoolId);
- ThreadPoolExecutor pool = executorService.getExecutor();
+ ThreadPoolExecutorHolder executorHolder = ThreadPoolExecutorRegistry.getHolder(threadPoolId);
+ ThreadPoolExecutor pool = executorHolder.getExecutor();
return getPoolRunState(threadPoolId, pool);
}
@@ -66,7 +68,7 @@ public abstract class AbstractThreadPoolRuntime {
int activeCount = actualExecutor.getActiveCount();
int largestPoolSize = actualExecutor.getLargestPoolSize();
BlockingQueue blockingQueue = actualExecutor.getQueue();
- long rejectCount = actualExecutor instanceof DynamicThreadPoolExecutor ? ((DynamicThreadPoolExecutor) actualExecutor).getRejectCountNum() : -1L;
+ long rejectCount = actualExecutor instanceof DynamicThreadPoolExecutor ? ((DynamicThreadPoolExecutor) actualExecutor).getRejectCountNum() : NO_REJECT_COUNT_NUM;
ThreadPoolRunStateInfo stateInfo = ThreadPoolRunStateInfo.builder()
.tpId(threadPoolId)
.activeSize(activeCount)
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/state/ThreadPoolRunStateHandler.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/state/ThreadPoolRunStateHandler.java
index 20662aa6..8d27ef3f 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/state/ThreadPoolRunStateHandler.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/state/ThreadPoolRunStateHandler.java
@@ -17,14 +17,14 @@
package cn.hippo4j.core.executor.state;
+import cn.hippo4j.common.executor.ThreadPoolExecutorHolder;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.common.model.ManyThreadPoolRunStateInfo;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.ByteConvertUtil;
import cn.hippo4j.common.toolkit.MemoryUtil;
import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.core.toolkit.inet.InetUtils;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -61,8 +61,8 @@ public class ThreadPoolRunStateHandler extends AbstractThreadPoolRuntime {
poolRunStateInfo.setMemoryProportion(memoryProportion);
poolRunStateInfo.setFreeMemory(ByteConvertUtil.getPrintSize(Math.subtractExact(max, used)));
String threadPoolId = poolRunStateInfo.getTpId();
- DynamicThreadPoolWrapper executorService = GlobalThreadPoolManage.getExecutorService(threadPoolId);
- ThreadPoolExecutor pool = executorService.getExecutor();
+ ThreadPoolExecutorHolder executorHolder = ThreadPoolExecutorRegistry.getHolder(threadPoolId);
+ ThreadPoolExecutor pool = executorHolder.getExecutor();
String rejectedName;
rejectedName = pool.getRejectedExecutionHandler().getClass().getSimpleName();
poolRunStateInfo.setRejectedName(rejectedName);
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java
index 6a61c23d..c7f8df03 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.executor.support;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
import cn.hippo4j.common.toolkit.Assert;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
import lombok.Data;
@@ -66,7 +66,7 @@ public class AbstractBuildThreadPoolTemplate {
Assert.notNull(initParam);
ThreadPoolExecutor executorService;
try {
- executorService = new ThreadPoolExecutorTemplate(initParam.getCorePoolNum(),
+ executorService = new ThreadPoolExecutor(initParam.getCorePoolNum(),
initParam.getMaximumPoolSize(),
initParam.getKeepAliveTime(),
initParam.getTimeUnit(),
@@ -80,41 +80,6 @@ public class AbstractBuildThreadPoolTemplate {
return executorService;
}
- /**
- * Build a fast-consuming task thread pool.
- *
- * @return fast thread-pool executor
- */
- public static ThreadPoolExecutor buildFastPool() {
- ThreadPoolInitParam initParam = initParam();
- return buildFastPool(initParam);
- }
-
- /**
- * Build a fast-consuming task thread pool.
- *
- * @param initParam init param
- * @return fast thread-pool executor
- */
- public static ThreadPoolExecutor buildFastPool(ThreadPoolInitParam initParam) {
- TaskQueue taskQueue = new TaskQueue(initParam.getCapacity());
- FastThreadPoolExecutor fastThreadPoolExecutor;
- try {
- fastThreadPoolExecutor = new FastThreadPoolExecutor(initParam.getCorePoolNum(),
- initParam.getMaximumPoolSize(),
- initParam.getKeepAliveTime(),
- initParam.getTimeUnit(),
- taskQueue,
- initParam.getThreadFactory(),
- initParam.rejectedExecutionHandler);
- } catch (IllegalArgumentException ex) {
- throw new IllegalArgumentException("Error creating thread pool parameter.", ex);
- }
- taskQueue.setExecutor(fastThreadPoolExecutor);
- fastThreadPoolExecutor.allowCoreThreadTimeOut(initParam.allowCoreThreadTimeOut);
- return fastThreadPoolExecutor;
- }
-
/**
* Build a dynamic monitor thread-pool.
*
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java
deleted file mode 100644
index 91de8469..00000000
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java
+++ /dev/null
@@ -1,177 +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.core.executor.support;
-
-import cn.hippo4j.core.plugin.impl.ThreadPoolExecutorShutdownPlugin;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.RunnableFuture;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Dynamic executor configuration support.
- *
- * @deprecated use {@link ThreadPoolExecutorShutdownPlugin} to get thread-pool shutdown support
- */
-@Deprecated
-@Slf4j
-public abstract class AbstractDynamicExecutorSupport extends ThreadPoolExecutor implements InitializingBean, DisposableBean {
-
- private String threadPoolId;
-
- private ExecutorService executor;
-
- public long awaitTerminationMillis;
-
- public boolean waitForTasksToCompleteOnShutdown;
-
- public AbstractDynamicExecutorSupport(int corePoolSize,
- int maximumPoolSize,
- long keepAliveTime,
- TimeUnit unit,
- boolean waitForTasksToCompleteOnShutdown,
- long awaitTerminationMillis,
- BlockingQueue workQueue,
- String threadPoolId,
- ThreadFactory threadFactory,
- RejectedExecutionHandler handler) {
- super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler);
- this.threadPoolId = threadPoolId;
- this.waitForTasksToCompleteOnShutdown = waitForTasksToCompleteOnShutdown;
- this.awaitTerminationMillis = awaitTerminationMillis;
- }
-
- /**
- * Create the target {@link java.util.concurrent.ExecutorService} instance.
- * Called by {@code afterPropertiesSet}.
- *
- * @return a new ExecutorService instance
- * @see #afterPropertiesSet()
- */
- protected abstract ExecutorService initializeExecutor();
-
- /**
- * Calls {@code initialize()} after the container applied all property values.
- *
- * @see #initialize()
- */
- @Override
- public void afterPropertiesSet() {
- initialize();
- }
-
- /**
- * Calls {@code shutdown} when the BeanFactory destroys.
- * the task executor instance.
- *
- * @see #shutdown()
- */
- @Override
- public void destroy() {
- shutdownSupport();
- }
-
- /**
- * Set up the ExecutorService.
- */
- public void initialize() {
- if (log.isInfoEnabled()) {
- log.info("Initializing ExecutorService" + (this.threadPoolId != null ? " '" + this.threadPoolId + "'" : ""));
- }
-
- this.executor = initializeExecutor();
- }
-
- /**
- * Set support param.
- *
- * @param awaitTerminationMillis
- * @param waitForTasksToCompleteOnShutdown
- */
- public void setSupportParam(long awaitTerminationMillis, boolean waitForTasksToCompleteOnShutdown) {
- this.awaitTerminationMillis = awaitTerminationMillis;
- this.waitForTasksToCompleteOnShutdown = waitForTasksToCompleteOnShutdown;
- }
-
- /**
- * Perform a shutdown on the underlying ExecutorService.
- *
- * @see java.util.concurrent.ExecutorService#shutdown()
- * @see java.util.concurrent.ExecutorService#shutdownNow()
- */
- public void shutdownSupport() {
- if (log.isInfoEnabled()) {
- log.info("Shutting down ExecutorService" + (this.threadPoolId != null ? " '" + this.threadPoolId + "'" : ""));
- }
- if (this.executor != null) {
- if (this.waitForTasksToCompleteOnShutdown) {
- this.executor.shutdown();
- } else {
- for (Runnable remainingTask : this.executor.shutdownNow()) {
- cancelRemainingTask(remainingTask);
- }
- }
- awaitTerminationIfNecessary(this.executor);
- }
- }
-
- /**
- * Cancel the given remaining task which never commended execution,
- * as returned from {@link ExecutorService#shutdownNow()}.
- *
- * @param task the task to cancel (typically a {@link RunnableFuture})
- * @see #shutdown()
- * @see RunnableFuture#cancel(boolean)
- * @since 5.0.5
- */
- protected void cancelRemainingTask(Runnable task) {
- if (task instanceof Future) {
- ((Future) task).cancel(true);
- }
- }
-
- /**
- * Wait for the executor to terminate, according to the value of the.
- */
- private void awaitTerminationIfNecessary(ExecutorService executor) {
- if (this.awaitTerminationMillis > 0) {
- try {
- if (!executor.awaitTermination(this.awaitTerminationMillis, TimeUnit.MILLISECONDS)) {
- if (log.isWarnEnabled()) {
- log.warn("Timed out while waiting for executor"
- + (this.threadPoolId != null ? " '" + this.threadPoolId + "'" : "") + " to terminate.");
- }
- }
- } catch (InterruptedException ex) {
- if (log.isWarnEnabled()) {
- log.warn("Interrupted while waiting for executor"
- + (this.threadPoolId != null ? " '" + this.threadPoolId + "'" : "") + " to terminate.");
- }
- Thread.currentThread().interrupt();
- }
- }
- }
-}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/FastThreadPoolExecutor.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/FastThreadPoolExecutor.java
deleted file mode 100644
index c4e4f569..00000000
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/FastThreadPoolExecutor.java
+++ /dev/null
@@ -1,84 +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.core.executor.support;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Fast thread-pool executor.
- */
-@Slf4j
-public class FastThreadPoolExecutor extends ThreadPoolExecutorTemplate {
-
- public FastThreadPoolExecutor(int corePoolSize,
- int maximumPoolSize,
- long keepAliveTime,
- TimeUnit unit,
- TaskQueue workQueue,
- ThreadFactory threadFactory,
- RejectedExecutionHandler handler) {
- super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler);
- }
-
- /**
- * Statistics on the number of tasks submitted by the fast consumption thread pool
- */
- private final AtomicInteger submittedTaskCount = new AtomicInteger(0);
-
- /**
- * Get submitted task count.
- *
- * @return submitted task count
- */
- public int getSubmittedTaskCount() {
- return submittedTaskCount.get();
- }
-
- @Override
- protected void afterExecute(Runnable r, Throwable t) {
- submittedTaskCount.decrementAndGet();
- }
-
- @Override
- public void execute(Runnable command) {
- submittedTaskCount.incrementAndGet();
- try {
- super.execute(command);
- } catch (RejectedExecutionException rx) {
- final TaskQueue queue = (TaskQueue) super.getQueue();
- try {
- if (!queue.retryOffer(command, 0, TimeUnit.MILLISECONDS)) {
- submittedTaskCount.decrementAndGet();
- throw new RejectedExecutionException("The blocking queue capacity is full.", rx);
- }
- } catch (InterruptedException x) {
- submittedTaskCount.decrementAndGet();
- throw new RejectedExecutionException(x);
- }
- } catch (Exception t) {
- submittedTaskCount.decrementAndGet();
- throw t;
- }
- }
-}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/TaskQueue.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/TaskQueue.java
deleted file mode 100644
index 9eeedcf9..00000000
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/TaskQueue.java
+++ /dev/null
@@ -1,73 +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.core.executor.support;
-
-import lombok.Setter;
-
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Task queue.
- */
-public class TaskQueue extends LinkedBlockingQueue {
-
- private static final long serialVersionUID = -2635853580887179627L;
-
- @Setter
- private FastThreadPoolExecutor executor;
-
- public TaskQueue(int capacity) {
- super(capacity);
- }
-
- @Override
- public boolean offer(Runnable runnable) {
- int currentPoolThreadSize = executor.getPoolSize();
- // If a core thread is idle, add the task to the blocking queue, and the core thread will process the task.
- if (executor.getSubmittedTaskCount() < currentPoolThreadSize) {
- return super.offer(runnable);
- }
- // The current number of threads in the thread pool is less than the maximum number of threads, and returns false.
- // According to the thread pool source code, non-core threads will be created.
- if (currentPoolThreadSize < executor.getMaximumPoolSize()) {
- return false;
- }
- // If the current thread pool number is greater than the maximum number of threads, the task is added to the blocking queue.
- return super.offer(runnable);
- }
-
- /**
- * Retry offer.
- *
- * @param runnable submit thread pool task
- * @param timeout how long to wait before giving up, in units of
- * {@code unit}
- * @param unit a {@code TimeUnit} determining how to interpret the
- * {@code timeout} parameter
- * @return
- * @throws InterruptedException
- */
- public boolean retryOffer(Runnable runnable, long timeout, TimeUnit unit) throws InterruptedException {
- if (executor.isShutdown()) {
- throw new RejectedExecutionException("Actuator closed!");
- }
- return super.offer(runnable, timeout, unit);
- }
-}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java
index 8b31ede9..3d432362 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.executor.support;
-import cn.hippo4j.common.design.builder.Builder;
+import cn.hippo4j.common.extension.design.Builder;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.common.toolkit.Assert;
import org.springframework.core.task.TaskDecorator;
@@ -411,16 +411,6 @@ public class ThreadPoolBuilder implements Builder {
return AbstractBuildThreadPoolTemplate.buildPool(buildInitParam(builder));
}
- /**
- * Build a fast thread-pool with {@code builder}.
- *
- * @param builder thread-pool builder
- * @return fast thread-pool executor
- */
- private static ThreadPoolExecutor buildFastPool(ThreadPoolBuilder builder) {
- return AbstractBuildThreadPoolTemplate.buildFastPool(buildInitParam(builder));
- }
-
/**
* Build a dynamic thread-pool with {@code builder}.
*
@@ -474,9 +464,6 @@ public class ThreadPoolBuilder implements Builder {
@Override
public ThreadPoolExecutor build() {
- if (isDynamicPool) {
- return buildDynamicPool(this);
- }
- return isFastPool ? buildFastPool(this) : buildPool(this);
+ return isDynamicPool ? buildDynamicPool(this) : buildPool(this);
}
}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolExecutorTemplate.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolExecutorTemplate.java
deleted file mode 100644
index 8d073065..00000000
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolExecutorTemplate.java
+++ /dev/null
@@ -1,105 +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.core.executor.support;
-
-import cn.hippo4j.common.toolkit.ArrayUtil;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-/**
- * ThreadPool executor template.
- */
-public class ThreadPoolExecutorTemplate extends ThreadPoolExecutor {
-
- public ThreadPoolExecutorTemplate(int corePoolSize,
- int maximumPoolSize,
- long keepAliveTime,
- TimeUnit unit,
- BlockingQueue workQueue,
- ThreadFactory threadFactory,
- RejectedExecutionHandler handler) {
- super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler);
- }
-
- @Override
- public void execute(final Runnable command) {
- super.execute(wrap(command, clientTrace()));
- }
-
- @Override
- public Future submit(final Runnable task) {
- return super.submit(wrap(task, clientTrace()));
- }
-
- @Override
- public Future submit(final Callable task) {
- return super.submit(wrap(task, clientTrace()));
- }
-
- /**
- * Client trace.
- *
- * @return exception
- */
- private Exception clientTrace() {
- return new Exception("Tread task root stack trace.");
- }
-
- /**
- * Wrapping thread pool tasks.
- *
- * @param task task
- * @param clientStack client stack
- * @return wrapped runnable
- */
- private Runnable wrap(final Runnable task, final Exception clientStack) {
- return () -> {
- try {
- task.run();
- } catch (Exception e) {
- e.setStackTrace(ArrayUtil.addAll(clientStack.getStackTrace(), e.getStackTrace()));
- throw e;
- }
- };
- }
-
- /**
- * Wrapping thread pool tasks.
- *
- * @param task task
- * @param clientStack client stack
- * @param computed result
- * @return wrapped runnable
- */
- private Callable wrap(final Callable task, final Exception clientStack) {
- return () -> {
- try {
- return task.call();
- } catch (Exception e) {
- e.setStackTrace(ArrayUtil.addAll(clientStack.getStackTrace(), e.getStackTrace()));
- throw e;
- }
- };
- }
-}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/DynamicThreadPoolAdapter.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/DynamicThreadPoolAdapter.java
index 54f97449..6296321e 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/DynamicThreadPoolAdapter.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/DynamicThreadPoolAdapter.java
@@ -17,9 +17,8 @@
package cn.hippo4j.core.executor.support.adpter;
-import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
-
import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
/**
* Dynamic thread pool adapter.
@@ -42,7 +41,7 @@ public interface DynamicThreadPoolAdapter {
* of dynamic thread pools
* @return get the real dynamic thread pool instance
*/
- DynamicThreadPoolExecutor unwrap(Object executor);
+ ThreadPoolExecutor unwrap(Object executor);
/**
* If the {@link DynamicThreadPoolAdapter#match(Object)} conditions are met,
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 420fc353..cce70f36 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,23 +17,22 @@
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;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
/**
* Dynamic thread pool adapter choose.
*/
public class DynamicThreadPoolAdapterChoose {
- private static List DYNAMIC_THREAD_POOL_ADAPTERS = new ArrayList<>();
+ private static final List DYNAMIC_THREAD_POOL_ADAPTERS = new ArrayList<>();
static {
DYNAMIC_THREAD_POOL_ADAPTERS.add(new TransmittableThreadLocalExecutorAdapter());
@@ -61,7 +60,7 @@ public class DynamicThreadPoolAdapterChoose {
* of dynamic thread pools
* @return get the real dynamic thread pool instance
*/
- public static DynamicThreadPoolExecutor unwrap(Object executor) {
+ public static ThreadPoolExecutor unwrap(Object executor) {
Optional dynamicThreadPoolAdapterOptional = DYNAMIC_THREAD_POOL_ADAPTERS.stream().filter(each -> each.match(executor)).findFirst();
return dynamicThreadPoolAdapterOptional.map(each -> each.unwrap(executor)).orElse(null);
}
@@ -83,15 +82,14 @@ public class DynamicThreadPoolAdapterChoose {
* Load SPI customer adapter.
*/
private static void loadCustomerAdapter() {
- ServiceLoaderRegistry.register(DynamicThreadPoolAdapterSPI.class);
- Collection instances = ServiceLoaderRegistry.getSingletonServiceInstances(DynamicThreadPoolAdapterSPI.class);
+ ServiceLoaderRegistry.register(DynamicThreadPoolAdapter.class);
+ Collection instances = ServiceLoaderRegistry.getSingletonServiceInstances(DynamicThreadPoolAdapter.class);
if (CollectionUtil.isEmpty(instances)) {
return;
}
- for (DynamicThreadPoolAdapterSPI instance : instances) {
- DynamicThreadPoolAdapter adapter = instance.adapter();
- if (adapter != null) {
- DYNAMIC_THREAD_POOL_ADAPTERS.add(adapter);
+ for (DynamicThreadPoolAdapter instance : instances) {
+ if (instance != null) {
+ DYNAMIC_THREAD_POOL_ADAPTERS.add(instance);
}
}
}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/ThreadPoolTaskExecutorAdapter.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/ThreadPoolTaskExecutorAdapter.java
index 283942db..69e0ec8d 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/ThreadPoolTaskExecutorAdapter.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/ThreadPoolTaskExecutorAdapter.java
@@ -35,18 +35,12 @@ import java.util.concurrent.TimeUnit;
public class ThreadPoolTaskExecutorAdapter implements DynamicThreadPoolAdapter {
private static final String EXECUTOR_FIELD_NAME = "threadPoolExecutor";
-
private static final String WAIT_FOR_TASKS_TO_COMPLETE_ON_SHUTDOWN = "waitForTasksToCompleteOnShutdown";
-
private static final String AWAIT_TERMINATION_MILLIS = "awaitTerminationMillis";
-
private static final String TASK_DECORATOR = "taskDecorator";
-
private static final String BEAN_NAME = "beanName";
-
private static final String QUEUE_CAPACITY = "queueCapacity";
-
- private static String MATCH_CLASS_NAME = "ThreadPoolTaskExecutor";
+ private static final String MATCH_CLASS_NAME = "ThreadPoolTaskExecutor";
@Override
public boolean match(Object executor) {
@@ -55,7 +49,7 @@ public class ThreadPoolTaskExecutorAdapter implements DynamicThreadPoolAdapter {
}
@Override
- public DynamicThreadPoolExecutor unwrap(Object executor) {
+ public ThreadPoolExecutor unwrap(Object executor) {
Object unwrap = ReflectUtil.getFieldValue(executor, EXECUTOR_FIELD_NAME);
if (unwrap == null) {
return null;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/TransmittableThreadLocalExecutorAdapter.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/TransmittableThreadLocalExecutorAdapter.java
index f51c809c..b848a8ed 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/TransmittableThreadLocalExecutorAdapter.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/TransmittableThreadLocalExecutorAdapter.java
@@ -28,9 +28,9 @@ import java.util.concurrent.Executor;
*/
public class TransmittableThreadLocalExecutorAdapter implements DynamicThreadPoolAdapter {
- private static String MATCH_CLASS_NAME = "ExecutorTtlWrapper";
+ private static final String MATCH_CLASS_NAME = "ExecutorTtlWrapper";
- private static String FIELD_NAME = "executor";
+ private static final String FIELD_NAME = "executor";
@Override
public boolean match(Object executor) {
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/TransmittableThreadLocalExecutorServiceAdapter.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/TransmittableThreadLocalExecutorServiceAdapter.java
index 575c9725..2597a0e6 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/TransmittableThreadLocalExecutorServiceAdapter.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/TransmittableThreadLocalExecutorServiceAdapter.java
@@ -28,9 +28,9 @@ import java.util.concurrent.Executor;
*/
public class TransmittableThreadLocalExecutorServiceAdapter implements DynamicThreadPoolAdapter {
- private static String MATCH_CLASS_NAME = "ExecutorServiceTtlWrapper";
+ private static final String MATCH_CLASS_NAME = "ExecutorServiceTtlWrapper";
- private static String FIELD_NAME = "executorService";
+ private static final String FIELD_NAME = "executorService";
@Override
public boolean match(Object executor) {
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java
index 9de29d56..f064e8f7 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/adpter/ZipkinExecutorAdapter.java
@@ -25,15 +25,16 @@ import java.lang.reflect.Field;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
/**
* Zipkin thread local executor adapter.
*/
public class ZipkinExecutorAdapter implements DynamicThreadPoolAdapter {
- private final static String MATCH_CLASS_NAME = "brave.internal.WrappingExecutorService";
- private final static String FIELD_NAME = "delegate";
- private final static String TYPE_NAME = "java.util.concurrent.ExecutorService";
+ private static final String MATCH_CLASS_NAME = "brave.internal.WrappingExecutorService";
+ private static final String FIELD_NAME = "delegate";
+ private static final String TYPE_NAME = "java.util.concurrent.ExecutorService";
@Override
public boolean match(Object executor) {
@@ -49,7 +50,7 @@ public class ZipkinExecutorAdapter implements DynamicThreadPoolAdapter {
}
@Override
- public DynamicThreadPoolExecutor unwrap(Object executor) {
+ public ThreadPoolExecutor unwrap(Object executor) {
Object unwrap = doUnwrap(executor);
if (unwrap instanceof DynamicThreadPoolExecutor) {
return (DynamicThreadPoolExecutor) unwrap;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/spi/DynamicThreadPoolAdapterSPI.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/spi/DynamicThreadPoolAdapterSPI.java
index 1fe5780d..0b4bbe7d 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/spi/DynamicThreadPoolAdapterSPI.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/spi/DynamicThreadPoolAdapterSPI.java
@@ -17,8 +17,6 @@
package cn.hippo4j.core.executor.support.spi;
-import cn.hippo4j.core.executor.support.adpter.DynamicThreadPoolAdapter;
-
/**
* Dynamic thread-pool adapter SPI.
*/
@@ -32,5 +30,5 @@ public interface DynamicThreadPoolAdapterSPI {
/**
* Adapter.
*/
- DynamicThreadPoolAdapter adapter();
+ // DynamicThreadPoolAdapter adapter();
}
diff --git a/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 94%
rename from threadpool/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..90c35e60 100644
--- a/threadpool/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;
@@ -25,6 +25,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * realization
+ */
@Inherited
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
diff --git a/threadpool/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 threadpool/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/threadpool/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/threadpool/core/src/main/java/cn/hippo4j/core/extension/initialize/Hippo4jDynamicThreadPoolInitializer.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/initialize/Hippo4jDynamicThreadPoolInitializer.java
new file mode 100644
index 00000000..0cb52af0
--- /dev/null
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/initialize/Hippo4jDynamicThreadPoolInitializer.java
@@ -0,0 +1,47 @@
+/*
+ * 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.core.extension.initialize;
+
+import cn.hippo4j.common.propertie.EnvironmentProperties;
+import cn.hippo4j.core.config.ApplicationContextHolder;
+import cn.hippo4j.core.toolkit.IdentifyUtil;
+import cn.hippo4j.threadpool.alarm.api.ThreadPoolCheckAlarm;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.env.ConfigurableEnvironment;
+
+/**
+ * Hippo-4j dynamic thread-pool initializer.
+ *
+ * Compatible with SpringBoot Starter and Agent mode.
+ */
+public class Hippo4jDynamicThreadPoolInitializer implements InitializingBean {
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ // Environment initialize
+ ConfigurableEnvironment environment = ApplicationContextHolder.getBean(ConfigurableEnvironment.class);
+ EnvironmentProperties.active = environment.getProperty("spring.profiles.active", "UNKNOWN");
+ EnvironmentProperties.itemId = environment.getProperty("spring.dynamic.thread-pool.item-id", "");
+ EnvironmentProperties.applicationName = environment.getProperty("spring.application.name", "");
+ EnvironmentProperties.checkStateInterval = environment.getProperty("spring.dynamic.thread-pool.check-state-interval", Long.class, 5L);
+ IdentifyUtil.getIdentify();
+ // Check alarm
+ ThreadPoolCheckAlarm threadPoolCheckAlarm = ApplicationContextHolder.getBean(ThreadPoolCheckAlarm.class);
+ threadPoolCheckAlarm.scheduleExecute();
+ }
+}
diff --git a/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 89%
rename from threadpool/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..9c4ea642 100644
--- a/threadpool/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,13 +15,17 @@
* 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;
+/**
+ * None extends
+ * @param
+ */
public class None extends Reducer> {
@Override
diff --git a/threadpool/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 81%
rename from threadpool/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..111cb195 100644
--- a/threadpool/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,17 +15,22 @@
* 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;
import java.util.List;
+/**
+ * reducer
+ * @param
+ * @param
+ */
public abstract class Reducer {
@Getter
diff --git a/threadpool/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 threadpool/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..83be76ec 100644
--- a/threadpool/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;
@@ -23,6 +23,9 @@ import java.util.List;
import java.util.Objects;
import java.util.function.Predicate;
+/**
+ * reducers
+ */
@SuppressWarnings("all")
public class Reducers {
diff --git a/threadpool/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 87%
rename from threadpool/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..12d28c05 100644
--- a/threadpool/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,12 +15,15 @@
* 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;
+/**
+ * Extension auto configuration.
+ */
@Configuration
public class ExtensionAutoConfiguration {
diff --git a/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 93%
rename from threadpool/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..c2406bde 100644
--- a/threadpool/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;
@@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentHashMap;
* Extension registry
*/
@Slf4j
-public class ExtensionRegistry implements IExtensionRegistry {
+public final class ExtensionRegistry implements IExtensionRegistry {
private final Map, List> registry = new ConcurrentHashMap<>();
diff --git a/threadpool/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 88%
rename from threadpool/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..44a1e479 100644
--- a/threadpool/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,12 +15,15 @@
* 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;
+/**
+ * extension registry interface
+ */
public interface IExtensionRegistry {
void register(IExtension realization);
diff --git a/threadpool/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 92%
rename from threadpool/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..48bd65a7 100644
--- a/threadpool/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,8 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.common.extension.support;
+package cn.hippo4j.core.extension.support;
+/**
+ * reduce type
+ */
public enum ReduceType {
NONE,
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/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/FileUtil.java
similarity index 94%
rename from threadpool/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..e0819b98 100644
--- a/threadpool/common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/FileUtil.java
@@ -15,9 +15,8 @@
* 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;
@@ -32,7 +31,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * File util;
+ * File util.
*/
public class FileUtil {
@@ -73,7 +72,7 @@ public class FileUtil {
strList.add(line);
}
} catch (IOException e) {
- throw new IllegalException("file read error", e);
+ throw new RuntimeException("file read error", e);
}
return strList;
}
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 00a67f26..a9de2a43 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,10 @@
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.common.propertie.IdentifyProperties;
+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;
@@ -36,21 +37,21 @@ import static cn.hippo4j.common.constant.Constants.IDENTIFY_SLICER_SYMBOL;
/**
* Identify util.
*/
-public class IdentifyUtil {
+public class IdentifyUtil extends IdentifyProperties {
static {
ServiceLoaderRegistry.register(ClientNetworkService.class);
}
/**
- * Identify
+ * Client identification value
*/
- private static String IDENTIFY;
+ public static final String CLIENT_IDENTIFICATION_VALUE = IdUtil.simpleUUID();
/**
- * Client identification value
+ * Get identify sleep time
*/
- public static final String CLIENT_IDENTIFICATION_VALUE = IdUtil.simpleUUID();
+ private static final int SLEEP_TIME = 500;
/**
* Generate identify.
@@ -96,7 +97,7 @@ public class IdentifyUtil {
String identify = generate(environment, inetUtils);
return identify;
}
- ThreadUtil.sleep(500);
+ ThreadUtil.sleep(SLEEP_TIME);
}
return IDENTIFY;
}
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/SystemClock.java b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/SystemClock.java
index bae6996c..550959db 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/SystemClock.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/SystemClock.java
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicLong;
* System clock.
* Refer to cn.hutool.core.date.SystemClock
*/
-public class SystemClock {
+public final class SystemClock {
/**
* Period
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtils.java b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtils.java
index 5b933523..53a78730 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtils.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtils.java
@@ -168,7 +168,7 @@ public class InetUtils implements Closeable {
/**
* Should override the host info.
*/
- public boolean override;
+ private boolean override;
private String ipAddress;
diff --git a/threadpool/common/src/main/resources/META-INF/spring.factories b/threadpool/core/src/main/resources/META-INF/spring.factories
similarity index 51%
rename from threadpool/common/src/main/resources/META-INF/spring.factories
rename to threadpool/core/src/main/resources/META-INF/spring.factories
index 520aa9cd..097c5c2e 100644
--- a/threadpool/common/src/main/resources/META-INF/spring.factories
+++ b/threadpool/core/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/threadpool/core/src/test/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutorTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutorTest.java
index 219ab297..ee0e8e14 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutorTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutorTest.java
@@ -18,12 +18,12 @@
package cn.hippo4j.core.executor;
import cn.hippo4j.common.toolkit.ThreadUtil;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
import lombok.Getter;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandlerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandlerTest.java
similarity index 96%
rename from threadpool/core/src/test/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandlerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandlerTest.java
index 824faf4c..a988cc04 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandlerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandlerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.handler;
+package cn.hippo4j.core.executor.handler;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/PluginRuntimeTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/PluginRuntimeTest.java
similarity index 93%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/PluginRuntimeTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/PluginRuntimeTest.java
index 80281460..24428752 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/PluginRuntimeTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/PluginRuntimeTest.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/ThreadPoolPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/ThreadPoolPluginTest.java
similarity index 94%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/ThreadPoolPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/ThreadPoolPluginTest.java
index 423400bf..d0c2968b 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/ThreadPoolPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/ThreadPoolPluginTest.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.*;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import lombok.Getter;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPluginTest.java
similarity index 92%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPluginTest.java
index 09f84f8f..5668947d 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPluginTest.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.PluginRuntime;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskDecoratorPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.core.task.TaskDecorator;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPluginTest.java
similarity index 93%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPluginTest.java
index a4ae9125..6f5f7603 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPluginTest.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectCountRecordPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
similarity index 92%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
index 8c1f1c65..aa35cdd0 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.threadpool.alarm.api.ThreadPoolCheckAlarm;
import lombok.Getter;
import org.junit.Assert;
import org.junit.Test;
@@ -69,26 +69,26 @@ public class TaskRejectNotifyAlarmPluginTest {
@Getter
private final AtomicInteger numberOfAlarms = new AtomicInteger(0);
+
@Override
public void checkPoolCapacityAlarm(String threadPoolId, ThreadPoolExecutor threadPoolExecutor) {
// do noting
}
+
@Override
public void checkPoolActivityAlarm(String threadPoolId, ThreadPoolExecutor threadPoolExecutor) {
// do noting
}
+
@Override
public void asyncSendRejectedAlarm(String threadPoolId) {
numberOfAlarms.incrementAndGet();
}
+
@Override
public void asyncSendExecuteTimeOutAlarm(String threadPoolId, long executeTime, long executeTimeOut, ThreadPoolExecutor threadPoolExecutor) {
// do noting
}
- @Override
- public void run(String... args) throws Exception {
-
- }
}
}
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPluginTest.java
similarity index 82%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPluginTest.java
index 88939bc1..ea839368 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPluginTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.Test;
@@ -80,4 +80,24 @@ public class TaskTimeRecordPluginTest {
return exceptLower < actual && actual < exceptUpper;
}
+ @Test
+ public void testTableSizeFor() {
+ int maxCap = 1 << 30;
+ for (int i = 0; i <= maxCap; i++) {
+ int tabSize1 = tabSizeFor_JDK8(i);
+ int tabSize2 = TaskTimeRecordPlugin.tableSizeFor(i);
+ Assert.assertTrue(tabSize1 == tabSize2);
+ }
+ }
+
+ private static int tabSizeFor_JDK8(int cap) {
+ int n = cap - 1;
+ n |= n >>> 1;
+ n |= n >>> 2;
+ n |= n >>> 4;
+ n |= n >>> 8;
+ n |= n >>> 16;
+ return (n < 0) ? 1 : (n >= 1073741824) ? 1073741824 : n + 1;
+ }
+
}
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
similarity index 93%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
index 92c7e310..c8d6de43 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.threadpool.alarm.api.ThreadPoolCheckAlarm;
import lombok.Getter;
import org.junit.Assert;
import org.junit.Test;
@@ -88,26 +88,26 @@ public class TaskTimeoutNotifyAlarmPluginTest {
@Getter
private final AtomicInteger numberOfAlarms = new AtomicInteger(0);
+
@Override
public void checkPoolCapacityAlarm(String threadPoolId, ThreadPoolExecutor threadPoolExecutor) {
// do noting
}
+
@Override
public void checkPoolActivityAlarm(String threadPoolId, ThreadPoolExecutor threadPoolExecutor) {
// do noting
}
+
@Override
public void asyncSendRejectedAlarm(String threadPoolId) {
// do noting
}
+
@Override
public void asyncSendExecuteTimeOutAlarm(String threadPoolId, long executeTime, long executeTimeOut, ThreadPoolExecutor threadPoolExecutor) {
numberOfAlarms.incrementAndGet();
}
- @Override
- public void run(String... args) throws Exception {
-
- }
}
}
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java
similarity index 92%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java
index 056dc1bd..424e4a7f 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java
similarity index 98%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java
index 834d0922..06e49b24 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.*;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.junit.Assert;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManagerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManagerTest.java
similarity index 95%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManagerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManagerTest.java
index 94ae0e1b..ebb63bc3 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManagerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManagerTest.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
-
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+package cn.hippo4j.core.executor.plugin.manager;
+
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import lombok.Getter;
import org.junit.Assert;
import org.junit.Before;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java
similarity index 77%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java
index ee6e5644..c968e735 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java
@@ -15,14 +15,18 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.impl.TaskDecoratorPlugin;
-import cn.hippo4j.core.plugin.impl.TaskRejectCountRecordPlugin;
-import cn.hippo4j.core.plugin.impl.TaskRejectNotifyAlarmPlugin;
-import cn.hippo4j.core.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
-import cn.hippo4j.core.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskDecoratorPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectCountRecordPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginRegistrar;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginRegistrar;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManagerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManagerTest.java
similarity index 93%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManagerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManagerTest.java
index be19f091..ce80299c 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManagerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManagerTest.java
@@ -15,9 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.EmptyThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
import lombok.Getter;
import org.junit.Assert;
import org.junit.Test;
@@ -26,7 +28,7 @@ import java.util.Collections;
import java.util.Optional;
/**
- * test for {@link cn.hippo4j.core.plugin.manager.EmptyThreadPoolPluginManager}
+ * test for {@link EmptyThreadPoolPluginManager}
*/
public class EmptyThreadPoolPluginManagerTest {
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupportTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupportTest.java
similarity index 93%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupportTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupportTest.java
index 92196a5f..0d5c2e87 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupportTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupportTest.java
@@ -15,14 +15,17 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginSupport;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.junit.Assert;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandlerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandlerTest.java
similarity index 94%
rename from threadpool/core/src/test/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandlerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandlerTest.java
index 54f36bc4..548c24a4 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandlerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandlerTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.proxy;
+package cn.hippo4j.core.executor.proxy;
-import cn.hippo4j.common.api.ThreadPoolCheckAlarm;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.core.config.ApplicationContextHolder;
+import cn.hippo4j.threadpool.alarm.api.ThreadPoolCheckAlarm;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
@@ -28,6 +28,7 @@ import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.context.ApplicationContext;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.concurrent.atomic.AtomicLong;
@@ -50,6 +51,7 @@ public class RejectedProxyInvocationHandlerTest {
private RejectedProxyInvocationHandler handler;
private AtomicLong rejectCount;
+
@Before
public void setUp() {
String threadPoolId = "test-pool";
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java
index d08fb953..39ce899f 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java
@@ -17,24 +17,23 @@
package cn.hippo4j.core.executor.state;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
-import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
+import org.junit.Test;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-@ExtendWith(MockitoExtension.class)
+@RunWith(MockitoJUnitRunner.class)
public class AbstractThreadPoolRuntimeTest {
@Test
- void testPoolRunState() {
+ public void testPoolRunState() {
AbstractThreadPoolRuntime threadPoolRuntime = new AbstractThreadPoolRuntime() {
@Override
@@ -42,24 +41,15 @@ public class AbstractThreadPoolRuntimeTest {
return threadPoolRunStateInfo;
}
};
-
final String threadPoolId = "test";
DynamicThreadPoolExecutor executor = new DynamicThreadPoolExecutor(
1, 1, 1000L, TimeUnit.MILLISECONDS,
1000L, true, 1000L,
new ArrayBlockingQueue<>(1), threadPoolId, Thread::new, new ThreadPoolExecutor.DiscardOldestPolicy());
-
- DynamicThreadPoolWrapper dynamicThreadPoolWrapper = DynamicThreadPoolWrapper.builder()
- .threadPoolId(threadPoolId)
- .executor(executor)
- .build();
- GlobalThreadPoolManage.registerPool(threadPoolId, dynamicThreadPoolWrapper);
-
+ ThreadPoolExecutorRegistry.putHolder(threadPoolId, executor, null);
ThreadPoolRunStateInfo threadPoolRunStateInfo = threadPoolRuntime.getPoolRunState(threadPoolId);
Assertions.assertNotNull(threadPoolRunStateInfo);
-
threadPoolRunStateInfo = threadPoolRuntime.getPoolRunState(threadPoolId, executor);
Assertions.assertNotNull(threadPoolRunStateInfo);
}
-
}
\ No newline at end of file
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/ThreadPoolRunStateHandlerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/ThreadPoolRunStateHandlerTest.java
index 782ba281..0251b6bc 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/ThreadPoolRunStateHandlerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/state/ThreadPoolRunStateHandlerTest.java
@@ -17,14 +17,14 @@
package cn.hippo4j.core.executor.state;
+import cn.hippo4j.common.executor.ThreadPoolExecutorHolder;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.common.model.ManyThreadPoolRunStateInfo;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.ByteConvertUtil;
import cn.hippo4j.common.toolkit.MemoryUtil;
import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -78,15 +78,15 @@ public class ThreadPoolRunStateHandlerTest {
String threadPoolId = poolRunStateInfo.getTpId();
- try (final MockedStatic globalThreadPoolManage = mockStatic(GlobalThreadPoolManage.class)) {
- globalThreadPoolManage.when(() -> GlobalThreadPoolManage.getExecutorService("1")).thenReturn(new DynamicThreadPoolWrapper());
- DynamicThreadPoolWrapper executorService = GlobalThreadPoolManage.getExecutorService(threadPoolId);
- Assertions.assertNotNull(executorService);
+ try (final MockedStatic globalThreadPoolManage = mockStatic(ThreadPoolExecutorRegistry.class)) {
+ globalThreadPoolManage.when(() -> ThreadPoolExecutorRegistry.getHolder("1")).thenReturn(new ThreadPoolExecutorHolder());
+ ThreadPoolExecutorHolder executorHolder = ThreadPoolExecutorRegistry.getHolder(threadPoolId);
+ Assertions.assertNotNull(executorHolder);
}
- DynamicThreadPoolWrapper dynamicThreadPoolWrapperMock = mock(DynamicThreadPoolWrapper.class);
- when(dynamicThreadPoolWrapperMock.getExecutor()).thenReturn(new ThreadPoolExecutor(2, 2, 2000, TimeUnit.SECONDS, new SynchronousQueue<>()));
- ThreadPoolExecutor pool = dynamicThreadPoolWrapperMock.getExecutor();
+ ThreadPoolExecutorHolder threadPoolExecutorHolderMock = mock(ThreadPoolExecutorHolder.class);
+ when(threadPoolExecutorHolderMock.getExecutor()).thenReturn(new ThreadPoolExecutor(2, 2, 2000, TimeUnit.SECONDS, new SynchronousQueue<>()));
+ ThreadPoolExecutor pool = threadPoolExecutorHolderMock.getExecutor();
Assertions.assertNotNull(pool);
String rejectedName;
@@ -123,5 +123,4 @@ public class ThreadPoolRunStateHandlerTest {
ByteConvertUtil.getPrintSize(max));
Assertions.assertEquals("Allocation: 54.87MB / Maximum available: 7.98GB", memoryProportion);
}
-
}
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplateTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplateTest.java
new file mode 100644
index 00000000..2db5ea4e
--- /dev/null
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplateTest.java
@@ -0,0 +1,98 @@
+/*
+ * 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.core.executor.support;
+
+import cn.hippo4j.common.toolkit.ThreadUtil;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * test for {@link AbstractBuildThreadPoolTemplate}
+ *
+ * @author dmego
+ */
+public class AbstractBuildThreadPoolTemplateTest {
+
+ AbstractBuildThreadPoolTemplate.ThreadPoolInitParam initParam;
+
+ @Before
+ public void before() {
+ initParam = new AbstractBuildThreadPoolTemplate.ThreadPoolInitParam(Executors.defaultThreadFactory());
+ initParam.setCorePoolNum(1)
+ .setMaximumPoolSize(1)
+ .setKeepAliveTime(1000L)
+ .setCapacity(10)
+ .setExecuteTimeOut(5000L)
+ .setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardPolicy())
+ .setWorkQueue(new LinkedBlockingQueue<>(1))
+ .setTimeUnit(TimeUnit.MILLISECONDS)
+ .setAllowCoreThreadTimeOut(false)
+ .setThreadPoolId("test")
+ .setTaskDecorator(runnable -> runnable);
+ }
+
+ @Test
+ public void testBuildPool() {
+ ThreadPoolExecutor executor = AbstractBuildThreadPoolTemplate.buildPool(initParam);
+ AtomicInteger count = new AtomicInteger(0);
+ executor.submit(() -> {
+ ThreadUtil.sleep(100L);
+ return count.incrementAndGet();
+ });
+ executor.submit(() -> {
+ ThreadUtil.sleep(100L);
+ count.incrementAndGet();
+ });
+
+ // waiting for shutdown
+ executor.shutdown();
+ while (!executor.isTerminated()) {
+ }
+ Assert.assertEquals(2, count.get());
+
+ }
+
+ @Test
+ public void testBuildDynamicPool() {
+ initParam.setWaitForTasksToCompleteOnShutdown(true);
+ initParam.setAwaitTerminationMillis(5000L);
+ ThreadPoolExecutor executor = AbstractBuildThreadPoolTemplate.buildDynamicPool(initParam);
+ AtomicInteger count = new AtomicInteger(0);
+ executor.submit(() -> {
+ ThreadUtil.sleep(100L);
+ return count.incrementAndGet();
+ });
+ executor.submit(() -> {
+ ThreadUtil.sleep(100L);
+ count.incrementAndGet();
+ });
+ // waiting for shutdown
+ executor.shutdown();
+ while (!executor.isTerminated()) {
+ }
+
+ Assert.assertEquals(2, count.get());
+ }
+}
diff --git a/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/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 threadpool/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/threadpool/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/threadpool/common/src/test/resources/test/test_utf8.txt b/threadpool/core/src/test/resources/test/test_utf8.txt
similarity index 100%
rename from threadpool/common/src/test/resources/test/test_utf8.txt
rename to threadpool/core/src/test/resources/test/test_utf8.txt
diff --git a/threadpool/message/pom.xml b/threadpool/message/pom.xml
index 3bb64281..d767b29b 100644
--- a/threadpool/message/pom.xml
+++ b/threadpool/message/pom.xml
@@ -16,25 +16,9 @@
${project.version}
- commons-codec
- commons-codec
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
+ cn.hippo4j
+ hippo4j-threadpool-message-core
+ ${project.version}
-
-
-
-
- src/main/resources
-
- **/*.txt
- **/*.json
-
-
-
-
diff --git a/threadpool/message/src/main/java/cn/hippo4j/message/config/MessageConfiguration.java b/threadpool/message/src/main/java/cn/hippo4j/message/config/MessageConfiguration.java
index e495cfe4..1deda548 100644
--- a/threadpool/message/src/main/java/cn/hippo4j/message/config/MessageConfiguration.java
+++ b/threadpool/message/src/main/java/cn/hippo4j/message/config/MessageConfiguration.java
@@ -17,14 +17,13 @@
package cn.hippo4j.message.config;
-import cn.hippo4j.message.api.NotifyConfigBuilder;
-import cn.hippo4j.message.platform.DingSendMessageHandler;
-import cn.hippo4j.message.platform.LarkSendMessageHandler;
-import cn.hippo4j.message.platform.WeChatSendMessageHandler;
-import cn.hippo4j.message.service.AlarmControlHandler;
-import cn.hippo4j.message.service.Hippo4jBaseSendMessageService;
-import cn.hippo4j.message.service.Hippo4jSendMessageService;
-import cn.hippo4j.message.service.SendMessageHandler;
+import cn.hippo4j.threadpool.message.api.NotifyConfigBuilder;
+import cn.hippo4j.threadpool.message.core.platform.DingSendMessageHandler;
+import cn.hippo4j.threadpool.message.core.platform.LarkSendMessageHandler;
+import cn.hippo4j.threadpool.message.core.platform.WeChatSendMessageHandler;
+import cn.hippo4j.threadpool.message.core.service.AlarmControlHandler;
+import cn.hippo4j.threadpool.message.core.service.SendMessageHandler;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolBaseSendMessageService;
import org.springframework.context.annotation.Bean;
/**
@@ -33,9 +32,14 @@ import org.springframework.context.annotation.Bean;
public class MessageConfiguration {
@Bean
- public Hippo4jSendMessageService hippo4jSendMessageService(NotifyConfigBuilder serverNotifyConfigBuilder,
- AlarmControlHandler alarmControlHandler) {
- return new Hippo4jBaseSendMessageService(serverNotifyConfigBuilder, alarmControlHandler);
+ public ThreadPoolBaseSendMessageService threadPoolSendMessageService(AlarmControlHandler alarmControlHandler) {
+ return new ThreadPoolBaseSendMessageService(alarmControlHandler);
+ }
+
+ @Bean
+ public ThreadPoolBaseSendMessageServiceInitializer threadPoolBaseSendMessageServiceInitializer(NotifyConfigBuilder notifyConfigBuilder,
+ ThreadPoolBaseSendMessageService threadPoolBaseSendMessageService) {
+ return new ThreadPoolBaseSendMessageServiceInitializer(notifyConfigBuilder, threadPoolBaseSendMessageService);
}
@Bean
diff --git a/threadpool/message/src/main/java/cn/hippo4j/message/config/ThreadPoolBaseSendMessageServiceInitializer.java b/threadpool/message/src/main/java/cn/hippo4j/message/config/ThreadPoolBaseSendMessageServiceInitializer.java
new file mode 100644
index 00000000..2513cf06
--- /dev/null
+++ b/threadpool/message/src/main/java/cn/hippo4j/message/config/ThreadPoolBaseSendMessageServiceInitializer.java
@@ -0,0 +1,45 @@
+/*
+ * 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.message.config;
+
+import cn.hippo4j.core.config.ApplicationContextHolder;
+import cn.hippo4j.threadpool.message.api.NotifyConfigBuilder;
+import cn.hippo4j.threadpool.message.api.NotifyConfigDTO;
+import cn.hippo4j.threadpool.message.core.service.SendMessageHandler;
+import cn.hippo4j.threadpool.message.core.service.ThreadPoolBaseSendMessageService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.CommandLineRunner;
+
+import java.util.List;
+import java.util.Map;
+
+@RequiredArgsConstructor
+public class ThreadPoolBaseSendMessageServiceInitializer implements CommandLineRunner {
+
+ private final NotifyConfigBuilder notifyConfigBuilder;
+ private final ThreadPoolBaseSendMessageService threadPoolBaseSendMessageService;
+
+ @Override
+ public void run(String... args) throws Exception {
+ Map sendMessageHandlerMap =
+ ApplicationContextHolder.getBeansOfType(SendMessageHandler.class);
+ sendMessageHandlerMap.values().forEach(each -> threadPoolBaseSendMessageService.getSendMessageHandlers().put(each.getType(), each));
+ Map> buildNotify = notifyConfigBuilder.buildNotify();
+ threadPoolBaseSendMessageService.getNotifyConfigs().putAll(buildNotify);
+ }
+}
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/base/src/main/java/cn/hippo4j/monitor/base/AbstractDynamicThreadPoolMonitor.java b/threadpool/monitor/base/src/main/java/cn/hippo4j/monitor/base/AbstractDynamicThreadPoolMonitor.java
index 2e8a77ac..7b55f155 100644
--- a/threadpool/monitor/base/src/main/java/cn/hippo4j/monitor/base/AbstractDynamicThreadPoolMonitor.java
+++ b/threadpool/monitor/base/src/main/java/cn/hippo4j/monitor/base/AbstractDynamicThreadPoolMonitor.java
@@ -17,8 +17,8 @@
package cn.hippo4j.monitor.base;
+import cn.hippo4j.common.executor.ThreadPoolExecutorRegistry;
import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
-import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
import javax.annotation.Resource;
@@ -41,7 +41,7 @@ public abstract class AbstractDynamicThreadPoolMonitor implements DynamicThreadP
@Override
public void collect() {
- List listDynamicThreadPoolId = GlobalThreadPoolManage.listThreadPoolId();
+ List listDynamicThreadPoolId = ThreadPoolExecutorRegistry.listThreadPoolExecutorId();
listDynamicThreadPoolId.forEach(each -> execute(threadPoolRunStateHandler.getPoolRunState(each)));
}
}
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/pom.xml b/threadpool/pom.xml
index 99831ecb..b167f2f3 100644
--- a/threadpool/pom.xml
+++ b/threadpool/pom.xml
@@ -13,7 +13,6 @@
adapter
- commoncoremessagemonitor
diff --git a/threadpool/rpc/pom.xml b/threadpool/rpc/pom.xml
index 15307e93..ca4a41a7 100644
--- a/threadpool/rpc/pom.xml
+++ b/threadpool/rpc/pom.xml
@@ -11,18 +11,14 @@
- cn.hippo4j
- hippo4j-threadpool-common
- ${project.version}
-
-
- org.springframework.boot
- spring-boot-starter-test
+ junit
+ junittest
- org.springframework
- spring-web
+ cn.hippo4j
+ hippo4j-threadpool-infra-common
+ ${project.version}org.projectlombok
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..aa5c90ce 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
@@ -30,8 +30,7 @@ import java.io.Closeable;
* able to communicate with the server. Wait for the server's Response ({@link Response})
*
METHOD
*
- *
{@link #connection(Request)}
- *
{@link #isActive()}
+ *
{@link #connect(Request)}
*
{@link #close()}
*
* You can usually use the client in this way:
@@ -45,7 +44,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 {
@@ -55,13 +54,6 @@ public interface Client extends Closeable {
* @param request Request information, Requested methods and parameters
* @return response Response from server side
*/
- Response connection(Request request);
-
- /**
- * Check whether the client is active
- *
- * @return Whether active
- */
- boolean isActive();
+ R connect(Request request);
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/ClientSupport.java
similarity index 56%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/ClientSupport.java
index 84797f44..18ea0205 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/ClientSupport.java
@@ -15,16 +15,19 @@
* limitations under the License.
*/
-package cn.hippo4j.rpc.support;
+package cn.hippo4j.rpc.client;
-import cn.hippo4j.common.web.exception.IllegalException;
-import cn.hippo4j.rpc.client.Client;
-import cn.hippo4j.rpc.client.ClientConnection;
-import cn.hippo4j.rpc.client.NettyClientConnection;
-import cn.hippo4j.rpc.client.RPCClient;
+import cn.hippo4j.rpc.connection.ClientConnection;
+import cn.hippo4j.rpc.connection.SimpleClientConnection;
+import cn.hippo4j.rpc.exception.OperationException;
+import cn.hippo4j.rpc.handler.ErrorClientHandler;
import cn.hippo4j.rpc.handler.HandlerManager;
-import cn.hippo4j.rpc.handler.NettyClientPoolHandler;
-import cn.hippo4j.rpc.handler.NettyClientTakeHandler;
+import cn.hippo4j.rpc.handler.ClientPoolHandler;
+import cn.hippo4j.rpc.handler.ClientTakeHandler;
+import cn.hippo4j.rpc.model.DefaultRequest;
+import cn.hippo4j.rpc.model.Request;
+import cn.hippo4j.rpc.support.AddressUtil;
+import cn.hippo4j.rpc.server.ServerSupport;
import io.netty.channel.ChannelHandler;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -34,6 +37,7 @@ import java.lang.ref.WeakReference;
import java.net.InetSocketAddress;
import java.util.Map;
import java.util.Optional;
+import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -49,13 +53,12 @@ import java.util.concurrent.ConcurrentHashMap;
* by the container
*
* @see cn.hippo4j.rpc.client.RPCClient
- * @see cn.hippo4j.rpc.client.NettyClientConnection
- * @see NettyServerSupport
- * @see ClientFactoryBean
- * @since 1.5.1
+ * @see SimpleClientConnection
+ * @see ServerSupport
+ * @since 2.0.0
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class NettyClientSupport {
+public final class ClientSupport {
/**
* the cache for client
@@ -71,13 +74,14 @@ public final class NettyClientSupport {
*/
public static Client getClient(InetSocketAddress address, HandlerManager handlerManager) {
return CLIENT_MAP.computeIfAbsent(address, a -> {
- NettyClientPoolHandler handler = (handlerManager instanceof NettyClientPoolHandler)
- ? (NettyClientPoolHandler) handlerManager
- : new NettyClientPoolHandler();
+ ClientPoolHandler handler = (handlerManager instanceof ClientPoolHandler)
+ ? (ClientPoolHandler) handlerManager
+ : new ClientPoolHandler();
if (handler.isEmpty()) {
- handler.addFirst(null, new NettyClientTakeHandler());
+ handler.addFirst(null, new ClientTakeHandler());
}
- NettyClientConnection connection = new NettyClientConnection(address, handler);
+ handler.addLast(null, new ErrorClientHandler());
+ SimpleClientConnection connection = new SimpleClientConnection(address, handler);
return new RPCClient(connection);
});
}
@@ -89,7 +93,44 @@ public final class NettyClientSupport {
* @return Client
*/
public static Client getClient(InetSocketAddress address) {
- return getClient(address, new NettyClientPoolHandler());
+ return getClient(address, new ClientPoolHandler());
+ }
+
+ /**
+ * Find a suitable client and send a request to the server
+ *
+ * @param address address
+ * @param handlerName The handler that can handle this request
+ * @param param parameter
+ * @return result
+ */
+ public static R clientSend(String address, String handlerName, Object[] param) {
+ InetSocketAddress socketAddress = AddressUtil.getInetAddress(address);
+ Client client = getClient(socketAddress);
+ Request request = new DefaultRequest(UUID.randomUUID().toString(), handlerName, param);
+ return client.connect(request);
+ }
+
+ public static R clientSend(String address, String handlerName, Object param) {
+ Object[] params = {param};
+ InetSocketAddress socketAddress = AddressUtil.getInetAddress(address);
+ Client client = getClient(socketAddress);
+ Request request = new DefaultRequest(UUID.randomUUID().toString(), handlerName, params);
+ return client.connect(request);
+ }
+
+ /**
+ * Find a suitable client and send a request to the server
+ *
+ * @param address address
+ * @param handlerName The handler that can handle this request
+ * @return result
+ */
+ public static R clientSend(String address, String handlerName) {
+ InetSocketAddress socketAddress = AddressUtil.getInetAddress(address);
+ Client client = getClient(socketAddress);
+ Request request = new DefaultRequest(UUID.randomUUID().toString(), handlerName);
+ return client.connect(request);
}
/**
@@ -104,7 +145,7 @@ public final class NettyClientSupport {
try {
c.close();
} catch (IOException e) {
- throw new IllegalException(e);
+ throw new OperationException(e);
}
});
}
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
deleted file mode 100644
index e6337999..00000000
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java
+++ /dev/null
@@ -1,117 +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.client;
-
-import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.common.web.exception.IllegalException;
-import cn.hippo4j.rpc.exception.TimeOutException;
-import cn.hippo4j.rpc.model.Request;
-import cn.hippo4j.rpc.model.Response;
-import cn.hippo4j.rpc.support.NettyConnectPool;
-import cn.hippo4j.rpc.support.NettyConnectPoolHolder;
-import cn.hippo4j.rpc.support.ResultHolder;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.pool.ChannelPoolHandler;
-import lombok.extern.slf4j.Slf4j;
-
-import java.net.InetSocketAddress;
-import java.util.Optional;
-import java.util.concurrent.locks.LockSupport;
-
-/**
- * Client implemented using netty
- *
- * @since 1.5.1
- */
-@Slf4j
-public class NettyClientConnection implements ClientConnection {
-
- InetSocketAddress address;
- /**
- * Obtain the connection timeout period. The default value is 30s
- */
- long timeout = 30000L;
- EventLoopGroup worker = new NioEventLoopGroup();
- NettyConnectPool connectionPool;
- ChannelFuture future;
- Channel channel;
-
- public NettyClientConnection(InetSocketAddress address,
- ChannelPoolHandler handler) {
- Assert.notNull(worker);
- this.address = address;
- this.connectionPool = NettyConnectPoolHolder.getPool(address, timeout, worker, handler);
- }
-
- @Override
- public Response connect(Request request) {
- this.channel = connectionPool.acquire(timeout);
- boolean debugEnabled = log.isDebugEnabled();
- Response response;
- try {
- String key = request.getKey();
- this.future = channel.writeAndFlush(request);
- if (debugEnabled) {
- log.debug("Call successful, target address is {}:{}, request key is {}", address.getHostName(), address.getPort(), key);
- }
- // Wait for execution to complete
- ResultHolder.putThread(key, Thread.currentThread());
- LockSupport.parkNanos(timeout() * 1000000);
- response = ResultHolder.get(key);
- if (response == null) {
- throw new TimeOutException("Timeout waiting for server-side response");
- }
- if (debugEnabled) {
- log.debug("The response from {}:{} was received successfully with the response key {}.", address.getHostName(), address.getPort(), key);
- }
- return response;
- } catch (Exception ex) {
- throw new IllegalException(ex);
- } finally {
- connectionPool.release(this.channel);
- }
- }
-
- @Override
- public long timeout() {
- return timeout;
- }
-
- @Override
- public void setTimeout(long timeout) {
- this.timeout = timeout;
- }
-
- @Override
- public void close() {
- Optional.ofNullable(this.channel)
- .ifPresent(c -> {
- worker.shutdownGracefully();
- this.future.channel().close();
- this.channel.close();
- });
- }
-
- @Override
- public boolean isActive() {
- return channel.isActive();
- }
-}
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..48fda056 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
@@ -17,8 +17,8 @@
package cn.hippo4j.rpc.client;
+import cn.hippo4j.rpc.connection.ClientConnection;
import cn.hippo4j.rpc.model.Request;
-import cn.hippo4j.rpc.model.Response;
import java.io.IOException;
@@ -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 {
@@ -37,15 +37,10 @@ public class RPCClient implements Client {
}
@Override
- public Response connection(Request request) {
+ public R connect(Request request) {
return clientConnection.connect(request);
}
- @Override
- public boolean isActive() {
- return clientConnection.isActive();
- }
-
/**
* Close the client and release all connections.
*
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/ObjectEncoder.java
similarity index 86%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/NettyEncoder.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/ObjectEncoder.java
index 7cbfaff7..982082e1 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/NettyEncoder.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/coder/ObjectEncoder.java
@@ -30,14 +30,15 @@ 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 {
+public class ObjectEncoder extends MessageToByteEncoder {
- private static final byte[] BYTE = new byte[4];
+ private static final int BYTE_LENGTH = 4;
+ private static final byte[] BYTE = new byte[BYTE_LENGTH];
@Override
- protected void encode(ChannelHandlerContext ctx, Serializable msg, ByteBuf out) throws Exception {
+ protected void encode(ChannelHandlerContext ctx, Serializable msg, ByteBuf out) {
int startIndex = out.writerIndex();
try (ByteBufOutputStream outPut = new ByteBufOutputStream(out)) {
outPut.write(BYTE);
@@ -49,6 +50,6 @@ public class NettyEncoder extends MessageToByteEncoder {
throw new CoderException("The encoding is abnormal, which may be caused by the transfer object being unable to be serialized");
}
int endIndex = out.writerIndex();
- out.setInt(startIndex, endIndex - startIndex - 4);
+ out.setInt(startIndex, endIndex - startIndex - BYTE_LENGTH);
}
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/ClientConnection.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/ClientConnection.java
similarity index 66%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/ClientConnection.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/ClientConnection.java
index e3fb241c..fd7d70b6 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/ClientConnection.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/ClientConnection.java
@@ -15,25 +15,31 @@
* limitations under the License.
*/
-package cn.hippo4j.rpc.client;
+package cn.hippo4j.rpc.connection;
-import cn.hippo4j.rpc.handler.Connection;
import cn.hippo4j.rpc.model.Request;
-import cn.hippo4j.rpc.model.Response;
+
+import java.io.Closeable;
/**
* Applicable to client connections
+ * Represents a network request connection and provides IO layer support
+ *
+ * This is not a strict and stateless Connection interface, it contains the necessary
+ * operations that should be done in the connection. It is more like integrating the
+ * connection and the connection channel together, so creating {@link ClientConnection} is
+ * very resource intensive, for which caching is recommended
*
- * @since 1.5.1
+ * @since 2.0.0
*/
-public interface ClientConnection extends Connection {
+public interface ClientConnection extends Closeable {
/**
* Establish a connection and process
*
* @param request Request information
*/
- Response connect(Request request);
+ R connect(Request request);
/**
* Get timeout, ms
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyConnectPoolHolder.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/ConnectPoolHolder.java
similarity index 77%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyConnectPoolHolder.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/ConnectPoolHolder.java
index 6af34cd6..aa20983a 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyConnectPoolHolder.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/ConnectPoolHolder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.rpc.support;
+package cn.hippo4j.rpc.connection;
import io.netty.channel.Channel;
import io.netty.channel.EventLoopGroup;
@@ -32,19 +32,19 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* To avoid creating multiple connection pools for the same host:port, save all connection pools of the client
*
- * @since 1.5.1
+ * @since 2.0.0
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class NettyConnectPoolHolder {
+public class ConnectPoolHolder {
static int maxConnect = 256;
- static Map connectPoolMap = new ConcurrentHashMap<>();
+ static Map connectPoolMap = new ConcurrentHashMap<>();
- private static NettyConnectPool initPool(InetSocketAddress address,
- long timeout, EventLoopGroup worker,
- ChannelPoolHandler handler) {
- return new NettyConnectPool(address, maxConnect, timeout, worker, NioSocketChannel.class, handler);
+ private static SimpleConnectPool initPool(InetSocketAddress address,
+ long timeout, EventLoopGroup worker,
+ ChannelPoolHandler handler) {
+ return new SimpleConnectPool(address, maxConnect, timeout, worker, NioSocketChannel.class, handler);
}
private static String getKey(InetSocketAddress address) {
@@ -58,7 +58,7 @@ public class NettyConnectPoolHolder {
* @param address the InetSocketAddress
* @param pool This parameter applies only to the connection pool of netty
*/
- public static void createPool(InetSocketAddress address, NettyConnectPool pool) {
+ public static void createPool(InetSocketAddress address, SimpleConnectPool pool) {
connectPoolMap.put(getKey(address), pool);
}
@@ -68,7 +68,7 @@ public class NettyConnectPoolHolder {
* @param address the InetSocketAddress
* @return Map to the connection pool
*/
- public static NettyConnectPool getPool(InetSocketAddress address) {
+ public static SimpleConnectPool getPool(InetSocketAddress address) {
return connectPoolMap.get(getKey(address));
}
@@ -82,13 +82,13 @@ public class NettyConnectPoolHolder {
* @param handler the chandler for netty
* @return Map to the connection pool
*/
- public static synchronized NettyConnectPool getPool(InetSocketAddress address,
- long timeout, EventLoopGroup worker,
- ChannelPoolHandler handler) {
+ public static synchronized SimpleConnectPool getPool(InetSocketAddress address,
+ long timeout, EventLoopGroup worker,
+ ChannelPoolHandler handler) {
/*
* this cannot use the computeIfAbsent method directly here because put is already used in init. Details refer to https://bugs.openjdk.java.net/browse/JDK-8062841
*/
- NettyConnectPool pool = getPool(address);
+ SimpleConnectPool pool = getPool(address);
return pool == null ? initPool(address, timeout, worker, handler) : pool;
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/Connection.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/ServerConnection.java
similarity index 83%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/Connection.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/ServerConnection.java
index 943b4f54..3441c7e2 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/Connection.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/ServerConnection.java
@@ -15,28 +15,34 @@
* limitations under the License.
*/
-package cn.hippo4j.rpc.handler;
+package cn.hippo4j.rpc.connection;
+
+import cn.hippo4j.rpc.discovery.ServerPort;
import java.io.Closeable;
/**
+ * This applies to server-side connections
+ *
* Represents a network request connection and provides IO layer support
*
* This is not a strict and stateless Connection interface, it contains the necessary
* operations that should be done in the connection. It is more like integrating the
- * connection and the connection channel together, so creating {@link Connection} is
+ * connection and the connection channel together, so creating {@link ServerConnection} is
* very resource intensive, for which caching is recommended
*
- * @since 1.5.1
+ * @since 2.0.0
*/
-public interface Connection extends Closeable {
+public interface ServerConnection extends Closeable {
+
+ /**
+ * Bind ports and process them
+ */
+ void bind(ServerPort port);
/**
* Gets the state of the connection, which is interpreted differently by different programs
*
- * Client: Active connection indicates that a connection is being maintained with the server.
- * Inactive connection indicates that no connection is being established with the server
- *
* Server: The active connection indicates that the server has been started, is receiving ports,
* and can obtain requests at any time. The inactive connection indicates that the server has been
* shut down and the ports have been released
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/SimpleClientConnection.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/SimpleClientConnection.java
new file mode 100644
index 00000000..dc7d9e77
--- /dev/null
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/SimpleClientConnection.java
@@ -0,0 +1,112 @@
+/*
+ * 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.connection;
+
+import cn.hippo4j.rpc.exception.ConnectionException;
+import cn.hippo4j.rpc.exception.TimeOutException;
+import cn.hippo4j.rpc.model.Request;
+import cn.hippo4j.rpc.model.Response;
+import cn.hippo4j.rpc.support.ResultHolder;
+import io.netty.channel.Channel;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.pool.ChannelPoolHandler;
+import lombok.extern.slf4j.Slf4j;
+
+import java.net.InetSocketAddress;
+import java.util.concurrent.locks.LockSupport;
+
+/**
+ * Client implemented using netty
+ *
+ * @since 2.0.0
+ */
+@Slf4j
+public class SimpleClientConnection implements ClientConnection {
+
+ InetSocketAddress address;
+ /**
+ * Obtain the connection timeout period. The default value is 30s
+ */
+ long timeout = 30000L;
+ EventLoopGroup worker = new NioEventLoopGroup();
+ SimpleConnectPool connectionPool;
+ static final String TIME_OUT_MSG = "Timeout waiting for server-side response";
+
+ public SimpleClientConnection(InetSocketAddress address,
+ ChannelPoolHandler handler) {
+ this.address = address;
+ this.connectionPool = ConnectPoolHolder.getPool(address, timeout, worker, handler);
+ }
+
+ @Override
+ public R connect(Request request) {
+ Channel channel = connectionPool.acquire(timeout);
+ try {
+ channel.writeAndFlush(request);
+ return wait(request.getRID());
+ } finally {
+ connectionPool.release(channel);
+ }
+ }
+
+ /**
+ * wait the Response
+ *
+ * @param requestId RID
+ * @return Response
+ */
+ @SuppressWarnings("unchecked")
+ public R wait(String requestId) {
+ Response response;
+ if (log.isDebugEnabled()) {
+ log.debug("Call successful, target address is {}:{}, request key is {}", address.getHostName(), address.getPort(), requestId);
+ }
+ // Wait for execution to complete
+ ResultHolder.putThread(requestId, Thread.currentThread());
+ LockSupport.parkNanos(timeout() * 1000000);
+ response = ResultHolder.get(requestId);
+ if (response == null) {
+ throw new TimeOutException(TIME_OUT_MSG);
+ }
+ if (response.isErr()) {
+ throw new ConnectionException(response.getErrMsg());
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("The response from {}:{} was received successfully with the response key {}.", address.getHostName(), address.getPort(), requestId);
+ }
+ return (R) response.getObj();
+ }
+
+ @Override
+ public long timeout() {
+ return timeout;
+ }
+
+ @Override
+ public void setTimeout(long timeout) {
+ this.timeout = timeout;
+ }
+
+ @Override
+ public void close() {
+ worker.shutdownGracefully();
+ connectionPool.close();
+ }
+
+}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyConnectPool.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/SimpleConnectPool.java
similarity index 83%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyConnectPool.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/SimpleConnectPool.java
index dc2f9b57..18ca6f13 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyConnectPool.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/SimpleConnectPool.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.rpc.support;
+package cn.hippo4j.rpc.connection;
+import cn.hippo4j.rpc.client.ClientSupport;
import cn.hippo4j.rpc.exception.ConnectionException;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
@@ -36,10 +37,10 @@ import java.util.concurrent.TimeUnit;
/**
* This parameter applies only to the connection pool of netty
*
- * @since 1.5.1
+ * @since 2.0.0
*/
@Slf4j
-public class NettyConnectPool {
+public class SimpleConnectPool {
ChannelHealthChecker healthCheck = ChannelHealthChecker.ACTIVE;
FixedChannelPool.AcquireTimeoutAction acquireTimeoutAction = FixedChannelPool.AcquireTimeoutAction.NEW;
@@ -48,10 +49,10 @@ public class NettyConnectPool {
ChannelPool pool;
InetSocketAddress address;
- public NettyConnectPool(InetSocketAddress address, int maxConnect,
- long timeout, EventLoopGroup worker,
- Class socketChannelCls,
- ChannelPoolHandler handler) {
+ public SimpleConnectPool(InetSocketAddress address, int maxConnect,
+ long timeout, EventLoopGroup worker,
+ Class socketChannelCls,
+ ChannelPoolHandler handler) {
Bootstrap bootstrap = new Bootstrap()
.group(worker)
.channel(socketChannelCls)
@@ -64,7 +65,7 @@ public class NettyConnectPool {
if (log.isDebugEnabled()) {
log.info("The connection pool is established with the connection target {}:{}", address.getHostName(), address.getPort());
}
- NettyConnectPoolHolder.createPool(address, this);
+ ConnectPoolHolder.createPool(address, this);
}
public Channel acquire(long timeoutMillis) {
@@ -72,7 +73,7 @@ public class NettyConnectPool {
Future fch = pool.acquire();
return fch.get(timeoutMillis, TimeUnit.MILLISECONDS);
} catch (Exception e) {
- NettyClientSupport.closeClient(address);
+ ClientSupport.closeClient(address);
throw new ConnectionException("Failed to get the connection", e);
}
}
@@ -81,7 +82,7 @@ public class NettyConnectPool {
try {
return pool.acquire();
} catch (Exception e) {
- NettyClientSupport.closeClient(address);
+ ClientSupport.closeClient(address);
throw new ConnectionException("Failed to get the connection", e);
}
}
@@ -92,7 +93,7 @@ public class NettyConnectPool {
try {
pool.release(channel);
} catch (Exception e) {
- NettyClientSupport.closeClient(address);
+ ClientSupport.closeClient(address);
throw new ConnectionException("Failed to release the connection", e);
}
});
@@ -101,9 +102,9 @@ public class NettyConnectPool {
public void close() {
try {
pool.close();
- NettyConnectPoolHolder.remove(address);
+ ConnectPoolHolder.remove(address);
} catch (Exception e) {
- NettyClientSupport.closeClient(address);
+ ClientSupport.closeClient(address);
throw new ConnectionException("Failed to close the connection pool", e);
}
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/SimpleServerConnection.java
similarity index 73%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/SimpleServerConnection.java
index a6adc0d1..aa8e29ea 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/connection/SimpleServerConnection.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.rpc.server;
+package cn.hippo4j.rpc.connection;
-import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.rpc.coder.NettyEncoder;
+import cn.hippo4j.rpc.coder.ObjectEncoder;
import cn.hippo4j.rpc.discovery.ServerPort;
import cn.hippo4j.rpc.exception.ConnectionException;
-import cn.hippo4j.rpc.handler.AbstractNettyHandlerManager;
+import cn.hippo4j.rpc.handler.AbstractHandlerManager;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -45,10 +44,10 @@ 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 {
+public class SimpleServerConnection extends AbstractHandlerManager implements ServerConnection {
ServerPort port;
EventLoopGroup leader;
@@ -56,31 +55,30 @@ public class NettyServerConnection extends AbstractNettyHandlerManager implement
Class socketChannelCls = NioServerSocketChannel.class;
ChannelFuture future;
Channel channel;
+ private static final int MAX_PORT_NUM = 65535;
- public NettyServerConnection(EventLoopGroup leader, EventLoopGroup worker, List handlers) {
+ public SimpleServerConnection(EventLoopGroup leader, EventLoopGroup worker, List handlers) {
super(handlers);
- Assert.notNull(leader);
- Assert.notNull(worker);
this.leader = leader;
this.worker = worker;
}
- public NettyServerConnection(EventLoopGroup leader, EventLoopGroup worker, ChannelHandler... handlers) {
+ public SimpleServerConnection(EventLoopGroup leader, EventLoopGroup worker, ChannelHandler... handlers) {
this(leader, worker, (handlers != null ? Arrays.asList(handlers) : Collections.emptyList()));
}
- public NettyServerConnection(ChannelHandler... handlers) {
+ public SimpleServerConnection(ChannelHandler... handlers) {
this(handlers != null ? Arrays.asList(handlers) : Collections.emptyList());
}
- public NettyServerConnection(List handlers) {
+ public SimpleServerConnection(List handlers) {
this(new NioEventLoopGroup(), new NioEventLoopGroup(), handlers);
}
@Override
public void bind(ServerPort port) {
int serverPort = port.getPort();
- if (serverPort < 0 || serverPort > 65535) {
+ if (serverPort < 0 || serverPort > MAX_PORT_NUM) {
throw new ConnectionException("The port number " + serverPort + " is outside 0~65535, which is not a legal port number");
}
ServerBootstrap server = new ServerBootstrap();
@@ -92,7 +90,7 @@ public class NettyServerConnection extends AbstractNettyHandlerManager implement
@Override
protected void initChannel(SocketChannel ch) {
ChannelPipeline pipeline = ch.pipeline();
- pipeline.addLast(new NettyEncoder());
+ pipeline.addLast(new ObjectEncoder());
pipeline.addLast(new ObjectDecoder(Integer.MAX_VALUE, ClassResolvers.cacheDisabled(null)));
handlerEntities.stream()
.sorted()
@@ -105,18 +103,12 @@ public class NettyServerConnection extends AbstractNettyHandlerManager implement
});
}
});
- try {
- this.future = server.bind(serverPort).sync();
- this.channel = this.future.channel();
- if (log.isDebugEnabled()) {
- log.debug("The server is started and can receive requests. The listening port is {}", serverPort);
- }
- this.port = port;
- this.future.channel().closeFuture().sync();
- } catch (InterruptedException ex) {
- Thread.currentThread().interrupt();
- throw new ConnectionException("Listening port failed, Please check whether the port is occupied", ex);
+ this.future = server.bind(serverPort);
+ this.channel = this.future.channel();
+ if (log.isDebugEnabled()) {
+ log.debug("The server is started and can receive requests. The listening port is {}", serverPort);
}
+ this.port = port;
}
@Override
@@ -142,13 +134,13 @@ public class NettyServerConnection extends AbstractNettyHandlerManager implement
}
@Override
- public NettyServerConnection addLast(String name, ChannelHandler handler) {
+ public SimpleServerConnection addLast(String name, ChannelHandler handler) {
super.addLast(name, handler);
return this;
}
@Override
- public NettyServerConnection addFirst(String name, ChannelHandler handler) {
+ public SimpleServerConnection addFirst(String name, ChannelHandler handler) {
super.addFirst(name, handler);
return this;
}
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
deleted file mode 100644
index d01f510e..00000000
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/ClassRegistry.java
+++ /dev/null
@@ -1,76 +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.discovery;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * the registration center for Client and Server
- *
- * @since 1.5.1
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class ClassRegistry {
-
- private static final Map> SERVER_REGISTER = new ConcurrentHashMap<>();
-
- /**
- * get a Obj in Registry center
- *
- * @param s key
- * @return t element
- */
- public static Class get(String s) {
- return SERVER_REGISTER.get(s);
- }
-
- /**
- * add the element to Registry Table
- * if the key already exists, failure, and return before the value of the key.
- * if success return the element
- *
- * @param s key
- * @param cls element
- * @return final mapped value
- */
- public static Class set(String s, Class cls) {
- return SERVER_REGISTER.putIfAbsent(s, cls);
- }
-
- /**
- * add the element to Registry Table
- * if the key already exists, failure, replace it
- *
- * @param s key
- * @param cls element
- */
- public static Class put(String s, Class cls) {
- return SERVER_REGISTER.put(s, cls);
- }
-
- /**
- * clear
- */
- public static void clear() {
- SERVER_REGISTER.clear();
- }
-}
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
deleted file mode 100644
index 44b9a6f4..00000000
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DefaultInstance.java
+++ /dev/null
@@ -1,54 +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.discovery;
-
-import cn.hippo4j.common.toolkit.ReflectUtil;
-import cn.hippo4j.common.web.exception.IllegalException;
-
-import java.util.Iterator;
-import java.util.ServiceLoader;
-
-/**
- * You simply create an instance of a class based on its name and specific type.
- * 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
- */
-public class DefaultInstance implements Instance {
-
- @Override
- public Object getInstance(Class cls) {
- ServiceLoader load = ServiceLoader.load(cls);
- Iterator iterator = load.iterator();
- if (iterator.hasNext()) {
- return iterator.next();
- }
- return ReflectUtil.createInstance(cls);
- }
-
- @Override
- public Object getInstance(String name) {
- try {
- Class cls = Class.forName(name);
- return getInstance(cls);
- } catch (ClassNotFoundException e) {
- throw new IllegalException(e);
- }
- }
-}
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
deleted file mode 100644
index 83f649f0..00000000
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/Instance.java
+++ /dev/null
@@ -1,44 +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.discovery;
-
-/**
- * Instance interface to get an instance
- *
- * @since 1.5.1
- */
-public interface Instance {
-
- /**
- * get a instance
- *
- * @param cls Class object
- * @return Information about instances created or found
- */
- Object getInstance(Class cls);
-
- /**
- * Gets an instance of a class with a recognizable identity,
- * which can be the fully qualified name of class. It can also be a unique name in a container
- *
- * @param name Identifying name
- * @return Information about instances created or found
- */
- Object getInstance(String name);
-
-}
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/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/HandlerNotFoundException.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/HandlerNotFoundException.java
new file mode 100644
index 00000000..5bc480e8
--- /dev/null
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/HandlerNotFoundException.java
@@ -0,0 +1,49 @@
+/*
+ * 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.exception;
+
+/**
+ * HandlerNotFoundException occurs when no executable handler can be found
+ *
+ * @since 2.0.0
+ */
+public class HandlerNotFoundException extends RuntimeException {
+
+ private static final long serialVersionUID = 8247610319171014183L;
+
+ public HandlerNotFoundException() {
+ super();
+ }
+
+ public HandlerNotFoundException(String message) {
+ super(message);
+ }
+
+ public HandlerNotFoundException(Throwable e) {
+ super(e.getMessage(), e);
+ }
+
+ public HandlerNotFoundException(String message, Throwable throwable) {
+ super(message, throwable);
+ }
+
+ public HandlerNotFoundException(String message, Throwable throwable, boolean enableSuppression, boolean writableStackTrace) {
+ super(message, throwable, enableSuppression, writableStackTrace);
+ }
+
+}
\ No newline at end of file
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/OperationException.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/OperationException.java
new file mode 100644
index 00000000..8512777b
--- /dev/null
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/exception/OperationException.java
@@ -0,0 +1,49 @@
+/*
+ * 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.exception;
+
+/**
+ * a generic operational exception
+ *
+ * @since 2.0.0
+ */
+public class OperationException extends RuntimeException {
+
+ private static final long serialVersionUID = 8247610319171014183L;
+
+ public OperationException() {
+ super();
+ }
+
+ public OperationException(String message) {
+ super(message);
+ }
+
+ public OperationException(Throwable e) {
+ super(e.getMessage(), e);
+ }
+
+ public OperationException(String message, Throwable throwable) {
+ super(message, throwable);
+ }
+
+ public OperationException(String message, Throwable throwable, boolean enableSuppression, boolean writableStackTrace) {
+ super(message, throwable, enableSuppression, writableStackTrace);
+ }
+
+}
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/AbstractHandlerManager.java
similarity index 78%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractNettyHandlerManager.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractHandlerManager.java
index a3d5eae2..1b50900a 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractNettyHandlerManager.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/AbstractHandlerManager.java
@@ -17,7 +17,6 @@
package cn.hippo4j.rpc.handler;
-import cn.hippo4j.common.toolkit.Assert;
import io.netty.channel.ChannelHandler;
import java.util.Arrays;
@@ -31,9 +30,9 @@ 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 {
+public abstract class AbstractHandlerManager implements HandlerManager {
protected final List> handlerEntities;
@@ -41,19 +40,18 @@ public abstract class AbstractNettyHandlerManager implements HandlerManager handlerEntities) {
- Assert.notNull(handlerEntities);
+ protected AbstractHandlerManager(List handlerEntities) {
this.handlerEntities = handlerEntities.stream()
.filter(Objects::nonNull)
.map(c -> getHandlerEntity(lastIndex.getAndIncrement(), c, null))
.collect(Collectors.toList());
}
- protected AbstractNettyHandlerManager(ChannelHandler... handlerEntities) {
+ protected AbstractHandlerManager(ChannelHandler... handlerEntities) {
this(handlerEntities != null ? Arrays.asList(handlerEntities) : Collections.emptyList());
}
- protected AbstractNettyHandlerManager() {
+ protected AbstractHandlerManager() {
this.handlerEntities = new LinkedList<>();
}
@@ -69,8 +67,7 @@ public abstract class AbstractNettyHandlerManager implements HandlerManager {
- throw new ConnectionException(cause);
+ if (log.isWarnEnabled()) {
+ log.warn(cause.getMessage());
+ }
});
}
@@ -59,8 +61,8 @@ public abstract class AbstractNettyTakeHandler extends ChannelInboundHandlerAdap
*/
@Override
public void handler(Response response) {
- ResultHolder.put(response.getKey(), response);
- ResultHolder.wake(response.getKey());
+ ResultHolder.put(response.getRID(), response);
+ ResultHolder.wake(response.getRID());
}
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ClientPoolHandler.java
similarity index 83%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ClientPoolHandler.java
index 42d5fbaf..5a61c8da 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ClientPoolHandler.java
@@ -17,7 +17,7 @@
package cn.hippo4j.rpc.handler;
-import cn.hippo4j.rpc.coder.NettyEncoder;
+import cn.hippo4j.rpc.coder.ObjectEncoder;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
@@ -33,31 +33,31 @@ 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 {
+public class ClientPoolHandler extends AbstractHandlerManager implements ChannelPoolHandler {
- public NettyClientPoolHandler(List handlers) {
+ public ClientPoolHandler(List handlers) {
super(handlers);
}
- public NettyClientPoolHandler(ChannelHandler... handlers) {
+ public ClientPoolHandler(ChannelHandler... handlers) {
super(handlers);
}
- public NettyClientPoolHandler() {
+ public ClientPoolHandler() {
super();
}
@Override
- public NettyClientPoolHandler addLast(String name, ChannelHandler handler) {
+ public ClientPoolHandler addLast(String name, ChannelHandler handler) {
super.addLast(name, handler);
return this;
}
@Override
- public NettyClientPoolHandler addFirst(String name, ChannelHandler handler) {
+ public ClientPoolHandler addFirst(String name, ChannelHandler handler) {
super.addFirst(name, handler);
return this;
}
@@ -81,7 +81,7 @@ public class NettyClientPoolHandler extends AbstractNettyHandlerManager implemen
channel.config()
.setTcpNoDelay(false);
ChannelPipeline pipeline = ch.pipeline();
- pipeline.addLast(new NettyEncoder());
+ pipeline.addLast(new ObjectEncoder());
pipeline.addLast(new ObjectDecoder(Integer.MAX_VALUE, ClassResolvers.cacheDisabled(null)));
this.handlerEntities.stream()
.sorted()
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ClientTakeHandler.java
similarity index 73%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ClientTakeHandler.java
index b1852bd5..3266bcc2 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ClientTakeHandler.java
@@ -17,7 +17,7 @@
package cn.hippo4j.rpc.handler;
-import cn.hippo4j.common.web.exception.IllegalException;
+import cn.hippo4j.rpc.exception.ConnectionException;
import cn.hippo4j.rpc.model.Response;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
@@ -25,20 +25,23 @@ 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 {
+public class ClientTakeHandler extends AbstractTakeHandler implements ConnectHandler {
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) {
try {
- Response response = (Response) msg;
- handler(response);
- ctx.flush();
+ if (msg instanceof Response) {
+ Response response = (Response) msg;
+ handler(response);
+ ctx.flush();
+ } else {
+ ctx.fireChannelRead(msg);
+ }
} catch (Exception e) {
- ctx.close();
- throw new IllegalException(e);
+ throw new ConnectionException(e);
}
}
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/discovery/SpringContextInstance.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ErrorClientHandler.java
similarity index 55%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/SpringContextInstance.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ErrorClientHandler.java
index fa25d4c9..7eef3402 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/SpringContextInstance.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ErrorClientHandler.java
@@ -15,25 +15,29 @@
* limitations under the License.
*/
-package cn.hippo4j.rpc.discovery;
+package cn.hippo4j.rpc.handler;
-import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.rpc.exception.HandlerNotFoundException;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
/**
- * Adapter Spring, The requested object is managed by spring
+ * The final handler, which returned an exception because no usable handler could be found
*
- * @since 1.5.1
+ * @since 2.0.0
*/
-public class SpringContextInstance implements Instance {
+@ChannelHandler.Sharable
+public class ErrorClientHandler extends AbstractTakeHandler implements ConnectHandler {
- @Override
- public Object getInstance(Class cls) {
- return ApplicationContextHolder.getBean(cls);
- }
+ private static final String ERR_MSG = "no handler found that matches the request";
@Override
- public Object getInstance(String name) {
- return ApplicationContextHolder.getInstance().getBean(name);
+ public void channelRead(ChannelHandlerContext ctx, Object msg) {
+ try {
+ throw new HandlerNotFoundException(ERR_MSG);
+ } finally {
+ ctx.close();
+ }
}
-}
+}
\ No newline at end of file
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ErrorServerHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ErrorServerHandler.java
new file mode 100644
index 00000000..d3d4828d
--- /dev/null
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ErrorServerHandler.java
@@ -0,0 +1,49 @@
+/*
+ * 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.handler;
+
+import cn.hippo4j.rpc.exception.HandlerNotFoundException;
+import cn.hippo4j.rpc.model.DefaultRequest;
+import cn.hippo4j.rpc.model.DefaultResponse;
+import cn.hippo4j.rpc.model.Request;
+import cn.hippo4j.rpc.model.Response;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+
+/**
+ * The final handler, which returned an exception because no usable handler could be found
+ *
+ * @since 2.0.0
+ */
+@ChannelHandler.Sharable
+public class ErrorServerHandler extends AbstractTakeHandler {
+
+ private static final String ERR_MSG = "no handler found that matches the request";
+
+ @Override
+ public void channelRead(ChannelHandlerContext ctx, Object msg) {
+ HandlerNotFoundException exception = new HandlerNotFoundException(ERR_MSG);
+ if (!(msg instanceof DefaultRequest)) {
+ ctx.close();
+ throw exception;
+ }
+ Request request = (Request) msg;
+ Response response = new DefaultResponse(request.getRID(), ERR_MSG);
+ ctx.writeAndFlush(response);
+ }
+}
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 18460ac3..49b722c5 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
@@ -17,7 +17,7 @@
package cn.hippo4j.rpc.handler;
-import cn.hippo4j.common.web.exception.IllegalException;
+import cn.hippo4j.rpc.exception.OperationException;
import io.netty.channel.ChannelHandler;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -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 {
@@ -66,13 +66,17 @@ public interface HandlerManager {
boolean b = cls.isAnnotationPresent(ChannelHandler.Sharable.class)
|| HandlerManager.class.isAssignableFrom(cls);
if (!b) {
- throw new IllegalException("Join the execution of the handler must add io.netty.channel.ChannelHandler."
+ throw new OperationException("Join the execution of the handler must add io.netty.channel.ChannelHandler."
+ "Sharable annotations, Please for the handler class " + cls.getName() + " add io.netty.channel."
+ "ChannelHandler.Sharable annotation");
}
return new HandlerEntity<>(order, handler, name);
}
+ /**
+ * handler entity
+ * @param
+ */
@Getter
@AllArgsConstructor
class HandlerEntity implements Comparable> {
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
deleted file mode 100644
index e0951c03..00000000
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyServerTakeHandler.java
+++ /dev/null
@@ -1,72 +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.handler;
-
-import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.common.toolkit.ReflectUtil;
-import cn.hippo4j.rpc.discovery.ClassRegistry;
-import cn.hippo4j.rpc.discovery.Instance;
-import cn.hippo4j.rpc.model.DefaultResponse;
-import cn.hippo4j.rpc.model.Request;
-import cn.hippo4j.rpc.model.Response;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-
-import java.lang.reflect.Method;
-
-/**
- * netty adaptation layer
- *
- * @since 1.5.1
- */
-@ChannelHandler.Sharable
-public class NettyServerTakeHandler extends AbstractNettyTakeHandler implements ConnectHandler {
-
- Instance instance;
-
- public NettyServerTakeHandler(Instance instance) {
- this.instance = instance;
- }
-
- @Override
- public void channelRead(ChannelHandlerContext ctx, Object msg) {
- if (!(msg instanceof Request)) {
- return;
- }
- Request request = (Request) msg;
- Response response = sendHandler(request);
- ctx.writeAndFlush(response);
- }
-
- @Override
- public Response sendHandler(Request request) {
- Response response;
- try {
- Class cls = ClassRegistry.get(request.getClassName());
- Method method = ReflectUtil.getMethodByName(cls, request.getMethodName(), request.getParameterTypes());
- Assert.notNull(method);
- Object invoke = ReflectUtil.invoke(instance.getInstance(cls), method, request.getParameters());
- response = new DefaultResponse(request.getKey(), invoke.getClass(), invoke);
- return response;
- } catch (Exception e) {
- response = new DefaultResponse(request.getKey(), e, e.getMessage());
- return response;
- }
- }
-
-}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerBareTakeHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerBareTakeHandler.java
new file mode 100644
index 00000000..39939cee
--- /dev/null
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerBareTakeHandler.java
@@ -0,0 +1,61 @@
+/*
+ * 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.handler;
+
+import cn.hippo4j.rpc.exception.HandlerNotFoundException;
+import cn.hippo4j.rpc.model.DefaultResponse;
+import cn.hippo4j.rpc.model.Request;
+import cn.hippo4j.rpc.model.Response;
+import io.netty.channel.ChannelHandler;
+import lombok.RequiredArgsConstructor;
+
+import java.util.function.Supplier;
+
+/**
+ * This is a processor that does not support parameters but can get the return value.
+ * Even if the parameters passed by the user will not be recognized, it will even become an error
+ *
+ * @since 2.0.0
+ */
+@RequiredArgsConstructor
+@ChannelHandler.Sharable
+public class ServerBareTakeHandler extends ServerHandler {
+
+ final String name;
+ final Supplier fun;
+
+ @Override
+ String getName() {
+ return name;
+ }
+
+ @Override
+ public Response sendHandler(Request request) {
+ try {
+ Object[] parameters = request.getParameters();
+ if (parameters.length != 0) {
+ throw new HandlerNotFoundException("no handler found that matches the pair " + name + " and function");
+ }
+ T t = fun.get();
+ return new DefaultResponse(request.getRID(), t);
+ } catch (Exception e) {
+ return new DefaultResponse(request.getRID(), e.getMessage());
+ }
+ }
+
+}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerBiTakeHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerBiTakeHandler.java
new file mode 100644
index 00000000..8bae327c
--- /dev/null
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerBiTakeHandler.java
@@ -0,0 +1,73 @@
+/*
+ * 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.handler;
+
+import cn.hippo4j.rpc.exception.HandlerNotFoundException;
+import cn.hippo4j.rpc.model.DefaultRequest;
+import cn.hippo4j.rpc.model.DefaultResponse;
+import cn.hippo4j.rpc.model.Request;
+import cn.hippo4j.rpc.model.Response;
+import io.netty.channel.ChannelHandler;
+import lombok.RequiredArgsConstructor;
+
+import java.util.function.BiFunction;
+
+/**
+ * netty adaptation layer about {@link DefaultRequest}
+ * Parse the parameters in the request to execute the corresponding method.
+ * This is a relatively flexible processor at present, but there are still great defects.
+ * For example:
+ *
+ *
This handler only supports requests with two parameters, it will not work if the number of parameters does not match
+ *
If you want to pass multiple parameters please wrap them, or customize the processor
+ *
This processor does not consider whether the types match when parsing parameters, and an error occurs if the conversion fails
+ *
+ *
+ * @since 2.0.0
+ */
+@ChannelHandler.Sharable
+@RequiredArgsConstructor
+public class ServerBiTakeHandler extends ServerHandler {
+
+ final String name;
+
+ final BiFunction fun;
+
+ @Override
+ String getName() {
+ return name;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public Response sendHandler(Request request) {
+ try {
+ Object[] parameters = request.getParameters();
+ if (parameters.length != 2) {
+ throw new HandlerNotFoundException("no handler found that matches the pair " + name + " and function");
+ }
+ T t = (T) parameters[0];
+ P p = (P) parameters[1];
+ K r = fun.apply(t, p);
+ return new DefaultResponse(request.getRID(), r);
+ } catch (Exception e) {
+ return new DefaultResponse(request.getRID(), e.getMessage());
+ }
+ }
+
+}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerHandler.java
new file mode 100644
index 00000000..f0372c90
--- /dev/null
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerHandler.java
@@ -0,0 +1,55 @@
+/*
+ * 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.handler;
+
+import cn.hippo4j.rpc.model.DefaultRequest;
+import cn.hippo4j.rpc.model.Request;
+import cn.hippo4j.rpc.model.Response;
+import io.netty.channel.ChannelHandlerContext;
+
+import java.util.Objects;
+
+/**
+ * The handler located on the server side provides unified operations for the server side
+ *
+ * @since 2.0.0
+ */
+abstract class ServerHandler extends AbstractTakeHandler {
+
+ @Override
+ public void channelRead(ChannelHandlerContext ctx, Object msg) {
+ if (!(msg instanceof DefaultRequest)) {
+ ctx.fireChannelRead(msg);
+ return;
+ }
+ Request request = (Request) msg;
+ if (!Objects.equals(request.getKey(), getName())) {
+ ctx.fireChannelRead(msg);
+ return;
+ }
+ Response response = sendHandler(request);
+ ctx.writeAndFlush(response);
+ }
+
+ /**
+ * Get the name of the current handler
+ *
+ * @return name
+ */
+ abstract String getName();
+}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerTakeHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerTakeHandler.java
new file mode 100644
index 00000000..9aaa60e0
--- /dev/null
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/ServerTakeHandler.java
@@ -0,0 +1,71 @@
+/*
+ * 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.handler;
+
+import cn.hippo4j.rpc.exception.HandlerNotFoundException;
+import cn.hippo4j.rpc.model.DefaultRequest;
+import cn.hippo4j.rpc.model.DefaultResponse;
+import cn.hippo4j.rpc.model.Request;
+import cn.hippo4j.rpc.model.Response;
+import io.netty.channel.ChannelHandler;
+import lombok.RequiredArgsConstructor;
+
+import java.util.function.Function;
+
+/**
+ * netty adaptation layer about {@link DefaultRequest}
+ * Parse the parameters in the request to execute the corresponding method.
+ * This is a relatively flexible processor at present, but there are still great defects.
+ * For example:
+ *
+ *
This handler only supports requests with one parameters, it will not work if the number of parameters does not match
+ *
If you want to pass multiple parameters please wrap them, or customize the processor
+ *
This processor does not consider whether the types match when parsing parameters, and an error occurs if the conversion fails
+ *
+ *
+ * @since 2.0.0
+ */
+@ChannelHandler.Sharable
+@RequiredArgsConstructor
+public class ServerTakeHandler extends ServerHandler {
+
+ final String name;
+ final Function fun;
+
+ @Override
+ String getName() {
+ return name;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public Response sendHandler(Request request) {
+ try {
+ Object[] parameters = request.getParameters();
+ if (parameters.length != 1) {
+ throw new HandlerNotFoundException("no handler found that matches the pair " + name + " and function");
+ }
+ T t = (T) parameters[0];
+ R r = fun.apply(t);
+ return new DefaultResponse(request.getRID(), r);
+ } catch (Exception e) {
+ return new DefaultResponse(request.getRID(), e.getMessage());
+ }
+ }
+
+}
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 4dc30bb8..5dff2ea1 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,42 +26,34 @@ 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 {
+ String RID;
String key;
- String className;
- String methodName;
- Class[] parameterTypes;
+ int length;
transient Object[] parameters;
- public DefaultRequest(String key, String className, String methodName, Class[] parameterTypes, Object[] parameters) {
+ public DefaultRequest(String RID, String key, Object[] parameters) {
+ this.RID = RID;
this.key = key;
- this.className = className;
- this.methodName = methodName;
- this.parameterTypes = parameterTypes;
this.parameters = parameters;
+ this.length = parameters.length;
}
- @Override
- public String getKey() {
- return key;
- }
-
- @Override
- public String getClassName() {
- return className;
+ public DefaultRequest(String RID, String key) {
+ this(RID, key, new Object[]{});
}
@Override
- public String getMethodName() {
- return methodName;
+ public String getRID() {
+ return RID;
}
@Override
- public Class[] getParameterTypes() {
- return parameterTypes;
+ public String getKey() {
+ return key;
}
@Override
@@ -71,19 +63,19 @@ public final class DefaultRequest implements Request {
@Override
public boolean equals(Object o) {
- if (this == o)
+ if (this == o) {
return true;
- if (o == null || getClass() != o.getClass())
+ }
+ if (o == null || getClass() != o.getClass()) {
return false;
+ }
DefaultRequest that = (DefaultRequest) o;
- return Objects.equals(key, that.key)
- && Objects.equals(className, that.className)
- && Objects.equals(methodName, that.methodName);
+ return Objects.equals(key, that.key) && Objects.equals(RID, that.RID);
}
@Override
public int hashCode() {
- return Objects.hash(key, className, methodName);
+ return Objects.hash(key, RID);
}
/**
@@ -109,11 +101,7 @@ public final class DefaultRequest implements Request {
*/
private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException {
s.defaultReadObject();
- if (parameterTypes == null) {
- return;
- }
// Deserialization parameters
- int length = parameterTypes.length;
Object[] a = new Object[length];
for (int i = 0; i < length; i++) {
a[i] = s.readObject();
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 0fc68f44..995db662 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,40 +26,31 @@ 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 {
- String key;
- Class cls;
+ String RID;
transient Object obj;
- Throwable throwable;
String errMsg;
- public DefaultResponse(String key, Class cls, Object obj, Throwable throwable, String errMsg) {
- this.key = key;
- this.cls = cls;
+ public DefaultResponse(String RID, Object obj, String errMsg) {
+ this.RID = RID;
this.obj = obj;
- this.throwable = throwable;
this.errMsg = errMsg;
}
- public DefaultResponse(String key, Throwable throwable, String errMsg) {
- this(key, null, null, throwable, errMsg);
+ public DefaultResponse(String RID, String errMsg) {
+ this(RID, null, errMsg);
}
- public DefaultResponse(String key, Class cls, Object obj) {
- this(key, cls, obj, null, null);
+ public DefaultResponse(String RID, Object obj) {
+ this(RID, obj, null);
}
@Override
- public String getKey() {
- return key;
- }
-
- @Override
- public Class getCls() {
- return cls;
+ public String getRID() {
+ return RID;
}
@Override
@@ -67,11 +58,6 @@ public class DefaultResponse implements Response {
return obj;
}
- @Override
- public Throwable getThrowable() {
- return throwable;
- }
-
@Override
public String getErrMsg() {
return errMsg;
@@ -79,22 +65,24 @@ public class DefaultResponse implements Response {
@Override
public boolean isErr() {
- return throwable != null || errMsg != null;
+ return errMsg != null;
}
@Override
public boolean equals(Object o) {
- if (this == o)
+ if (this == o) {
return true;
- if (o == null || getClass() != o.getClass())
+ }
+ if (o == null || getClass() != o.getClass()) {
return false;
+ }
DefaultResponse that = (DefaultResponse) o;
- return Objects.equals(key, that.key) && Objects.equals(cls, that.cls);
+ return Objects.equals(RID, that.RID);
}
@Override
public int hashCode() {
- return Objects.hash(key, cls);
+ return Objects.hash(RID);
}
/**
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..ee972c74 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,29 +22,19 @@ import java.io.Serializable;
/**
* request
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface Request extends Serializable {
/**
- * The unique identity of the current request
- */
- String getKey();
-
- /**
- * The Class name of the current request
+ * the request id, Used to specify an executable handler
*/
- String getClassName();
+ String getRID();
/**
- * The Method name of the current request
- */
- String getMethodName();
-
- /**
- * The parameter type of the current request
+ * The unique identity of the current request
*/
- Class[] getParameterTypes();
+ String getKey();
/**
* The parameters of the current request
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..aa7a5e33 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,30 +22,20 @@ import java.io.Serializable;
/**
* Response
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public interface Response extends Serializable {
/**
* The unique identity of the current Response
*/
- String getKey();
-
- /**
- * The class of the current Response, The target of deserialization
- */
- Class getCls();
+ String getRID();
/**
* The results of this request can be obtained, The source of deserialization
*/
Object getObj();
- /**
- * The Throwable of the current Response
- */
- Throwable getThrowable();
-
/**
* the error message
*/
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..888fede1 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
@@ -17,7 +17,7 @@
package cn.hippo4j.rpc.server;
-import cn.hippo4j.common.toolkit.ThreadUtil;
+import cn.hippo4j.rpc.connection.ServerConnection;
import cn.hippo4j.rpc.discovery.ServerPort;
import java.io.IOException;
@@ -25,7 +25,7 @@ import java.io.IOException;
/**
* Server Implementation
*
- * @since 1.5.1
+ * @since 2.0.0
*/
public class RPCServer implements Server {
@@ -36,10 +36,7 @@ public class RPCServer implements Server {
public RPCServer(ServerConnection serverConnection, ServerPort port) {
this.port = port;
this.serverConnection = serverConnection;
- this.thread = ThreadUtil.newThread(
- () -> serverConnection.bind(port),
- "hippo4j-rpc-" + port.getPort(),
- false);
+ this.thread = new Thread(() -> serverConnection.bind(port), "hippo4j-rpc-" + port.getPort());
}
/**
@@ -61,7 +58,7 @@ public class RPCServer implements Server {
*/
@Override
public void close() throws IOException {
- thread = null;
+ thread.interrupt();
serverConnection.close();
}
}
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/support/NettyServerSupport.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/ServerSupport.java
similarity index 55%
rename from threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyServerSupport.java
rename to threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/ServerSupport.java
index b2cc2af1..ba0c0c14 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyServerSupport.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/server/ServerSupport.java
@@ -15,22 +15,17 @@
* limitations under the License.
*/
-package cn.hippo4j.rpc.support;
+package cn.hippo4j.rpc.server;
-import cn.hippo4j.rpc.discovery.ClassRegistry;
-import cn.hippo4j.rpc.discovery.DefaultInstance;
+import cn.hippo4j.rpc.client.ClientSupport;
import cn.hippo4j.rpc.discovery.ServerPort;
+import cn.hippo4j.rpc.handler.ErrorServerHandler;
import cn.hippo4j.rpc.handler.HandlerManager;
-import cn.hippo4j.rpc.handler.NettyServerTakeHandler;
-import cn.hippo4j.rpc.server.NettyServerConnection;
-import cn.hippo4j.rpc.server.RPCServer;
-import cn.hippo4j.rpc.server.Server;
+import cn.hippo4j.rpc.connection.ServerConnection;
+import cn.hippo4j.rpc.connection.SimpleServerConnection;
import io.netty.channel.ChannelHandler;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
/**
* This is a server-side build class that allows you to quickly prepare data on the server side and start the server side.
@@ -38,17 +33,11 @@ import java.util.List;
* The composite pattern is adopted, which means that it is itself a server-side implementation, so it is stateless.
*
* @see RPCServer
- * @see NettyServerConnection
- * @see NettyClientSupport
- * @since 1.5.1
+ * @see ServerConnection
+ * @see ClientSupport
+ * @since 2.0.0
*/
-public class NettyServerSupport implements Server {
-
- /**
- * The interface that the server side can call,
- * All the methods in the interface are brokered during initialization
- */
- protected List> classes;
+public class ServerSupport implements Server {
/**
* Extract the port number of the web container,
@@ -63,20 +52,11 @@ public class NettyServerSupport implements Server {
protected Server server;
- public NettyServerSupport(ServerPort serverPort, Class... classes) {
- this(serverPort, new NettyServerConnection(), classes);
- }
-
- public NettyServerSupport(ServerPort serverPort, List> classes) {
- this(serverPort, new NettyServerConnection(), classes);
- }
-
- public NettyServerSupport(ServerPort serverPort, HandlerManager handlerManager, Class... classes) {
- this(serverPort, handlerManager, classes != null ? Arrays.asList(classes) : Collections.emptyList());
+ public ServerSupport(ServerPort serverPort) {
+ this(serverPort, new SimpleServerConnection());
}
- public NettyServerSupport(ServerPort serverPort, HandlerManager handlerManager, List> classes) {
- this.classes = classes;
+ public ServerSupport(ServerPort serverPort, HandlerManager handlerManager) {
this.serverPort = serverPort;
this.handlerManager = handlerManager;
initServer();
@@ -88,16 +68,11 @@ public class NettyServerSupport implements Server {
* If no processor is available, a default processor is provided
*/
protected void initServer() {
- // Register the interface that can be invoked
- classes.stream().filter(Class::isInterface)
- .forEach(cls -> ClassRegistry.put(cls.getName(), cls));
- NettyServerConnection connection = (handlerManager instanceof NettyServerConnection)
- ? (NettyServerConnection) handlerManager
- : new NettyServerConnection();
+ SimpleServerConnection connection = (handlerManager instanceof SimpleServerConnection)
+ ? (SimpleServerConnection) handlerManager
+ : new SimpleServerConnection();
// Assign a default handler if no handler exists
- if (connection.isEmpty()) {
- connection.addFirst(null, new NettyServerTakeHandler(new DefaultInstance()));
- }
+ connection.addLast(null, new ErrorServerHandler());
server = new RPCServer(connection, serverPort);
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/AddressUtil.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/AddressUtil.java
new file mode 100644
index 00000000..90fda034
--- /dev/null
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/AddressUtil.java
@@ -0,0 +1,54 @@
+/*
+ * 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.rpc.exception.ConnectionException;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.net.InetSocketAddress;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class AddressUtil {
+
+ private static final String HTTP = "http://";
+ private static final String HTTPS = "https://";
+
+ /**
+ * parsing hostname
+ *
+ * @param address address
+ * @return InetAddress
+ */
+ public static InetSocketAddress getInetAddress(String address) {
+ if (address.startsWith(HTTP)) {
+ address = address.replaceFirst(HTTP, "");
+ }
+
+ if (address.startsWith(HTTPS)) {
+ address = address.replaceFirst(HTTPS, "");
+ }
+
+ String[] addressStr = address.split(":");
+ if (addressStr.length < 2) {
+ throw new ConnectionException("Failed to connect to the server because the IP address is invalid. Procedure");
+ }
+ return InetSocketAddress.createUnresolved(addressStr[0], Integer.parseInt(addressStr[1]));
+ }
+
+}
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