From a170b038981c67daca3f482aa125b9637d784c9e Mon Sep 17 00:00:00 2001 From: srzou Date: Sat, 19 Oct 2024 20:54:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:(1.2.0-beta2):=201=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dopenapi=E4=B8=ADadd=E6=96=B9=E6=B3=95=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95=202=E3=80=81=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E7=B1=BB=E5=9E=8B=E9=87=8D=E6=96=B0=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E5=85=B3=E4=BA=8Eupdate=E6=96=B9=E6=B3=95=E7=9A=84openapi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/handler/add/BroadcastAddHandler.java | 2 +- .../core/handler/add/ClusterAddHandler.java | 4 +- .../job/core/handler/add/MapAddHandler.java | 4 +- .../core/handler/add/MapReduceAddHandler.java | 4 +- .../{quert => query}/RequestQueryHandler.java | 2 +- .../update/BroadcastUpdateHandler.java | 14 ++ .../handler/update/ClusterUpdateHandler.java | 21 +++ .../update/MapReduceUpdateHandler.java | 24 ++++ .../core/handler/update/MapUpdateHandler.java | 20 +++ .../handler/update/ShardingUpdateHandler.java | 19 +++ ...tUpdateHandler.java => UpdateHandler.java} | 131 ++++++------------ .../job/core/openapi/SnailJobOpenApi.java | 56 ++++++-- 12 files changed, 199 insertions(+), 102 deletions(-) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/{quert => query}/RequestQueryHandler.java (95%) create mode 100644 snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/BroadcastUpdateHandler.java create mode 100644 snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/ClusterUpdateHandler.java create mode 100644 snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/MapReduceUpdateHandler.java create mode 100644 snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/MapUpdateHandler.java create mode 100644 snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/ShardingUpdateHandler.java rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/{RequestUpdateHandler.java => UpdateHandler.java} (52%) diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/BroadcastAddHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/BroadcastAddHandler.java index d692de49..1fe96463 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/BroadcastAddHandler.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/BroadcastAddHandler.java @@ -11,7 +11,7 @@ import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; public class BroadcastAddHandler extends AddHandler { public BroadcastAddHandler() { - this(JobTaskTypeEnum.CLUSTER, null); + this(JobTaskTypeEnum.BROADCAST, null); } public BroadcastAddHandler(JobTaskTypeEnum taskType, Integer shardNum) { diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/ClusterAddHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/ClusterAddHandler.java index 427519c9..375681d9 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/ClusterAddHandler.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/ClusterAddHandler.java @@ -10,8 +10,8 @@ import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; */ public class ClusterAddHandler extends AddHandler { - public ClusterAddHandler(JobTaskTypeEnum taskType) { - this(taskType, null); + public ClusterAddHandler() { + this(JobTaskTypeEnum.CLUSTER, null); } public ClusterAddHandler(JobTaskTypeEnum taskType, Integer shardNum) { diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/MapAddHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/MapAddHandler.java index 6feb3001..c26f644d 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/MapAddHandler.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/MapAddHandler.java @@ -21,8 +21,8 @@ public class MapAddHandler extends AddHandler { } @Override - public MapAddHandler addShardingArgs(String... shardingValue) { - return super.addShardingArgs(shardingValue); + public MapAddHandler addArgsStr(String argsKey, Object argsValue) { + return super.addArgsStr(argsKey, argsValue); } @Override diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/MapReduceAddHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/MapReduceAddHandler.java index 7fe10889..f2646f7d 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/MapReduceAddHandler.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/add/MapReduceAddHandler.java @@ -21,8 +21,8 @@ public class MapReduceAddHandler extends AddHandler { } @Override - public MapReduceAddHandler addShardingArgs(String... shardingValue) { - return super.addShardingArgs(shardingValue); + public MapReduceAddHandler addArgsStr(String argsKey, Object argsValue) { + return super.addArgsStr(argsKey, argsValue); } @Override diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/quert/RequestQueryHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/query/RequestQueryHandler.java similarity index 95% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/quert/RequestQueryHandler.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/query/RequestQueryHandler.java index d6ac886f..76195e1a 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/quert/RequestQueryHandler.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/query/RequestQueryHandler.java @@ -1,4 +1,4 @@ -package com.aizuda.snailjob.client.job.core.handler.quert; +package com.aizuda.snailjob.client.job.core.handler.query; import cn.hutool.core.lang.Assert; diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/BroadcastUpdateHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/BroadcastUpdateHandler.java new file mode 100644 index 00000000..1383f17e --- /dev/null +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/BroadcastUpdateHandler.java @@ -0,0 +1,14 @@ +package com.aizuda.snailjob.client.job.core.handler.update; + +public class BroadcastUpdateHandler extends UpdateHandler{ + + public BroadcastUpdateHandler(Long jobId) { + super(jobId); + setR(this); + } + + @Override + public BroadcastUpdateHandler addArgsStr(String argsKey, Object argsValue) { + return super.addArgsStr(argsKey, argsValue); + } +} diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/ClusterUpdateHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/ClusterUpdateHandler.java new file mode 100644 index 00000000..2d5294c8 --- /dev/null +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/ClusterUpdateHandler.java @@ -0,0 +1,21 @@ +package com.aizuda.snailjob.client.job.core.handler.update; + +import com.aizuda.snailjob.client.job.core.enums.AllocationAlgorithmEnum; + +public class ClusterUpdateHandler extends UpdateHandler { + + public ClusterUpdateHandler(Long jobId) { + super(jobId); + setR(this); + } + + @Override + public ClusterUpdateHandler setRouteKey(AllocationAlgorithmEnum algorithmEnum) { + return super.setRouteKey(algorithmEnum); + } + + @Override + public ClusterUpdateHandler addArgsStr(String argsKey, Object argsValue) { + return super.addArgsStr(argsKey, argsValue); + } +} diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/MapReduceUpdateHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/MapReduceUpdateHandler.java new file mode 100644 index 00000000..72b6c076 --- /dev/null +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/MapReduceUpdateHandler.java @@ -0,0 +1,24 @@ +package com.aizuda.snailjob.client.job.core.handler.update; + +public class MapReduceUpdateHandler extends UpdateHandler { + + public MapReduceUpdateHandler(Long jobId) { + super(jobId); + setR(this); + } + + @Override + public MapReduceUpdateHandler addArgsStr(String argsKey, Object argsValue) { + return super.addArgsStr(argsKey, argsValue); + } + + @Override + public MapReduceUpdateHandler setParallelNum(Integer parallelNum) { + return super.setParallelNum(parallelNum); + } + + @Override + public MapReduceUpdateHandler setShardNum(Integer shardNum) { + return super.setShardNum(shardNum); + } +} diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/MapUpdateHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/MapUpdateHandler.java new file mode 100644 index 00000000..95111981 --- /dev/null +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/MapUpdateHandler.java @@ -0,0 +1,20 @@ +package com.aizuda.snailjob.client.job.core.handler.update; + + +public class MapUpdateHandler extends UpdateHandler { + + public MapUpdateHandler(Long jobId) { + super(jobId); + setR(this); + } + + @Override + protected MapUpdateHandler addArgsStr(String argsKey, Object argsValue) { + return super.addArgsStr(argsKey, argsValue); + } + + @Override + protected MapUpdateHandler setParallelNum(Integer parallelNum) { + return super.setParallelNum(parallelNum); + } +} diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/ShardingUpdateHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/ShardingUpdateHandler.java new file mode 100644 index 00000000..370cdbd8 --- /dev/null +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/ShardingUpdateHandler.java @@ -0,0 +1,19 @@ +package com.aizuda.snailjob.client.job.core.handler.update; + +public class ShardingUpdateHandler extends UpdateHandler{ + + public ShardingUpdateHandler(Long jobId) { + super(jobId); + setR(this); + } + + @Override + protected ShardingUpdateHandler addShardingArgs(String[] shardingValue) { + return super.addShardingArgs(shardingValue); + } + + @Override + protected ShardingUpdateHandler setParallelNum(Integer parallelNum) { + return super.setParallelNum(parallelNum); + } +} diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/RequestUpdateHandler.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/UpdateHandler.java similarity index 52% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/RequestUpdateHandler.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/UpdateHandler.java index 40f7858c..15b6d593 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/RequestUpdateHandler.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/handler/update/UpdateHandler.java @@ -2,34 +2,29 @@ package com.aizuda.snailjob.client.job.core.handler.update; import cn.hutool.core.lang.Pair; import cn.hutool.core.util.StrUtil; -import com.aizuda.snailjob.client.common.exception.SnailJobClientException; import com.aizuda.snailjob.client.job.core.dto.RequestUpdateJobDTO; import com.aizuda.snailjob.client.job.core.enums.AllocationAlgorithmEnum; import com.aizuda.snailjob.client.job.core.enums.TriggerTypeEnum; import com.aizuda.snailjob.client.job.core.handler.AbstractRequestHandler; import com.aizuda.snailjob.client.job.core.util.ValidatorUtils; import com.aizuda.snailjob.common.core.enums.BlockStrategyEnum; -import com.aizuda.snailjob.common.core.enums.ExecutorTypeEnum; import com.aizuda.snailjob.common.core.enums.JobArgsTypeEnum; -import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.common.core.util.JsonUtil; -import com.aizuda.snailjob.common.log.SnailJobLog; +import lombok.Setter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; -import static com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum.CLUSTER; -public class RequestUpdateHandler extends AbstractRequestHandler { +public abstract class UpdateHandler extends AbstractRequestHandler { private final RequestUpdateJobDTO reqDTO; + @Setter + private R r; - public RequestUpdateHandler(Long jobId) { + public UpdateHandler(Long jobId) { this.reqDTO = new RequestUpdateJobDTO(); // 更新必须要id reqDTO.setId(jobId); - // 默认java - reqDTO.setExecutorType(ExecutorTypeEnum.JAVA.getType()); } @Override @@ -39,7 +34,10 @@ public class RequestUpdateHandler extends AbstractRequestHandler { @Override protected void beforeExecute() { - + if (reqDTO.getTriggerType() == TriggerTypeEnum.WORK_FLOW.getType()) { + // 工作流没有调度时间 + setTriggerInterval("*"); + } } @Override @@ -49,30 +47,7 @@ public class RequestUpdateHandler extends AbstractRequestHandler { @Override protected Pair checkRequest() { - Pair validated = ValidatorUtils.validateEntity(reqDTO); - if (!validated.getKey()) { - return validated; - } - - // 如果校验正确，下面则进行相关参数填充 - Optional.ofNullable(reqDTO.getTaskType()).ifPresent(taskType -> { - if (reqDTO.getTaskType() == CLUSTER.getType()) { - // 集群模式只允许并发为 1 - setParallelNum(1); - } else { - // 非集群模式 路由策略只能为轮询 - setRouteKey(AllocationAlgorithmEnum.ROUND); - } - }); - - Optional.ofNullable(reqDTO.getTriggerType()).ifPresent((triggerType) -> { - if (reqDTO.getTriggerType() == TriggerTypeEnum.WORK_FLOW.getType()) { - // 工作流没有调度时间 - setTriggerInterval("*"); - } - }); - - return validated; + return ValidatorUtils.validateEntity(reqDTO); } /** @@ -82,19 +57,14 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param shardNum * @return */ - public RequestUpdateHandler setShardNum(Integer shardNum) { - Integer taskType = reqDTO.getTaskType(); - if (taskType != null && taskType.equals(JobTaskTypeEnum.MAP_REDUCE.getType())) { - // 设置分片 - if (shardNum != null) { - Map map = new HashMap<>(1); - map.put(SHARD_NUM, shardNum); - reqDTO.setArgsStr(JsonUtil.toJsonString(map)); - } - } else { - throw new SnailJobClientException("非MapReduce模式不能设置分片数"); + protected R setShardNum(Integer shardNum) { + // 设置分片 + if (shardNum != null) { + Map map = new HashMap<>(1); + map.put(SHARD_NUM, shardNum); + setArgsStr(map); } - return this; + return r; } /** @@ -103,9 +73,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param jobName * @return */ - public RequestUpdateHandler setJobName(String jobName) { + public R setJobName(String jobName) { reqDTO.setJobName(jobName); - return this; + return r; } /** @@ -115,7 +85,7 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param argsStr * @return */ - private RequestUpdateHandler setArgsStr(Map argsStr) { + private R setArgsStr(Map argsStr) { Map args = new HashMap<>(); if (StrUtil.isNotBlank(reqDTO.getArgsStr())) { args = JsonUtil.parseHashMap(reqDTO.getArgsStr()); @@ -123,7 +93,7 @@ public class RequestUpdateHandler extends AbstractRequestHandler { args.putAll(argsStr); reqDTO.setArgsStr(JsonUtil.toJsonString(args)); reqDTO.setArgsType(JobArgsTypeEnum.JSON.getArgsType()); - return this; + return r; } /** @@ -135,12 +105,7 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param argsValue 参数值 * @return */ - public RequestUpdateHandler addArgsStr(String argsKey, Object argsValue) { - if (reqDTO.getTaskType() != null - && reqDTO.getTaskType().equals(JobTaskTypeEnum.SHARDING.getType())) { - SnailJobLog.LOCAL.warn("静态分片任务，不可使用该方法添加相关任务参数，请使用addShardingArgs"); - return this; - } + protected R addArgsStr(String argsKey, Object argsValue) { Map map = new HashMap<>(); if (StrUtil.isNotBlank(reqDTO.getArgsStr())) { map = JsonUtil.parseHashMap(reqDTO.getArgsStr()); @@ -148,24 +113,20 @@ public class RequestUpdateHandler extends AbstractRequestHandler { map.put(argsKey, argsValue); reqDTO.setArgsStr(JsonUtil.toJsonString(map)); reqDTO.setArgsType(JobArgsTypeEnum.JSON.getArgsType()); - return this; + return r; } /** * 添加静态分片相关参数 + * 只有静态分片任务可用 * * @param shardingValue * @return */ - public RequestUpdateHandler addShardingArgs(String[] shardingValue) { - if (reqDTO.getTaskType() != null - && !reqDTO.getTaskType().equals(JobTaskTypeEnum.SHARDING.getType())) { - SnailJobLog.LOCAL.warn("非静态分片任务，不可使用该方法添加相关任务参数，请使用addArgsStr"); - return this; - } + protected R addShardingArgs(String[] shardingValue) { reqDTO.setArgsStr(JsonUtil.toJsonString(shardingValue)); reqDTO.setArgsType(JobArgsTypeEnum.TEXT.getArgsType()); - return this; + return r; } /** @@ -174,9 +135,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param algorithmEnum * @return */ - public RequestUpdateHandler setRouteKey(AllocationAlgorithmEnum algorithmEnum) { + protected R setRouteKey(AllocationAlgorithmEnum algorithmEnum) { reqDTO.setRouteKey(algorithmEnum.getType()); - return this; + return r; } /** @@ -185,9 +146,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param executorInfo * @return */ - public RequestUpdateHandler setExecutorInfo(String executorInfo) { + public R setExecutorInfo(String executorInfo) { reqDTO.setExecutorInfo(executorInfo); - return this; + return r; } /** @@ -196,9 +157,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param triggerType * @return */ - public RequestUpdateHandler setTriggerType(TriggerTypeEnum triggerType) { + public R setTriggerType(TriggerTypeEnum triggerType) { reqDTO.setTriggerType(triggerType.getType()); - return this; + return r; } /** @@ -209,9 +170,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param triggerInterval * @return */ - public RequestUpdateHandler setTriggerInterval(String triggerInterval) { + public R setTriggerInterval(String triggerInterval) { reqDTO.setTriggerInterval(triggerInterval); - return this; + return r; } /** @@ -220,9 +181,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param blockStrategy * @return */ - public RequestUpdateHandler setBlockStrategy(BlockStrategyEnum blockStrategy) { + public R setBlockStrategy(BlockStrategyEnum blockStrategy) { reqDTO.setBlockStrategy(blockStrategy.getBlockStrategy()); - return this; + return r; } /** @@ -231,9 +192,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param executorTimeout * @return */ - public RequestUpdateHandler setExecutorTimeout(Integer executorTimeout) { + public R setExecutorTimeout(Integer executorTimeout) { reqDTO.setExecutorTimeout(executorTimeout); - return this; + return r; } /** @@ -242,9 +203,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param maxRetryTimes * @return */ - public RequestUpdateHandler setMaxRetryTimes(Integer maxRetryTimes) { + public R setMaxRetryTimes(Integer maxRetryTimes) { reqDTO.setMaxRetryTimes(maxRetryTimes); - return this; + return r; } /** @@ -253,9 +214,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param retryInterval * @return */ - public RequestUpdateHandler setRetryInterval(Integer retryInterval) { + public R setRetryInterval(Integer retryInterval) { reqDTO.setRetryInterval(retryInterval); - return this; + return r; } /** @@ -264,9 +225,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param parallelNum * @return */ - public RequestUpdateHandler setParallelNum(Integer parallelNum) { + protected R setParallelNum(Integer parallelNum) { reqDTO.setParallelNum(parallelNum); - return this; + return r; } /** @@ -275,9 +236,9 @@ public class RequestUpdateHandler extends AbstractRequestHandler { * @param description * @return */ - public RequestUpdateHandler setDescription(String description) { + public R setDescription(String description) { reqDTO.setDescription(description); - return this; + return r; } diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/openapi/SnailJobOpenApi.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/openapi/SnailJobOpenApi.java index 811cb1d8..644c6c88 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/openapi/SnailJobOpenApi.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/openapi/SnailJobOpenApi.java @@ -2,11 +2,9 @@ package com.aizuda.snailjob.client.job.core.openapi; import com.aizuda.snailjob.client.job.core.enums.JobTypeEnum; import com.aizuda.snailjob.client.job.core.handler.add.*; -import com.aizuda.snailjob.client.job.core.handler.quert.RequestQueryHandler; +import com.aizuda.snailjob.client.job.core.handler.query.RequestQueryHandler; import com.aizuda.snailjob.client.job.core.handler.trigger.RequestTriggerJobHandler; -import com.aizuda.snailjob.client.job.core.handler.update.RequestUpdateHandler; -import com.aizuda.snailjob.client.job.core.handler.update.RequestUpdateStatusHandler; -import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; +import com.aizuda.snailjob.client.job.core.handler.update.*; /** * @author opensnail @@ -23,7 +21,7 @@ public final class SnailJobOpenApi { * @return {@link ClusterAddHandler} */ public static ClusterAddHandler addClusterJob() { - return new ClusterAddHandler(JobTaskTypeEnum.CLUSTER); + return new ClusterAddHandler(); } /** @@ -64,13 +62,53 @@ public final class SnailJobOpenApi { } /** - * 更新定时任务 + * 更新广播定时任务 * * @param jobId 定时任务ID - * @return {@link RequestUpdateHandler} + * @return {@link BroadcastUpdateHandler} */ - public static RequestUpdateHandler updateJob(Long jobId) { - return new RequestUpdateHandler(jobId); + public static BroadcastUpdateHandler updateBroadcastJob(Long jobId) { + return new BroadcastUpdateHandler(jobId); + } + + /** + * 更新集群定时任务 + * + * @param jobId 定时任务ID + * @return {@link ClusterUpdateHandler} + */ + public static ClusterUpdateHandler updateClusterJob(Long jobId) { + return new ClusterUpdateHandler(jobId); + } + + /** + * 更新MapReduce定时任务 + * + * @param jobId 定时任务ID + * @return {@link MapReduceUpdateHandler} + */ + public static MapReduceUpdateHandler updateMapReduceJob(Long jobId) { + return new MapReduceUpdateHandler(jobId); + } + + /** + * 更新Map定时任务 + * + * @param jobId 定时任务ID + * @return {@link MapUpdateHandler} + */ + public static MapUpdateHandler updateMapJob(Long jobId) { + return new MapUpdateHandler(jobId); + } + + /** + * 更新静态分片定时任务 + * + * @param jobId 定时任务ID + * @return {@link ShardingUpdateHandler} + */ + public static ShardingUpdateHandler updateShardingJob(Long jobId) { + return new ShardingUpdateHandler(jobId); } /**