Refactoring blocking queues and refusing policy-related packet adjustments

docs/docs/user_docs/dev_manual/rejected-policy-custom.md

@@ -34,9 +34,9 @@ public class ErrorLogRejectedExecutionHandler implements CustomRejectedExecution
 }
 ```
 
-创建 `src/main/resources/META-INF/services` 目录，创建 SPI 自定义拒绝策略文件 `cn.hippo4j.core.spi.CustomRejectedExecutionHandler`。
+创建 `src/main/resources/META-INF/services` 目录，创建 SPI 自定义拒绝策略文件 `cn.hippo4j.common.executor.support.CustomRejectedExecutionHandler`。
 
-`cn.hippo4j.core.spi.CustomRejectedExecutionHandler` 文件内仅放一行自定义拒绝策略全限定名即可，示例：
+`cn.hippo4j.common.executor.support.CustomRejectedExecutionHandler` 文件内仅放一行自定义拒绝策略全限定名即可，示例：
 
 ```text
 cn.hippo4j.example.core.handler.ErrorLogRejectedExecutionHandler

hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.spi;
+package cn.hippo4j.common.executor.support;
 
 import java.util.concurrent.BlockingQueue;
 

hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.spi;
+package cn.hippo4j.common.executor.support;
 
 import java.util.concurrent.RejectedExecutionHandler;
 

hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/QueueTypeEnum.java

@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.executor.support;
+package cn.hippo4j.common.executor.support;
 
-import cn.hippo4j.core.spi.CustomBlockingQueue;
-import cn.hippo4j.core.spi.DynamicThreadPoolServiceLoader;
+import cn.hippo4j.common.spi.DynamicThreadPoolServiceLoader;
 
 import java.util.Arrays;
 import java.util.Collection;

hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RejectedTypeEnum.java

@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.executor.support;
+package cn.hippo4j.common.executor.support;
 
-import cn.hippo4j.core.spi.CustomRejectedExecutionHandler;
-import cn.hippo4j.core.spi.DynamicThreadPoolServiceLoader;
+import cn.hippo4j.common.spi.DynamicThreadPoolServiceLoader;
 
 import java.util.Collection;
 import java.util.Objects;

hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.executor.support;
+package cn.hippo4j.common.executor.support;
 
 import cn.hutool.core.util.ReflectUtil;
 import lombok.extern.slf4j.Slf4j;

hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.executor.support;
+package cn.hippo4j.common.executor.support;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.RejectedExecutionHandler;

hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.executor.support;
+package cn.hippo4j.common.executor.support;
 
 import lombok.extern.slf4j.Slf4j;
 

hippo4j-common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java

@@ -17,6 +17,8 @@
 
 package cn.hippo4j.common.model.register;
 
+import cn.hippo4j.common.executor.support.QueueTypeEnum;
+import cn.hippo4j.common.executor.support.RejectedTypeEnum;
 import com.fasterxml.jackson.annotation.JsonAlias;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -56,7 +58,7 @@ public class DynamicThreadPoolRegisterParameter {
     /**
      * Queue type
      */
-    private Integer queueType;
+    private QueueTypeEnum queueType;
 
     /**
      * Capacity
@@ -71,7 +73,7 @@ public class DynamicThreadPoolRegisterParameter {
     /**
      * Rejected type
      */
-    private Integer rejectedType;
+    private RejectedTypeEnum rejectedType;
 
     /**
      * Is alarm

hippo4j-common/src/main/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoader.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.spi;
+package cn.hippo4j.common.spi;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

hippo4j-common/src/main/java/cn/hippo4j/common/spi/ServiceLoaderInstantiationException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.spi;
+package cn.hippo4j.common.spi;
 
 /**
  * Service loader instantiation exception.

hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java

@@ -181,6 +181,8 @@ public class ConfigServiceImpl implements ConfigService {
         configAllInfo.setItemId(registerWrapper.getItemId());
         configAllInfo.setTpId(registerParameter.getThreadPoolId());
         configAllInfo.setLivenessAlarm(registerParameter.getActiveAlarm());
+        configAllInfo.setQueueType(registerParameter.getQueueType().type);
+        configAllInfo.setRejectedType(registerParameter.getRejectedType().type);
         configAllInfo.setAllowCoreThreadTimeOut(registerParameter.getAllowCoreThreadTimeOut());
         return configAllInfo;
     }

hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/CommonDynamicThreadPool.java

@@ -17,6 +17,7 @@
 
 package cn.hippo4j.core.executor.support;
 
+import cn.hippo4j.common.executor.support.QueueTypeEnum;
 import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
 
 import java.util.concurrent.TimeUnit;

hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java

@@ -18,6 +18,7 @@
 package cn.hippo4j.core.executor.support;
 
 import cn.hippo4j.common.design.builder.Builder;
+import cn.hippo4j.common.executor.support.QueueTypeEnum;
 import cn.hippo4j.common.toolkit.Assert;
 import org.springframework.core.task.TaskDecorator;
 

hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/service/AbstractDynamicThreadPoolService.java

@@ -18,8 +18,8 @@
 package cn.hippo4j.core.executor.support.service;
 
 import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterParameter;
-import cn.hippo4j.core.executor.support.QueueTypeEnum;
-import cn.hippo4j.core.executor.support.RejectedTypeEnum;
+import cn.hippo4j.common.executor.support.QueueTypeEnum;
+import cn.hippo4j.common.executor.support.RejectedTypeEnum;
 import cn.hippo4j.core.executor.support.ThreadPoolBuilder;
 
 import java.util.concurrent.ThreadPoolExecutor;
@@ -41,11 +41,11 @@ public abstract class AbstractDynamicThreadPoolService implements DynamicThreadP
                 .threadPoolId(registerParameter.getThreadPoolId())
                 .corePoolSize(registerParameter.getCorePoolSize())
                 .maxPoolNum(registerParameter.getMaximumPoolSize())
-                .workQueue(QueueTypeEnum.createBlockingQueue(registerParameter.getQueueType(), registerParameter.getCapacity()))
+                .workQueue(QueueTypeEnum.createBlockingQueue(registerParameter.getQueueType().type, registerParameter.getCapacity()))
                 .threadFactory(registerParameter.getThreadNamePrefix())
                 .keepAliveTime(registerParameter.getKeepAliveTime(), TimeUnit.SECONDS)
                 .executeTimeOut(registerParameter.getExecuteTimeOut())
-                .rejected(RejectedTypeEnum.createPolicy(registerParameter.getRejectedType()))
+                .rejected(RejectedTypeEnum.createPolicy(registerParameter.getRejectedType().type))
                 .dynamicPool()
                 .build();
         return dynamicThreadPoolExecutor;

hippo4j-example/hippo4j-example-core/src/main/java/cn/hippo4j/example/core/handler/ErrorLogRejectedExecutionHandler.java

@@ -17,7 +17,7 @@
 
 package cn.hippo4j.example.core.handler;
 
-import cn.hippo4j.core.spi.CustomRejectedExecutionHandler;
+import cn.hippo4j.common.executor.support.CustomRejectedExecutionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

hippo4j-example/hippo4j-example-core/src/main/java/cn/hippo4j/example/core/inittest/RegisterDynamicThreadPoolTest.java

@@ -23,8 +23,8 @@ import cn.hippo4j.common.model.register.notify.DynamicThreadPoolRegisterCoreNoti
 import cn.hippo4j.common.model.register.notify.DynamicThreadPoolRegisterServerNotifyParameter;
 import cn.hippo4j.common.toolkit.JSONUtil;
 import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
-import cn.hippo4j.core.executor.support.QueueTypeEnum;
-import cn.hippo4j.core.executor.support.RejectedTypeEnum;
+import cn.hippo4j.common.executor.support.QueueTypeEnum;
+import cn.hippo4j.common.executor.support.RejectedTypeEnum;
 import cn.hippo4j.message.enums.NotifyPlatformEnum;
 import lombok.extern.slf4j.Slf4j;
 
@@ -40,13 +40,13 @@ public class RegisterDynamicThreadPoolTest {
         DynamicThreadPoolRegisterParameter parameterInfo = DynamicThreadPoolRegisterParameter.builder()
                 .corePoolSize(1)
                 .maximumPoolSize(2)
-                .queueType(QueueTypeEnum.LINKED_BLOCKING_QUEUE.type)
+                .queueType(QueueTypeEnum.LINKED_BLOCKING_QUEUE)
                 .capacity(1024)
                 // TimeUnit.SECONDS
                 .keepAliveTime(1024L)
                 // TimeUnit.MILLISECONDS
                 .executeTimeOut(1024L)
-                .rejectedType(RejectedTypeEnum.DISCARD_POLICY.type)
+                .rejectedType(RejectedTypeEnum.DISCARD_POLICY)
                 .isAlarm(true)
                 .allowCoreThreadTimeOut(false)
                 .capacityAlarm(90)

hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/monitor/DynamicThreadPoolMonitorExecutor.java

@@ -20,7 +20,7 @@ package cn.hippo4j.core.springboot.starter.monitor;
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.common.toolkit.StringUtil;
 import cn.hippo4j.core.executor.support.ThreadFactoryBuilder;
-import cn.hippo4j.core.spi.DynamicThreadPoolServiceLoader;
+import cn.hippo4j.common.spi.DynamicThreadPoolServiceLoader;
 import cn.hippo4j.core.springboot.starter.config.BootstrapCoreProperties;
 import cn.hippo4j.monitor.base.DynamicThreadPoolMonitor;
 import cn.hippo4j.monitor.base.ThreadPoolMonitor;

hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java

@@ -23,9 +23,9 @@ import cn.hippo4j.core.executor.ThreadPoolNotifyAlarmHandler;
 import cn.hippo4j.core.executor.manage.GlobalNotifyAlarmManage;
 import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
 import cn.hippo4j.core.executor.support.AbstractDynamicExecutorSupport;
-import cn.hippo4j.core.executor.support.QueueTypeEnum;
-import cn.hippo4j.core.executor.support.RejectedTypeEnum;
-import cn.hippo4j.core.executor.support.ResizableCapacityLinkedBlockingQueue;
+import cn.hippo4j.common.executor.support.QueueTypeEnum;
+import cn.hippo4j.common.executor.support.RejectedTypeEnum;
+import cn.hippo4j.common.executor.support.ResizableCapacityLinkedBlockingQueue;
 import cn.hippo4j.core.proxy.RejectedProxyUtil;
 import cn.hippo4j.core.springboot.starter.config.BootstrapCoreProperties;
 import cn.hippo4j.core.springboot.starter.config.ExecutorProperties;

hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolConfigService.java

@@ -24,8 +24,8 @@ import cn.hippo4j.common.toolkit.BooleanUtil;
 import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
 import cn.hippo4j.core.executor.manage.GlobalNotifyAlarmManage;
 import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
-import cn.hippo4j.core.executor.support.QueueTypeEnum;
-import cn.hippo4j.core.executor.support.RejectedTypeEnum;
+import cn.hippo4j.common.executor.support.QueueTypeEnum;
+import cn.hippo4j.common.executor.support.RejectedTypeEnum;
 import cn.hippo4j.core.executor.support.service.AbstractDynamicThreadPoolService;
 import cn.hippo4j.core.springboot.starter.config.ExecutorProperties;
 import cn.hippo4j.message.service.ThreadPoolNotifyAlarm;
@@ -67,9 +67,10 @@ public class DynamicThreadPoolConfigService extends AbstractDynamicThreadPoolSer
                 .maximumPoolSize(registerParameter.getMaximumPoolSize())
                 .allowCoreThreadTimeOut(BooleanUtil.toBoolean(String.valueOf(registerParameter.getAllowCoreThreadTimeOut())))
                 .keepAliveTime(registerParameter.getKeepAliveTime())
-                .blockingQueue(QueueTypeEnum.getBlockingQueueNameByType(registerParameter.getQueueType()))
+                .blockingQueue(QueueTypeEnum.getBlockingQueueNameByType(registerParameter.getQueueType().type))
+                .capacityAlarm(registerParameter.getCapacity())
                 .threadNamePrefix(registerParameter.getThreadNamePrefix())
-                .rejectedHandler(RejectedTypeEnum.getRejectedNameByType(registerParameter.getRejectedType()))
+                .rejectedHandler(RejectedTypeEnum.getRejectedNameByType(registerParameter.getRejectedType().type))
                 .executeTimeOut(registerParameter.getExecuteTimeOut())
                 .threadPoolId(registerParameter.getThreadPoolId())
                 .build();

hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java

@@ -18,6 +18,8 @@
 package cn.hippo4j.core.springboot.starter.support;
 
 import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.common.executor.support.QueueTypeEnum;
+import cn.hippo4j.common.executor.support.RejectedTypeEnum;
 import cn.hippo4j.common.toolkit.StringUtil;
 import cn.hippo4j.core.executor.DynamicThreadPool;
 import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;

hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java

@@ -18,7 +18,7 @@
 package cn.hippo4j.springboot.starter.core;
 
 import cn.hippo4j.common.api.ThreadPoolDynamicRefresh;
-import cn.hippo4j.core.executor.support.QueueTypeEnum;
+import cn.hippo4j.common.executor.support.QueueTypeEnum;
 import cn.hippo4j.core.executor.support.ThreadPoolBuilder;
 import cn.hippo4j.springboot.starter.config.BootstrapProperties;
 import lombok.RequiredArgsConstructor;

hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java

@@ -26,9 +26,9 @@ import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
 import cn.hippo4j.core.executor.ThreadPoolNotifyAlarmHandler;
 import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
 import cn.hippo4j.core.executor.support.AbstractDynamicExecutorSupport;
-import cn.hippo4j.core.executor.support.QueueTypeEnum;
-import cn.hippo4j.core.executor.support.RejectedTypeEnum;
-import cn.hippo4j.core.executor.support.ResizableCapacityLinkedBlockingQueue;
+import cn.hippo4j.common.executor.support.QueueTypeEnum;
+import cn.hippo4j.common.executor.support.RejectedTypeEnum;
+import cn.hippo4j.common.executor.support.ResizableCapacityLinkedBlockingQueue;
 import cn.hippo4j.core.proxy.RejectedProxyUtil;
 import cn.hippo4j.common.api.ThreadPoolDynamicRefresh;
 import lombok.AllArgsConstructor;

hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java

@@ -23,7 +23,7 @@ import cn.hippo4j.common.toolkit.CollectionUtil;
 import cn.hippo4j.common.toolkit.ThreadUtil;
 import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
 import cn.hippo4j.core.executor.support.ThreadFactoryBuilder;
-import cn.hippo4j.core.spi.DynamicThreadPoolServiceLoader;
+import cn.hippo4j.common.spi.DynamicThreadPoolServiceLoader;
 import cn.hippo4j.springboot.starter.config.BootstrapProperties;
 import cn.hippo4j.springboot.starter.monitor.collect.Collector;
 import cn.hippo4j.springboot.starter.monitor.send.MessageSender;

hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java

@@ -20,6 +20,8 @@ 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.support.QueueTypeEnum;
+import cn.hippo4j.common.executor.support.RejectedTypeEnum;
 import cn.hippo4j.common.model.ThreadPoolParameterInfo;
 import cn.hippo4j.common.toolkit.BooleanUtil;
 import cn.hippo4j.common.toolkit.JSONUtil;