From aea64de21ff2eaaefc982652b38d63670ad6edc8 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Thu, 9 Jan 2025 01:00:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(1.4.0-beta1):=20Converter=20=E7=A7=BB?= =?UTF-8?q?=E5=85=A5=20convert=20=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aizuda/snailjob/server/common/alarm/AbstractAlarm.java | 3 +-- .../aizuda/snailjob/server/common/alarm/AbstractJobAlarm.java | 4 +--- .../snailjob/server/common/alarm/AbstractWorkflowAlarm.java | 4 ++-- .../snailjob/server/common/cache/CacheRegisterTable.java | 2 +- .../server/common/{ => convert}/AlarmInfoConverter.java | 2 +- .../common/{ => convert}/RegisterNodeInfoConverter.java | 2 +- .../listener/RetryTaskFailDeadLetterAlarmListener.java | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) rename snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/{ => convert}/AlarmInfoConverter.java (97%) rename snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/{ => convert}/RegisterNodeInfoConverter.java (90%) diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java index 902d6e1f3..50ec1817c 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java @@ -8,9 +8,9 @@ import com.aizuda.snailjob.common.core.enums.StatusEnum; import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.core.util.StreamUtils; import com.aizuda.snailjob.common.log.SnailJobLog; -import com.aizuda.snailjob.server.common.AlarmInfoConverter; import com.aizuda.snailjob.server.common.Lifecycle; import com.aizuda.snailjob.server.common.cache.CacheNotifyRateLimiter; +import com.aizuda.snailjob.server.common.convert.AlarmInfoConverter; import com.aizuda.snailjob.server.common.dto.AlarmInfo; import com.aizuda.snailjob.server.common.dto.NotifyConfigInfo; import com.aizuda.snailjob.server.common.dto.NotifyConfigInfo.RecipientInfo; @@ -20,7 +20,6 @@ import com.aizuda.snailjob.template.datasource.persistence.mapper.NotifyRecipien import com.aizuda.snailjob.template.datasource.persistence.po.NotifyConfig; import com.aizuda.snailjob.template.datasource.persistence.po.NotifyRecipient; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.util.concurrent.RateLimiter; import lombok.extern.slf4j.Slf4j; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractJobAlarm.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractJobAlarm.java index b01314b24..f89d7f1d0 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractJobAlarm.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractJobAlarm.java @@ -3,7 +3,7 @@ package com.aizuda.snailjob.server.common.alarm; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.core.util.StreamUtils; -import com.aizuda.snailjob.server.common.AlarmInfoConverter; +import com.aizuda.snailjob.server.common.convert.AlarmInfoConverter; import com.aizuda.snailjob.server.common.dto.JobAlarmInfo; import com.aizuda.snailjob.template.datasource.persistence.dataobject.JobBatchResponseDO; import com.aizuda.snailjob.template.datasource.persistence.mapper.JobTaskBatchMapper; @@ -14,8 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEvent; import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; /** * @author xiaowoniu diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractWorkflowAlarm.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractWorkflowAlarm.java index 138418af3..83a45711c 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractWorkflowAlarm.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractWorkflowAlarm.java @@ -2,7 +2,7 @@ package com.aizuda.snailjob.server.common.alarm; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.util.JsonUtil; -import com.aizuda.snailjob.server.common.AlarmInfoConverter; +import com.aizuda.snailjob.server.common.convert.AlarmInfoConverter; import com.aizuda.snailjob.server.common.dto.WorkflowAlarmInfo; import com.aizuda.snailjob.template.datasource.persistence.dataobject.WorkflowBatchResponseDO; import com.aizuda.snailjob.template.datasource.persistence.mapper.WorkflowTaskBatchMapper; @@ -50,7 +50,7 @@ public abstract class AbstractWorkflowAlarm extends List workflowAlarmInfos = workflowAlarmInfoMap.getOrDefault(workflowNotifyId, Lists.newArrayList()); workflowAlarmInfos.add(workflowAlarmInfo); - workflowAlarmInfoMap.put(workflowNotifyId ,workflowAlarmInfos); + workflowAlarmInfoMap.put(workflowNotifyId, workflowAlarmInfos); } } diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/cache/CacheRegisterTable.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/cache/CacheRegisterTable.java index c104a4ca5..c8e2468ab 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/cache/CacheRegisterTable.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/cache/CacheRegisterTable.java @@ -5,7 +5,7 @@ import com.aizuda.snailjob.common.core.context.SnailSpringContext; import com.aizuda.snailjob.common.core.util.StreamUtils; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.Lifecycle; -import com.aizuda.snailjob.server.common.RegisterNodeInfoConverter; +import com.aizuda.snailjob.server.common.convert.RegisterNodeInfoConverter; import com.aizuda.snailjob.server.common.dto.RegisterNodeInfo; import com.aizuda.snailjob.server.common.register.ServerRegister; import com.aizuda.snailjob.server.common.triple.Pair; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/AlarmInfoConverter.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/convert/AlarmInfoConverter.java similarity index 97% rename from snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/AlarmInfoConverter.java rename to snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/convert/AlarmInfoConverter.java index ed6fd595b..8497892ec 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/AlarmInfoConverter.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/convert/AlarmInfoConverter.java @@ -1,4 +1,4 @@ -package com.aizuda.snailjob.server.common; +package com.aizuda.snailjob.server.common.convert; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.util.JsonUtil; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/RegisterNodeInfoConverter.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/convert/RegisterNodeInfoConverter.java similarity index 90% rename from snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/RegisterNodeInfoConverter.java rename to snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/convert/RegisterNodeInfoConverter.java index 2cebfe5cd..e02cbd0cf 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/RegisterNodeInfoConverter.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/convert/RegisterNodeInfoConverter.java @@ -1,4 +1,4 @@ -package com.aizuda.snailjob.server.common; +package com.aizuda.snailjob.server.common.convert; import com.aizuda.snailjob.server.common.dto.RegisterNodeInfo; import com.aizuda.snailjob.template.datasource.persistence.po.ServerNode; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java index f6e86e1d0..e6c7e1684 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java @@ -5,9 +5,9 @@ import com.aizuda.snailjob.common.core.alarm.AlarmContext; import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.common.core.util.EnvironmentUtils; import com.aizuda.snailjob.common.log.SnailJobLog; -import com.aizuda.snailjob.server.common.AlarmInfoConverter; import com.aizuda.snailjob.server.common.Lifecycle; import com.aizuda.snailjob.server.common.alarm.AbstractRetryAlarm; +import com.aizuda.snailjob.server.common.convert.AlarmInfoConverter; import com.aizuda.snailjob.server.common.dto.NotifyConfigInfo; import com.aizuda.snailjob.server.common.dto.RetryAlarmInfo; import com.aizuda.snailjob.server.common.enums.SyetemTaskTypeEnum;