From a066e01a938722476ee97c846bcd17fd38d985dc Mon Sep 17 00:00:00 2001 From: yangsanity Date: Thu, 4 May 2023 16:48:04 +0800 Subject: [PATCH] refactor 1171: optimize @Deprecated coreSize and maxSize --- .../dubbo/AlibabaDubboThreadPoolAdapter.java | 4 ++-- .../adapter/base/ThreadPoolAdapterState.java | 8 ++++---- .../adapter/dubbo/DubboThreadPoolAdapter.java | 4 ++-- .../hystrix/AbstractHystrixThreadPoolAdapter.java | 4 ++-- .../adapter/kafka/KafkaThreadPoolAdapter.java | 8 ++++---- .../rabbitmq/RabbitMQThreadPoolAdapter.java | 4 ++-- .../rocketmq/RocketMQThreadPoolAdapter.java | 4 ++-- ...SpringCloudStreamRabbitMQThreadPoolAdapter.java | 10 +++++----- ...SpringCloudStreamRocketMQThreadPoolAdapter.java | 4 ++-- .../jetty/JettyWebThreadPoolHandlerSupport.java | 12 ++++++------ .../tomcat/TomcatWebThreadPoolHandlerSupport.java | 12 ++++++------ .../UndertowWebThreadPoolHandlerSupport.java | 12 ++++++------ .../hippo4j/common/model/GlobalRemotePoolInfo.java | 8 ++++---- .../hippo4j/common/model/ThreadPoolBaseInfo.java | 8 ++++---- .../cn/hippo4j/common/toolkit/ContentUtil.java | 4 ++-- .../executor/state/AbstractThreadPoolRuntime.java | 4 ++-- .../AdapterThreadPoolMicrometerMonitorHandler.java | 4 ++-- .../DynamicThreadPoolMicrometerMonitorHandler.java | 4 ++-- .../WebThreadPoolMicrometerMonitorHandler.java | 4 ++-- .../biz/threadpool/ConfigModifyVerifyReqDTO.java | 2 -- .../event/AdapterExecutorsRefreshListener.java | 4 ++-- .../event/WebExecutorRefreshListener.java | 14 +++++++------- 22 files changed, 70 insertions(+), 72 deletions(-) diff --git a/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/alibaba/dubbo/AlibabaDubboThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/alibaba/dubbo/AlibabaDubboThreadPoolAdapter.java index 2eb12e3d..2b6f1421 100644 --- a/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/alibaba/dubbo/AlibabaDubboThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/src/main/java/cn/hippo4j/adapter/alibaba/dubbo/AlibabaDubboThreadPoolAdapter.java @@ -58,8 +58,8 @@ public class AlibabaDubboThreadPoolAdapter implements ThreadPoolAdapter, Applica return threadPoolAdapterState; } threadPoolAdapterState.setThreadPoolKey(identify); - threadPoolAdapterState.setCoreSize(executor.getCorePoolSize()); - threadPoolAdapterState.setMaximumSize(executor.getMaximumPoolSize()); + threadPoolAdapterState.setCorePoolSize(executor.getCorePoolSize()); + threadPoolAdapterState.setMaximumPoolSize(executor.getMaximumPoolSize()); return threadPoolAdapterState; } diff --git a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterState.java b/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterState.java index b46c6c26..2757071f 100644 --- a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterState.java +++ b/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterState.java @@ -46,14 +46,14 @@ public class ThreadPoolAdapterState { private String clientAddress; /** - * Core size + * Core pool size */ - private Integer coreSize; + private Integer corePoolSize; /** - * Maximum size + * Maximum pool size */ - private Integer maximumSize; + private Integer maximumPoolSize; /** * Blocking queue type diff --git a/hippo4j-adapter/hippo4j-adapter-dubbo/src/main/java/cn/hippo4j/adapter/dubbo/DubboThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-dubbo/src/main/java/cn/hippo4j/adapter/dubbo/DubboThreadPoolAdapter.java index a3257f19..9ab127f8 100644 --- a/hippo4j-adapter/hippo4j-adapter-dubbo/src/main/java/cn/hippo4j/adapter/dubbo/DubboThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-dubbo/src/main/java/cn/hippo4j/adapter/dubbo/DubboThreadPoolAdapter.java @@ -62,8 +62,8 @@ public class DubboThreadPoolAdapter implements ThreadPoolAdapter, ApplicationLis return threadPoolAdapterState; } threadPoolAdapterState.setThreadPoolKey(identify); - threadPoolAdapterState.setCoreSize(executor.getCorePoolSize()); - threadPoolAdapterState.setMaximumSize(executor.getMaximumPoolSize()); + threadPoolAdapterState.setCorePoolSize(executor.getCorePoolSize()); + threadPoolAdapterState.setMaximumPoolSize(executor.getMaximumPoolSize()); return threadPoolAdapterState; } diff --git a/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/AbstractHystrixThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/AbstractHystrixThreadPoolAdapter.java index 441a1efb..f2c2f442 100644 --- a/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/AbstractHystrixThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/AbstractHystrixThreadPoolAdapter.java @@ -70,8 +70,8 @@ public abstract class AbstractHystrixThreadPoolAdapter implements ThreadPoolAdap if (threadPoolExecutor != null) { BlockingQueue blockingQueue = threadPoolExecutor.getQueue(); result.setThreadPoolKey(identify); - result.setCoreSize(threadPoolExecutor.getCorePoolSize()); - result.setMaximumSize(threadPoolExecutor.getMaximumPoolSize()); + result.setCorePoolSize(threadPoolExecutor.getCorePoolSize()); + result.setMaximumPoolSize(threadPoolExecutor.getMaximumPoolSize()); result.setBlockingQueueCapacity(blockingQueue.size() + blockingQueue.remainingCapacity()); return result; } diff --git a/hippo4j-adapter/hippo4j-adapter-kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java index 21e417ac..5ce4584f 100644 --- a/hippo4j-adapter/hippo4j-adapter-kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java @@ -65,11 +65,11 @@ public class KafkaThreadPoolAdapter implements ThreadPoolAdapter, ApplicationLis result.setThreadPoolKey(identify); if (listenerContainer instanceof ConcurrentMessageListenerContainer) { - result.setCoreSize(((ConcurrentMessageListenerContainer) listenerContainer).getConcurrency()); - result.setMaximumSize(result.getCoreSize()); + result.setCorePoolSize(((ConcurrentMessageListenerContainer) listenerContainer).getConcurrency()); + result.setMaximumPoolSize(result.getCorePoolSize()); } else { - result.setCoreSize(1); - result.setMaximumSize(1); + result.setCorePoolSize(1); + result.setMaximumPoolSize(1); } return result; } diff --git a/hippo4j-adapter/hippo4j-adapter-rabbitmq/src/main/java/cn/hippo4j/adapter/rabbitmq/RabbitMQThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-rabbitmq/src/main/java/cn/hippo4j/adapter/rabbitmq/RabbitMQThreadPoolAdapter.java index b8b5ae1e..c5f5c014 100644 --- a/hippo4j-adapter/hippo4j-adapter-rabbitmq/src/main/java/cn/hippo4j/adapter/rabbitmq/RabbitMQThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-rabbitmq/src/main/java/cn/hippo4j/adapter/rabbitmq/RabbitMQThreadPoolAdapter.java @@ -64,8 +64,8 @@ public class RabbitMQThreadPoolAdapter implements ThreadPoolAdapter, Application ThreadPoolExecutor threadPoolTaskExecutor = rabbitmqThreadPoolTaskExecutor.get(identify); threadPoolAdapterState.setThreadPoolKey(identify); if (Objects.nonNull(threadPoolTaskExecutor)) { - threadPoolAdapterState.setCoreSize(threadPoolTaskExecutor.getCorePoolSize()); - threadPoolAdapterState.setMaximumSize(threadPoolTaskExecutor.getMaximumPoolSize()); + threadPoolAdapterState.setCorePoolSize(threadPoolTaskExecutor.getCorePoolSize()); + threadPoolAdapterState.setMaximumPoolSize(threadPoolTaskExecutor.getMaximumPoolSize()); } return threadPoolAdapterState; } diff --git a/hippo4j-adapter/hippo4j-adapter-rocketmq/src/main/java/cn/hippo4j/adapter/rocketmq/RocketMQThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-rocketmq/src/main/java/cn/hippo4j/adapter/rocketmq/RocketMQThreadPoolAdapter.java index 3fa91856..e01e6025 100644 --- a/hippo4j-adapter/hippo4j-adapter-rocketmq/src/main/java/cn/hippo4j/adapter/rocketmq/RocketMQThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-rocketmq/src/main/java/cn/hippo4j/adapter/rocketmq/RocketMQThreadPoolAdapter.java @@ -57,8 +57,8 @@ public class RocketMQThreadPoolAdapter implements ThreadPoolAdapter, Application ThreadPoolExecutor rocketMQConsumeExecutor = rocketmqConsumeExecutor.get(identify); if (rocketMQConsumeExecutor != null) { result.setThreadPoolKey(identify); - result.setCoreSize(rocketMQConsumeExecutor.getCorePoolSize()); - result.setMaximumSize(rocketMQConsumeExecutor.getMaximumPoolSize()); + result.setCorePoolSize(rocketMQConsumeExecutor.getCorePoolSize()); + result.setMaximumPoolSize(rocketMQConsumeExecutor.getMaximumPoolSize()); return result; } log.warn("[{}] RocketMQ consuming thread pool not found.", identify); diff --git a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java index d5b3326c..4613bc30 100644 --- a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java @@ -64,17 +64,17 @@ public class SpringCloudStreamRabbitMQThreadPoolAdapter implements ThreadPoolAda result.setThreadPoolKey(identify); if (messageListenerContainer instanceof SimpleMessageListenerContainer) { int concurrentConsumers = (int) ReflectUtil.getFieldValue(messageListenerContainer, "concurrentConsumers"); - result.setCoreSize(concurrentConsumers); + result.setCorePoolSize(concurrentConsumers); Object maxConcurrentConsumers = ReflectUtil.getFieldValue(messageListenerContainer, "maxConcurrentConsumers"); if (maxConcurrentConsumers != null) { - result.setMaximumSize((Integer) maxConcurrentConsumers); + result.setMaximumPoolSize((Integer) maxConcurrentConsumers); } else { - result.setMaximumSize(concurrentConsumers); + result.setMaximumPoolSize(concurrentConsumers); } } else if (messageListenerContainer instanceof DirectMessageListenerContainer) { int consumersPerQueue = (int) ReflectUtil.getFieldValue(messageListenerContainer, "consumersPerQueue"); - result.setCoreSize(consumersPerQueue); - result.setMaximumSize(consumersPerQueue); + result.setCorePoolSize(consumersPerQueue); + result.setMaximumPoolSize(consumersPerQueue); } return result; } diff --git a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rocketmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rocketmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQThreadPoolAdapter.java index 12769cf3..eb1bb80a 100644 --- a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rocketmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rocketmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rocketmq/SpringCloudStreamRocketMQThreadPoolAdapter.java @@ -65,8 +65,8 @@ public class SpringCloudStreamRocketMQThreadPoolAdapter implements ThreadPoolAda ThreadPoolExecutor rocketMQConsumeExecutor = rocketMqSpringCloudStreamConsumeExecutor.get(identify); if (rocketMQConsumeExecutor != null) { result.setThreadPoolKey(identify); - result.setCoreSize(rocketMQConsumeExecutor.getCorePoolSize()); - result.setMaximumSize(rocketMQConsumeExecutor.getMaximumPoolSize()); + result.setCorePoolSize(rocketMQConsumeExecutor.getCorePoolSize()); + result.setMaximumPoolSize(rocketMQConsumeExecutor.getMaximumPoolSize()); return result; } log.warn("[{}] RocketMQ consuming thread pool not found.", identify); diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java index f82b3408..5b3edd28 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java @@ -57,8 +57,8 @@ public class JettyWebThreadPoolHandlerSupport implements IWebThreadPoolHandlerSu public ThreadPoolBaseInfo simpleInfo() { ThreadPoolBaseInfo poolBaseInfo = new ThreadPoolBaseInfo(); QueuedThreadPool queuedThreadPool = (QueuedThreadPool) executor; - poolBaseInfo.setCoreSize(queuedThreadPool.getMinThreads()); - poolBaseInfo.setMaximumSize(queuedThreadPool.getMaxThreads()); + poolBaseInfo.setCorePoolSize(queuedThreadPool.getMinThreads()); + poolBaseInfo.setMaximumPoolSize(queuedThreadPool.getMaxThreads()); BlockingQueue jobs = (BlockingQueue) ReflectUtil.getFieldValue(queuedThreadPool, "_jobs"); int queueCapacity = jobs.remainingCapacity() + jobs.size(); poolBaseInfo.setQueueCapacity(queueCapacity); @@ -76,8 +76,8 @@ public class JettyWebThreadPoolHandlerSupport implements IWebThreadPoolHandlerSu QueuedThreadPool jettyExecutor = (QueuedThreadPool) executor; int minThreads = jettyExecutor.getMinThreads(); int maxThreads = jettyExecutor.getMaxThreads(); - parameterInfo.setCoreSize(minThreads); - parameterInfo.setMaxSize(maxThreads); + parameterInfo.setCorePoolSize(minThreads); + parameterInfo.setMaximumPoolSize(maxThreads); } catch (Exception ex) { log.error("Failed to get the jetty thread pool parameter.", ex); } @@ -102,9 +102,9 @@ public class JettyWebThreadPoolHandlerSupport implements IWebThreadPoolHandlerSu runStateInfo.setQueueSize(queueSize); runStateInfo.setQueueCapacity(queueCapacity); runStateInfo.setQueueRemainingCapacity(remainingCapacity); - runStateInfo.setCoreSize(corePoolSize); + runStateInfo.setCorePoolSize(corePoolSize); runStateInfo.setPoolSize(poolSize); - runStateInfo.setMaximumSize(maximumPoolSize); + runStateInfo.setMaximumPoolSize(maximumPoolSize); runStateInfo.setActiveSize(busyCount); runStateInfo.setCurrentLoad(currentLoad); runStateInfo.setClientLastRefreshTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java index 446a4b43..d6b23206 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java @@ -72,8 +72,8 @@ public class TomcatWebThreadPoolHandlerSupport implements IWebThreadPoolHandlerS int queueCapacity = queueSize + remainingCapacity; String rejectedExecutionHandlerName = executor instanceof ThreadPoolExecutor ? ((ThreadPoolExecutor) executor).getRejectedExecutionHandler().getClass().getSimpleName() : tomcatThreadPoolExecutor.getRejectedExecutionHandler().getClass().getSimpleName(); - poolBaseInfo.setCoreSize(corePoolSize); - poolBaseInfo.setMaximumSize(maximumPoolSize); + poolBaseInfo.setCorePoolSize(corePoolSize); + poolBaseInfo.setMaximumPoolSize(maximumPoolSize); poolBaseInfo.setKeepAliveTime(keepAliveTime); poolBaseInfo.setQueueType(blockingQueue.getClass().getSimpleName()); poolBaseInfo.setQueueCapacity(queueCapacity); @@ -89,8 +89,8 @@ public class TomcatWebThreadPoolHandlerSupport implements IWebThreadPoolHandlerS int minThreads = tomcatThreadPoolExecutor.getCorePoolSize(); int maxThreads = tomcatThreadPoolExecutor.getMaximumPoolSize(); long keepAliveTime = tomcatThreadPoolExecutor.getKeepAliveTime(TimeUnit.SECONDS); - parameterInfo.setCoreSize(minThreads); - parameterInfo.setMaxSize(maxThreads); + parameterInfo.setCorePoolSize(minThreads); + parameterInfo.setMaximumPoolSize(maxThreads); parameterInfo.setKeepAliveTime(keepAliveTime); } catch (Exception ex) { log.error("Failed to get the tomcat thread pool parameter.", ex); @@ -118,9 +118,9 @@ public class TomcatWebThreadPoolHandlerSupport implements IWebThreadPoolHandlerS String queueType = queue.getClass().getSimpleName(); int remainingCapacity = queue.remainingCapacity(); int queueCapacity = queueSize + remainingCapacity; - runStateInfo.setCoreSize(corePoolSize); + runStateInfo.setCorePoolSize(corePoolSize); runStateInfo.setPoolSize(poolSize); - runStateInfo.setMaximumSize(maximumPoolSize); + runStateInfo.setMaximumPoolSize(maximumPoolSize); runStateInfo.setActiveSize(activeCount); runStateInfo.setCurrentLoad(currentLoad); runStateInfo.setPeakLoad(peakLoad); diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java index 6917a26a..d72bbe3e 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java @@ -63,8 +63,8 @@ public class UndertowWebThreadPoolHandlerSupport implements IWebThreadPoolHandle int coreSize = xnioWorker.getOption(Options.WORKER_TASK_CORE_THREADS); int maximumPoolSize = xnioWorker.getOption(Options.WORKER_TASK_MAX_THREADS); int keepAliveTime = xnioWorker.getOption(Options.WORKER_TASK_KEEPALIVE); - poolBaseInfo.setCoreSize(coreSize); - poolBaseInfo.setMaximumSize(maximumPoolSize); + poolBaseInfo.setCorePoolSize(coreSize); + poolBaseInfo.setMaximumPoolSize(maximumPoolSize); poolBaseInfo.setKeepAliveTime((long) keepAliveTime); poolBaseInfo.setRejectedName("-"); poolBaseInfo.setQueueType("-"); @@ -83,8 +83,8 @@ public class UndertowWebThreadPoolHandlerSupport implements IWebThreadPoolHandle int minThreads = xnioWorker.getOption(Options.WORKER_TASK_CORE_THREADS); int maxThreads = xnioWorker.getOption(Options.WORKER_TASK_MAX_THREADS); long keepAliveTime = xnioWorker.getOption(Options.WORKER_TASK_KEEPALIVE); - parameterInfo.setCoreSize(minThreads); - parameterInfo.setMaxSize(maxThreads); + parameterInfo.setCorePoolSize(minThreads); + parameterInfo.setMaximumPoolSize(maxThreads); parameterInfo.setKeepAliveTime(keepAliveTime); } catch (Exception ex) { log.error("Failed to get the undertow thread pool parameter.", ex); @@ -114,9 +114,9 @@ public class UndertowWebThreadPoolHandlerSupport implements IWebThreadPoolHandle activeCount = Math.max(activeCount, 0); String currentLoad = CalculateUtil.divide(activeCount, maximumPoolSize) + ""; String peakLoad = CalculateUtil.divide(activeCount, maximumPoolSize) + ""; - stateInfo.setCoreSize(corePoolSize); + stateInfo.setCorePoolSize(corePoolSize); stateInfo.setPoolSize(poolSize); - stateInfo.setMaximumSize(maximumPoolSize); + stateInfo.setMaximumPoolSize(maximumPoolSize); stateInfo.setActiveSize(activeCount); stateInfo.setCurrentLoad(currentLoad); stateInfo.setPeakLoad(peakLoad); diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java index f704c49b..9cffbb7b 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java @@ -47,14 +47,14 @@ public class GlobalRemotePoolInfo implements Serializable { private String tpId; /** - * coreSize + * corePoolSize */ - private Integer coreSize; + private Integer corePoolSize; /** - * maxSize + * maximumPoolSize */ - private Integer maxSize; + private Integer maximumPoolSize; /** * queueType diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java index 8fba9dd0..606c895d 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolBaseInfo.java @@ -28,14 +28,14 @@ import lombok.experimental.Accessors; public class ThreadPoolBaseInfo { /** - * coreSize + * corePoolSize */ - private Integer coreSize; + private Integer corePoolSize; /** - * maximumSize + * maximumPoolSize */ - private Integer maximumSize; + private Integer maximumPoolSize; /** * queueType diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java index ae5b6dfe..bcd363d9 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java @@ -37,8 +37,8 @@ public class ContentUtil { threadPoolParameterInfo.setTenantId(parameter.getTenantId()) .setItemId(parameter.getItemId()) .setTpId(parameter.getTpId()) - .setCoreSize(parameter.getCoreSize()) - .setMaxSize(parameter.getMaxSize()) + .setCorePoolSize(parameter.getCoreSize()) + .setMaximumPoolSize(parameter.getMaxSize()) .setQueueType(parameter.getQueueType()) .setCapacity(parameter.getCapacity()) .setKeepAliveTime(parameter.getKeepAliveTime()) diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntime.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntime.java index 8d9ca68f..719132ac 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntime.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntime.java @@ -81,8 +81,8 @@ public abstract class AbstractThreadPoolRuntime { .rejectCount(rejectCount) .timestamp(System.currentTimeMillis()) .build(); - stateInfo.setCoreSize(actualExecutor.getCorePoolSize()); - stateInfo.setMaximumSize(actualExecutor.getMaximumPoolSize()); + stateInfo.setCorePoolSize(actualExecutor.getCorePoolSize()); + stateInfo.setMaximumPoolSize(actualExecutor.getMaximumPoolSize()); stateInfo.setQueueType(blockingQueue.getClass().getSimpleName()); stateInfo.setQueueCapacity(blockingQueue.size() + blockingQueue.remainingCapacity()); return supplement(stateInfo); diff --git a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java index b5e20608..94cd7617 100644 --- a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java @@ -56,8 +56,8 @@ public class AdapterThreadPoolMicrometerMonitorHandler extends AbstractAdapterTh Iterable tags = CollectionUtil.newArrayList( Tag.of(ADAPTER_THREAD_POOL_ID_TAG, threadPoolAdapterState.getThreadPoolKey()), Tag.of(APPLICATION_NAME_TAG, applicationName)); - Metrics.gauge(metricName("core.size"), tags, threadPoolAdapterState, ThreadPoolAdapterState::getCoreSize); - Metrics.gauge(metricName("maximum.size"), tags, threadPoolAdapterState, ThreadPoolAdapterState::getMaximumSize); + Metrics.gauge(metricName("core.size"), tags, threadPoolAdapterState, ThreadPoolAdapterState::getCorePoolSize); + Metrics.gauge(metricName("maximum.size"), tags, threadPoolAdapterState, ThreadPoolAdapterState::getMaximumPoolSize); Metrics.gauge(metricName("queue.capacity"), tags, threadPoolAdapterState, ThreadPoolAdapterState::getBlockingQueueCapacity); } diff --git a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java index 19dac923..028efd23 100644 --- a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java @@ -58,8 +58,8 @@ public class DynamicThreadPoolMicrometerMonitorHandler extends AbstractDynamicTh Tag.of(APPLICATION_NAME_TAG, applicationName)); Metrics.gauge(metricName("current.load"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getSimpleCurrentLoad); Metrics.gauge(metricName("peak.load"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getSimplePeakLoad); - Metrics.gauge(metricName("core.size"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getCoreSize); - Metrics.gauge(metricName("maximum.size"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getMaximumSize); + Metrics.gauge(metricName("core.size"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getCorePoolSize); + Metrics.gauge(metricName("maximum.size"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getMaximumPoolSize); Metrics.gauge(metricName("current.size"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getPoolSize); Metrics.gauge(metricName("largest.size"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getLargestPoolSize); Metrics.gauge(metricName("active.size"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getActiveSize); diff --git a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java index 078cb8c1..e852e181 100644 --- a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java @@ -54,8 +54,8 @@ public class WebThreadPoolMicrometerMonitorHandler extends AbstractWebThreadPool Iterable tags = CollectionUtil.newArrayList(Tag.of(APPLICATION_NAME_TAG, applicationName)); Metrics.gauge(metricName("current.load"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getSimpleCurrentLoad); Metrics.gauge(metricName("peak.load"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getSimplePeakLoad); - Metrics.gauge(metricName("core.size"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getCoreSize); - Metrics.gauge(metricName("maximum.size"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getMaximumSize); + Metrics.gauge(metricName("core.size"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getCorePoolSize); + Metrics.gauge(metricName("maximum.size"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getMaximumPoolSize); Metrics.gauge(metricName("current.size"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getPoolSize); Metrics.gauge(metricName("largest.size"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getLargestPoolSize); Metrics.gauge(metricName("active.size"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getActiveSize); diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java index 946e4764..9e9c2d0b 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java @@ -20,8 +20,6 @@ package cn.hippo4j.config.model.biz.threadpool; import com.fasterxml.jackson.annotation.JsonAlias; import lombok.Data; -import java.util.List; - /** * Config modify verify dto */ diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java index 8b780bb0..df3016f5 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java @@ -69,8 +69,8 @@ public class AdapterExecutorsRefreshListener extends AbstractRefreshListener { if (Objects.equals(val.mark(), each.getMark())) { ThreadPoolAdapterState threadPoolState = val.getThreadPoolState(each.getThreadPoolKey()); - if (!Objects.equals(threadPoolState.getCoreSize(), each.getCorePoolSize()) - || !Objects.equals(threadPoolState.getMaximumSize(), each.getMaximumPoolSize())) { + if (!Objects.equals(threadPoolState.getCorePoolSize(), each.getCorePoolSize()) + || !Objects.equals(threadPoolState.getMaximumPoolSize(), each.getMaximumPoolSize())) { val.updateThreadPool(BeanUtil.convert(each, ThreadPoolAdapterParameter.class)); DynamicThreadPoolAdapterRegister.ADAPTER_EXECUTORS_MAP.put(buildKey, each); } diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java index 0baf43b3..4f384438 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java @@ -66,17 +66,17 @@ public class WebExecutorRefreshListener extends AbstractRefreshListener