From 5931f1be0e6fd48469d295bc1e357a50d1866049 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Sat, 5 Nov 2022 01:32:13 +0800 Subject: [PATCH] Remove useless modules and refactor code --- .../base/ThreadPoolAdapterBeanContainer.java | 2 +- .../base/ThreadPoolAdapterRegisterAction.java | 5 +- .../hystrix/ThreadPoolAdapterScheduler.java | 11 ++-- hippo4j-adapter/hippo4j-adapter-kafka/pom.xml | 18 ------ .../adapter/kafka/KafkaThreadPoolAdapter.java | 52 ---------------- .../rabbitmq/RabbitMQThreadPoolAdapter.java | 1 - .../pom.xml | 18 ------ ...ringCloudStreamKafkaThreadPoolAdapter.java | 59 ------------------- ...gCloudStreamRabbitMQThreadPoolAdapter.java | 2 +- .../web/AbstractWebThreadPoolService.java | 4 +- .../web/WebThreadPoolHandlerChoose.java | 2 +- .../web/WebThreadPoolRunStateHandler.java | 4 +- hippo4j-adapter/pom.xml | 2 - 13 files changed, 16 insertions(+), 164 deletions(-) delete mode 100644 hippo4j-adapter/hippo4j-adapter-kafka/pom.xml delete mode 100644 hippo4j-adapter/hippo4j-adapter-kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java delete mode 100644 hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-kafka/pom.xml delete mode 100644 hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-kafka/src/main/java/cn/hippo4j/adapter/springcloud/stream/kafka/SpringCloudStreamKafkaThreadPoolAdapter.java diff --git a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterBeanContainer.java b/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterBeanContainer.java index 92d555f2..a87b4743 100644 --- a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterBeanContainer.java +++ b/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterBeanContainer.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; public class ThreadPoolAdapterBeanContainer implements InitializingBean { /** - * Store three-party thread pool framework bean instances. + * Store three-party thread pool framework bean instances */ public static final Map THREAD_POOL_ADAPTER_BEAN_CONTAINER = new ConcurrentHashMap<>(); diff --git a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterRegisterAction.java b/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterRegisterAction.java index 0d380f15..0dda7fa3 100644 --- a/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterRegisterAction.java +++ b/hippo4j-adapter/hippo4j-adapter-base/src/main/java/cn/hippo4j/adapter/base/ThreadPoolAdapterRegisterAction.java @@ -28,7 +28,7 @@ public interface ThreadPoolAdapterRegisterAction { /** * Get thread pool adapter cache configs. * - * @param threadPoolAdapterMap + * @param threadPoolAdapterMap thread-pool adapter map * @return List */ List getThreadPoolAdapterCacheConfigs(Map threadPoolAdapterMap); @@ -36,8 +36,7 @@ public interface ThreadPoolAdapterRegisterAction { /** * Do register. * - * @param cacheConfigList - * @return + * @param cacheConfigList cache config list */ void doRegister(List cacheConfigList); } diff --git a/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java b/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java index d71cf267..143b285e 100644 --- a/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java +++ b/hippo4j-adapter/hippo4j-adapter-hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java @@ -18,6 +18,7 @@ package cn.hippo4j.adapter.hystrix; import cn.hippo4j.common.design.builder.ThreadFactoryBuilder; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import java.util.concurrent.ScheduledExecutorService; @@ -31,6 +32,7 @@ public class ThreadPoolAdapterScheduler { private static final int TASK_INTERVAL_SECONDS = 10; + @Getter private final ScheduledExecutorService scheduler; public ThreadPoolAdapterScheduler() { @@ -41,10 +43,11 @@ public class ThreadPoolAdapterScheduler { .build()); } - public ScheduledExecutorService getScheduler() { - return scheduler; - } - + /** + * Gt task interval seconds. + * + * @return task interval seconds + */ public int getTaskIntervalSeconds() { return TASK_INTERVAL_SECONDS; } diff --git a/hippo4j-adapter/hippo4j-adapter-kafka/pom.xml b/hippo4j-adapter/hippo4j-adapter-kafka/pom.xml deleted file mode 100644 index f193cc75..00000000 --- a/hippo4j-adapter/hippo4j-adapter-kafka/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - cn.hippo4j - hippo4j-adapter - ${revision} - - hippo4j-adapter-kafka - - - - cn.hippo4j - hippo4j-adapter-base - - - 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 deleted file mode 100644 index e27ced8a..00000000 --- a/hippo4j-adapter/hippo4j-adapter-kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cn.hippo4j.adapter.kafka; - -import cn.hippo4j.adapter.base.ThreadPoolAdapter; -import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter; -import cn.hippo4j.adapter.base.ThreadPoolAdapterState; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.context.event.ApplicationStartedEvent; -import org.springframework.context.ApplicationListener; - -/** - * Kafka thread-pool adapter. - */ -@Slf4j -public class KafkaThreadPoolAdapter implements ThreadPoolAdapter, ApplicationListener { - - @Override - public String mark() { - return "Kafka"; - } - - @Override - public ThreadPoolAdapterState getThreadPoolState(String identify) { - return null; - } - - @Override - public boolean updateThreadPool(ThreadPoolAdapterParameter threadPoolAdapterParameter) { - return false; - } - - @Override - public void onApplicationEvent(ApplicationStartedEvent event) { - - } -} 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 ccaab2b1..a05ac956 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 @@ -105,7 +105,6 @@ public class RabbitMQThreadPoolAdapter implements ThreadPoolAdapter, Application log.warn("Custom thread pools only support ThreadPoolExecutor"); } } - }); } } diff --git a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-kafka/pom.xml b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-kafka/pom.xml deleted file mode 100644 index 25be8e39..00000000 --- a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-kafka/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - cn.hippo4j - hippo4j-adapter - ${revision} - - hippo4j-adapter-spring-cloud-stream-kafka - - - - cn.hippo4j - hippo4j-adapter-base - - - diff --git a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-kafka/src/main/java/cn/hippo4j/adapter/springcloud/stream/kafka/SpringCloudStreamKafkaThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-kafka/src/main/java/cn/hippo4j/adapter/springcloud/stream/kafka/SpringCloudStreamKafkaThreadPoolAdapter.java deleted file mode 100644 index 4cc49356..00000000 --- a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-kafka/src/main/java/cn/hippo4j/adapter/springcloud/stream/kafka/SpringCloudStreamKafkaThreadPoolAdapter.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cn.hippo4j.adapter.springcloud.stream.kafka; - -import cn.hippo4j.adapter.base.ThreadPoolAdapter; -import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter; -import cn.hippo4j.adapter.base.ThreadPoolAdapterState; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.context.event.ApplicationStartedEvent; -import org.springframework.context.ApplicationListener; - -import java.util.List; - -/** - * Spring cloud stream kafka thread-pool adapter. - */ -@Slf4j -public class SpringCloudStreamKafkaThreadPoolAdapter implements ThreadPoolAdapter, ApplicationListener { - - @Override - public String mark() { - return "KafkaSpringCloudStream"; - } - - @Override - public ThreadPoolAdapterState getThreadPoolState(String identify) { - return null; - } - - @Override - public List getThreadPoolStates() { - return null; - } - - @Override - public boolean updateThreadPool(ThreadPoolAdapterParameter threadPoolAdapterParameter) { - return false; - } - - @Override - public void onApplicationEvent(ApplicationStartedEvent event) { - - } -} 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 cb04cf6b..02c034cc 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 @@ -39,7 +39,7 @@ import java.util.*; import static cn.hippo4j.common.constant.ChangeThreadPoolConstants.CHANGE_DELIMITER; /** - * Spring cloud stream rabbimq thread-pool adapter. + * Spring cloud stream rabbit-mq thread-pool adapter. */ @Slf4j public class SpringCloudStreamRabbitMQThreadPoolAdapter implements ThreadPoolAdapter, ApplicationListener { diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java index 771d6699..bafdf678 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java @@ -34,12 +34,12 @@ import java.util.concurrent.Executor; public abstract class AbstractWebThreadPoolService implements WebThreadPoolService, ApplicationRunner { /** - * Thread pool executor. + * Thread pool executor */ protected volatile Executor executor; /** - * Get web thread pool by server. + * Get web thread pool by server * * @param webServer * @return diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java index f88f4d54..1d94d379 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java @@ -30,7 +30,7 @@ public class WebThreadPoolHandlerChoose { /** * Choose the web thread pool service bean. * - * @return + * @return web thread pool service bean */ public WebThreadPoolService choose() { WebThreadPoolService webThreadPoolService; diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolRunStateHandler.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolRunStateHandler.java index 2727e52c..a30c16c8 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolRunStateHandler.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolRunStateHandler.java @@ -35,9 +35,9 @@ public class WebThreadPoolRunStateHandler extends AbstractThreadPoolRuntime { long used = MemoryUtil.heapMemoryUsed(); long max = MemoryUtil.heapMemoryMax(); String memoryProportion = StringUtil.newBuilder( - "已分配: ", + "Allocation: ", ByteConvertUtil.getPrintSize(used), - " / 最大可用: ", + " / Maximum available: ", ByteConvertUtil.getPrintSize(max)); poolRunStateInfo.setCurrentLoad(poolRunStateInfo.getCurrentLoad() + "%"); poolRunStateInfo.setPeakLoad(poolRunStateInfo.getPeakLoad() + "%"); diff --git a/hippo4j-adapter/pom.xml b/hippo4j-adapter/pom.xml index d1c0624a..1993176c 100644 --- a/hippo4j-adapter/pom.xml +++ b/hippo4j-adapter/pom.xml @@ -14,12 +14,10 @@ hippo4j-adapter-base hippo4j-adapter-dubbo hippo4j-adapter-alibaba-dubbo - hippo4j-adapter-kafka hippo4j-adapter-rabbitmq hippo4j-adapter-rocketmq hippo4j-adapter-hystrix hippo4j-adapter-spring-cloud-stream-rocketmq - hippo4j-adapter-spring-cloud-stream-kafka hippo4j-adapter-spring-cloud-stream-rabbitmq hippo4j-adapter-web