From cf6bba0840358bb30b7faa87e2eada961ae95503 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Tue, 16 Aug 2022 12:40:10 +0800 Subject: [PATCH] Code naming and access refactoring --- ...TypeEnum.java => BlockingQueueTypeEnum.java} | 17 ++++++++++------- ...ypeEnum.java => RejectedPolicyTypeEnum.java} | 17 ++++++++++------- .../DynamicThreadPoolRegisterParameter.java | 12 ++++++------ .../service/biz/impl/ConfigServiceImpl.java | 4 ++-- .../support/CommonDynamicThreadPool.java | 4 ++-- .../executor/support/ThreadPoolBuilder.java | 16 ++++++++-------- .../AbstractDynamicThreadPoolService.java | 8 ++++---- .../inittest/RegisterDynamicThreadPoolTest.java | 8 ++++---- .../event/DynamicThreadPoolRefreshListener.java | 10 +++++----- .../support/DynamicThreadPoolConfigService.java | 8 ++++---- .../support/DynamicThreadPoolPostProcessor.java | 8 ++++---- .../core/DynamicThreadPoolSubscribeConfig.java | 4 ++-- .../core/ServerThreadPoolDynamicRefresh.java | 12 ++++++------ .../support/DynamicThreadPoolPostProcessor.java | 8 ++++---- 14 files changed, 71 insertions(+), 65 deletions(-) rename hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/{QueueTypeEnum.java => BlockingQueueTypeEnum.java} (93%) rename hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/{RejectedTypeEnum.java => RejectedPolicyTypeEnum.java} (90%) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/QueueTypeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java similarity index 93% rename from hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/QueueTypeEnum.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java index 557e800e..a2c29693 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/QueueTypeEnum.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java @@ -18,6 +18,7 @@ package cn.hippo4j.common.executor.support; import cn.hippo4j.common.spi.DynamicThreadPoolServiceLoader; +import lombok.Getter; import java.util.Arrays; import java.util.Collection; @@ -27,9 +28,9 @@ import java.util.concurrent.*; import java.util.stream.Stream; /** - * Queue type enum. + * Blocking queue type enum. */ -public enum QueueTypeEnum { +public enum BlockingQueueTypeEnum { /** * {@link java.util.concurrent.ArrayBlockingQueue} @@ -66,11 +67,13 @@ public enum QueueTypeEnum { */ RESIZABLE_LINKED_BLOCKING_QUEUE(9, "ResizableCapacityLinkedBlockingQueue"); - public Integer type; + @Getter + private Integer type; - public String name; + @Getter + private String name; - QueueTypeEnum(int type, String name) { + BlockingQueueTypeEnum(int type, String name) { this.type = type; this.name = name; } @@ -81,7 +84,7 @@ public enum QueueTypeEnum { public static BlockingQueue createBlockingQueue(String blockingQueueName, Integer capacity) { BlockingQueue blockingQueue = null; - QueueTypeEnum queueTypeEnum = Stream.of(QueueTypeEnum.values()) + BlockingQueueTypeEnum queueTypeEnum = Stream.of(BlockingQueueTypeEnum.values()) .filter(each -> Objects.equals(each.name, blockingQueueName)) .findFirst() .orElse(null); @@ -137,7 +140,7 @@ public enum QueueTypeEnum { } public static String getBlockingQueueNameByType(int type) { - Optional queueTypeEnum = Arrays.stream(QueueTypeEnum.values()) + Optional queueTypeEnum = Arrays.stream(BlockingQueueTypeEnum.values()) .filter(each -> each.type == type) .findFirst(); return queueTypeEnum.map(each -> each.name).orElse(""); diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RejectedTypeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java similarity index 90% rename from hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RejectedTypeEnum.java rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java index 744f0066..597751fd 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RejectedTypeEnum.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java @@ -18,6 +18,7 @@ package cn.hippo4j.common.executor.support; import cn.hippo4j.common.spi.DynamicThreadPoolServiceLoader; +import lombok.Getter; import java.util.Collection; import java.util.Objects; @@ -27,9 +28,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Stream; /** - * Reject policy type Enum. + * Rejected policy type Enum. */ -public enum RejectedTypeEnum { +public enum RejectedPolicyTypeEnum { CALLER_RUNS_POLICY(1, "CallerRunsPolicy", new ThreadPoolExecutor.CallerRunsPolicy()), @@ -43,13 +44,15 @@ public enum RejectedTypeEnum { SYNC_PUT_QUEUE_POLICY(6, "SyncPutQueuePolicy", new SyncPutQueuePolicy()); - public Integer type; + @Getter + private Integer type; - public String name; + @Getter + private String name; public RejectedExecutionHandler rejectedHandler; - RejectedTypeEnum(Integer type, String name, RejectedExecutionHandler rejectedHandler) { + RejectedPolicyTypeEnum(Integer type, String name, RejectedExecutionHandler rejectedHandler) { this.type = type; this.name = name; this.rejectedHandler = rejectedHandler; @@ -60,7 +63,7 @@ public enum RejectedTypeEnum { } public static RejectedExecutionHandler createPolicy(String name) { - RejectedTypeEnum rejectedTypeEnum = Stream.of(RejectedTypeEnum.values()) + RejectedPolicyTypeEnum rejectedTypeEnum = Stream.of(RejectedPolicyTypeEnum.values()) .filter(each -> Objects.equals(each.name, name)) .findFirst() .orElse(null); @@ -77,7 +80,7 @@ public enum RejectedTypeEnum { } public static RejectedExecutionHandler createPolicy(int type) { - Optional rejectedTypeEnum = Stream.of(RejectedTypeEnum.values()) + Optional rejectedTypeEnum = Stream.of(RejectedPolicyTypeEnum.values()) .filter(each -> Objects.equals(type, each.type)) .map(each -> each.rejectedHandler) .findFirst(); 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 ef7e65d0..608cb7ca 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,8 +17,8 @@ package cn.hippo4j.common.model.register; -import cn.hippo4j.common.executor.support.QueueTypeEnum; -import cn.hippo4j.common.executor.support.RejectedTypeEnum; +import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum; +import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum; import com.fasterxml.jackson.annotation.JsonAlias; import lombok.AllArgsConstructor; import lombok.Builder; @@ -56,9 +56,9 @@ public class DynamicThreadPoolRegisterParameter { private Integer maximumPoolSize; /** - * Queue type + * Blocking queue type */ - private QueueTypeEnum queueType; + private BlockingQueueTypeEnum blockingQueueType; /** * Capacity @@ -71,9 +71,9 @@ public class DynamicThreadPoolRegisterParameter { private Long keepAliveTime; /** - * Rejected type + * Rejected policy type */ - private RejectedTypeEnum rejectedType; + private RejectedPolicyTypeEnum rejectedPolicyType; /** * Is alarm 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 3e6f25fe..5162b11b 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,8 +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.setQueueType(registerParameter.getBlockingQueueType().getType()); + configAllInfo.setRejectedType(registerParameter.getRejectedPolicyType().getType()); 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 7d98eb77..9da3b6b7 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,7 +17,7 @@ package cn.hippo4j.core.executor.support; -import cn.hippo4j.common.executor.support.QueueTypeEnum; +import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum; import cn.hippo4j.core.executor.DynamicThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -33,7 +33,7 @@ public class CommonDynamicThreadPool { .threadFactory(threadPoolId) .poolThreadSize(2, 4) .keepAliveTime(60L, TimeUnit.SECONDS) - .workQueue(QueueTypeEnum.RESIZABLE_LINKED_BLOCKING_QUEUE, 1024) + .workQueue(BlockingQueueTypeEnum.RESIZABLE_LINKED_BLOCKING_QUEUE, 1024) .build(); return dynamicThreadPoolExecutor; } 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 f826a29f..5f62f719 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,7 +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.executor.support.BlockingQueueTypeEnum; import cn.hippo4j.common.toolkit.Assert; import org.springframework.core.task.TaskDecorator; @@ -47,7 +47,7 @@ public class ThreadPoolBuilder implements Builder { private int capacity = 512; - private QueueTypeEnum queueType; + private BlockingQueueTypeEnum blockingQueueType; private BlockingQueue workQueue = new LinkedBlockingQueue(capacity); @@ -150,8 +150,8 @@ public class ThreadPoolBuilder implements Builder { return this; } - public ThreadPoolBuilder workQueue(QueueTypeEnum queueType, int capacity) { - this.queueType = queueType; + public ThreadPoolBuilder workQueue(BlockingQueueTypeEnum queueType, int capacity) { + this.blockingQueueType = queueType; this.capacity = capacity; return this; } @@ -161,8 +161,8 @@ public class ThreadPoolBuilder implements Builder { return this; } - public ThreadPoolBuilder workQueue(QueueTypeEnum queueType) { - this.queueType = queueType; + public ThreadPoolBuilder workQueue(BlockingQueueTypeEnum blockingQueueType) { + this.blockingQueueType = blockingQueueType; return this; } @@ -246,8 +246,8 @@ public class ThreadPoolBuilder implements Builder { initParam.setAwaitTerminationMillis(builder.awaitTerminationMillis); } if (!builder.isFastPool) { - if (builder.queueType != null) { - builder.workQueue = QueueTypeEnum.createBlockingQueue(builder.queueType.type, builder.capacity); + if (builder.blockingQueueType != null) { + builder.workQueue = BlockingQueueTypeEnum.createBlockingQueue(builder.blockingQueueType.getType(), builder.capacity); } initParam.setWorkQueue(builder.workQueue); } 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 60422717..4348c78a 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.common.executor.support.QueueTypeEnum; -import cn.hippo4j.common.executor.support.RejectedTypeEnum; +import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum; +import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum; 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().type, registerParameter.getCapacity())) + .workQueue(BlockingQueueTypeEnum.createBlockingQueue(registerParameter.getBlockingQueueType().getType(), registerParameter.getCapacity())) .threadFactory(registerParameter.getThreadNamePrefix()) .keepAliveTime(registerParameter.getKeepAliveTime(), TimeUnit.SECONDS) .executeTimeOut(registerParameter.getExecuteTimeOut()) - .rejected(RejectedTypeEnum.createPolicy(registerParameter.getRejectedType().type)) + .rejected(RejectedPolicyTypeEnum.createPolicy(registerParameter.getRejectedPolicyType().getType())) .dynamicPool() .build(); return dynamicThreadPoolExecutor; 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 c01b4982..d081f092 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.common.executor.support.QueueTypeEnum; -import cn.hippo4j.common.executor.support.RejectedTypeEnum; +import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum; +import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum; 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) + .blockingQueueType(BlockingQueueTypeEnum.LINKED_BLOCKING_QUEUE) .capacity(1024) // TimeUnit.SECONDS .keepAliveTime(1024L) // TimeUnit.MILLISECONDS .executeTimeOut(1024L) - .rejectedType(RejectedTypeEnum.DISCARD_POLICY) + .rejectedPolicyType(RejectedPolicyTypeEnum.DISCARD_POLICY) .isAlarm(true) .allowCoreThreadTimeOut(false) .capacityAlarm(90) diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java index ada78efb..e7d07c80 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java @@ -23,8 +23,8 @@ 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.common.executor.support.QueueTypeEnum; -import cn.hippo4j.common.executor.support.RejectedTypeEnum; +import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum; +import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum; import cn.hippo4j.common.executor.support.ResizableCapacityLinkedBlockingQueue; import cn.hippo4j.core.proxy.RejectedProxyUtil; import cn.hippo4j.core.springboot.starter.config.BootstrapCoreProperties; @@ -200,7 +200,7 @@ public class DynamicThreadPoolRefreshListener implements ApplicationListener queue = (ResizableCapacityLinkedBlockingQueue) executor.getQueue(); queue.setCapacity(properties.getQueueCapacity()); diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolConfigService.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolConfigService.java index 3cd68d86..eafa4530 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolConfigService.java +++ b/hippo4j-spring-boot/hippo4j-config-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.common.executor.support.QueueTypeEnum; -import cn.hippo4j.common.executor.support.RejectedTypeEnum; +import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum; +import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum; import cn.hippo4j.core.executor.support.service.AbstractDynamicThreadPoolService; import cn.hippo4j.core.springboot.starter.config.ExecutorProperties; import cn.hippo4j.message.service.ThreadPoolNotifyAlarm; @@ -67,10 +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().type)) + .blockingQueue(BlockingQueueTypeEnum.getBlockingQueueNameByType(registerParameter.getBlockingQueueType().getType())) .capacityAlarm(registerParameter.getCapacity()) .threadNamePrefix(registerParameter.getThreadNamePrefix()) - .rejectedHandler(RejectedTypeEnum.getRejectedNameByType(registerParameter.getRejectedType().type)) + .rejectedHandler(RejectedPolicyTypeEnum.getRejectedNameByType(registerParameter.getRejectedPolicyType().getType())) .executeTimeOut(registerParameter.getExecuteTimeOut()) .threadPoolId(registerParameter.getThreadPoolId()) .build(); diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java index fee2c23d..739323cd 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/support/DynamicThreadPoolPostProcessor.java @@ -18,8 +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.executor.support.BlockingQueueTypeEnum; +import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum; import cn.hippo4j.common.toolkit.StringUtil; import cn.hippo4j.core.executor.DynamicThreadPool; import cn.hippo4j.core.executor.DynamicThreadPoolExecutor; @@ -118,7 +118,7 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor { .orElse(null); if (executorProperties != null) { try { - BlockingQueue workQueue = QueueTypeEnum.createBlockingQueue(executorProperties.getBlockingQueue(), executorProperties.getQueueCapacity()); + BlockingQueue workQueue = BlockingQueueTypeEnum.createBlockingQueue(executorProperties.getBlockingQueue(), executorProperties.getQueueCapacity()); String threadNamePrefix = executorProperties.getThreadNamePrefix(); newDynamicPoolExecutor = ThreadPoolBuilder.builder() .dynamicPool() @@ -127,7 +127,7 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor { .executeTimeOut(Optional.ofNullable(executorProperties.getExecuteTimeOut()).orElse(0L)) .poolThreadSize(executorProperties.getCorePoolSize(), executorProperties.getMaximumPoolSize()) .keepAliveTime(executorProperties.getKeepAliveTime(), TimeUnit.SECONDS) - .rejected(RejectedTypeEnum.createPolicy(executorProperties.getRejectedHandler())) + .rejected(RejectedPolicyTypeEnum.createPolicy(executorProperties.getRejectedHandler())) .allowCoreThreadTimeOut(executorProperties.getAllowCoreThreadTimeOut()) .build(); } catch (Exception ex) { 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 b495f893..6e57b6f4 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.common.executor.support.QueueTypeEnum; +import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum; import cn.hippo4j.core.executor.support.ThreadPoolBuilder; import cn.hippo4j.springboot.starter.config.BootstrapProperties; import lombok.RequiredArgsConstructor; @@ -46,7 +46,7 @@ public class DynamicThreadPoolSubscribeConfig { .maxPoolNum(2) .keepAliveTime(2000) .timeUnit(TimeUnit.MILLISECONDS) - .workQueue(QueueTypeEnum.SYNCHRONOUS_QUEUE) + .workQueue(BlockingQueueTypeEnum.SYNCHRONOUS_QUEUE) .allowCoreThreadTimeOut(true) .threadFactory("client.dynamic.threadPool.change.config") .rejected(new ThreadPoolExecutor.AbortPolicy()) 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 e0224ae0..8d0feb4d 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,8 +26,8 @@ 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.common.executor.support.QueueTypeEnum; -import cn.hippo4j.common.executor.support.RejectedTypeEnum; +import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum; +import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum; import cn.hippo4j.common.executor.support.ResizableCapacityLinkedBlockingQueue; import cn.hippo4j.core.proxy.RejectedProxyUtil; import cn.hippo4j.common.api.ThreadPoolDynamicRefresh; @@ -94,7 +94,7 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh .nowAllowsCoreThreadTimeOut(EnableEnum.getBool(parameter.getAllowCoreThreadTimeOut())) .nowKeepAliveTime(afterExecutor.getKeepAliveTime(TimeUnit.SECONDS)) .nowQueueCapacity((afterExecutor.getQueue().remainingCapacity() + afterExecutor.getQueue().size())) - .nowRejectedName(RejectedTypeEnum.getRejectedNameByType(parameter.getRejectedType())) + .nowRejectedName(RejectedPolicyTypeEnum.getRejectedNameByType(parameter.getRejectedType())) .nowExecuteTimeOut(executeTimeOut) .build(); changeNotifyRequest.setThreadPoolId(threadPoolId); @@ -106,7 +106,7 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh String.format(CHANGE_DELIMITER, originalCapacity, (afterExecutor.getQueue().remainingCapacity() + afterExecutor.getQueue().size())), String.format(CHANGE_DELIMITER, originalKeepAliveTime, afterExecutor.getKeepAliveTime(TimeUnit.SECONDS)), String.format(CHANGE_DELIMITER, originalExecuteTimeOut, executeTimeOut), - String.format(CHANGE_DELIMITER, originalRejected, RejectedTypeEnum.getRejectedNameByType(parameter.getRejectedType())), + String.format(CHANGE_DELIMITER, originalRejected, RejectedPolicyTypeEnum.getRejectedNameByType(parameter.getRejectedType())), String.format(CHANGE_DELIMITER, originalAllowCoreThreadTimeOut, EnableEnum.getBool(parameter.getAllowCoreThreadTimeOut()))); } @@ -128,7 +128,7 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh } } if (parameter.getCapacity() != null - && Objects.equals(QueueTypeEnum.RESIZABLE_LINKED_BLOCKING_QUEUE.type, parameter.getQueueType())) { + && Objects.equals(BlockingQueueTypeEnum.RESIZABLE_LINKED_BLOCKING_QUEUE.getType(), parameter.getQueueType())) { if (executor.getQueue() instanceof ResizableCapacityLinkedBlockingQueue) { ResizableCapacityLinkedBlockingQueue queue = (ResizableCapacityLinkedBlockingQueue) executor.getQueue(); queue.setCapacity(parameter.getCapacity()); @@ -144,7 +144,7 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh ((DynamicThreadPoolExecutor) executor).setExecuteTimeOut(executeTimeOut); } if (parameter.getRejectedType() != null) { - RejectedExecutionHandler rejectedExecutionHandler = RejectedTypeEnum.createPolicy(parameter.getRejectedType()); + RejectedExecutionHandler rejectedExecutionHandler = RejectedPolicyTypeEnum.createPolicy(parameter.getRejectedType()); if (executor instanceof AbstractDynamicExecutorSupport) { DynamicThreadPoolExecutor dynamicExecutor = (DynamicThreadPoolExecutor) executor; dynamicExecutor.setRedundancyHandler(rejectedExecutionHandler); 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 4da97421..6f85e360 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,8 +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.executor.support.BlockingQueueTypeEnum; +import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum; import cn.hippo4j.common.model.ThreadPoolParameterInfo; import cn.hippo4j.common.toolkit.BooleanUtil; import cn.hippo4j.common.toolkit.JSONUtil; @@ -135,14 +135,14 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor { String resultJsonStr = JSONUtil.toJSONString(result.getData()); if ((threadPoolParameterInfo = JSONUtil.parseObject(resultJsonStr, ThreadPoolParameterInfo.class)) != null) { // Create a thread pool with relevant parameters. - BlockingQueue workQueue = QueueTypeEnum.createBlockingQueue(threadPoolParameterInfo.getQueueType(), threadPoolParameterInfo.getCapacity()); + BlockingQueue workQueue = BlockingQueueTypeEnum.createBlockingQueue(threadPoolParameterInfo.getQueueType(), threadPoolParameterInfo.getCapacity()); newDynamicThreadPoolExecutor = ThreadPoolBuilder.builder() .dynamicPool() .workQueue(workQueue) .threadFactory(threadPoolId) .poolThreadSize(threadPoolParameterInfo.corePoolSizeAdapt(), threadPoolParameterInfo.maximumPoolSizeAdapt()) .keepAliveTime(threadPoolParameterInfo.getKeepAliveTime(), TimeUnit.SECONDS) - .rejected(RejectedTypeEnum.createPolicy(threadPoolParameterInfo.getRejectedType())) + .rejected(RejectedPolicyTypeEnum.createPolicy(threadPoolParameterInfo.getRejectedType())) .allowCoreThreadTimeOut(EnableEnum.getBool(threadPoolParameterInfo.getAllowCoreThreadTimeOut())) .build(); // Set dynamic thread pool enhancement parameters.