diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java index 601a5ac6..75912d3a 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java @@ -53,7 +53,5 @@ public interface ClientCloseHookExecute { * groupKey */ private String groupKey; - } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java index e9347a94..19202328 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java @@ -54,5 +54,4 @@ public interface JsonFacade { * @return */ List parseArray(String text, Class clazz); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java index c3fc1241..51587861 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java @@ -36,5 +36,4 @@ public interface NotifyConfigBuilder { * @return */ Map> buildNotify(); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java index a36da0e5..9d2aa3b5 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java @@ -45,5 +45,4 @@ public interface ThreadDetailState { * @return */ List getThreadDetailStateInfo(ThreadPoolExecutor threadPoolExecutor); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java index 2040a35b..629cc04b 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java @@ -18,7 +18,7 @@ package cn.hippo4j.common.api; /** - * Thread pool dynamic refresh. + * Thread-pool dynamic refresh. * * @author chen.ma * @date 2022/2/26 12:26 @@ -31,5 +31,4 @@ public interface ThreadPoolDynamicRefresh { * @param content */ void dynamicRefresh(String content); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java b/hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java index 7a91b2d7..ef07f93e 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java @@ -93,5 +93,4 @@ public class ApplicationContextHolder implements ApplicationContextAware { public static ApplicationContext getInstance() { return CONTEXT; } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java index bcb81e02..f1c5cf1c 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java @@ -102,5 +102,4 @@ public class Constants { public static final String EXECUTE_TIMEOUT_TRACE = "executeTimeoutTrace"; public static final int HTTP_EXECUTE_TIMEOUT = 5000; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java index 87aee3b2..03f55669 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java @@ -27,11 +27,5 @@ import java.io.Serializable; */ public interface Builder extends Serializable { - /** - * Build. - * - * @return - */ T build(); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java index ff25a62c..bc7d87e4 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java @@ -145,7 +145,5 @@ public class AbstractSubjectCenter { * Clear config cache. */ CLEAR_CONFIG_CACHE - } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java index 755f6d21..0b51887d 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java @@ -31,5 +31,4 @@ public interface Observer { * @param observerMessage */ void accept(ObserverMessage observerMessage); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java index e1ee6d39..42ebb9cb 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java @@ -25,11 +25,5 @@ package cn.hippo4j.common.design.observer; */ public interface ObserverMessage { - /** - * Message. - * - * @return - */ T message(); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java index 975dc86b..cae79da9 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java @@ -53,5 +53,4 @@ public enum DelEnum { public String toString() { return statusCode; } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java index afd39855..4d7130e9 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java @@ -59,5 +59,4 @@ public enum EnableEnum { public static boolean getBool(Integer intStatusCode) { return Objects.equals(intStatusCode, EnableEnum.YES.getIntCode()) ? true : false; } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java index 0adfd088..5b9e77c9 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java @@ -41,5 +41,4 @@ public class ExecutorFactory { return executorService; } } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java index be3c74e1..db309c00 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java @@ -59,7 +59,6 @@ public class ThreadPoolManager { lockers.put(tenantId, new Object()); } } - final Object monitor = lockers.get(tenantId); synchronized (monitor) { Map> map = resourcesManager.get(tenantId); @@ -76,5 +75,4 @@ public class ThreadPoolManager { map.get(group).add(executor); } } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java b/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java index a481ad72..5b237d63 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java @@ -26,12 +26,5 @@ package cn.hippo4j.common.function; @FunctionalInterface public interface Matcher { - /** - * Match. - * - * @param t - * @return - */ boolean match(T t); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java b/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java index d17492e7..0ed7e826 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java @@ -26,9 +26,5 @@ package cn.hippo4j.common.function; @FunctionalInterface public interface NoArgsConsumer { - /** - * 方法执行 - */ void accept(); - } 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 78fd0d0d..e2fd3b62 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 @@ -98,5 +98,4 @@ public class GlobalRemotePoolInfo implements Serializable { * content */ private String content; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java index 018b5e2f..5c283111 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java @@ -184,7 +184,5 @@ public class InstanceInfo { private String lastDirtyTimestamp; private String status; - } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ManyPoolRunStateInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ManyPoolRunStateInfo.java index c8fd6900..924db886 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ManyPoolRunStateInfo.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ManyPoolRunStateInfo.java @@ -42,5 +42,4 @@ public class ManyPoolRunStateInfo extends PoolRunStateInfo { * state */ private String state; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolBaseInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolBaseInfo.java index 7f6ee683..6d817d08 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolBaseInfo.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolBaseInfo.java @@ -59,5 +59,4 @@ public class PoolBaseInfo { * keepAliveTime */ private Long keepAliveTime; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameter.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameter.java index 61fcd381..c877739e 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameter.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameter.java @@ -115,5 +115,4 @@ public interface PoolParameter { * @return */ Integer getAllowCoreThreadTimeOut(); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameterInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameterInfo.java index 982be085..0a80a962 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameterInfo.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameterInfo.java @@ -103,5 +103,4 @@ public class PoolParameterInfo implements PoolParameter, Serializable { * allowCoreThreadTimeOut */ private Integer allowCoreThreadTimeOut; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolRunStateInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolRunStateInfo.java index 23db32b3..f4c4317f 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolRunStateInfo.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolRunStateInfo.java @@ -119,5 +119,4 @@ public class PoolRunStateInfo extends PoolBaseInfo implements Serializable { public Integer getSimplePeakLoad() { return Integer.parseInt(getPeakLoad().replace("%", "")); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java index 0c5ab6d7..01d5f2e3 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java @@ -51,5 +51,4 @@ public class ThreadDetailStateInfo { * threadStack */ private List threadStack; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java index 4c88fb83..6c34d3d6 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java @@ -41,5 +41,4 @@ public class TokenInfo { * tokenTtl */ private Long tokenTtl; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java index 6b11784c..f174cd74 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java @@ -46,5 +46,4 @@ public abstract class AbstractMessage implements Message { * message */ private List messages; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java index 91c9a8d3..d91b1f60 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java @@ -48,5 +48,4 @@ public interface Message extends Serializable { * @return */ List getMessages(); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java index efdc9405..845d5ac6 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java @@ -48,5 +48,4 @@ public interface MessageRequest { * @return */ MessageTypeEnum getMessageType(); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java index 6206a8a5..bb9e1b86 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java @@ -34,5 +34,4 @@ public enum MessageTypeEnum { * DEFAULT */ DEFAULT - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java index 03ff9ef3..04ab80f3 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java @@ -64,5 +64,4 @@ public class MessageWrapper implements MessageRequest { public MessageTypeEnum getMessageType() { return messageType; } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java index 8a61574a..fff47f14 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java @@ -84,5 +84,4 @@ public class RuntimeMessage extends AbstractMessage { * timestamp */ private Long timestamp; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java index 374fae21..e512e3ee 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java @@ -54,5 +54,4 @@ public class AlarmControlDTO { public String buildPk() { return StrUtil.builder(threadPool, "+", platform).toString(); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java index 4812a310..9e5ca195 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java @@ -52,7 +52,6 @@ public class AlarmControlHandler { if (cache == null) { return false; } - String pkId = cache.getIfPresent(alarmControl.getTypeEnum().name()); if (StrUtil.isBlank(pkId)) { ReentrantLock lock = threadPoolLock.get(threadPoolKey); @@ -68,7 +67,6 @@ public class AlarmControlHandler { lock.unlock(); } } - return false; } @@ -85,10 +83,8 @@ public class AlarmControlHandler { .expireAfterWrite(interval, TimeUnit.MINUTES) .build(); threadPoolAlarmCache.put(threadPoolKey, cache); - // Set the lock to prevent false sending of alarm information. ReentrantLock reentrantLock = new ReentrantLock(); threadPoolLock.put(threadPoolKey, reentrantLock); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java index 43bc4ac2..12a14589 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java @@ -57,7 +57,6 @@ public class HippoBaseSendMessageService implements HippoSendMessageService, Com if (CollUtil.isEmpty(notifyList)) { return; } - notifyList.forEach(each -> { try { SendMessageHandler messageHandler = sendMessageHandlers.get(each.getPlatform()); @@ -65,7 +64,6 @@ public class HippoBaseSendMessageService implements HippoSendMessageService, Com log.warn("Please configure alarm notification on the server. key :: [{}]", threadPoolId); return; } - if (isSendAlarm(each.getTpId(), each.getPlatform(), typeEnum)) { alarmNotifyRequest.setNotifyTypeEnum(typeEnum); messageHandler.sendAlarmMessage(each, alarmNotifyRequest); @@ -85,7 +83,6 @@ public class HippoBaseSendMessageService implements HippoSendMessageService, Com log.warn("Please configure alarm notification on the server. key :: [{}]", threadPoolId); return; } - notifyList.forEach(each -> { try { SendMessageHandler messageHandler = sendMessageHandlers.get(each.getPlatform()); @@ -93,7 +90,6 @@ public class HippoBaseSendMessageService implements HippoSendMessageService, Com log.warn("Please configure alarm notification on the server. key :: [{}]", threadPoolId); return; } - messageHandler.sendChangeMessage(each, changeParameterNotifyRequest); } catch (Exception ex) { log.warn("Failed to send thread pool change notification. key :: [{}]", threadPoolId, ex); @@ -115,7 +111,6 @@ public class HippoBaseSendMessageService implements HippoSendMessageService, Com .platform(platform) .typeEnum(typeEnum) .build(); - return alarmControlHandler.isSendAlarm(alarmControl); } @@ -124,7 +119,6 @@ public class HippoBaseSendMessageService implements HippoSendMessageService, Com Map sendMessageHandlerMap = ApplicationContextHolder.getBeansOfType(SendMessageHandler.class); sendMessageHandlerMap.values().forEach(each -> sendMessageHandlers.put(each.getType(), each)); - Map> buildNotify = notifyConfigBuilder.buildNotify(); notifyConfigs.putAll(buildNotify); } @@ -137,5 +131,4 @@ public class HippoBaseSendMessageService implements HippoSendMessageService, Com public synchronized void putPlatform(Map> notifyConfigs) { this.notifyConfigs.putAll(notifyConfigs); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java index 013b8310..c61207c3 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java @@ -42,5 +42,4 @@ public interface HippoSendMessageService { * @param changeParameterNotifyRequest */ void sendChangeMessage(ChangeParameterNotifyRequest changeParameterNotifyRequest); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java index 728f5a80..ea5dac31 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java @@ -79,5 +79,4 @@ public class NotifyConfigDTO { * 报警类型 */ private NotifyTypeEnum typeEnum; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java index 0dc5a334..ab6df22a 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java @@ -39,5 +39,4 @@ public enum NotifyPlatformEnum { * WECHAT */ WECHAT - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java index 004688b7..6ca18cb9 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java @@ -49,5 +49,4 @@ public enum NotifyTypeEnum { * TIMEOUT */ TIMEOUT - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java index b24e5f63..a1a1bb8e 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java @@ -49,5 +49,4 @@ public interface SendMessageHandler receives; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java index 8b0bb77f..389c9795 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java @@ -39,5 +39,4 @@ public class ThreadPoolNotifyDTO { * notifyList */ private List notifyList; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java index c312f4e7..3be7a953 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java @@ -110,5 +110,4 @@ public class DingAlarmConstants { "OWNER：@%s \n\n" + " --- \n\n " + "**播报时间：%s**"; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java index 498e006d..35eda308 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java @@ -62,7 +62,6 @@ public class DingSendMessageHandler implements SendMessageHandler OWNER：<@%s> \n" + "> 提示：动态线程池配置变更实时通知（无限制） \n\n" + "**播报时间：%s**"; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java index 72c7ed20..7563e4b6 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java @@ -52,7 +52,6 @@ public class WeChatSendMessageHandler implements SendMessageHandler<@").join(receives); - String weChatAlarmTxt; String weChatAlarmTimoutReplaceTxt; if (Objects.equals(alarmNotifyRequest.getNotifyTypeEnum(), NotifyTypeEnum.TIMEOUT)) { @@ -63,7 +62,6 @@ public class WeChatSendMessageHandler implements SendMessageHandler<@").join(receives); - String text = String.format( WE_CHAT_NOTICE_TXT, // 环境 @@ -153,7 +149,6 @@ public class WeChatSendMessageHandler implements SendMessageHandler groupKeys; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java index afde1439..bd9cf89b 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java @@ -57,5 +57,4 @@ public class BaseNotifyRequest implements NotifyRequest { * receives */ private String receives; - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java index c977cf5b..1868704e 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java @@ -67,7 +67,6 @@ public class ArrayUtil { } } } - return null; } @@ -115,5 +114,4 @@ public class ArrayUtil { } return array.clone(); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java index 8079bf31..d5bba97a 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java @@ -25,12 +25,6 @@ package cn.hippo4j.common.toolkit; */ public class ByteConvertUtil { - /** - * 字节转换. - * - * @param size - * @return - */ public static String getPrintSize(long size) { long covertNum = 1024; if (size < covertNum) { @@ -51,5 +45,4 @@ public class ByteConvertUtil { return (size / 100) + "." + (size % 100) + "GB"; } } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java index 05af9a8b..a9e42506 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java @@ -125,5 +125,4 @@ public class CollectionUtil { public static boolean isNotEmpty(Collection collection) { return !isEmpty(collection); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java index 78af4b16..1d2ed3de 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java @@ -34,5 +34,4 @@ public class ConditionUtil { falseConsumer.accept(); } } - } 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 a40cd458..c3000971 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 @@ -62,13 +62,10 @@ public class ContentUtil { StringBuilder stringBuilder = new StringBuilder(); for (int i = 0; i < parameters.length; i++) { stringBuilder.append(parameters[i]); - if (i < parameters.length - 1) { stringBuilder.append(Constants.GROUP_KEY_DELIMITER); } } - return stringBuilder.toString(); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java index f0e530d1..778ff3c7 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java @@ -41,11 +41,9 @@ public class GroupKey { public static String getKey(String... params) { StringBuilder groupKey = new StringBuilder(); groupKey.append(params[0]).append(GROUP_KEY_DELIMITER); - for (int i = 1; i < params.length - 1; i++) { groupKey.append(params[i]).append(GROUP_KEY_DELIMITER); } - groupKey.append(params[params.length]); return groupKey.toString(); } @@ -63,7 +61,6 @@ public class GroupKey { sb.append(GROUP_KEY_DELIMITER); urlEncode(datumStr, sb); } - return sb.toString(); } @@ -83,5 +80,4 @@ public class GroupKey { } } } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java index 62a9c5f9..a6429c51 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java @@ -54,5 +54,4 @@ public class JSONUtil { return JSON_FACADE.parseArray(text, clazz); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java index 5c859f23..dca6b34c 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java @@ -70,5 +70,4 @@ public class JacksonHandler implements JsonFacade { CollectionType collectionType = MAPPER.getTypeFactory().constructCollectionType(ArrayList.class, clazz); return MAPPER.readValue(text, collectionType); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java index 22770b0e..9b88310a 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java @@ -67,12 +67,10 @@ public class Md5Util { public static String encodeHexString(byte[] bytes) { int l = bytes.length; char[] out = new char[l << 1]; - for (int i = 0, j = 0; i < l; i++) { out[j++] = DIGITS_LOWER[(0xF0 & bytes[i]) >>> 4]; out[j++] = DIGITS_LOWER[0x0F & bytes[i]]; } - return new String(out); } @@ -84,9 +82,7 @@ public class Md5Util { if (null == changedGroupKeys) { return ""; } - StringBuilder sb = new StringBuilder(); - for (String groupKey : changedGroupKeys) { String[] dataIdGroupId = GroupKey.parseKey(groupKey); sb.append(dataIdGroupId[0]); @@ -106,9 +102,7 @@ public class Md5Util { } sb.append(Constants.LINE_SEPARATOR); } - // To encode WORD_SEPARATOR and LINE_SEPARATOR invisible characters, encoded value is %02 and %01 return URLEncoder.encode(sb.toString(), "UTF-8"); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java index f6736daf..37683a6f 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java @@ -44,7 +44,6 @@ public class MessageConvert { MessageWrapper wrapper = new MessageWrapper(); wrapper.setResponseClass(message.getClass()); wrapper.setMessageType(message.getMessageType()); - List> messageMapList = new ArrayList(); List messages = message.getMessages(); messages.forEach(each -> { @@ -52,7 +51,6 @@ public class MessageConvert { Map mapObj = JSONUtil.parseObject(eachVal, Map.class); messageMapList.add(mapObj); }); - wrapper.setContentParams(messageMapList); return wrapper; } @@ -67,17 +65,14 @@ public class MessageConvert { public static Message convert(MessageWrapper messageWrapper) { AbstractMessage message = (AbstractMessage) messageWrapper.getResponseClass().newInstance(); List> contentParams = messageWrapper.getContentParams(); - List messages = new ArrayList(); contentParams.forEach(each -> { String eachVal = JSONUtil.toJSONString(each); Message messageObj = JSONUtil.parseObject(eachVal, messageWrapper.getResponseClass()); messages.add(messageObj); }); - message.setMessages(messages); message.setMessageType(messageWrapper.getMessageType()); return message; } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java index 329a8ec0..45ee5990 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java @@ -37,7 +37,6 @@ public class ReflectUtil { if (null == obj || StringUtil.isBlank(fieldName)) { return null; } - Field field = getField(obj instanceof Class ? (Class) obj : obj.getClass(), fieldName); return getFieldValue(obj, field); } @@ -49,7 +48,6 @@ public class ReflectUtil { if (obj instanceof Class) { obj = null; } - setAccessible(field); Object result; try { @@ -58,7 +56,6 @@ public class ReflectUtil { String exceptionMsg = String.format("IllegalAccess for %s.%s", field.getDeclaringClass(), field.getName()); throw new RuntimeException(exceptionMsg, e); } - return result; } @@ -79,7 +76,6 @@ public class ReflectUtil { if (null != allFields) { return allFields; } - allFields = getFieldsDirectly(beanClass, true); FIELDS_CACHE.put(beanClass, allFields); return allFields; @@ -87,7 +83,6 @@ public class ReflectUtil { public static Field[] getFieldsDirectly(Class beanClass, boolean withSuperClassFields) throws SecurityException { Assert.notNull(beanClass); - Field[] allFields = null; Class searchType = beanClass; Field[] declaredFields; @@ -112,8 +107,6 @@ public class ReflectUtil { if (null == field) { return null; } - return field.getName(); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java index e5e8bbf0..069708d5 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java @@ -37,20 +37,16 @@ public class StringUtil { */ public static boolean isBlank(CharSequence str) { int length; - if ((str == null) || ((length = str.length()) == 0)) { return true; } - for (int i = 0; i < length; i++) { char c = str.charAt(i); - boolean charNotBlank = Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\ufeff' || c == '\u202a'; if (charNotBlank == false) { return false; } } - return true; } @@ -163,8 +159,6 @@ public class StringUtil { sb.append(c); } } - return sb.toString(); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java index d2c227e4..75af4087 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java @@ -26,11 +26,11 @@ package cn.hippo4j.common.toolkit; public class ThreadUtil { /** - * 创建新线程. + * New thread. * - * @param runnable {@link Runnable} - * @param name 线程名 - * @param isDaemon 是否守护线程 + * @param runnable + * @param name + * @param isDaemon * @return {@link Thread} */ public static Thread newThread(Runnable runnable, String name, boolean isDaemon) { @@ -40,9 +40,9 @@ public class ThreadUtil { } /** - * 挂起当前线程. + * Suspend the current thread. * - * @param millis 毫秒 + * @param millis * @return */ public static boolean sleep(long millis) { @@ -53,8 +53,6 @@ public class ThreadUtil { return false; } } - return true; } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java index 8cb03ecd..e972fca2 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java @@ -57,7 +57,5 @@ public class UserContext { private String username; private String userRole; - } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java index b4071b35..48e3ec19 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java @@ -62,5 +62,4 @@ public class Result implements Serializable { public boolean isSuccess() { return SUCCESS_CODE.equals(code); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java index c4ba8499..9d131aa6 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java @@ -31,44 +31,21 @@ import java.util.Optional; */ public final class Results { - /** - * 成功. - * - * @return - */ public static Result success() { return new Result() .setCode(Result.SUCCESS_CODE); } - /** - * 成功. - * - * @param data 并设置 DATA 参数 - * @param 对应 DATA 字段的数据类型 - * @return - */ public static Result success(T data) { return new Result() .setCode(Result.SUCCESS_CODE) .setData(data); } - /** - * 返回失败信息. - * - * @return - */ public static Result failure() { return failure(ErrorCodeEnum.SERVICE_ERROR.getCode(), ErrorCodeEnum.SERVICE_ERROR.getMessage()); } - /** - * 框架定义抽象异常拦截. - * - * @param abstractException 框架自定义抽象异常 - * @return - */ public static Result failure(AbstractException abstractException) { String errorCode = Optional.ofNullable(abstractException.getErrorCode()) .map(ErrorCode::getCode) @@ -78,38 +55,18 @@ public final class Results { .setMessage(abstractException.getMessage()); } - /** - * 未知异常. - * - * @param throwable 未知异常 - * @return - */ public static Result failure(Throwable throwable) { return new Result().setCode(ErrorCodeEnum.SERVICE_ERROR.getCode()) .setMessage(throwable.getMessage()); } - /** - * 返回失败信息. - * - * @param errorCode 错误编码、错误信息 - * @return - */ public static Result failure(ErrorCode errorCode) { return failure(errorCode.getCode(), errorCode.getMessage()); } - /** - * 返回失败信息. - * - * @param code 错误编码. - * @param message 错误信息. - * @return - */ public static Result failure(String code, String message) { return new Result() .setCode(code) .setMessage(message); } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java index 057f6afd..736a3e55 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java @@ -34,5 +34,4 @@ public class AbstractException extends RuntimeException { super(message, throwable); this.errorCode = errorCode; } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java index 4d9685ce..4f130071 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java @@ -18,7 +18,7 @@ package cn.hippo4j.common.web.exception; /** - * 错误码抽象接口. + * Error code abstract interface. * * @author chen.ma * @date 2021/9/16 15:39 @@ -26,17 +26,16 @@ package cn.hippo4j.common.web.exception; public interface ErrorCode { /** - * 错误码. + * Get code. * * @return */ String getCode(); /** - * 错误信息. + * Get message. * * @return */ String getMessage(); - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java index d36ae1fb..5fb54df0 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java @@ -99,5 +99,4 @@ public enum ErrorCodeEnum implements ErrorCode { return "登录时间过长, 请退出重新登录"; } } - } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java index 60c1c49c..765bab16 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java @@ -28,78 +28,34 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class ServiceException extends AbstractException { - /** - * 无指定错误码. - */ public ServiceException() { this(ErrorCodeEnum.SERVICE_ERROR); } - /** - * 指定错误码. - * - * @param errorCode - */ public ServiceException(ErrorCode errorCode) { this(errorCode.getMessage(), null, errorCode); } - /** - * 指定报错信息. - * - * @param message - */ public ServiceException(String message) { this(message, null, ErrorCodeEnum.SERVICE_ERROR); } - /** - * 异常抛出. - * - * @param cause - */ public ServiceException(Throwable cause) { this(cause, cause.getMessage()); } - /** - * 异常抛出并指定错误信息. - * - * @param message - * @param cause - */ public ServiceException(String message, Throwable cause) { this(message, cause, ErrorCodeEnum.SERVICE_ERROR); } - /** - * 异常抛出并指定错误信息. - * - * @param cause - * @param message - */ public ServiceException(Throwable cause, String message) { this(message, cause, ErrorCodeEnum.SERVICE_ERROR); } - /** - * 异常抛出并指定错误码. - * - * @param cause - * @param errorCode - */ public ServiceException(Throwable cause, ErrorCode errorCode) { this(errorCode.getMessage(), cause, errorCode); } - /** - * 报错信息与错误码同时存在, 并且不一致. - *

以报错信息为主, 进行打印. - * - * @param message - * @param cause - * @param errorCode - */ public ServiceException(String message, Throwable cause, ErrorCode errorCode) { super(message, cause, errorCode); } @@ -111,5 +67,4 @@ public class ServiceException extends AbstractException { "message='" + errorCode.getMessage() + "'" + '}'; } - } diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalNotifyAlarmManage.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalNotifyAlarmManage.java index 414f595b..c41fa814 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalNotifyAlarmManage.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalNotifyAlarmManage.java @@ -30,27 +30,12 @@ import java.util.concurrent.ConcurrentHashMap; */ public class GlobalNotifyAlarmManage { - /** - * Notify alarm map. - */ private static final Map NOTIFY_ALARM_MAP = new ConcurrentHashMap(); - /** - * Get. - * - * @param key - * @return - */ public static ThreadPoolNotifyAlarm get(String key) { return NOTIFY_ALARM_MAP.get(key); } - /** - * Put. - * - * @param key - * @param val - */ public static void put(String key, ThreadPoolNotifyAlarm val) { NOTIFY_ALARM_MAP.put(key, val); } diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalThreadPoolManage.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalThreadPoolManage.java index d17c1620..3d870ccf 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalThreadPoolManage.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/manage/GlobalThreadPoolManage.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** - * Global threadPool manage. + * Global thread-pool manage. * * @author chen.ma * @date 2021/6/20 15:57 @@ -34,17 +34,17 @@ import java.util.concurrent.ConcurrentHashMap; public class GlobalThreadPoolManage { /** - * 动态线程池参数容器. + * Dynamic thread pool parameter container. */ private static final Map POOL_PARAMETER = new ConcurrentHashMap(); /** - * 动态线程池包装容器. + * Dynamic thread pool wrapper. */ private static final Map EXECUTOR_MAP = new ConcurrentHashMap(); /** - * 获取动态线程池包装类. + * Get the dynamic thread pool wrapper class. * * @param threadPoolId * @return @@ -54,7 +54,7 @@ public class GlobalThreadPoolManage { } /** - * 获取动态线程池参数. + * Get dynamic thread pool parameters. * * @param threadPoolId * @return @@ -64,7 +64,7 @@ public class GlobalThreadPoolManage { } /** - * 注册动态线程池包装以及参数. + * Register dynamic thread pool wrapper and parameters. * * @param threadPoolId * @param poolParameter @@ -76,7 +76,7 @@ public class GlobalThreadPoolManage { } /** - * 注册动态线程池. + * Register dynamic thread pool. * * @param threadPoolId * @param executor @@ -86,7 +86,7 @@ public class GlobalThreadPoolManage { } /** - * 注册动态线程池参数. + * Register dynamic thread pool parameters. * * @param threadPoolId * @param poolParameter @@ -96,7 +96,7 @@ public class GlobalThreadPoolManage { } /** - * 获取动态线程池标识集合. + * Get the dynamic thread pool identifier collection. * * @return */ @@ -105,8 +105,10 @@ public class GlobalThreadPoolManage { } /** - * 获取动态线程池数量. - * 数据在项目最初启动的时候可能不准确, 因为是异步进行注册. + * Get the number of dynamic thread pools. + * + * The data may be inaccurate when the project is initially + * launched because registration is done asynchronously. * * @return */ 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 ef4940f0..58e9b3a5 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 @@ -58,11 +58,6 @@ public class AbstractBuildThreadPoolTemplate { return buildPool(initParam); } - /** - * 构建线程池. - * - * @return - */ public static ThreadPoolExecutor buildPool(ThreadPoolInitParam initParam) { Assert.notNull(initParam); ThreadPoolExecutor executorService; @@ -81,21 +76,11 @@ public class AbstractBuildThreadPoolTemplate { return executorService; } - /** - * 构建快速执行线程池. - * - * @return - */ public static ThreadPoolExecutor buildFastPool() { ThreadPoolInitParam initParam = initParam(); return buildFastPool(initParam); } - /** - * 构建快速执行线程池. - * - * @return - */ public static ThreadPoolExecutor buildFastPool(ThreadPoolInitParam initParam) { TaskQueue taskQueue = new TaskQueue(initParam.getCapacity()); FastThreadPoolExecutor fastThreadPoolExecutor; @@ -115,12 +100,6 @@ public class AbstractBuildThreadPoolTemplate { return fastThreadPoolExecutor; } - /** - * 构建动态线程池. - * - * @param initParam - * @return - */ public static DynamicThreadPoolExecutor buildDynamicPool(ThreadPoolInitParam initParam) { Assert.notNull(initParam); DynamicThreadPoolExecutor dynamicThreadPoolExecutor; @@ -149,74 +128,32 @@ public class AbstractBuildThreadPoolTemplate { @Accessors(chain = true) public static class ThreadPoolInitParam { - /** - * 核心线程数量 - */ private Integer corePoolNum; - /** - * 最大线程数量 - */ private Integer maxPoolNum; - /** - * 线程存活时间 - */ private Long keepAliveTime; - /** - * 线程存活时间单位 - */ private TimeUnit timeUnit; - /** - * 执行超时时间 - */ private Long executeTimeOut; - /** - * 队列最大容量 - */ private Integer capacity; - /** - * 阻塞队列 - */ private BlockingQueue workQueue; - /** - * 线程池任务满时拒绝任务策略 - */ private RejectedExecutionHandler rejectedExecutionHandler; - /** - * 创建线程工厂 - */ private ThreadFactory threadFactory; - /** - * 线程 ID - */ private String threadPoolId; - /** - * 线程任务装饰器 - */ private TaskDecorator taskDecorator; - /** - * 等待终止毫秒 - */ private Long awaitTerminationMillis; - /** - * 等待任务在关机时完成 - */ private Boolean waitForTasksToCompleteOnShutdown; - /** - * 允许核心线程超时 - */ private Boolean allowCoreThreadTimeOut = false; public ThreadPoolInitParam(String threadNamePrefix, boolean isDaemon) { diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java index aeb39c88..088ceaf7 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java @@ -30,10 +30,7 @@ import java.util.concurrent.*; * @date 2021/11/28 12:17 */ @Slf4j -public abstract class AbstractDynamicExecutorSupport extends ThreadPoolExecutor - implements - InitializingBean, - DisposableBean { +public abstract class AbstractDynamicExecutorSupport extends ThreadPoolExecutor implements InitializingBean, DisposableBean { private String threadPoolId; 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 0e5af10a..2d0ee846 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 @@ -29,12 +29,6 @@ import java.util.concurrent.TimeUnit; */ public class CommonDynamicThreadPool { - /** - * Get instance. - * - * @param threadPoolId - * @return - */ public static DynamicThreadPoolExecutor getInstance(String threadPoolId) { DynamicThreadPoolExecutor poolExecutor = (DynamicThreadPoolExecutor) ThreadPoolBuilder.builder() .dynamicPool() diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/QueueTypeEnum.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/QueueTypeEnum.java index 6046f9a3..e9375f2e 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/QueueTypeEnum.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/QueueTypeEnum.java @@ -83,13 +83,6 @@ public enum QueueTypeEnum { DynamicThreadPoolServiceLoader.register(CustomBlockingQueue.class); } - /** - * Create blocking queue. - * - * @param blockingQueueName - * @param capacity - * @return - */ public static BlockingQueue createBlockingQueue(String blockingQueueName, Integer capacity) { BlockingQueue blockingQueue = null; QueueTypeEnum queueTypeEnum = Stream.of(QueueTypeEnum.values()) @@ -121,13 +114,6 @@ public enum QueueTypeEnum { return blockingQueue; } - /** - * Create blocking queue. - * - * @param type - * @param capacity - * @return - */ public static BlockingQueue createBlockingQueue(int type, Integer capacity) { BlockingQueue blockingQueue = null; if (Objects.equals(type, ARRAY_BLOCKING_QUEUE.type)) { @@ -155,12 +141,6 @@ public enum QueueTypeEnum { return blockingQueue; } - /** - * Get blocking queue name by type. - * - * @param type - * @return - */ public static String getBlockingQueueNameByType(int type) { Optional queueTypeEnum = Arrays.stream(QueueTypeEnum.values()) .filter(each -> each.type == type) diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedPolicies.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedPolicies.java index ba312ffd..ae8e01d9 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedPolicies.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedPolicies.java @@ -32,9 +32,6 @@ import java.util.concurrent.ThreadPoolExecutor; @Slf4j public class RejectedPolicies { - /** - * 发生拒绝事件时, 添加新任务并运行最早的任务. - */ public static class RunsOldestTaskPolicy implements RejectedExecutionHandler { @Override @@ -54,9 +51,6 @@ public class RejectedPolicies { } } - /** - * 使用阻塞方法将拒绝任务添加队列, 可保证任务不丢失. - */ public static class SyncPutQueuePolicy implements RejectedExecutionHandler { @Override diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedTypeEnum.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedTypeEnum.java index 0dce3174..57517ab2 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedTypeEnum.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/RejectedTypeEnum.java @@ -35,49 +35,22 @@ import java.util.stream.Stream; */ public enum RejectedTypeEnum { - /** - * 被拒绝任务的程序由主线程执行 - */ CALLER_RUNS_POLICY(1, "CallerRunsPolicy", new ThreadPoolExecutor.CallerRunsPolicy()), - /** - * 被拒绝任务的处理程序, 抛出异常 - */ ABORT_POLICY(2, "AbortPolicy", new ThreadPoolExecutor.AbortPolicy()), - /** - * 被拒绝任务的处理程序, 默默地丢弃被拒绝的任务。 - */ DISCARD_POLICY(3, "DiscardPolicy", new ThreadPoolExecutor.DiscardPolicy()), - /** - * 被拒绝任务的处理程序, 它丢弃最早的未处理请求, 然后重试 - */ DISCARD_OLDEST_POLICY(4, "DiscardOldestPolicy", new ThreadPoolExecutor.DiscardOldestPolicy()), - /** - * 发生拒绝事件时, 添加新任务并运行最早的任务 - */ RUNS_OLDEST_TASK_POLICY(5, "RunsOldestTaskPolicy", new RejectedPolicies.RunsOldestTaskPolicy()), - /** - * 使用阻塞方法将拒绝任务添加队列, 可保证任务不丢失 - */ SYNC_PUT_QUEUE_POLICY(6, "SyncPutQueuePolicy", new RejectedPolicies.SyncPutQueuePolicy()); - /** - * 类型 - */ public Integer type; - /** - * 名称 - */ public String name; - /** - * 线程池拒绝策略 - */ public RejectedExecutionHandler rejectedHandler; RejectedTypeEnum(Integer type, String name, RejectedExecutionHandler rejectedHandler) { @@ -90,12 +63,6 @@ public enum RejectedTypeEnum { DynamicThreadPoolServiceLoader.register(CustomRejectedExecutionHandler.class); } - /** - * Create policy. - * - * @param name - * @return - */ public static RejectedExecutionHandler createPolicy(String name) { RejectedTypeEnum rejectedTypeEnum = Stream.of(RejectedTypeEnum.values()) .filter(each -> Objects.equals(each.name, name)) @@ -113,18 +80,11 @@ public enum RejectedTypeEnum { return customRejected.orElse(ABORT_POLICY.rejectedHandler); } - /** - * Create policy. - * - * @param type - * @return - */ public static RejectedExecutionHandler createPolicy(int type) { Optional rejectedTypeEnum = Stream.of(RejectedTypeEnum.values()) .filter(each -> Objects.equals(type, each.type)) .map(each -> each.rejectedHandler) .findFirst(); - // 使用 SPI 匹配拒绝策略 RejectedExecutionHandler resultRejected = rejectedTypeEnum.orElseGet(() -> { Collection customRejectedExecutionHandlers = DynamicThreadPoolServiceLoader .getSingletonServiceInstances(CustomRejectedExecutionHandler.class); @@ -137,12 +97,6 @@ public enum RejectedTypeEnum { return resultRejected; } - /** - * Get rejected name by type. - * - * @param type - * @return - */ public static String getRejectedNameByType(int type) { return createPolicy(type).getClass().getSimpleName(); } diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ResizableCapacityLinkedBlockIngQueue.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ResizableCapacityLinkedBlockIngQueue.java index f59bc7ff..60fb7f9f 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ResizableCapacityLinkedBlockIngQueue.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ResizableCapacityLinkedBlockIngQueue.java @@ -24,7 +24,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicInteger; /** - * Resizable capacity linkedBlockIngQueue. + * Resizable capacity linked-blocking-queue. * * @author chen.ma * @date 2021/6/20 14:24 diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ThreadFactoryBuilder.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ThreadFactoryBuilder.java index 09ed9052..9ae828bc 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ThreadFactoryBuilder.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ThreadFactoryBuilder.java @@ -24,7 +24,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicLong; /** - * ThreadFactory builder. + * Thread-factory builder. * * @author chen.ma * @date 2021/7/5 21:53 @@ -33,73 +33,31 @@ public class ThreadFactoryBuilder implements Builder { private static final long serialVersionUID = 1L; - /** - * 用于线程创建的线程工厂类 - */ private ThreadFactory backingThreadFactory; - /** - * 线程名的前缀 - */ private String namePrefix; - /** - * 是否守护线程，默认false - */ private Boolean daemon; - /** - * 线程优先级 - */ private Integer priority; - /** - * 未捕获异常处理器 - */ private Thread.UncaughtExceptionHandler uncaughtExceptionHandler; - /** - * 设置用于创建基础线程的线程工厂. - * - * @param backingThreadFactory 用于创建基础线程的线程工厂 - * @return this - */ public ThreadFactoryBuilder threadFactory(ThreadFactory backingThreadFactory) { this.backingThreadFactory = backingThreadFactory; return this; } - /** - * 设置线程名前缀, 例如设置前缀为 mb-thread- 则线程名为 mb-thread-1 之类. - * - * @param namePrefix 线程名前缀 - * @return this - */ public ThreadFactoryBuilder prefix(String namePrefix) { this.namePrefix = namePrefix; return this; } - /** - * 设置是否守护线程. - * - * @param daemon 是否守护线程 - * @return this - */ public ThreadFactoryBuilder daemon(boolean daemon) { this.daemon = daemon; return this; } - /** - * 设置线程优先级. - * - * @param priority 优先级 - * @return this - * @see Thread#MIN_PRIORITY - * @see Thread#NORM_PRIORITY - * @see Thread#MAX_PRIORITY - */ public ThreadFactoryBuilder priority(int priority) { if (priority < Thread.MIN_PRIORITY) { throw new IllegalArgumentException(String.format("Thread priority ({}) must be >= {}", priority, Thread.MIN_PRIORITY)); @@ -111,40 +69,19 @@ public class ThreadFactoryBuilder implements Builder { return this; } - /** - * 设置未捕获异常的处理方式. - * - * @param uncaughtExceptionHandler {@link Thread.UncaughtExceptionHandler} - */ public void uncaughtExceptionHandler(Thread.UncaughtExceptionHandler uncaughtExceptionHandler) { this.uncaughtExceptionHandler = uncaughtExceptionHandler; } - /** - * 构建. - * - * @return - */ public static ThreadFactoryBuilder builder() { return new ThreadFactoryBuilder(); } - /** - * 构建 {@link ThreadFactory} - * - * @return {@link ThreadFactory} - */ @Override public ThreadFactory build() { return build(this); } - /** - * 构建. - * - * @param builder {@link ThreadFactoryBuilder} - * @return {@link ThreadFactory} - */ private static ThreadFactory build(ThreadFactoryBuilder builder) { final ThreadFactory backingThreadFactory = (null != builder.backingThreadFactory) ? builder.backingThreadFactory 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 5fc7e475..96521c24 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 @@ -26,110 +26,49 @@ import java.util.Optional; import java.util.concurrent.*; /** - * ThreadPool builder. + * Thread-pool builder. * * @author chen.ma * @date 2021/6/28 17:29 */ public class ThreadPoolBuilder implements Builder { - /** - * 是否创建快速消费线程池 - */ private boolean isFastPool; - /** - * 是否动态线程池 - */ private boolean isDynamicPool; - /** - * 核心线程数量 - */ private int corePoolSize = calculateCoreNum(); - /** - * 最大线程数量 - */ private int maxPoolSize = corePoolSize + (corePoolSize >> 1); - /** - * 线程存活时间 - */ private long keepAliveTime = 30000L; - /** - * 线程存活时间单位 - */ private TimeUnit timeUnit = TimeUnit.MILLISECONDS; - /** - * 线程执行超时时间 - */ private long executeTimeOut = 10000L; - /** - * 队列最大容量 - */ private int capacity = 512; - /** - * 队列类型枚举 - */ private QueueTypeEnum queueType; - /** - * 阻塞队列 - */ private BlockingQueue workQueue = new LinkedBlockingQueue(capacity); - /** - * 线程池任务满时拒绝任务策略 - */ private RejectedExecutionHandler rejectedExecutionHandler = new ThreadPoolExecutor.AbortPolicy(); - /** - * 是否守护线程 - */ private boolean isDaemon = false; - /** - * 线程名称前缀 - */ private String threadNamePrefix; - /** - * 线程池 ID - */ private String threadPoolId; - /** - * 线程任务装饰器 - */ private TaskDecorator taskDecorator; - /** - * 等待终止毫秒 - */ private Long awaitTerminationMillis = 5000L; - /** - * 等待任务在关机时完成 - */ private Boolean waitForTasksToCompleteOnShutdown = true; - /** - * 允许核心线程超时 - */ private Boolean allowCoreThreadTimeOut = false; - private Boolean prestartCoreThread = false; - - /** - * 计算公式：CPU 核数 / (1 - 阻塞系数 0.8) - * - * @return 线程池核心线程数 - */ private Integer calculateCoreNum() { int cpuCoreNum = Runtime.getRuntime().availableProcessors(); return new BigDecimal(cpuCoreNum).divide(new BigDecimal("0.2")).intValue(); @@ -265,11 +204,6 @@ public class ThreadPoolBuilder implements Builder { return this; } - /** - * 构建. - * - * @return - */ @Override public ThreadPoolExecutor build() { if (isDynamicPool) { @@ -278,56 +212,26 @@ public class ThreadPoolBuilder implements Builder { return isFastPool ? buildFastPool(this) : buildPool(this); } - /** - * 创建. - * - * @return - */ public static ThreadPoolBuilder builder() { return new ThreadPoolBuilder(); } - /** - * 构建普通线程池. - * - * @param builder - * @return - */ private static ThreadPoolExecutor buildPool(ThreadPoolBuilder builder) { return AbstractBuildThreadPoolTemplate.buildPool(buildInitParam(builder)); } - /** - * 构建快速消费线程池. - * - * @param builder - * @return - */ private static ThreadPoolExecutor buildFastPool(ThreadPoolBuilder builder) { return AbstractBuildThreadPoolTemplate.buildFastPool(buildInitParam(builder)); } - /** - * 构建动态线程池. - * - * @param builder - * @return - */ private static ThreadPoolExecutor buildDynamicPool(ThreadPoolBuilder builder) { return AbstractBuildThreadPoolTemplate.buildDynamicPool(buildInitParam(builder)); } - /** - * 构建初始化参数. - * - * @param builder - * @return - */ private static AbstractBuildThreadPoolTemplate.ThreadPoolInitParam buildInitParam(ThreadPoolBuilder builder) { Assert.notEmpty(builder.threadNamePrefix, "The thread name prefix cannot be empty or an empty string."); AbstractBuildThreadPoolTemplate.ThreadPoolInitParam initParam = new AbstractBuildThreadPoolTemplate.ThreadPoolInitParam(builder.threadNamePrefix, builder.isDaemon); - initParam.setCorePoolNum(builder.corePoolSize) .setMaxPoolNum(builder.maxPoolSize) .setKeepAliveTime(builder.keepAliveTime) @@ -337,22 +241,18 @@ public class ThreadPoolBuilder implements Builder { .setTimeUnit(builder.timeUnit) .setAllowCoreThreadTimeOut(builder.allowCoreThreadTimeOut) .setTaskDecorator(builder.taskDecorator); - if (builder.isDynamicPool) { String threadPoolId = Optional.ofNullable(builder.threadPoolId).orElse(builder.threadNamePrefix); initParam.setThreadPoolId(threadPoolId); initParam.setWaitForTasksToCompleteOnShutdown(builder.waitForTasksToCompleteOnShutdown); initParam.setAwaitTerminationMillis(builder.awaitTerminationMillis); } - if (!builder.isFastPool) { if (builder.queueType != null) { builder.workQueue = QueueTypeEnum.createBlockingQueue(builder.queueType.type, builder.capacity); } initParam.setWorkQueue(builder.workQueue); } - return initParam; } - } diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java b/hippo4j-core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java index 2c32bc3b..592d6eae 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java @@ -27,7 +27,7 @@ import org.springframework.boot.ansi.AnsiOutput; import org.springframework.boot.ansi.AnsiStyle; /** - * Dynamic thread pool print banner. + * Dynamic thread-pool print banner. * * @author chen.ma * @date 2021/6/20 16:34 diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomBlockingQueue.java b/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomBlockingQueue.java index 3288e184..1e269ed3 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomBlockingQueue.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomBlockingQueue.java @@ -20,7 +20,7 @@ package cn.hippo4j.core.spi; import java.util.concurrent.BlockingQueue; /** - * Custom blockingQueue. + * Custom blocking-queue. * * @author chen.ma * @date 2021/7/11 00:51 diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomRejectedExecutionHandler.java b/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomRejectedExecutionHandler.java index b8b0793c..fa5a0a40 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomRejectedExecutionHandler.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/spi/CustomRejectedExecutionHandler.java @@ -20,7 +20,7 @@ package cn.hippo4j.core.spi; import java.util.concurrent.RejectedExecutionHandler; /** - * Custom rejectedExecution handler. + * Custom rejected execution handler. * * @author chen.ma * @date 2021/7/10 23:51 diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/DynamicThreadPoolServiceLoader.java b/hippo4j-core/src/main/java/cn/hippo4j/core/spi/DynamicThreadPoolServiceLoader.java index 3ff0b12c..0ea8d7ca 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/spi/DynamicThreadPoolServiceLoader.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/spi/DynamicThreadPoolServiceLoader.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; /** - * Dynamic threadPool service loader. + * Dynamic thread-pool service loader. * * @author chen.ma * @date 2021/7/10 23:45 diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/CalculateUtil.java b/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/CalculateUtil.java index 524e209e..d4a8d3cd 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/CalculateUtil.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/CalculateUtil.java @@ -25,13 +25,6 @@ package cn.hippo4j.core.toolkit; */ public class CalculateUtil { - /** - * Divide. - * - * @param num1 - * @param num2 - * @return - */ public static int divide(int num1, int num2) { return ((int) (Double.parseDouble(num1 + "") / Double.parseDouble(num2 + "") * 100)); } diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/TraceContextUtil.java b/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/TraceContextUtil.java index fe44da6e..f75ce753 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/TraceContextUtil.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/TraceContextUtil.java @@ -22,7 +22,7 @@ import org.slf4j.MDC; import static cn.hippo4j.common.constant.Constants.EXECUTE_TIMEOUT_TRACE; /** - * MD util. + * Trace context util. * * @author chen.ma * @date 2022/3/3 08:30 diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtils.java b/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtils.java index e767f87e..7dbd4eb2 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtils.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtils.java @@ -228,7 +228,5 @@ public class InetUtils implements Closeable { public void setHostname(String hostname) { this.hostname = hostname; } - } - } diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtilsProperties.java b/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtilsProperties.java index e4fed7ee..c5fb7908 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtilsProperties.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/toolkit/inet/InetUtilsProperties.java @@ -121,5 +121,4 @@ public class InetUtilsProperties { public void setPreferredNetworks(List preferredNetworks) { this.preferredNetworks = preferredNetworks; } - } diff --git a/hippo4j-core/src/main/resources/application.properties b/hippo4j-core/src/main/resources/application.properties deleted file mode 100644 index 8b137891..00000000 --- a/hippo4j-core/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/common/ConfigFileTypeEnum.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/common/ConfigFileTypeEnum.java index 915ce04d..30e5f92c 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/common/ConfigFileTypeEnum.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/common/ConfigFileTypeEnum.java @@ -61,5 +61,4 @@ public enum ConfigFileTypeEnum { * @return */ public abstract String type(); - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/BootstrapCoreProperties.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/BootstrapCoreProperties.java index cca0aec5..f877dfab 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/BootstrapCoreProperties.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/BootstrapCoreProperties.java @@ -146,5 +146,4 @@ public class BootstrapCoreProperties implements BootstrapPropertiesInterface { * Executors. */ private List executors; - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/DynamicThreadPoolCoreAutoConfiguration.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/DynamicThreadPoolCoreAutoConfiguration.java index a279b28e..4c6280a6 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/DynamicThreadPoolCoreAutoConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/DynamicThreadPoolCoreAutoConfiguration.java @@ -50,7 +50,7 @@ import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; /** - * Dynamic thread pool auto configuration. + * Dynamic thread-pool auto configuration. * * @author chen.ma * @date 2022/2/25 00:21 @@ -163,5 +163,4 @@ public class DynamicThreadPoolCoreAutoConfiguration { public MetricMonitorHandler hippo4jMetricMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) { return new MetricMonitorHandler(threadPoolRunStateHandler); } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/ExecutorProperties.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/ExecutorProperties.java index 003b5a92..72b1786f 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/ExecutorProperties.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/ExecutorProperties.java @@ -93,5 +93,4 @@ public class ExecutorProperties { public Map receives() { return Objects.isNull(this.notify) || this.notify.getReceives() == null ? Maps.newHashMap() : this.notify.getReceives(); } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/NotifyPlatformProperties.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/NotifyPlatformProperties.java index 7cdd2084..771755cf 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/NotifyPlatformProperties.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/NotifyPlatformProperties.java @@ -49,5 +49,4 @@ public class NotifyPlatformProperties { * Secret. */ private String secret; - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/WebThreadPoolProperties.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/WebThreadPoolProperties.java index 4f2c17d1..3d499836 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/WebThreadPoolProperties.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/config/WebThreadPoolProperties.java @@ -42,5 +42,4 @@ public class WebThreadPoolProperties { * Keep alive time */ private Integer keepAliveTime; - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/AbstractDynamicThreadPoolMonitor.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/AbstractDynamicThreadPoolMonitor.java index 36ae954c..0b2890da 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/AbstractDynamicThreadPoolMonitor.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/AbstractDynamicThreadPoolMonitor.java @@ -50,5 +50,4 @@ public abstract class AbstractDynamicThreadPoolMonitor implements DynamicThreadP execute(poolRunState); } } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/DynamicThreadPoolMonitorExecutor.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/DynamicThreadPoolMonitorExecutor.java index 4000c226..7adbfece 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/DynamicThreadPoolMonitorExecutor.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/DynamicThreadPoolMonitorExecutor.java @@ -94,5 +94,4 @@ public class DynamicThreadPoolMonitorExecutor implements ApplicationRunner { } } } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/LogMonitorHandler.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/LogMonitorHandler.java index 627c105c..6036e64f 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/LogMonitorHandler.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/LogMonitorHandler.java @@ -44,5 +44,4 @@ public class LogMonitorHandler extends AbstractDynamicThreadPoolMonitor { public String getType() { return "log"; } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/MetricMonitorHandler.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/MetricMonitorHandler.java index d67915c4..ea4cc695 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/MetricMonitorHandler.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/MetricMonitorHandler.java @@ -90,5 +90,4 @@ public class MetricMonitorHandler extends AbstractDynamicThreadPoolMonitor { public String getType() { return "metric"; } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/ThreadPoolMonitor.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/ThreadPoolMonitor.java index ec30b283..47a898e1 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/ThreadPoolMonitor.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/monitor/ThreadPoolMonitor.java @@ -36,5 +36,4 @@ public interface ThreadPoolMonitor { * Collect data. */ void collect(); - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/notify/CoreNotifyConfigBuilder.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/notify/CoreNotifyConfigBuilder.java index 302d9e77..5051bd5a 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/notify/CoreNotifyConfigBuilder.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/notify/CoreNotifyConfigBuilder.java @@ -137,5 +137,4 @@ public class CoreNotifyConfigBuilder implements NotifyConfigBuilder { private String getToken(NotifyPlatformProperties platformProperties) { return StringUtil.isNotBlank(platformProperties.getToken()) ? platformProperties.getToken() : platformProperties.getSecretKey(); } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/AbstractConfigParser.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/AbstractConfigParser.java index 1b4f6f7b..9b52afd4 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/AbstractConfigParser.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/AbstractConfigParser.java @@ -28,5 +28,4 @@ public abstract class AbstractConfigParser implements ConfigParser { public boolean supports(ConfigFileTypeEnum type) { return getConfigFileTypes().contains(type); } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/ConfigParser.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/ConfigParser.java index 6aaff703..f09019ad 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/ConfigParser.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/ConfigParser.java @@ -51,5 +51,4 @@ public interface ConfigParser { * @return */ List getConfigFileTypes(); - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/ConfigParserHandler.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/ConfigParserHandler.java index f0f2cefa..4e025798 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/ConfigParserHandler.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/ConfigParserHandler.java @@ -61,5 +61,4 @@ public class ConfigParserHandler { private static class ConfigParserHandlerHolder { private static final ConfigParserHandler INSTANCE = new ConfigParserHandler(); } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/PropertiesConfigParser.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/PropertiesConfigParser.java index b76678ce..d052d38e 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/PropertiesConfigParser.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/PropertiesConfigParser.java @@ -43,5 +43,4 @@ public class PropertiesConfigParser extends AbstractConfigParser { public List getConfigFileTypes() { return Lists.newArrayList(ConfigFileTypeEnum.PROPERTIES); } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/YamlConfigParser.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/YamlConfigParser.java index d1d57daf..ed36b20b 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/YamlConfigParser.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/parser/YamlConfigParser.java @@ -49,5 +49,4 @@ public class YamlConfigParser extends AbstractConfigParser { public List getConfigFileTypes() { return Lists.newArrayList(ConfigFileTypeEnum.YML, ConfigFileTypeEnum.YAML); } - } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/refresher/AbstractCoreThreadPoolDynamicRefresh.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/refresher/AbstractCoreThreadPoolDynamicRefresh.java index 6cad3b01..fd4c25a7 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/refresher/AbstractCoreThreadPoolDynamicRefresh.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/refresher/AbstractCoreThreadPoolDynamicRefresh.java @@ -58,7 +58,7 @@ import static cn.hippo4j.common.constant.ChangeThreadPoolConstants.CHANGE_DELIMI import static cn.hippo4j.common.constant.ChangeThreadPoolConstants.CHANGE_THREAD_POOL_TEXT; /** - * Abstract core thread pool dynamic refresh. + * Abstract core thread-pool dynamic refresh. * * @author chen.ma * @date 2022/2/26 12:42 @@ -94,7 +94,7 @@ public abstract class AbstractCoreThreadPoolDynamicRefresh implements ThreadPool } /** - * register notify alarm manage + * Register notify alarm manage. */ public void registerNotifyAlarmManage() { bootstrapCoreProperties.getExecutors().forEach(executorProperties -> { @@ -125,7 +125,6 @@ public abstract class AbstractCoreThreadPoolDynamicRefresh implements ThreadPool if (nowParameter != null) { WebThreadPoolHandlerChoose webThreadPoolHandlerChoose = ApplicationContextHolder.getBean(WebThreadPoolHandlerChoose.class); WebThreadPoolService webThreadPoolService = webThreadPoolHandlerChoose.choose(); - PoolParameter beforeParameter = webThreadPoolService.getWebThreadPoolParameter(); if (!Objects.equals(beforeParameter.getCoreSize(), nowParameter.getCoreSize()) || !Objects.equals(beforeParameter.getMaxSize(), nowParameter.getMaxSize()) diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/refresher/ZookeeperRefresherHandler.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/refresher/ZookeeperRefresherHandler.java index a4f580b4..83f8e1ec 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/refresher/ZookeeperRefresherHandler.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/refresher/ZookeeperRefresherHandler.java @@ -83,7 +83,7 @@ public class ZookeeperRefresherHandler extends AbstractCoreThreadPoolDynamicRefr } /** - * load config info and refresh. + * Load config info and refresh. * * @param nodePath zk config node path. */ diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/support/DynamicThreadPoolPostProcessor.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/support/DynamicThreadPoolPostProcessor.java index 7392a775..120371e1 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/support/DynamicThreadPoolPostProcessor.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/support/DynamicThreadPoolPostProcessor.java @@ -42,7 +42,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; /** - * Dynamic threadPool post processor. + * Dynamic thread-pool post processor. * * @author chen.ma * @date 2021/8/2 20:40 @@ -113,7 +113,6 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor { .orElse(null); if (executorProperties != null) { try { - // 使用相关参数创建线程池 BlockingQueue workQueue = QueueTypeEnum.createBlockingQueue(executorProperties.getBlockingQueue(), executorProperties.getQueueCapacity()); String threadNamePrefix = executorProperties.getThreadNamePrefix(); newDynamicPoolExecutor = ThreadPoolBuilder.builder() @@ -137,7 +136,6 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor { } if (dynamicThreadPoolWrap.getExecutor() instanceof AbstractDynamicExecutorSupport) { - // 设置动态线程池增强参数 ThreadPoolNotifyAlarm notify = Optional.ofNullable(executorProperties).map(ExecutorProperties::getNotify).orElse(null); boolean isAlarm = Optional.ofNullable(notify) .map(each -> each.getIsAlarm()).orElseGet(() -> bootstrapCoreProperties.getAlarm() != null ? bootstrapCoreProperties.getAlarm() : true); diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/support/GlobalCoreThreadPoolManage.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/support/GlobalCoreThreadPoolManage.java index 1e694fc4..21a384d5 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/support/GlobalCoreThreadPoolManage.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/support/GlobalCoreThreadPoolManage.java @@ -23,7 +23,7 @@ import com.google.common.collect.Maps; import java.util.Map; /** - * Global core thread pool manage. + * Global core thread-pool manage. * * @author chen.ma * @date 2022/2/26 19:47 @@ -61,5 +61,4 @@ public class GlobalCoreThreadPoolManage { public static void refresh(String threadPoolId, ExecutorProperties executorProperties) { EXECUTOR_PROPERTIES.put(threadPoolId, executorProperties); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/BootstrapProperties.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/BootstrapProperties.java index 4bff3fef..61c39c0a 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/BootstrapProperties.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/BootstrapProperties.java @@ -96,5 +96,4 @@ public class BootstrapProperties implements BootstrapPropertiesInterface { * JSON serialization type. */ private String jsonSerializeType = "JACKSON"; - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfiguration.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfiguration.java index 4ca92810..42a3c0ea 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfiguration.java @@ -31,7 +31,6 @@ import org.springframework.core.env.ConfigurableEnvironment; import java.net.InetAddress; -import static cn.hippo4j.common.constant.Constants.GROUP_KEY_DELIMITER; import static cn.hippo4j.core.toolkit.IdentifyUtil.CLIENT_IDENTIFICATION_VALUE; import static cn.hippo4j.starter.toolkit.CloudCommonIdUtil.getDefaultInstanceId; import static cn.hippo4j.starter.toolkit.CloudCommonIdUtil.getIpApplicationName; @@ -89,5 +88,4 @@ public class DiscoveryConfiguration { public DiscoveryClient hippo4JDiscoveryClient(HttpAgent httpAgent, InstanceInfo instanceInfo) { return new DiscoveryClient(httpAgent, instanceInfo); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java index a5ae6da5..6e4c5cc2 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java @@ -51,7 +51,7 @@ import org.springframework.core.annotation.Order; import org.springframework.core.env.ConfigurableEnvironment; /** - * DynamicTp auto configuration. + * Dynamic thread-pool auto configuration. * * @author chen.ma * @date 2021/6/22 09:20 @@ -144,5 +144,4 @@ public class DynamicThreadPoolAutoConfiguration { public WebThreadPoolController webThreadPoolController(WebThreadPoolHandlerChoose webThreadPoolServiceChoose) { return new WebThreadPoolController(webThreadPoolServiceChoose); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/HttpClientConfiguration.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/HttpClientConfiguration.java index 8c563700..c05301fe 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/HttpClientConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/HttpClientConfiguration.java @@ -82,5 +82,4 @@ public class HttpClientConfiguration { builder.sslSocketFactory(sslSocketFactory, (X509TrustManager) trustAllCerts[0]); builder.hostnameVerifier((hostname, session) -> true); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageNotifyConfiguration.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageNotifyConfiguration.java index 7be2cc6b..75145ce1 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageNotifyConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/MessageNotifyConfiguration.java @@ -80,5 +80,4 @@ public class MessageNotifyConfiguration { public ServerThreadPoolDynamicRefresh threadPoolDynamicRefresh(ThreadPoolNotifyAlarmHandler threadPoolNotifyAlarmHandler) { return new ServerThreadPoolDynamicRefresh(threadPoolNotifyAlarmHandler); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/PoolRunStateController.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/PoolRunStateController.java index b210a9f8..1198713a 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/PoolRunStateController.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/PoolRunStateController.java @@ -57,5 +57,4 @@ public class PoolRunStateController { List detailStateInfo = threadDetailState.getThreadDetailStateInfo(threadPoolId); return Results.success(detailStateInfo); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/WebThreadPoolController.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/WebThreadPoolController.java index f356ebfe..08025f7d 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/WebThreadPoolController.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/WebThreadPoolController.java @@ -58,5 +58,4 @@ public class WebThreadPoolController { webThreadPoolServiceChoose.choose().updateWebThreadPool(poolParameterInfo); return Results.success(); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/BaseThreadDetailStateHandler.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/BaseThreadDetailStateHandler.java index 17b06aa5..2d02650f 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/BaseThreadDetailStateHandler.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/BaseThreadDetailStateHandler.java @@ -94,8 +94,6 @@ public class BaseThreadDetailStateHandler implements ThreadDetailState { } catch (Exception ex) { log.error("Failed to get thread status.", ex); } - return resultThreadState; } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/CacheData.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/CacheData.java index df8b1391..2f58dd55 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/CacheData.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/CacheData.java @@ -83,7 +83,6 @@ public class CacheData { private void safeNotifyListener(String content, String md5, ManagerListenerWrapper wrap) { Listener listener = wrap.getListener(); - Runnable runnable = () -> { wrap.setLastCallMd5(md5); listener.receiveConfigInfo(content); @@ -120,5 +119,4 @@ public class CacheData { public void setInitializing(boolean isInitializing) { this.isInitializing = isInitializing; } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ClientWorker.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ClientWorker.java index 6278d9b3..383bd402 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ClientWorker.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ClientWorker.java @@ -69,25 +69,18 @@ public class ClientWorker { this.identification = identification; this.timeout = CONFIG_LONG_POLL_TIMEOUT; this.serverHealthCheck = serverHealthCheck; - this.executor = Executors.newScheduledThreadPool(1, r -> { Thread t = new Thread(r); t.setName("client.worker.executor"); t.setDaemon(true); return t; }); - this.executorService = Executors.newSingleThreadScheduledExecutor( ThreadFactoryBuilder.builder().prefix("client.long.polling.executor").daemon(true).build()); - log.info("Client identity :: {}", identification); - this.executor.scheduleWithFixedDelay(() -> { try { - // 等待 spring 容器启动成功 awaitApplicationComplete.await(); - - // 检查动态线程池配置是否被更新 checkConfigInfo(); } catch (Throwable e) { log.error("Sub check rotate check error.", e); @@ -99,7 +92,6 @@ public class ClientWorker { int listenerSize = cacheMap.size(); double perTaskConfigSize = 3000D; int longingTaskCount = (int) Math.ceil(listenerSize / perTaskConfigSize); - if (longingTaskCount > currentLongingTaskCount) { for (int i = (int) currentLongingTaskCount; i < longingTaskCount; i++) { executorService.execute(new LongPollingRunnable()); @@ -114,7 +106,6 @@ public class ClientWorker { @SneakyThrows public void run() { serverHealthCheck.isHealthStatus(); - List cacheDataList = new ArrayList(); List inInitializingCacheList = new ArrayList(); cacheMap.forEach((key, val) -> cacheDataList.add(val)); @@ -125,7 +116,6 @@ public class ClientWorker { String tpId = keys[0]; String itemId = keys[1]; String namespace = keys[2]; - try { String content = getServerConfig(namespace, itemId, tpId, 3000L); CacheData cacheData = cacheMap.get(tpId); @@ -144,7 +134,6 @@ public class ClientWorker { cacheData.setInitializing(false); } } - inInitializingCacheList.clear(); executorService.execute(this); } @@ -158,12 +147,10 @@ public class ClientWorker { sb.append(cacheData.tenantId).append(WORD_SEPARATOR); sb.append(identification).append(WORD_SEPARATOR); sb.append(cacheData.getMd5()).append(LINE_SEPARATOR); - if (cacheData.isInitializing()) { inInitializingCacheList.add(GroupKey.getKeyTenant(cacheData.tpId, cacheData.itemId, cacheData.tenantId)); } } - boolean isInitializingCacheList = !inInitializingCacheList.isEmpty(); return checkUpdateTpIds(sb.toString(), isInitializingCacheList); } @@ -174,23 +161,18 @@ public class ClientWorker { params.put(WEIGHT_CONFIGS, IdUtil.simpleUUID()); Map headers = new HashMap(2); headers.put(LONG_PULLING_TIMEOUT, "" + timeout); - - // 确认客户端身份, 修改线程池配置时可单独修改 + // Confirm the identity of the client, and can be modified separately when modifying the thread pool configuration. headers.put(LONG_PULLING_CLIENT_IDENTIFICATION, identification); - // told server do not hang me up if new initializing cacheData added in if (isInitializingCacheList) { headers.put(LONG_PULLING_TIMEOUT_NO_HANGUP, "true"); } - if (StringUtils.isEmpty(probeUpdateString)) { return Collections.emptyList(); } - try { long readTimeoutMs = timeout + (long) Math.round(timeout >> 1); Result result = agent.httpPostByConfig(LISTENER_PATH, headers, params, readTimeoutMs); - if (result != null && result.isSuccess()) { return parseUpdateDataIdResponse(result.getData().toString()); } @@ -198,7 +180,6 @@ public class ClientWorker { setHealthServer(false); log.error("Check update get changed dataId exception. error message :: {}", ex.getMessage()); } - return Collections.emptyList(); } @@ -208,12 +189,10 @@ public class ClientWorker { params.put("itemId", itemId); params.put("tpId", tpId); params.put("instanceId", identification); - Result result = agent.httpGetByConfig(CONFIG_CONTROLLER_PATH, null, params, readTimeout); if (result.isSuccess()) { return JSONUtil.toJSONString(result.getData()); } - log.error("Sub server namespace :: {}, itemId :: {}, tpId :: {}, result code :: {}", namespace, itemId, tpId, result.getCode()); return NULL; @@ -223,13 +202,11 @@ public class ClientWorker { if (StringUtils.isEmpty(response)) { return Collections.emptyList(); } - try { response = URLDecoder.decode(response, "UTF-8"); } catch (Exception e) { log.error("Polling resp decode modifiedDataIdsString error.", e); } - List updateList = new LinkedList(); for (String dataIdAndGroup : response.split(LINE_SEPARATOR)) { if (!StringUtils.isEmpty(dataIdAndGroup)) { @@ -245,7 +222,6 @@ public class ClientWorker { } } } - return updateList; } @@ -261,7 +237,6 @@ public class ClientWorker { if (cacheData != null) { return cacheData; } - cacheData = new CacheData(namespace, itemId, tpId); CacheData lastCacheData = cacheMap.putIfAbsent(tpId, cacheData); if (lastCacheData == null) { @@ -273,13 +248,10 @@ public class ClientWorker { } catch (Exception ex) { log.error("Cache Data Error. Service Unavailable :: {}", ex.getMessage()); } - int taskId = cacheMap.size() / CONFIG_LONG_POLL_TIMEOUT; cacheData.setTaskId(taskId); - lastCacheData = cacheData; } - return lastCacheData; } @@ -290,5 +262,4 @@ public class ClientWorker { protected void notifyApplicationComplete() { awaitApplicationComplete.countDown(); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ConfigEmptyAnalyzer.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ConfigEmptyAnalyzer.java index 5fcfecbc..8f84e754 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ConfigEmptyAnalyzer.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ConfigEmptyAnalyzer.java @@ -33,5 +33,4 @@ public class ConfigEmptyAnalyzer extends AbstractFailureAnalyzer threadPoolDynamicRefresh.dynamicRefresh(config)); } } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/Listener.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/Listener.java index de616281..41f39000 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/Listener.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/Listener.java @@ -40,5 +40,4 @@ public interface Listener { * @param configInfo */ void receiveConfigInfo(String configInfo); - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ServerThreadPoolDynamicRefresh.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ServerThreadPoolDynamicRefresh.java index 5c6ee99a..326dcf75 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ServerThreadPoolDynamicRefresh.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ServerThreadPoolDynamicRefresh.java @@ -88,7 +88,6 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh originalExecuteTimeOut = dynamicExecutor.getExecuteTimeOut(); } String originalRejected = rejectedExecutionHandler.getClass().getSimpleName(); - // Send change message. ChangeParameterNotifyRequest request = new ChangeParameterNotifyRequest(); request.setBeforeCorePoolSize(originalCoreSize); @@ -103,7 +102,6 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh changePoolInfo(executor, parameter); ThreadPoolExecutor afterExecutor = GlobalThreadPoolManage.getExecutorService(threadPoolId).getExecutor(); - request.setNowCorePoolSize(afterExecutor.getCorePoolSize()); request.setNowMaximumPoolSize(afterExecutor.getMaximumPoolSize()); request.setNowAllowsCoreThreadTimeOut(EnableEnum.getBool(parameter.getAllowCoreThreadTimeOut())); @@ -112,7 +110,6 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh request.setNowRejectedName(RejectedTypeEnum.getRejectedNameByType(parameter.getRejectedType())); request.setNowExecuteTimeOut(originalExecuteTimeOut); threadPoolNotifyAlarmHandler.sendPoolConfigChange(request); - log.info(CHANGE_THREAD_POOL_TEXT, threadPoolId.toUpperCase(), String.format(CHANGE_DELIMITER, originalCoreSize, afterExecutor.getCorePoolSize()), @@ -149,7 +146,6 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh executor.setCorePoolSize(parameter.getCoreSize()); } } - if (parameter.getCapacity() != null && Objects.equals(QueueTypeEnum.RESIZABLE_LINKED_BLOCKING_QUEUE.type, parameter.getQueueType())) { if (executor.getQueue() instanceof ResizableCapacityLinkedBlockIngQueue) { @@ -159,11 +155,9 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh log.warn("The queue length cannot be modified. Queue type mismatch. Current queue type :: {}", executor.getQueue().getClass().getSimpleName()); } } - if (parameter.getKeepAliveTime() != null) { executor.setKeepAliveTime(parameter.getKeepAliveTime(), TimeUnit.SECONDS); } - if (parameter.getRejectedType() != null) { RejectedExecutionHandler rejectedExecutionHandler = RejectedTypeEnum.createPolicy(parameter.getRejectedType()); if (executor instanceof AbstractDynamicExecutorSupport) { @@ -172,13 +166,10 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh AtomicLong rejectCount = dynamicExecutor.getRejectCount(); rejectedExecutionHandler = RejectedProxyUtil.createProxy(rejectedExecutionHandler, parameter.getTpId(), rejectCount); } - executor.setRejectedExecutionHandler(rejectedExecutionHandler); } - if (parameter.getAllowCoreThreadTimeOut() != null) { executor.allowCoreThreadTimeOut(EnableEnum.getBool(parameter.getAllowCoreThreadTimeOut())); } } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ShutdownExecuteException.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ShutdownExecuteException.java index 233a7a82..6daca171 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ShutdownExecuteException.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ShutdownExecuteException.java @@ -28,5 +28,4 @@ public class ShutdownExecuteException extends Exception { public ShutdownExecuteException() { super("Execute task when stopped."); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolConfigService.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolConfigService.java index 5e765958..f6513d9a 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolConfigService.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolConfigService.java @@ -25,7 +25,7 @@ import org.springframework.context.ApplicationListener; import java.util.Arrays; /** - * ThreadPool config service. + * Thread-pool config service. * * @author chen.ma * @date 2021/6/21 21:50 @@ -59,5 +59,4 @@ public class ThreadPoolConfigService implements ConfigService, ApplicationListen public void onApplicationEvent(ApplicationCompleteEvent event) { clientWorker.notifyApplicationComplete(); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolOperation.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolOperation.java index 273a8711..32822733 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolOperation.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolOperation.java @@ -22,7 +22,7 @@ import cn.hippo4j.starter.config.BootstrapProperties; import java.util.concurrent.Executor; /** - * ThreadPool operation. + * Thread-pool operation. * * @author chen.ma * @date 2021/6/22 20:25 @@ -50,10 +50,7 @@ public class ThreadPoolOperation { return executor; } }; - configService.addListener(properties.getNamespace(), properties.getItemId(), tpId, configListener); - return configListener; } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolSubscribeCallback.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolSubscribeCallback.java index 851d3b0f..88362c9d 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolSubscribeCallback.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolSubscribeCallback.java @@ -31,5 +31,4 @@ public interface ThreadPoolSubscribeCallback { * @param config */ void callback(String config); - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/event/ApplicationCompleteEvent.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/event/ApplicationCompleteEvent.java index 4ce0c121..8adf23a3 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/event/ApplicationCompleteEvent.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/event/ApplicationCompleteEvent.java @@ -36,5 +36,4 @@ public class ApplicationCompleteEvent extends ApplicationEvent { public ApplicationCompleteEvent(Object source) { super(source); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/event/ApplicationContentPostProcessor.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/event/ApplicationContentPostProcessor.java index 2265be21..aa24347b 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/event/ApplicationContentPostProcessor.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/event/ApplicationContentPostProcessor.java @@ -45,5 +45,4 @@ public class ApplicationContentPostProcessor implements ApplicationListener - * {@link BlockingQueue} 充当缓冲容器, 实现生产-消费模型. + * {@link BlockingQueue} Act as a buffer container, enabling a production-consumption model. * * @author chen.ma * @date 2021/12/6 20:23 @@ -64,17 +64,19 @@ public class ReportingEventExecutor implements Runnable, CommandLineRunner, Disp private final ServerHealthCheck serverHealthCheck; /** - * 数据采集组件集合 + * Collection of data collection components. */ private Map collectors; /** - * 数据采集的缓冲容器, 等待 ReportingEventExecutor 上报服务端 + * Buffer container for data collection, waiting + * for ReportingEventExecutor to report to the server. */ private BlockingQueue messageCollectVessel; /** - * 数据采集定时执行器, Spring 启动后延时一段时间进行采集动态线程池的运行数据 + * Data collection timing executor, after Spring starts, + * it delays for a period of time to collect the running data of the dynamic thread pool. */ private ScheduledThreadPoolExecutor collectVesselExecutor; @@ -96,27 +98,21 @@ public class ReportingEventExecutor implements Runnable, CommandLineRunner, Disp if (properties.getCollect()) { Integer bufferSize = properties.getTaskBufferSize(); messageCollectVessel = new ArrayBlockingQueue(bufferSize); - String collectVesselTaskName = "client.scheduled.collect.data"; collectVesselExecutor = new ScheduledThreadPoolExecutor( new Integer(1), ThreadFactoryBuilder.builder().daemon(true).prefix(collectVesselTaskName).build()); - - // 延迟 initialDelay 后循环调用. scheduleWithFixedDelay 每次执行时间为上一次任务结束时, 向后推一个时间间隔 collectVesselExecutor.scheduleWithFixedDelay( () -> runTimeGatherTask(), properties.getInitialDelay(), properties.getCollectInterval(), TimeUnit.MILLISECONDS); - - // 启动上报监控数据线程 + // Start reporting monitoring data thread String reportingTaskName = "client.thread.reporting.task"; ThreadUtil.newThread(this, reportingTaskName, Boolean.TRUE).start(); - - // 获取所有数据采集组件, 目前仅有历史运行数据采集 + // Get all data collection components, currently only historical operation data collection. collectors = ApplicationContextHolder.getBeansOfType(Collector.class); } - log.info("Dynamic thread pool :: [{}]. The dynamic thread pool starts data collection and reporting. ", getThreadPoolNum()); } @@ -126,14 +122,13 @@ public class ReportingEventExecutor implements Runnable, CommandLineRunner, Disp } /** - * 采集动态线程池数据, 并添加缓冲队列. + * Collect dynamic thread pool data and add buffer queues. */ private void runTimeGatherTask() { boolean healthStatus = serverHealthCheck.isHealthStatus(); if (!healthStatus || CollUtil.isEmpty(collectors)) { return; } - collectors.forEach((beanName, collector) -> { Message message = collector.collectMessage(); boolean offer = messageCollectVessel.offer(message); @@ -142,5 +137,4 @@ public class ReportingEventExecutor implements Runnable, CommandLineRunner, Disp } }); } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/collect/Collector.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/collect/Collector.java index 991100f8..5406b2a2 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/collect/Collector.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/collect/Collector.java @@ -20,7 +20,7 @@ package cn.hippo4j.starter.monitor.collect; import cn.hippo4j.common.monitor.Message; /** - * Collect dynamic thread pool data. + * Collect thread-pool data. * * @author chen.ma * @date 2021/12/7 20:11 @@ -33,5 +33,4 @@ public interface Collector { * @return */ Message collectMessage(); - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/collect/RunTimeInfoCollector.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/collect/RunTimeInfoCollector.java index 1096df8b..8ec29410 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/collect/RunTimeInfoCollector.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/collect/RunTimeInfoCollector.java @@ -47,7 +47,6 @@ public class RunTimeInfoCollector extends AbstractThreadPoolRuntime implements C @Override public Message collectMessage() { AbstractMessage message = new RuntimeMessage(); - List runtimeMessages = Lists.newArrayList(); List listThreadPoolId = GlobalThreadPoolManage.listThreadPoolId(); for (String each : listThreadPoolId) { @@ -56,10 +55,8 @@ public class RunTimeInfoCollector extends AbstractThreadPoolRuntime implements C runtimeMessage.setGroupKey(getThreadPoolIdentify(each, properties.getItemId(), properties.getNamespace())); runtimeMessages.add(runtimeMessage); } - message.setMessageType(MessageTypeEnum.RUNTIME); message.setMessages(runtimeMessages); - return message; } @@ -67,5 +64,4 @@ public class RunTimeInfoCollector extends AbstractThreadPoolRuntime implements C protected PoolRunStateInfo supplement(PoolRunStateInfo basePoolRunStateInfo) { return basePoolRunStateInfo; } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/send/HttpConnectSender.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/send/HttpConnectSender.java index 9568af4f..8559af16 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/send/HttpConnectSender.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/send/HttpConnectSender.java @@ -27,7 +27,7 @@ import lombok.extern.slf4j.Slf4j; import static cn.hippo4j.common.constant.Constants.MONITOR_PATH; /** - * Http mvc sender. + * Http sender. * * @author chen.ma * @date 2021/12/7 20:53 @@ -47,5 +47,4 @@ public class HttpConnectSender implements MessageSender { log.error("Failed to push dynamic thread pool runtime data.", ex); } } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/send/MessageSender.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/send/MessageSender.java index 65afb2fe..467488a1 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/send/MessageSender.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/send/MessageSender.java @@ -33,5 +33,4 @@ public interface MessageSender { * @param message */ void send(Message message); - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/notify/ServerNotifyConfigBuilder.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/notify/ServerNotifyConfigBuilder.java index 3090ed73..f7b4b9ed 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/notify/ServerNotifyConfigBuilder.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/notify/ServerNotifyConfigBuilder.java @@ -64,20 +64,17 @@ public class ServerNotifyConfigBuilder implements NotifyConfigBuilder { log.warn("The client does not have a dynamic thread pool instance configured."); return resultMap; } - List groupKeys = Lists.newArrayList(); threadPoolIds.forEach(each -> { String groupKey = GroupKey.getKeyTenant(each, properties.getItemId(), properties.getNamespace()); groupKeys.add(groupKey); }); - Result result = null; try { result = httpAgent.httpPostByDiscovery(BASE_PATH + "/notify/list/config", new ThreadPoolNotifyRequest(groupKeys)); } catch (Throwable ex) { log.error("Get dynamic thread pool notify configuration error. message :: {}", ex.getMessage()); } - if (result != null && result.isSuccess() && result.getData() != null) { String resultDataStr = JSONUtil.toJSONString(result.getData()); List resultData = JSONUtil.parseArray(resultDataStr, ThreadPoolNotifyDTO.class); @@ -86,8 +83,6 @@ public class ServerNotifyConfigBuilder implements NotifyConfigBuilder { resultMap.forEach((key, val) -> val.stream().filter(each -> StrUtil.equals("ALARM", each.getType())) .forEach(each -> alarmControlHandler.initCacheAndLock(each.getTpId(), each.getPlatform(), each.getInterval()))); } - return resultMap; } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/AbstractHealthCheck.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/AbstractHealthCheck.java index 61c61586..48d9f79a 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/AbstractHealthCheck.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/AbstractHealthCheck.java @@ -109,11 +109,9 @@ public abstract class AbstractHealthCheck implements ServerHealthCheck, Initiali healthMainLock.unlock(); } } - if (!healthStatus) { throw new ShutdownExecuteException(); } - return healthStatus; } @@ -142,12 +140,14 @@ public abstract class AbstractHealthCheck implements ServerHealthCheck, Initiali @Override public void afterPropertiesSet() throws Exception { - // 添加钩子函数, Client 端停止时, 如果 Server 端是非健康状态, Client 销毁函数会暂停运行 + /** + * Add a hook function, when the client stops, if the server is in an unhealthy state, + * the client destroy function will suspend operation + */ Runtime.getRuntime().addShutdownHook(new Thread(() -> { clientShutdownHook = true; signalAllBizThread(); })); - healthCheckExecutor.scheduleWithFixedDelay(() -> healthCheck(), 0, HEALTH_CHECK_INTERVAL, TimeUnit.SECONDS); } @@ -155,5 +155,4 @@ public abstract class AbstractHealthCheck implements ServerHealthCheck, Initiali public void onApplicationEvent(ApplicationCompleteEvent event) { contextInitComplete = true; } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/HttpAgent.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/HttpAgent.java index 19f0ccca..b966b340 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/HttpAgent.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/HttpAgent.java @@ -109,5 +109,4 @@ public interface HttpAgent { */ Result httpDeleteByConfig(String path, Map headers, Map paramValues, long readTimeoutMs); - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/HttpScheduledHealthCheck.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/HttpScheduledHealthCheck.java index e8933bc3..bd282e7c 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/HttpScheduledHealthCheck.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/HttpScheduledHealthCheck.java @@ -52,5 +52,4 @@ public class HttpScheduledHealthCheck extends AbstractHealthCheck { return healthStatus; } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerHealthCheck.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerHealthCheck.java index f87e47bf..6b5a4deb 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerHealthCheck.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerHealthCheck.java @@ -38,5 +38,4 @@ public interface ServerHealthCheck { * @param healthStatus */ void setHealthStatus(boolean healthStatus); - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerHttpAgent.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerHttpAgent.java index 6cffc3c1..f0f782f5 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerHttpAgent.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerHttpAgent.java @@ -59,12 +59,10 @@ public class ServerHttpAgent implements HttpAgent { this.httpClientUtil = httpClientUtil; this.serverListManager = new ServerListManager(dynamicThreadPoolProperties); this.securityProxy = new SecurityProxy(httpClientUtil, properties); - this.securityProxy.applyToken(this.serverListManager.getServerUrls()); this.executorService = new ScheduledThreadPoolExecutor( new Integer(1), ThreadFactoryBuilder.builder().daemon(true).prefix("client.scheduled.token.security.updater").build()); - this.executorService.scheduleWithFixedDelay( () -> securityProxy.applyToken(serverListManager.getServerUrls()), 0, @@ -134,7 +132,6 @@ public class ServerHttpAgent implements HttpAgent { if (serverHealthCheck == null) { serverHealthCheck = ApplicationContextHolder.getBean(ServerHealthCheck.class); } - serverHealthCheck.isHealthStatus(); } @@ -142,7 +139,6 @@ public class ServerHttpAgent implements HttpAgent { if (StrUtil.isNotBlank(securityProxy.getAccessToken())) { params.put(Constants.ACCESS_TOKEN, securityProxy.getAccessToken()); } - return params; } @@ -151,5 +147,4 @@ public class ServerHttpAgent implements HttpAgent { String resultPath = httpClientUtil.buildUrl(path, injectSecurityInfo(Maps.newHashMap())); return resultPath; } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerListManager.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerListManager.java index 3fb8bd97..176f5ec2 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerListManager.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/remote/ServerListManager.java @@ -52,22 +52,18 @@ public class ServerListManager { public ServerListManager(BootstrapProperties dynamicThreadPoolProperties) { this.properties = dynamicThreadPoolProperties; serverAddrsStr = properties.getServerAddr(); - if (!StringUtils.isEmpty(serverAddrsStr)) { List serverAddrList = new ArrayList(); String[] serverAddrListArr = this.serverAddrsStr.split(","); - for (String serverAddr : serverAddrListArr) { boolean whetherJoint = StrUtil.isNotBlank(serverAddr) && !serverAddr.startsWith(HTTPS) && !serverAddr.startsWith(HTTP); if (whetherJoint) { serverAddr = HTTP + serverAddr; } - currentServerAddr = serverAddr; serverAddrList.add(serverAddr); } - this.serverUrls = serverAddrList; } } @@ -141,5 +137,4 @@ public class ServerListManager { } } } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/security/SecurityProxy.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/security/SecurityProxy.java index d8bd7c0e..f41eff38 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/security/SecurityProxy.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/security/SecurityProxy.java @@ -68,7 +68,6 @@ public class SecurityProxy { .toMillis(tokenTtl - tokenRefreshWindow)) { return true; } - for (String server : servers) { if (applyToken(server)) { lastRefreshTime = System.currentTimeMillis(); @@ -78,28 +77,23 @@ public class SecurityProxy { } catch (Throwable ignore) { // ignore } - return false; } public boolean applyToken(String server) { if (StringUtil.isAllNotEmpty(username, password)) { String url = server + APPLY_TOKEN_URL; - Map bodyMap = new HashMap(2); bodyMap.put("userName", username); bodyMap.put("password", password); - try { Result result = httpClientUtil.restApiPost(url, bodyMap, Result.class); if (!result.isSuccess()) { log.error("Error getting access token. message :: {}", result.getMessage()); return false; } - String tokenJsonStr = JSONUtil.toJSONString(result.getData()); TokenInfo tokenInfo = JSONUtil.parseObject(tokenJsonStr, TokenInfo.class); - accessToken = tokenInfo.getAccessToken(); tokenTtl = tokenInfo.getTokenTtl(); tokenRefreshWindow = tokenTtl / 10; @@ -108,12 +102,10 @@ public class SecurityProxy { return false; } } - return true; } public String getAccessToken() { return accessToken; } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/toolkit/CloudCommonIdUtil.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/toolkit/CloudCommonIdUtil.java index d6a7dfff..7a7d1a0b 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/toolkit/CloudCommonIdUtil.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/toolkit/CloudCommonIdUtil.java @@ -57,5 +57,4 @@ public class CloudCommonIdUtil { } return combined; } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/toolkit/HttpClientUtil.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/toolkit/HttpClientUtil.java index ad11ee21..4eb64435 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/toolkit/HttpClientUtil.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/toolkit/HttpClientUtil.java @@ -45,7 +45,7 @@ public class HttpClientUtil { private static int HTTP_OK_CODE = 200; /** - * Get 请求. + * Get. * * @param url * @return @@ -61,10 +61,10 @@ public class HttpClientUtil { } /** - * Get 请求, 支持添加查询字符串. + * Get request, supports adding query string. * * @param url - * @param queryString 查询字符串 + * @param queryString * @return */ public String get(String url, Map queryString) { @@ -73,7 +73,7 @@ public class HttpClientUtil { } /** - * 获取 Json 后直接反序列化. + * Deserialize directly after getting Json. * * @param url * @param clazz @@ -85,7 +85,7 @@ public class HttpClientUtil { } /** - * 调用健康检查. + * Call health check. * * @param url * @param clazz @@ -99,7 +99,7 @@ public class HttpClientUtil { } /** - * Get 请求, 支持查询字符串. + * Get request, supports query string. * * @param url * @param queryString @@ -114,7 +114,7 @@ public class HttpClientUtil { } /** - * Rest 接口 Post 调用. + * Rest interface Post call. * * @param url * @param body @@ -130,8 +130,7 @@ public class HttpClientUtil { } /** - * Rest 接口 Post 调用. - * 对返回值直接反序列化. + * Rest interface Post call. Deserialize the return value directly. * * @param url * @param body @@ -143,7 +142,7 @@ public class HttpClientUtil { } /** - * 根据查询字符串构造完整的 Url. + * Constructs a complete Url from the query string. * * @param url * @param queryString @@ -153,10 +152,8 @@ public class HttpClientUtil { if (null == queryString) { return url; } - StringBuilder builder = new StringBuilder(url); boolean isFirst = true; - for (Map.Entry entry : queryString.entrySet()) { String key = entry.getKey(); if (key != null && entry.getValue() != null) { @@ -171,7 +168,6 @@ public class HttpClientUtil { .append(queryString.get(key)); } } - return builder.toString(); } @@ -189,7 +185,6 @@ public class HttpClientUtil { String msg = String.format("HttpPost 响应 code 异常. [code] %s [url] %s [body] %s", resp.code(), url, jsonBody); throw new ServiceException(msg); } - return responseBody.string(); } } @@ -213,16 +208,13 @@ public class HttpClientUtil { public T restApiGetByThreadPool(String url, Map headers, Map paramValues, Long readTimeoutMs, Class clazz) { String buildUrl = buildUrl(url, paramValues); Request.Builder builder = new Request.Builder().get(); - if (!CollectionUtils.isEmpty(headers)) { builder.headers(Headers.of(headers)); } - Request request = builder.url(buildUrl).build(); - Call call = hippo4JOkHttpClient.newCall(request); + // TODO Plan to optimize the timout api because its version is too high. call.timeout().timeout(readTimeoutMs, TimeUnit.MILLISECONDS); - try (Response resp = call.execute()) { try (ResponseBody responseBody = resp.body()) { if (resp.code() != HTTP_OK_CODE) { @@ -230,7 +222,6 @@ public class HttpClientUtil { log.error(msg); throw new ServiceException(msg); } - return JSONUtil.parseObject(responseBody.string(), clazz); } } @@ -239,16 +230,14 @@ public class HttpClientUtil { @SneakyThrows public T restApiPostByThreadPool(String url, Map headers, Map paramValues, Long readTimeoutMs, Class clazz) { String buildUrl = buildUrl(url, paramValues); - Request request = new Request.Builder() .url(buildUrl) .headers(Headers.of(headers)) .post(RequestBody.create(jsonMediaType, "")) .build(); - Call call = hippo4JOkHttpClient.newCall(request); + // TODO Plan to optimize the timout api because its version is too high. call.timeout().timeout(readTimeoutMs, TimeUnit.MILLISECONDS); - try (Response resp = call.execute()) { try (ResponseBody responseBody = resp.body()) { if (resp.code() != HTTP_OK_CODE) { @@ -256,10 +245,8 @@ public class HttpClientUtil { log.error(msg); throw new ServiceException(msg); } - return JSONUtil.parseObject(responseBody.string(), clazz); } } } - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/wrapper/ManagerListenerWrapper.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/wrapper/ManagerListenerWrapper.java index 3d2c8739..1d79b882 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/wrapper/ManagerListenerWrapper.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/wrapper/ManagerListenerWrapper.java @@ -44,5 +44,4 @@ public class ManagerListenerWrapper { * Listener */ private Listener listener; - }