gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat: 2.6.0

Browse Source 
1. 变更TaskTypeEnum 为 JobTaskTypeEnum
This commit is contained in:
byteblogs168 2024-01-09 09:03:39 +08:00
parent 9ba2aae241
commit 9acba06cc8
26 changed files with 70 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/sql/easy_retry_mysql.sql
View File

@ -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 '修改时间',

5
easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/executor/AbstractJobExecutor.java
View File

@ -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<ExecuteResult> submit = decorator.submit(() -> {
JobArgs jobArgs;
if (jobContext.getTaskType() == TaskTypeEnum.SHARDING.getType()) {
if (jobContext.getTaskType() == JobTaskTypeEnum.SHARDING.getType()) {
jobArgs = buildShardingJobArgs(jobContext);
} else {
jobArgs = buildJobArgs(jobContext);

4
easy-retry-client/easy-retry-client-job-core/src/main/java/com/aizuda/easy/retry/client/job/core/executor/JobExecutorFutureCallback.java
View File

@ -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<ExecuteResult>
}
private void stopThreadPool() {
if (jobContext.getTaskType() == TaskTypeEnum.CLUSTER.getType()) {
if (jobContext.getTaskType() == JobTaskTypeEnum.CLUSTER.getType()) {
ThreadPoolCache.stopThreadPool(jobContext.getTaskBatchId());
}
}

6
easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/TaskTypeEnum.java → easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/JobTaskTypeEnum.java
View File

@ -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;
}

4
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/ClientCallbackHandler.java
View File

@ -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);
}

4
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobExecutor.java
View File

@ -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);
}

4
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskStopHandler.java
View File

@ -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);

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/BroadcastClientCallbackHandler.java
View File

@ -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

8
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackFactory.java
View File

@ -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<TaskTypeEnum, ClientCallbackHandler> CACHE = new ConcurrentHashMap<>();
private static final ConcurrentHashMap<JobTaskTypeEnum, ClientCallbackHandler> 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));
}
}

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClusterClientCallbackHandler.java
View File

@ -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

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ShardingClientCallbackHandler.java
View File

@ -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

4
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java
View File

@ -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);

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/BroadcastTaskJobExecutor.java
View File

@ -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

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/ClusterJobExecutor.java
View File

@ -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

8
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/JobExecutorFactory.java
View File

@ -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<TaskTypeEnum, JobExecutor> CACHE = new ConcurrentHashMap<>();
private static final ConcurrentHashMap<JobTaskTypeEnum, JobExecutor> 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));
}
}

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/ShardingJobExecutor.java
View File

@ -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

2
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/WorkflowExecutorFactory.java
View File

@ -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;

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/BroadcastTaskGenerator.java
View File

@ -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

7
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ClusterTaskGenerator.java
View File

@ -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

4
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerator.java
View File

@ -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<JobTask> generate(JobTaskGenerateContext context);

8
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGeneratorFactory.java
View File

@ -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<TaskTypeEnum, JobTaskGenerator> CACHE = new ConcurrentHashMap<>();
private static final ConcurrentHashMap<JobTaskTypeEnum, JobTaskGenerator> 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));
}
}

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ShardingTaskGenerator.java
View File

@ -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

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/BroadcastTaskStopHandler.java
View File

@ -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

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ClusterTaskStopHandler.java
View File

@ -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

8
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/JobTaskStopFactory.java
View File

@ -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<TaskTypeEnum, JobTaskStopHandler> CACHE = new ConcurrentHashMap<>();
private static final ConcurrentHashMap<JobTaskTypeEnum, JobTaskStopHandler> 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() {

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ShardingTaskStopHandler.java
View File

@ -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