From e05b2915561838dbafe79509c63c31be0517ee59 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Wed, 10 Jul 2024 23:18:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sj=5F1.1.0-beta3):=20enum=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8lombok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/enums/AlarmTypeEnum.java | 12 ++++------ .../common/core/enums/FailStrategyEnum.java | 15 ++---------- .../common/core/enums/HeadersEnum.java | 5 ++-- .../common/core/enums/JobNotifySceneEnum.java | 16 +++++-------- .../common/core/enums/NodeTypeEnum.java | 6 ++--- .../core/enums/RetryNotifySceneEnum.java | 17 +++++--------- .../core/enums/RetryResultStatusEnum.java | 6 ++--- .../common/core/enums/RetryStatusEnum.java | 2 -- .../common/core/enums/StatusEnum.java | 7 ++---- .../core/enums/WorkflowNodeTypeEnum.java | 15 ++---------- .../client/ClientLoadBalanceManager.java | 6 ++--- .../server/common/enums/DelayLevelEnum.java | 17 ++++++-------- .../common/strategy/WaitStrategies.java | 7 ++---- .../server/web/annotation/RoleEnum.java | 18 ++++----------- .../server/web/model/enums/DateTypeEnum.java | 23 ++++--------------- 15 files changed, 49 insertions(+), 123 deletions(-) diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/AlarmTypeEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/AlarmTypeEnum.java index 9e245bf71..6f31e1535 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/AlarmTypeEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/AlarmTypeEnum.java @@ -1,11 +1,16 @@ package com.aizuda.snailjob.common.core.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + /** * 预警类型 * * @author: opensnail * @date : 2021-11-25 09:19 */ +@AllArgsConstructor +@Getter public enum AlarmTypeEnum { /** @@ -36,11 +41,4 @@ public enum AlarmTypeEnum { private final int value; - AlarmTypeEnum(int value) { - this.value = value; - } - - public int getValue() { - return value; - } } diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/FailStrategyEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/FailStrategyEnum.java index 049d6dd61..307ac2df8 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/FailStrategyEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/FailStrategyEnum.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.common.core.enums; +import lombok.AllArgsConstructor; import lombok.Getter; import java.util.Objects; @@ -10,6 +11,7 @@ import java.util.Objects; * @since 2.6.0 */ @Getter +@AllArgsConstructor public enum FailStrategyEnum { SKIP(1, "跳过"), @@ -18,19 +20,6 @@ public enum FailStrategyEnum { private final Integer code; private final String desc; - FailStrategyEnum(Integer code, String desc) { - this.code = code; - this.desc = desc; - } - - public Integer getCode() { - return code; - } - - public String getDesc() { - return desc; - } - public static FailStrategyEnum valueOf(Integer code) { for (FailStrategyEnum failStrategyEnum : FailStrategyEnum.values()) { if (Objects.equals(failStrategyEnum.code, code)) { diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/HeadersEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/HeadersEnum.java index 2f200276d..78204835c 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/HeadersEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/HeadersEnum.java @@ -1,11 +1,13 @@ package com.aizuda.snailjob.common.core.enums; +import lombok.AllArgsConstructor; import lombok.Getter; /** * @author: opensnail * @date : 2022-03-11 19:44 */ +@AllArgsConstructor @Getter public enum HeadersEnum { @@ -23,7 +25,4 @@ public enum HeadersEnum { private final String key; - HeadersEnum(String key) { - this.key = key; - } } diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/JobNotifySceneEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/JobNotifySceneEnum.java index 25b6de236..e7e5fcf9a 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/JobNotifySceneEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/JobNotifySceneEnum.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.common.core.enums; +import lombok.AllArgsConstructor; import lombok.Getter; /** @@ -8,6 +9,7 @@ import lombok.Getter; * @author: zuoJunLin * @date : 2023-12-02 18:18 */ +@AllArgsConstructor @Getter public enum JobNotifySceneEnum { @@ -23,21 +25,15 @@ public enum JobNotifySceneEnum { */ private final int notifyScene; - /** - * 触发通知节点类型 - */ - private final NodeTypeEnum nodeType; - /** * 描述 */ private final String desc; - JobNotifySceneEnum(int notifyScene, String desc, NodeTypeEnum nodeType) { - this.notifyScene = notifyScene; - this.desc = desc; - this.nodeType = nodeType; - } + /** + * 触发通知节点类型 + */ + private final NodeTypeEnum nodeType; /** * 获取通知场景 diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/NodeTypeEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/NodeTypeEnum.java index abd0c5d7e..a452a9804 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/NodeTypeEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/NodeTypeEnum.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.common.core.enums; +import lombok.AllArgsConstructor; import lombok.Getter; /** @@ -8,6 +9,7 @@ import lombok.Getter; * @author: opensnail * @date : 2021-11-26 18:01 */ +@AllArgsConstructor @Getter public enum NodeTypeEnum { @@ -24,8 +26,4 @@ public enum NodeTypeEnum { private final Integer type; - NodeTypeEnum(int type) { - this.type = type; - } - } diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryNotifySceneEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryNotifySceneEnum.java index 7d99d3896..71a9bbb83 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryNotifySceneEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryNotifySceneEnum.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.common.core.enums; +import lombok.AllArgsConstructor; import lombok.Getter; /** @@ -9,6 +10,7 @@ import lombok.Getter; * @date : 2021-11-24 18:18 * @since : 1.0.0 */ +@AllArgsConstructor @Getter public enum RetryNotifySceneEnum { @@ -30,21 +32,15 @@ public enum RetryNotifySceneEnum { */ private final int notifyScene; - /** - * 触发通知节点类型 - */ - private final NodeTypeEnum nodeType; - /** * 描述 */ private final String desc; - RetryNotifySceneEnum(int notifyScene, String desc, NodeTypeEnum nodeType) { - this.notifyScene = notifyScene; - this.desc = desc; - this.nodeType = nodeType; - } + /** + * 触发通知节点类型 + */ + private final NodeTypeEnum nodeType; /** * 获取通知场景 @@ -63,5 +59,4 @@ public enum RetryNotifySceneEnum { return null; } - } diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryResultStatusEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryResultStatusEnum.java index c43c4443a..d4a521855 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryResultStatusEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryResultStatusEnum.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.common.core.enums; +import lombok.AllArgsConstructor; import lombok.Getter; /** @@ -8,6 +9,7 @@ import lombok.Getter; * @author: opensnail * @date : 2021-11-03 11:05 */ +@AllArgsConstructor @Getter public enum RetryResultStatusEnum { @@ -17,10 +19,6 @@ public enum RetryResultStatusEnum { private final Integer status; - RetryResultStatusEnum(int status) { - this.status = status; - } - public static RetryResultStatusEnum getRetryResultStatusEnum(int status) { for (RetryResultStatusEnum value : RetryResultStatusEnum.values()) { if (value.status == status) { diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryStatusEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryStatusEnum.java index 34f8a1fd5..98c2013aa 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryStatusEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryStatusEnum.java @@ -45,13 +45,11 @@ public enum RetryStatusEnum { } public static RetryStatusEnum getByStatus(@NonNull Integer status) { - for (RetryStatusEnum value : RetryStatusEnum.values()) { if (Objects.equals(value.status, status)) { return value; } } - return null; } diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/StatusEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/StatusEnum.java index c309b7762..b5fd22704 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/StatusEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/StatusEnum.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.common.core.enums; +import lombok.AllArgsConstructor; import lombok.Getter; /** @@ -8,6 +9,7 @@ import lombok.Getter; * @author: opensnail * @date : 2021-11-26 17:58 */ +@AllArgsConstructor @Getter public enum StatusEnum { @@ -16,9 +18,4 @@ public enum StatusEnum { private final Integer status; - StatusEnum(int status) { - this.status = status; - } - - } diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/WorkflowNodeTypeEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/WorkflowNodeTypeEnum.java index 7e7ebb54b..050f27d6d 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/WorkflowNodeTypeEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/WorkflowNodeTypeEnum.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.common.core.enums; +import lombok.AllArgsConstructor; import lombok.Getter; /** @@ -9,6 +10,7 @@ import lombok.Getter; * @date 2023-12-24 08:13:43 * @since 2.6.0 */ +@AllArgsConstructor @Getter public enum WorkflowNodeTypeEnum { JOB_TASK(1, "JOB任务"), @@ -19,19 +21,6 @@ public enum WorkflowNodeTypeEnum { private final int type; private final String desc; - WorkflowNodeTypeEnum(int type, String desc) { - this.type = type; - this.desc = desc; - } - - public int getType() { - return type; - } - - public String getDesc() { - return desc; - } - public static WorkflowNodeTypeEnum valueOf(int type) { for (WorkflowNodeTypeEnum workflowNodeTypeEnum : WorkflowNodeTypeEnum.values()) { if (workflowNodeTypeEnum.getType() == type) { diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceManager.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceManager.java index 4468870d4..a18183aba 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceManager.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceManager.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.common.allocate.client; import com.aizuda.snailjob.server.common.ClientLoadBalance; import com.aizuda.snailjob.server.common.exception.SnailJobServerException; +import lombok.AllArgsConstructor; import lombok.Getter; /** @@ -21,6 +22,7 @@ public class ClientLoadBalanceManager { throw new SnailJobServerException("routeType is not existed. routeType:[{}]", routeType); } + @AllArgsConstructor @Getter public enum AllocationAlgorithmEnum { @@ -32,10 +34,6 @@ public class ClientLoadBalanceManager { private final int type; private final ClientLoadBalance clientLoadBalance; - AllocationAlgorithmEnum(int type, ClientLoadBalance clientLoadBalance) { - this.type = type; - this.clientLoadBalance = clientLoadBalance; - } } } diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/DelayLevelEnum.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/DelayLevelEnum.java index e8b71900a..b5d85630c 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/DelayLevelEnum.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/DelayLevelEnum.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.server.common.enums; +import lombok.AllArgsConstructor; import lombok.Getter; import java.time.temporal.ChronoUnit; @@ -10,6 +11,7 @@ import java.time.temporal.ChronoUnit; * @author: opensnail * @date : 2021-11-29 17:30 */ +@AllArgsConstructor @Getter public enum DelayLevelEnum { @@ -41,27 +43,22 @@ public enum DelayLevelEnum { _26(26, 12, ChronoUnit.HOURS), ; - /** - * 时间 - */ - private final int time; /** * 等级 */ private final int level; + /** + * 时间 + */ + private final int time; + /** * 单位 */ private final ChronoUnit unit; - DelayLevelEnum(int level, int time, ChronoUnit unit) { - this.time = time; - this.unit = unit; - this.level = level; - } - /** * 根据等级获取延迟等级枚举 * diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/strategy/WaitStrategies.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/strategy/WaitStrategies.java index 6166484b7..324f778e1 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/strategy/WaitStrategies.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/strategy/WaitStrategies.java @@ -7,6 +7,7 @@ import com.aizuda.snailjob.server.common.enums.DelayLevelEnum; import com.aizuda.snailjob.server.common.exception.SnailJobServerException; import com.aizuda.snailjob.server.common.util.DateUtils; import com.google.common.base.Preconditions; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; @@ -57,6 +58,7 @@ public class WaitStrategies { } } + @AllArgsConstructor @Getter public enum WaitStrategyEnum { DELAY_LEVEL(1, delayLevelWait()), @@ -67,11 +69,6 @@ public class WaitStrategies { private final int type; private final WaitStrategy waitStrategy; - WaitStrategyEnum(int type, WaitStrategy waitStrategy) { - this.type = type; - this.waitStrategy = waitStrategy; - } - /** * 获取退避策略 * diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/annotation/RoleEnum.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/annotation/RoleEnum.java index 75356dc41..f7567a6da 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/annotation/RoleEnum.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/annotation/RoleEnum.java @@ -1,5 +1,8 @@ package com.aizuda.snailjob.server.web.annotation; +import lombok.AllArgsConstructor; +import lombok.Getter; + import java.util.HashMap; import java.util.Map; @@ -7,6 +10,8 @@ import java.util.Map; * @author: byteblogs * @date: 2019/09/02 16:35 */ +@AllArgsConstructor +@Getter public enum RoleEnum { /** @@ -31,11 +36,6 @@ public enum RoleEnum { private final String roleName; - RoleEnum(Integer roleId, String roleName) { - this.roleId = roleId; - this.roleName = roleName; - } - public static Map getEnumTypeMap() { return enumTypeMap; } @@ -48,12 +48,4 @@ public enum RoleEnum { return USER.getRoleId().equals(roleId); } - public Integer getRoleId() { - return roleId; - } - - public String getRoleName() { - return roleName; - } - } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/enums/DateTypeEnum.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/enums/DateTypeEnum.java index 2096bcbfa..49f109d8d 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/enums/DateTypeEnum.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/enums/DateTypeEnum.java @@ -3,6 +3,8 @@ package com.aizuda.snailjob.server.web.model.enums; import cn.hutool.core.date.LocalDateTimeUtil; import com.aizuda.snailjob.common.core.util.StreamUtils; import com.aizuda.snailjob.server.web.model.response.DashboardLineResponseVO; +import lombok.AllArgsConstructor; +import lombok.Getter; import java.time.LocalDate; import java.time.LocalDateTime; @@ -17,6 +19,8 @@ import java.util.function.Function; * @author: byteblogs * @date: 2020/1/19 20:36 */ +@AllArgsConstructor +@Getter public enum DateTypeEnum { /** * 天（按小时） @@ -105,14 +109,6 @@ public enum DateTypeEnum { private Function startTime; private Function endTime; - DateTypeEnum(Consumer> consumer, - Function startTime, - Function endTime) { - this.consumer = consumer; - this.startTime = startTime; - this.endTime = endTime; - } - private static DashboardLineResponseVO buildZeroedVoWithCreateDt(String createDt) { return new DashboardLineResponseVO() .setTotal(0L) @@ -129,15 +125,4 @@ public enum DateTypeEnum { .setCreateDt(createDt); } - public Function getStartTime() { - return startTime; - } - - public Function getEndTime() { - return endTime; - } - - public Consumer> getConsumer() { - return consumer; - } }