From 518e9fb45e2563f2f79f30f20e5fc6b3279e3a2e Mon Sep 17 00:00:00 2001 From: WuLang <48200100+wulangcode@users.noreply.github.com> Date: Mon, 7 Nov 2022 21:53:16 +0800 Subject: [PATCH] style:hippo4j-message CheckStyle (#926) --- dev-support/hippo4j_checkstyle_suppression.xml | 1 + .../java/cn/hippo4j/message/dto/AlarmControlDTO.java | 4 +++- .../message/platform/WeChatSendMessageHandler.java | 6 ++++++ .../message/platform/constant/DingAlarmConstants.java | 8 ++++---- .../platform/constant/WeChatAlarmConstants.java | 6 +++--- .../service/DefaultThreadPoolCheckAlarmHandler.java | 10 +++++----- .../message/service/Hippo4jBaseSendMessageService.java | 2 +- 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dev-support/hippo4j_checkstyle_suppression.xml b/dev-support/hippo4j_checkstyle_suppression.xml index 3bf2965c..e760e379 100644 --- a/dev-support/hippo4j_checkstyle_suppression.xml +++ b/dev-support/hippo4j_checkstyle_suppression.xml @@ -27,4 +27,5 @@ + diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/dto/AlarmControlDTO.java b/hippo4j-message/src/main/java/cn/hippo4j/message/dto/AlarmControlDTO.java index 11c5128f..73cb7314 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/dto/AlarmControlDTO.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/dto/AlarmControlDTO.java @@ -18,7 +18,9 @@ package cn.hippo4j.message.dto; import cn.hippo4j.message.enums.NotifyTypeEnum; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; /** * Alarm control DTO. diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/WeChatSendMessageHandler.java b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/WeChatSendMessageHandler.java index 68dcbed5..b4fb42bf 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/WeChatSendMessageHandler.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/WeChatSendMessageHandler.java @@ -70,6 +70,9 @@ public class WeChatSendMessageHandler extends AbstractRobotSendMessageHandler { } } + /** + * WeChat + */ @Data @Accessors(chain = true) public static class WeChatReqDTO { @@ -79,6 +82,9 @@ public class WeChatSendMessageHandler extends AbstractRobotSendMessageHandler { private Markdown markdown; } + /** + * Markdown + */ @Data public static class Markdown { diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/DingAlarmConstants.java b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/DingAlarmConstants.java index f8505403..f4bb2285 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/DingAlarmConstants.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/DingAlarmConstants.java @@ -46,8 +46,8 @@ public class DingAlarmConstants { * Replace task timeout template */ public static final String DING_ALARM_TIMEOUT_REPLACE_TXT = - "任务执行时间：%d / ms \n\n " + - "超时时间：%d / ms \n\n " + - DING_ALARM_TIMEOUT_TRACE_REPLACE_TXT + - " --- \n\n "; + "任务执行时间：%d / ms \n\n " + + "超时时间：%d / ms \n\n " + + DING_ALARM_TIMEOUT_TRACE_REPLACE_TXT + + " --- \n\n "; } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/WeChatAlarmConstants.java b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/WeChatAlarmConstants.java index 8d4f56f8..8b6001fc 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/WeChatAlarmConstants.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/WeChatAlarmConstants.java @@ -36,7 +36,7 @@ public class WeChatAlarmConstants { * Replace task timeout template */ public static final String WE_CHAT_ALARM_TIMOUT_REPLACE_TXT = - "\n> 任务执行时间：%s / ms \n" + - "> 超时时间：%s / ms " + - WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT; + "\n> 任务执行时间：%s / ms \n" + + "> 超时时间：%s / ms " + + WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT; } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/service/DefaultThreadPoolCheckAlarmHandler.java b/hippo4j-message/src/main/java/cn/hippo4j/message/service/DefaultThreadPoolCheckAlarmHandler.java index bb155495..de770758 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/service/DefaultThreadPoolCheckAlarmHandler.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/service/DefaultThreadPoolCheckAlarmHandler.java @@ -64,11 +64,11 @@ public class DefaultThreadPoolCheckAlarmHandler implements Runnable, ThreadPoolC @Value("${spring.dynamic.thread-pool.check-state-interval:5}") private Integer checkStateInterval; - private final ScheduledExecutorService ALARM_NOTIFY_EXECUTOR = new ScheduledThreadPoolExecutor( + private final ScheduledExecutorService alarmNotifyExecutor = new ScheduledThreadPoolExecutor( 1, r -> new Thread(r, "client.alarm.notify")); - private final ExecutorService ASYNC_ALARM_NOTIFY_EXECUTOR = ThreadPoolBuilder.builder() + private final ExecutorService asyncAlarmNotifyExecutor = ThreadPoolBuilder.builder() .poolThreadSize(2, 4) .threadFactory("client.execute.timeout.alarm") .allowCoreThreadTimeOut(true) @@ -79,7 +79,7 @@ public class DefaultThreadPoolCheckAlarmHandler implements Runnable, ThreadPoolC @Override public void run(String... args) throws Exception { - ALARM_NOTIFY_EXECUTOR.scheduleWithFixedDelay(this, 0, checkStateInterval, TimeUnit.SECONDS); + alarmNotifyExecutor.scheduleWithFixedDelay(this, 0, checkStateInterval, TimeUnit.SECONDS); } @Override @@ -162,7 +162,7 @@ public class DefaultThreadPoolCheckAlarmHandler implements Runnable, ThreadPoolC hippo4jSendMessageService.sendAlarmMessage(NotifyTypeEnum.REJECT, alarmNotifyRequest); } }; - ASYNC_ALARM_NOTIFY_EXECUTOR.execute(checkPoolRejectedAlarmTask); + asyncAlarmNotifyExecutor.execute(checkPoolRejectedAlarmTask); } /** @@ -190,7 +190,7 @@ public class DefaultThreadPoolCheckAlarmHandler implements Runnable, ThreadPoolC alarmNotifyRequest.setExecuteTimeoutTrace(executeTimeoutTrace); } Runnable task = () -> hippo4jSendMessageService.sendAlarmMessage(NotifyTypeEnum.TIMEOUT, alarmNotifyRequest); - ASYNC_ALARM_NOTIFY_EXECUTOR.execute(task); + asyncAlarmNotifyExecutor.execute(task); } catch (Throwable ex) { log.error("Send thread pool execution timeout alarm error.", ex); } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java b/hippo4j-message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java index 2f5eedbd..0792d6f1 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java @@ -46,7 +46,7 @@ public class Hippo4jBaseSendMessageService implements Hippo4jSendMessageService, private final AlarmControlHandler alarmControlHandler; @Getter - public final Map> notifyConfigs = new HashMap<>(); + private final Map> notifyConfigs = new HashMap<>(); private final Map sendMessageHandlers = new HashMap<>();