From 9acba06cc834303bc51b3b8323f34b396ce4c00b Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Tue, 9 Jan 2024 09:03:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=202.6.0=201.=20=E5=8F=98=E6=9B=B4TaskType?= =?UTF-8?q?Enum=20=E4=B8=BA=20JobTaskTypeEnum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/easy_retry_mysql.sql | 1 + .../client/job/core/executor/AbstractJobExecutor.java | 5 ++--- .../job/core/executor/JobExecutorFutureCallback.java | 4 ++-- .../enums/{TaskTypeEnum.java => JobTaskTypeEnum.java} | 6 +++--- .../server/job/task/support/ClientCallbackHandler.java | 4 ++-- .../easy/retry/server/job/task/support/JobExecutor.java | 4 ++-- .../retry/server/job/task/support/JobTaskStopHandler.java | 4 ++-- .../support/callback/BroadcastClientCallbackHandler.java | 6 +++--- .../job/task/support/callback/ClientCallbackFactory.java | 8 ++++---- .../support/callback/ClusterClientCallbackHandler.java | 6 +++--- .../support/callback/ShardingClientCallbackHandler.java | 6 +++--- .../job/task/support/dispatch/JobExecutorResultActor.java | 4 ++-- .../support/executor/job/BroadcastTaskJobExecutor.java | 6 +++--- .../job/task/support/executor/job/ClusterJobExecutor.java | 6 +++--- .../job/task/support/executor/job/JobExecutorFactory.java | 8 ++++---- .../task/support/executor/job/ShardingJobExecutor.java | 6 +++--- .../executor/workflow/WorkflowExecutorFactory.java | 2 -- .../support/generator/task/BroadcastTaskGenerator.java | 6 +++--- .../task/support/generator/task/ClusterTaskGenerator.java | 7 +++---- .../job/task/support/generator/task/JobTaskGenerator.java | 4 ++-- .../support/generator/task/JobTaskGeneratorFactory.java | 8 ++++---- .../support/generator/task/ShardingTaskGenerator.java | 6 +++--- .../job/task/support/stop/BroadcastTaskStopHandler.java | 6 +++--- .../job/task/support/stop/ClusterTaskStopHandler.java | 6 +++--- .../server/job/task/support/stop/JobTaskStopFactory.java | 8 ++++---- .../job/task/support/stop/ShardingTaskStopHandler.java | 6 +++--- 26 files changed, 70 insertions(+), 73 deletions(-) rename easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/{TaskTypeEnum.java => JobTaskTypeEnum.java} (78%) diff --git a/doc/sql/easy_retry_mysql.sql b/doc/sql/easy_retry_mysql.sql index 0b4c9979e..d01e50155 100644 --- a/doc/sql/easy_retry_mysql.sql +++ b/doc/sql/easy_retry_mysql.sql @@ -366,6 +366,7 @@ CREATE TABLE `job_task_batch` `task_batch_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '任务批次状态 0、失败 1、成功', `operation_reason` tinyint(4) NOT NULL DEFAULT '0' COMMENT '操作原因', `execution_at` bigint(13) NOT NULL DEFAULT '0' COMMENT '任务执行时间', + `task_type` tinyint(4) NOT NULL DEFAULT '3' COMMENT '任务类型 3、JOB任务 4、WORKFLOW任务', `parent_id` varchar(64) NOT NULL DEFAULT '' COMMENT '父节点', `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', diff --git a/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/executor/AbstractJobExecutor.java b/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/executor/AbstractJobExecutor.java index 8c76a335f..67d3f5264 100644 --- a/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/executor/AbstractJobExecutor.java +++ b/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/executor/AbstractJobExecutor.java @@ -9,14 +9,13 @@ import com.aizuda.easy.retry.client.job.core.dto.ShardingJobArgs; import com.aizuda.easy.retry.client.job.core.timer.StopTaskTimerTask; import com.aizuda.easy.retry.client.job.core.timer.TimerManager; import com.aizuda.easy.retry.client.model.ExecuteResult; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import lombok.extern.slf4j.Slf4j; -import java.util.concurrent.Callable; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -43,7 +42,7 @@ public abstract class AbstractJobExecutor implements IJobExecutor { // 执行任务 ListenableFuture submit = decorator.submit(() -> { JobArgs jobArgs; - if (jobContext.getTaskType() == TaskTypeEnum.SHARDING.getType()) { + if (jobContext.getTaskType() == JobTaskTypeEnum.SHARDING.getType()) { jobArgs = buildShardingJobArgs(jobContext); } else { jobArgs = buildJobArgs(jobContext); diff --git a/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/executor/JobExecutorFutureCallback.java b/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/executor/JobExecutorFutureCallback.java index acf9c8fb1..aa564731a 100644 --- a/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/executor/JobExecutorFutureCallback.java +++ b/easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/executor/JobExecutorFutureCallback.java @@ -8,7 +8,7 @@ import com.aizuda.easy.retry.client.model.ExecuteResult; import com.aizuda.easy.retry.client.model.request.DispatchJobResultRequest; import com.aizuda.easy.retry.common.core.enums.JobTaskStatusEnum; import com.aizuda.easy.retry.common.core.enums.StatusEnum; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.common.core.model.NettyResult; import com.aizuda.easy.retry.common.core.util.JsonUtil; @@ -62,7 +62,7 @@ public class JobExecutorFutureCallback implements FutureCallback } private void stopThreadPool() { - if (jobContext.getTaskType() == TaskTypeEnum.CLUSTER.getType()) { + if (jobContext.getTaskType() == JobTaskTypeEnum.CLUSTER.getType()) { ThreadPoolCache.stopThreadPool(jobContext.getTaskBatchId()); } } diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/TaskTypeEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/JobTaskTypeEnum.java similarity index 78% rename from easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/TaskTypeEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/JobTaskTypeEnum.java index 23b20317d..93fd527ea 100644 --- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/TaskTypeEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/JobTaskTypeEnum.java @@ -11,7 +11,7 @@ import lombok.Getter; */ @AllArgsConstructor @Getter -public enum TaskTypeEnum { +public enum JobTaskTypeEnum { CLUSTER(1), BROADCAST(2), @@ -19,8 +19,8 @@ public enum TaskTypeEnum { private final int type; - public static TaskTypeEnum valueOf(int type) { - for (TaskTypeEnum value : TaskTypeEnum.values()) { + public static JobTaskTypeEnum valueOf(int type) { + for (JobTaskTypeEnum value : JobTaskTypeEnum.values()) { if (value.getType() == type) { return value; } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/ClientCallbackHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/ClientCallbackHandler.java index 7b7251c90..8ca34b67c 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/ClientCallbackHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/ClientCallbackHandler.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.job.task.support; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.server.job.task.support.callback.ClientCallbackContext; /** @@ -10,7 +10,7 @@ import com.aizuda.easy.retry.server.job.task.support.callback.ClientCallbackCont */ public interface ClientCallbackHandler { - TaskTypeEnum getTaskInstanceType(); + JobTaskTypeEnum getTaskInstanceType(); void callback(ClientCallbackContext context); } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobExecutor.java index d89821c77..5a77b845f 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobExecutor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobExecutor.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.job.task.support; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.server.job.task.support.executor.job.JobExecutorContext; /** @@ -10,7 +10,7 @@ import com.aizuda.easy.retry.server.job.task.support.executor.job.JobExecutorCon */ public interface JobExecutor { - TaskTypeEnum getTaskInstanceType(); + JobTaskTypeEnum getTaskInstanceType(); void execute(JobExecutorContext context); } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskStopHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskStopHandler.java index 83c03c262..828c465da 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskStopHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskStopHandler.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.job.task.support; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.server.job.task.support.stop.TaskStopJobContext; /** @@ -10,7 +10,7 @@ import com.aizuda.easy.retry.server.job.task.support.stop.TaskStopJobContext; */ public interface JobTaskStopHandler { - TaskTypeEnum getTaskType(); + JobTaskTypeEnum getTaskType(); void stop(TaskStopJobContext context); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/BroadcastClientCallbackHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/BroadcastClientCallbackHandler.java index ef9222806..6fb351f26 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/BroadcastClientCallbackHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/BroadcastClientCallbackHandler.java @@ -4,7 +4,7 @@ import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobExecutorResultDTO; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -18,8 +18,8 @@ import org.springframework.stereotype.Component; public class BroadcastClientCallbackHandler extends AbstractClientCallbackHandler { @Override - public TaskTypeEnum getTaskInstanceType() { - return TaskTypeEnum.BROADCAST; + public JobTaskTypeEnum getTaskInstanceType() { + return JobTaskTypeEnum.BROADCAST; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackFactory.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackFactory.java index 806f7c4e2..9bbaeb388 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackFactory.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackFactory.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.job.task.support.callback; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.server.job.task.support.ClientCallbackHandler; import java.util.concurrent.ConcurrentHashMap; @@ -12,13 +12,13 @@ import java.util.concurrent.ConcurrentHashMap; */ public class ClientCallbackFactory { - private static final ConcurrentHashMap CACHE = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap CACHE = new ConcurrentHashMap<>(); - public static void registerJobExecutor(TaskTypeEnum taskInstanceType, ClientCallbackHandler callbackHandler) { + public static void registerJobExecutor(JobTaskTypeEnum taskInstanceType, ClientCallbackHandler callbackHandler) { CACHE.put(taskInstanceType, callbackHandler); } public static ClientCallbackHandler getClientCallback(Integer type) { - return CACHE.get(TaskTypeEnum.valueOf(type)); + return CACHE.get(JobTaskTypeEnum.valueOf(type)); } } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClusterClientCallbackHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClusterClientCallbackHandler.java index d1411cc9d..48503b974 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClusterClientCallbackHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClusterClientCallbackHandler.java @@ -4,7 +4,7 @@ import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobExecutorResultDTO; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -18,8 +18,8 @@ import org.springframework.stereotype.Component; public class ClusterClientCallbackHandler extends AbstractClientCallbackHandler { @Override - public TaskTypeEnum getTaskInstanceType() { - return TaskTypeEnum.CLUSTER; + public JobTaskTypeEnum getTaskInstanceType() { + return JobTaskTypeEnum.CLUSTER; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ShardingClientCallbackHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ShardingClientCallbackHandler.java index e2f7af632..a41c53bf1 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ShardingClientCallbackHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ShardingClientCallbackHandler.java @@ -4,7 +4,7 @@ import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobExecutorResultDTO; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -18,8 +18,8 @@ import org.springframework.stereotype.Component; public class ShardingClientCallbackHandler extends AbstractClientCallbackHandler { @Override - public TaskTypeEnum getTaskInstanceType() { - return TaskTypeEnum.SHARDING; + public JobTaskTypeEnum getTaskInstanceType() { + return JobTaskTypeEnum.SHARDING; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java index 027113441..ec9e82f95 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java @@ -3,7 +3,7 @@ package com.aizuda.easy.retry.server.job.task.support.dispatch; import akka.actor.AbstractActor; import akka.actor.ActorRef; import cn.hutool.core.lang.Assert; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.common.core.util.JsonUtil; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; @@ -73,7 +73,7 @@ public class JobExecutorResultActor extends AbstractActor { if (complete) { // 尝试停止任务 // 若是集群任务则客户端会主动关闭 - if (result.getTaskType() != TaskTypeEnum.CLUSTER.getType()) { + if (result.getTaskType() != JobTaskTypeEnum.CLUSTER.getType()) { JobTaskStopHandler instanceInterrupt = JobTaskStopFactory.getJobTaskStop(result.getTaskType()); TaskStopJobContext stopJobContext = JobTaskConverter.INSTANCE.toStopJobContext(result); stopJobContext.setNeedUpdateTaskStatus(Boolean.FALSE); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/BroadcastTaskJobExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/BroadcastTaskJobExecutor.java index 422149b67..123e86771 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/BroadcastTaskJobExecutor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/BroadcastTaskJobExecutor.java @@ -5,7 +5,7 @@ import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.util.ClientInfoUtils; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealJobExecutorDTO; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -22,8 +22,8 @@ import java.util.List; public class BroadcastTaskJobExecutor extends AbstractJobExecutor { @Override - public TaskTypeEnum getTaskInstanceType() { - return TaskTypeEnum.BROADCAST; + public JobTaskTypeEnum getTaskInstanceType() { + return JobTaskTypeEnum.BROADCAST; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/ClusterJobExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/ClusterJobExecutor.java index 5463166fa..1f7555d20 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/ClusterJobExecutor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/ClusterJobExecutor.java @@ -5,7 +5,7 @@ import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.util.ClientInfoUtils; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealJobExecutorDTO; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -23,8 +23,8 @@ public class ClusterJobExecutor extends AbstractJobExecutor { @Override - public TaskTypeEnum getTaskInstanceType() { - return TaskTypeEnum.CLUSTER; + public JobTaskTypeEnum getTaskInstanceType() { + return JobTaskTypeEnum.CLUSTER; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/JobExecutorFactory.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/JobExecutorFactory.java index 63247e28a..eb12f1df5 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/JobExecutorFactory.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/JobExecutorFactory.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.job.task.support.executor.job; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.server.job.task.support.JobExecutor; import java.util.concurrent.ConcurrentHashMap; @@ -12,13 +12,13 @@ import java.util.concurrent.ConcurrentHashMap; */ public class JobExecutorFactory { - private static final ConcurrentHashMap CACHE = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap CACHE = new ConcurrentHashMap<>(); - public static void registerJobExecutor(TaskTypeEnum taskInstanceType, JobExecutor executor) { + public static void registerJobExecutor(JobTaskTypeEnum taskInstanceType, JobExecutor executor) { CACHE.put(taskInstanceType, executor); } public static JobExecutor getJobExecutor(Integer type) { - return CACHE.get(TaskTypeEnum.valueOf(type)); + return CACHE.get(JobTaskTypeEnum.valueOf(type)); } } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/ShardingJobExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/ShardingJobExecutor.java index be6a31e38..59e501045 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/ShardingJobExecutor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/ShardingJobExecutor.java @@ -5,7 +5,7 @@ import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.util.ClientInfoUtils; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealJobExecutorDTO; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -24,8 +24,8 @@ import java.util.List; public class ShardingJobExecutor extends AbstractJobExecutor { @Override - public TaskTypeEnum getTaskInstanceType() { - return TaskTypeEnum.SHARDING; + public JobTaskTypeEnum getTaskInstanceType() { + return JobTaskTypeEnum.SHARDING; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/WorkflowExecutorFactory.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/WorkflowExecutorFactory.java index acdbd9c91..9aae1bfba 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/WorkflowExecutorFactory.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/WorkflowExecutorFactory.java @@ -1,8 +1,6 @@ package com.aizuda.easy.retry.server.job.task.support.executor.workflow; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; import com.aizuda.easy.retry.common.core.enums.WorkflowNodeTypeEnum; -import com.aizuda.easy.retry.server.job.task.support.JobExecutor; import com.aizuda.easy.retry.server.job.task.support.WorkflowExecutor; import java.util.concurrent.ConcurrentHashMap; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/BroadcastTaskGenerator.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/BroadcastTaskGenerator.java index 6cff1f708..9c652324c 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/BroadcastTaskGenerator.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/BroadcastTaskGenerator.java @@ -3,7 +3,7 @@ package com.aizuda.easy.retry.server.job.task.support.generator.task; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.aizuda.easy.retry.common.core.enums.JobTaskStatusEnum; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.server.common.cache.CacheRegisterTable; import com.aizuda.easy.retry.server.common.dto.RegisterNodeInfo; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; @@ -36,8 +36,8 @@ public class BroadcastTaskGenerator extends AbstractJobTaskGenerator { private JobTaskMapper jobTaskMapper; @Override - public TaskTypeEnum getTaskInstanceType() { - return TaskTypeEnum.BROADCAST; + public JobTaskTypeEnum getTaskInstanceType() { + return JobTaskTypeEnum.BROADCAST; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ClusterTaskGenerator.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ClusterTaskGenerator.java index de9ca36d4..12ee0bd4f 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ClusterTaskGenerator.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ClusterTaskGenerator.java @@ -8,8 +8,7 @@ import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.common.handler.ClientNodeAllocateHandler; import com.aizuda.easy.retry.server.common.util.ClientInfoUtils; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; -import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobMapper; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import com.google.common.collect.Lists; @@ -36,8 +35,8 @@ public class ClusterTaskGenerator extends AbstractJobTaskGenerator { private JobTaskMapper jobTaskMapper; @Override - public TaskTypeEnum getTaskInstanceType() { - return TaskTypeEnum.CLUSTER; + public JobTaskTypeEnum getTaskInstanceType() { + return JobTaskTypeEnum.CLUSTER; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerator.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerator.java index a265d1317..620c05632 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerator.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerator.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.job.task.support.generator.task; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import java.util.List; @@ -12,7 +12,7 @@ import java.util.List; */ public interface JobTaskGenerator { - TaskTypeEnum getTaskInstanceType(); + JobTaskTypeEnum getTaskInstanceType(); List generate(JobTaskGenerateContext context); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGeneratorFactory.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGeneratorFactory.java index b5012a042..6815a04c5 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGeneratorFactory.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGeneratorFactory.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.job.task.support.generator.task; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import java.util.concurrent.ConcurrentHashMap; @@ -11,13 +11,13 @@ import java.util.concurrent.ConcurrentHashMap; */ public class JobTaskGeneratorFactory { - private static final ConcurrentHashMap CACHE = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap CACHE = new ConcurrentHashMap<>(); - public static void registerTaskInstance(TaskTypeEnum taskInstanceType, JobTaskGenerator generator) { + public static void registerTaskInstance(JobTaskTypeEnum taskInstanceType, JobTaskGenerator generator) { CACHE.put(taskInstanceType, generator); } public static JobTaskGenerator getTaskInstance(Integer type) { - return CACHE.get(TaskTypeEnum.valueOf(type)); + return CACHE.get(JobTaskTypeEnum.valueOf(type)); } } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ShardingTaskGenerator.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ShardingTaskGenerator.java index bc9caf7d2..5bae60f9f 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ShardingTaskGenerator.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ShardingTaskGenerator.java @@ -10,7 +10,7 @@ import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.common.handler.ClientNodeAllocateHandler; import com.aizuda.easy.retry.server.common.util.ClientInfoUtils; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import com.google.common.collect.Lists; @@ -39,8 +39,8 @@ public class ShardingTaskGenerator extends AbstractJobTaskGenerator { private JobTaskMapper jobTaskMapper; @Override - public TaskTypeEnum getTaskInstanceType() { - return TaskTypeEnum.SHARDING; + public JobTaskTypeEnum getTaskInstanceType() { + return JobTaskTypeEnum.SHARDING; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/BroadcastTaskStopHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/BroadcastTaskStopHandler.java index 7645cb843..7cad7632b 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/BroadcastTaskStopHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/BroadcastTaskStopHandler.java @@ -5,7 +5,7 @@ import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.util.ClientInfoUtils; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealStopTaskInstanceDTO; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -20,8 +20,8 @@ import org.springframework.stereotype.Component; public class BroadcastTaskStopHandler extends AbstractJobTaskStopHandler { @Override - public TaskTypeEnum getTaskType() { - return TaskTypeEnum.BROADCAST; + public JobTaskTypeEnum getTaskType() { + return JobTaskTypeEnum.BROADCAST; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ClusterTaskStopHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ClusterTaskStopHandler.java index d817bb73f..0341e2e9a 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ClusterTaskStopHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ClusterTaskStopHandler.java @@ -5,7 +5,7 @@ import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.util.ClientInfoUtils; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealStopTaskInstanceDTO; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -23,8 +23,8 @@ public class ClusterTaskStopHandler extends AbstractJobTaskStopHandler { @Override - public TaskTypeEnum getTaskType() { - return TaskTypeEnum.CLUSTER; + public JobTaskTypeEnum getTaskType() { + return JobTaskTypeEnum.CLUSTER; } @Override diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/JobTaskStopFactory.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/JobTaskStopFactory.java index c241e91d1..d1a291a3f 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/JobTaskStopFactory.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/JobTaskStopFactory.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.job.task.support.stop; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.server.job.task.support.JobTaskStopHandler; import java.util.concurrent.ConcurrentHashMap; @@ -12,17 +12,17 @@ import java.util.concurrent.ConcurrentHashMap; */ public final class JobTaskStopFactory { - private static final ConcurrentHashMap CACHE = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap CACHE = new ConcurrentHashMap<>(); private JobTaskStopFactory() { } - public static void registerTaskStop(TaskTypeEnum taskInstanceType, JobTaskStopHandler interrupt) { + public static void registerTaskStop(JobTaskTypeEnum taskInstanceType, JobTaskStopHandler interrupt) { CACHE.put(taskInstanceType, interrupt); } public static JobTaskStopHandler getJobTaskStop(Integer type) { - return CACHE.get(TaskTypeEnum.valueOf(type)); + return CACHE.get(JobTaskTypeEnum.valueOf(type)); } public static JobTaskStopFactory createJobTaskStopFactory() { diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ShardingTaskStopHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ShardingTaskStopHandler.java index 9bc56a8d0..b1775bfc8 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ShardingTaskStopHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ShardingTaskStopHandler.java @@ -5,7 +5,7 @@ import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.util.ClientInfoUtils; import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealStopTaskInstanceDTO; -import com.aizuda.easy.retry.common.core.enums.TaskTypeEnum; +import com.aizuda.easy.retry.common.core.enums.JobTaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -20,8 +20,8 @@ import org.springframework.stereotype.Component; public class ShardingTaskStopHandler extends AbstractJobTaskStopHandler { @Override - public TaskTypeEnum getTaskType() { - return TaskTypeEnum.SHARDING; + public JobTaskTypeEnum getTaskType() { + return JobTaskTypeEnum.SHARDING; } @Override