From 68a635b4acbe6c17989eb82f03b310b9b578b4ea Mon Sep 17 00:00:00 2001 From: yangsanity Date: Fri, 3 Mar 2023 10:16:04 +0800 Subject: [PATCH] rename maxPoolNum to maximumPoolSize (#1073) --- .../AbstractBuildThreadPoolTemplate.java | 8 ++--- .../executor/support/ThreadPoolBuilder.java | 34 ++++++++++++------- .../adpter/ThreadPoolTaskExecutorAdapter.java | 2 +- .../AbstractDynamicThreadPoolService.java | 2 +- .../DynamicThreadPoolSubscribeConfig.java | 2 +- 5 files changed, 28 insertions(+), 20 deletions(-) diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java index 8f463319..bccd9e56 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java @@ -63,7 +63,7 @@ public class AbstractBuildThreadPoolTemplate { ThreadPoolExecutor executorService; try { executorService = new ThreadPoolExecutorTemplate(initParam.getCorePoolNum(), - initParam.getMaxPoolNum(), + initParam.getMaximumPoolSize(), initParam.getKeepAliveTime(), initParam.getTimeUnit(), initParam.getWorkQueue(), @@ -97,7 +97,7 @@ public class AbstractBuildThreadPoolTemplate { FastThreadPoolExecutor fastThreadPoolExecutor; try { fastThreadPoolExecutor = new FastThreadPoolExecutor(initParam.getCorePoolNum(), - initParam.getMaxPoolNum(), + initParam.getMaximumPoolSize(), initParam.getKeepAliveTime(), initParam.getTimeUnit(), taskQueue, @@ -123,7 +123,7 @@ public class AbstractBuildThreadPoolTemplate { try { dynamicThreadPoolExecutor = new DynamicThreadPoolExecutor( initParam.getCorePoolNum(), - initParam.getMaxPoolNum(), + initParam.getMaximumPoolSize(), initParam.getKeepAliveTime(), initParam.getTimeUnit(), initParam.getExecuteTimeOut(), @@ -150,7 +150,7 @@ public class AbstractBuildThreadPoolTemplate { private Integer corePoolNum; - private Integer maxPoolNum; + private Integer maximumPoolSize; private Long keepAliveTime; 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 b1a830f9..8b31ede9 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 @@ -41,7 +41,7 @@ public class ThreadPoolBuilder implements Builder { private int corePoolSize = calculateCoreNum(); - private int maxPoolSize = corePoolSize + (corePoolSize >> 1); + private int maximumPoolSize = corePoolSize + (corePoolSize >> 1); private long keepAliveTime = 30000L; @@ -150,16 +150,24 @@ public class ThreadPoolBuilder implements Builder { return this; } + /** + * @deprecated Use {@link #maximumPoolSize} + */ + @Deprecated + public ThreadPoolBuilder maxPoolNum(int maximumPoolSize) { + return this.maximumPoolSize(maximumPoolSize); + } + /** * Max pool num. * - * @param maxPoolSize max pool num + * @param maximumPoolSize max pool num * @return thread-pool builder */ - public ThreadPoolBuilder maxPoolNum(int maxPoolSize) { - this.maxPoolSize = maxPoolSize; - if (maxPoolSize < this.corePoolSize) { - this.corePoolSize = maxPoolSize; + public ThreadPoolBuilder maximumPoolSize(int maximumPoolSize) { + this.maximumPoolSize = maximumPoolSize; + if (maximumPoolSize < this.corePoolSize) { + this.corePoolSize = maximumPoolSize; } return this; } @@ -172,7 +180,7 @@ public class ThreadPoolBuilder implements Builder { public ThreadPoolBuilder singlePool() { int singleNum = 1; this.corePoolSize = singleNum; - this.maxPoolSize = singleNum; + this.maximumPoolSize = singleNum; return this; } @@ -185,7 +193,7 @@ public class ThreadPoolBuilder implements Builder { public ThreadPoolBuilder singlePool(String threadNamePrefix) { int singleNum = 1; this.corePoolSize = singleNum; - this.maxPoolSize = singleNum; + this.maximumPoolSize = singleNum; this.threadNamePrefix = threadNamePrefix; return this; } @@ -193,13 +201,13 @@ public class ThreadPoolBuilder implements Builder { /** * Pool thread size. * - * @param corePoolSize core pool size - * @param maxPoolSize max pool size + * @param corePoolSize core pool size + * @param maximumPoolSize max pool size * @return thread-pool builder */ - public ThreadPoolBuilder poolThreadSize(int corePoolSize, int maxPoolSize) { + public ThreadPoolBuilder poolThreadSize(int corePoolSize, int maximumPoolSize) { this.corePoolSize = corePoolSize; - this.maxPoolSize = maxPoolSize; + this.maximumPoolSize = maximumPoolSize; return this; } @@ -438,7 +446,7 @@ public class ThreadPoolBuilder implements Builder { initParam = new AbstractBuildThreadPoolTemplate.ThreadPoolInitParam(builder.threadFactory); } initParam.setCorePoolNum(builder.corePoolSize) - .setMaxPoolNum(builder.maxPoolSize) + .setMaximumPoolSize(builder.maximumPoolSize) .setKeepAliveTime(builder.keepAliveTime) .setCapacity(builder.capacity) .setExecuteTimeOut(builder.executeTimeOut) diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ThreadPoolTaskExecutorAdapter.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ThreadPoolTaskExecutorAdapter.java index 3dea2eb1..283942db 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ThreadPoolTaskExecutorAdapter.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/adpter/ThreadPoolTaskExecutorAdapter.java @@ -79,7 +79,7 @@ public class ThreadPoolTaskExecutorAdapter implements DynamicThreadPoolAdapter { ThreadPoolBuilder threadPoolBuilder = ThreadPoolBuilder.builder() .dynamicPool() .corePoolSize(threadPoolTaskExecutor.getCorePoolSize()) - .maxPoolNum(threadPoolTaskExecutor.getMaxPoolSize()) + .maximumPoolSize(threadPoolTaskExecutor.getMaxPoolSize()) .keepAliveTime(threadPoolTaskExecutor.getKeepAliveSeconds()) .timeUnit(TimeUnit.SECONDS) .allowCoreThreadTimeOut(threadPoolExecutor.allowsCoreThreadTimeOut()) 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 abf6e989..4057f987 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 @@ -40,7 +40,7 @@ public abstract class AbstractDynamicThreadPoolService implements DynamicThreadP ThreadPoolExecutor dynamicThreadPoolExecutor = ThreadPoolBuilder.builder() .threadPoolId(registerParameter.getThreadPoolId()) .corePoolSize(registerParameter.getCorePoolSize()) - .maxPoolNum(registerParameter.getMaximumPoolSize()) + .maximumPoolSize(registerParameter.getMaximumPoolSize()) .workQueue(BlockingQueueTypeEnum.createBlockingQueue(registerParameter.getBlockingQueueType().getType(), registerParameter.getCapacity())) .threadFactory(registerParameter.getThreadNamePrefix()) .threadFactory(registerParameter.getThreadFactory()) 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 5a087427..804c0864 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 @@ -43,7 +43,7 @@ public class DynamicThreadPoolSubscribeConfig { private final ExecutorService configRefreshExecutorService = ThreadPoolBuilder.builder() .corePoolSize(1) - .maxPoolNum(2) + .maximumPoolSize(2) .keepAliveTime(2000) .timeUnit(TimeUnit.MILLISECONDS) .workQueue(BlockingQueueTypeEnum.SYNCHRONOUS_QUEUE)