diff --git a/docs/docs/user_docs/dev_manual/rejected-policy-custom.md b/docs/docs/user_docs/dev_manual/rejected-policy-custom.md index a42873fc..970511f5 100644 --- a/docs/docs/user_docs/dev_manual/rejected-policy-custom.md +++ b/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 diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomBlockingQueue.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java similarity index 96% rename from hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomBlockingQueue.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/CustomBlockingQueue.java index 893ee11f..6800b06a 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomBlockingQueue.java +++ b/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; diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomRejectedExecutionHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java similarity index 96% rename from hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomRejectedExecutionHandler.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/CustomRejectedExecutionHandler.java index 8cdb7f8b..c76fcc7b 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomRejectedExecutionHandler.java +++ b/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; diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/QueueTypeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/QueueTypeEnum.java similarity index 97% rename from hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/QueueTypeEnum.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/QueueTypeEnum.java index 283d4618..557e800e 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/QueueTypeEnum.java +++ b/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; diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedTypeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RejectedTypeEnum.java similarity index 96% rename from hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedTypeEnum.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RejectedTypeEnum.java index 5dd8d61c..744f0066 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedTypeEnum.java +++ b/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; diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ResizableCapacityLinkedBlockingQueue.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java similarity index 97% rename from hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ResizableCapacityLinkedBlockingQueue.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java index 77fccccb..9e9a8d10 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ResizableCapacityLinkedBlockingQueue.java +++ b/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; diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RunsOldestTaskPolicy.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java similarity index 97% rename from hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RunsOldestTaskPolicy.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RunsOldestTaskPolicy.java index 0e115865..26dac5a6 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RunsOldestTaskPolicy.java +++ b/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; diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/SyncPutQueuePolicy.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java similarity index 96% rename from hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/SyncPutQueuePolicy.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/SyncPutQueuePolicy.java index ef803bee..961b80f6 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/SyncPutQueuePolicy.java +++ b/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; diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java index 812ba82f..ef7e65d0 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/register/DynamicThreadPoolRegisterParameter.java +++ b/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 diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/DynamicThreadPoolServiceLoader.java b/hippo4j-common/src/main/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoader.java similarity index 98% rename from hippo4j-core/src/main/java/cn/hippo4j/core/spi/DynamicThreadPoolServiceLoader.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoader.java index e0a817bb..ca4ec671 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/DynamicThreadPoolServiceLoader.java +++ b/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; diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/ServiceLoaderInstantiationException.java b/hippo4j-common/src/main/java/cn/hippo4j/common/spi/ServiceLoaderInstantiationException.java similarity index 97% rename from hippo4j-core/src/main/java/cn/hippo4j/core/spi/ServiceLoaderInstantiationException.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/spi/ServiceLoaderInstantiationException.java index c5806119..496d44dd 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/ServiceLoaderInstantiationException.java +++ b/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. diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java index 7a251e6d..3e6f25fe 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java +++ b/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; } diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/CommonDynamicThreadPool.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/CommonDynamicThreadPool.java index 186dd47c..7d98eb77 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/CommonDynamicThreadPool.java +++ b/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; diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java index ce51e17f..f826a29f 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java +++ b/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; diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/service/AbstractDynamicThreadPoolService.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/service/AbstractDynamicThreadPoolService.java index 5f54d5a9..60422717 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/service/AbstractDynamicThreadPoolService.java +++ b/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; diff --git a/hippo4j-example/hippo4j-example-core/src/main/java/cn/hippo4j/example/core/handler/ErrorLogRejectedExecutionHandler.java b/hippo4j-example/hippo4j-example-core/src/main/java/cn/hippo4j/example/core/handler/ErrorLogRejectedExecutionHandler.java index d2b17531..cc5816d7 100644 --- a/hippo4j-example/hippo4j-example-core/src/main/java/cn/hippo4j/example/core/handler/ErrorLogRejectedExecutionHandler.java +++ b/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; diff --git a/hippo4j-example/hippo4j-example-core/src/main/java/cn/hippo4j/example/core/inittest/RegisterDynamicThreadPoolTest.java b/hippo4j-example/hippo4j-example-core/src/main/java/cn/hippo4j/example/core/inittest/RegisterDynamicThreadPoolTest.java index ff05b814..c01b4982 100644 --- a/hippo4j-example/hippo4j-example-core/src/main/java/cn/hippo4j/example/core/inittest/RegisterDynamicThreadPoolTest.java +++ b/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) diff --git a/hippo4j-example/hippo4j-spring-boot-starter-example/src/main/resources/META-INF/services/cn.hippo4j.core.spi.CustomRejectedExecutionHandler b/hippo4j-example/hippo4j-spring-boot-starter-example/src/main/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomRejectedExecutionHandler similarity index 100% rename from hippo4j-example/hippo4j-spring-boot-starter-example/src/main/resources/META-INF/services/cn.hippo4j.core.spi.CustomRejectedExecutionHandler rename to hippo4j-example/hippo4j-spring-boot-starter-example/src/main/resources/META-INF/services/cn.hippo4j.common.executor.support.CustomRejectedExecutionHandler diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/monitor/DynamicThreadPoolMonitorExecutor.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/monitor/DynamicThreadPoolMonitorExecutor.java index cd4d508d..38f295a4 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/monitor/DynamicThreadPoolMonitorExecutor.java +++ b/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; diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java index 4a8aa52e..ada78efb 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java +++ b/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; diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolConfigService.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolConfigService.java index 44bf20a8..3cd68d86 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolConfigService.java +++ b/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(); diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java index b582f91c..fee2c23d 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java +++ b/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; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java index 78d35543..b495f893 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java +++ b/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; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java index 3fcd1f9b..e0224ae0 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java +++ b/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; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java index b5f3fed0..a97149ba 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java +++ b/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; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java index 28b12371..4da97421 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java +++ b/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;