diff --git a/snail-job-server/snail-job-server-common/pom.xml b/snail-job-server/snail-job-server-common/pom.xml index db68baa18..833f341ab 100644 --- a/snail-job-server/snail-job-server-common/pom.xml +++ b/snail-job-server/snail-job-server-common/pom.xml @@ -44,13 +44,23 @@ - com.typesafe.akka - akka-actor-typed_2.13 + org.apache.pekko + pekko-actor-typed_2.13 + 1.2.0-M1 - com.typesafe.akka - akka-actor-testkit-typed_2.13 + org.apache.pekko + pekko-actor-testkit-typed_2.13 + 1.2.0-M1 + + + + + + + + com.google.guava guava diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/ActorGenerator.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/ActorGenerator.java index 7cc413629..fae1def08 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/ActorGenerator.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/ActorGenerator.java @@ -1,8 +1,8 @@ package com.aizuda.snailjob.server.common.akka; -import akka.actor.ActorRef; -import akka.actor.ActorSystem; import com.aizuda.snailjob.common.core.context.SnailSpringContext; +import org.apache.pekko.actor.ActorRef; +import org.apache.pekko.actor.ActorSystem; /** @@ -18,20 +18,15 @@ public class ActorGenerator { public static final String SCAN_BUCKET_ACTOR = "ScanBucketActor"; public static final String REQUEST_HANDLER_ACTOR = "RequestHandlerActor"; public static final String GRPC_REQUEST_HANDLER_ACTOR = "GrpcRequestHandlerActor"; - private static final String COMMON_LOG_DISPATCHER = "akka.actor.common-log-dispatcher"; - private static final String COMMON_SCAN_TASK_DISPATCHER = "akka.actor.common-scan-task-dispatcher"; - private static final String NETTY_RECEIVE_REQUEST_DISPATCHER = "akka.actor.netty-receive-request-dispatcher"; + private static final String COMMON_LOG_DISPATCHER = "pekko.actor.common-log-dispatcher"; + private static final String COMMON_SCAN_TASK_DISPATCHER = "pekko.actor.common-scan-task-dispatcher"; + private static final String NETTY_RECEIVE_REQUEST_DISPATCHER = "pekko.actor.netty-receive-request-dispatcher"; /*----------------------------------------系统通用配置 END----------------------------------------*/ /*----------------------------------------分布式重试任务 START----------------------------------------*/ public static final String SCAN_CALLBACK_GROUP_ACTOR = "ScanCallbackGroupActor"; public static final String SCAN_RETRY_ACTOR = "ScanRetryActor"; - public static final String FINISH_ACTOR = "FinishActor"; - public static final String FAILURE_ACTOR = "FailureActor"; - public static final String NO_RETRY_ACTOR = "NoRetryActor"; - public static final String EXEC_CALLBACK_UNIT_ACTOR = "ExecCallbackUnitActor"; - public static final String EXEC_UNIT_ACTOR = "ExecUnitActor"; public static final String RETRY_EXECUTOR_ACTOR = "RetryExecutorActor"; public static final String RETRY_TASK_PREPARE_ACTOR = "RetryTaskPrepareActor"; public static final String LOG_ACTOR = "RetryLogActor"; @@ -41,9 +36,9 @@ public class ActorGenerator { public static final String RETRY_REAL_STOP_TASK_INSTANCE_ACTOR = "RetryRealStopTaskInstanceActor"; - private static final String RETRY_TASK_EXECUTOR_DISPATCHER = "akka.actor.retry-task-executor-dispatcher"; - private static final String RETRY_TASK_EXECUTOR_RESULT_DISPATCHER = "akka.actor.retry-task-executor-result-dispatcher"; - private static final String RETRY_TASK_EXECUTOR_CALL_CLIENT_DISPATCHER = "akka.actor.retry-task-executor-call-client-dispatcher"; + private static final String RETRY_TASK_EXECUTOR_DISPATCHER = "pekko.actor.retry-task-executor-dispatcher"; + private static final String RETRY_TASK_EXECUTOR_RESULT_DISPATCHER = "pekko.actor.retry-task-executor-result-dispatcher"; + private static final String RETRY_TASK_EXECUTOR_CALL_CLIENT_DISPATCHER = "pekko.actor.retry-task-executor-call-client-dispatcher"; /*----------------------------------------分布式重试任务 END----------------------------------------*/ @@ -61,12 +56,12 @@ public class ActorGenerator { public static final String JOB_REAL_STOP_TASK_INSTANCE_ACTOR = "JobRealStopTaskInstanceActor"; /*----------------------------------------dispatcher----------------------------------------*/ - private static final String JOB_TASK_DISPATCHER = "akka.actor.job-task-prepare-dispatcher"; - private static final String JOB_TASK_EXECUTOR_DISPATCHER = "akka.actor.job-task-executor-dispatcher"; - private static final String JOB_TASK_EXECUTOR_RESULT_DISPATCHER = "akka.actor.job-task-executor-result-dispatcher"; - private static final String JOB_TASK_EXECUTOR_CALL_CLIENT_DISPATCHER = "akka.actor.job-task-executor-call-client-dispatcher"; - private static final String WORKFLOW_TASK_DISPATCHER = "akka.actor.workflow-task-prepare-dispatcher"; - private static final String WORKFLOW_TASK_EXECUTOR_DISPATCHER = "akka.actor.workflow-task-executor-dispatcher"; + private static final String JOB_TASK_DISPATCHER = "pekko.actor.job-task-prepare-dispatcher"; + private static final String JOB_TASK_EXECUTOR_DISPATCHER = "pekko.actor.job-task-executor-dispatcher"; + private static final String JOB_TASK_EXECUTOR_RESULT_DISPATCHER = "pekko.actor.job-task-executor-result-dispatcher"; + private static final String JOB_TASK_EXECUTOR_CALL_CLIENT_DISPATCHER = "pekko.actor.job-task-executor-call-client-dispatcher"; + private static final String WORKFLOW_TASK_DISPATCHER = "pekko.actor.workflow-task-prepare-dispatcher"; + private static final String WORKFLOW_TASK_EXECUTOR_DISPATCHER = "pekko.actor.workflow-task-executor-dispatcher"; /*----------------------------------------分布式任务调度 END----------------------------------------*/ @@ -171,6 +166,7 @@ public class ActorGenerator { * * @return actor 引用 */ + @Deprecated public static ActorRef scanJobActor() { return getCommonActorSystemSystem().actorOf(getSpringExtension() .props(SCAN_JOB_ACTOR) diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/AkkaConfiguration.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/AkkaConfiguration.java index fc90c4742..8a42ca8a9 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/AkkaConfiguration.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/AkkaConfiguration.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.common.akka; -import akka.actor.ActorSystem; +import org.apache.pekko.actor.ActorSystem; import com.typesafe.config.ConfigFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/SpringActorProducer.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/SpringActorProducer.java index aec9c1da9..4267c7c83 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/SpringActorProducer.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/SpringActorProducer.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.common.akka; -import akka.actor.Actor; -import akka.actor.IndirectActorProducer; +import org.apache.pekko.actor.Actor; +import org.apache.pekko.actor.IndirectActorProducer; import org.springframework.context.ApplicationContext; /** diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/SpringExtension.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/SpringExtension.java index df8f5afee..76a510270 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/SpringExtension.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/SpringExtension.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.common.akka; -import akka.actor.Extension; -import akka.actor.Props; +import org.apache.pekko.actor.Extension; +import org.apache.pekko.actor.Props; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/cache/CacheGroupScanActor.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/cache/CacheGroupScanActor.java index 238a0bb91..89e0ec4a1 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/cache/CacheGroupScanActor.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/cache/CacheGroupScanActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.common.cache; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.Lifecycle; import com.aizuda.snailjob.server.common.enums.SyetemTaskTypeEnum; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/SyetemTaskTypeEnum.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/SyetemTaskTypeEnum.java index 5cf3d0141..947637f1c 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/SyetemTaskTypeEnum.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/SyetemTaskTypeEnum.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.common.enums; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/generator/id/SegmentIdGenerator.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/generator/id/SegmentIdGenerator.java index 7e390bce4..0e824d083 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/generator/id/SegmentIdGenerator.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/generator/id/SegmentIdGenerator.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicLong; * @date 2023-05-04 * @since 1.2.0 */ -@Component +//@Component @Slf4j @Deprecated public class SegmentIdGenerator implements IdGenerator, Lifecycle { diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/GrpcRequestHandlerActor.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/GrpcRequestHandlerActor.java index 6de39ae93..e49c7a05c 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/GrpcRequestHandlerActor.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/GrpcRequestHandlerActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.common.rpc.server; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.net.url.UrlBuilder; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.context.SnailSpringContext; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/NettyHttpServerHandler.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/NettyHttpServerHandler.java index 16511883e..4f6f3b5a3 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/NettyHttpServerHandler.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/NettyHttpServerHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.common.rpc.server; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import com.aizuda.snailjob.server.common.dto.NettyHttpRequest; import io.netty.channel.ChannelHandlerContext; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/RequestHandlerActor.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/RequestHandlerActor.java index 4c35a3f8a..fcf3313b2 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/RequestHandlerActor.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/RequestHandlerActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.common.rpc.server; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.net.url.UrlBuilder; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.context.SnailSpringContext; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/UnaryRequestHandler.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/UnaryRequestHandler.java index e633a7efb..ef5afa297 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/UnaryRequestHandler.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/UnaryRequestHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.common.rpc.server; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.grpc.auto.GrpcResult; import com.aizuda.snailjob.common.core.grpc.auto.GrpcSnailJobRequest; import com.aizuda.snailjob.common.core.grpc.auto.Metadata; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ReportLogHttpRequestHandler.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ReportLogHttpRequestHandler.java index 25d6f1021..acb4fb1a5 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ReportLogHttpRequestHandler.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ReportLogHttpRequestHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.common.rpc.server.handler; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.net.url.UrlQuery; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/block/job/RecoveryBlockStrategy.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/block/job/RecoveryBlockStrategy.java index e0ab13a75..a95dc7bff 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/block/job/RecoveryBlockStrategy.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/block/job/RecoveryBlockStrategy.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.block.job; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import com.aizuda.snailjob.common.core.enums.JobTaskStatusEnum; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/AbstractClientCallbackHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/AbstractClientCallbackHandler.java index f39708702..68ec9f1e7 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/AbstractClientCallbackHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/AbstractClientCallbackHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.callback; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.enums.JobTaskStatusEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/BroadcastClientCallbackHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/BroadcastClientCallbackHandler.java index 69b413f71..75e30a3ac 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/BroadcastClientCallbackHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/BroadcastClientCallbackHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.callback; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.common.core.util.StreamUtils; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ClusterClientCallbackHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ClusterClientCallbackHandler.java index b1de5b58d..dd9669ba4 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ClusterClientCallbackHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ClusterClientCallbackHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.callback; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import com.aizuda.snailjob.server.common.dto.RegisterNodeInfo; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/MapReduceClientCallbackHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/MapReduceClientCallbackHandler.java index cf0a5f46d..d8d4072e9 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/MapReduceClientCallbackHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/MapReduceClientCallbackHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.callback; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.RandomUtil; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ShardingClientCallbackHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ShardingClientCallbackHandler.java index 55a44a607..800dcf57c 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ShardingClientCallbackHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ShardingClientCallbackHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.callback; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.RandomUtil; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java index 6c47b6d35..96774c99f 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorResultActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorResultActor.java index 6e471897f..c9e6b0700 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorResultActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorResultActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.lang.Assert; import com.aizuda.snailjob.common.core.enums.StatusEnum; import com.aizuda.snailjob.common.core.util.JsonUtil; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobLogActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobLogActor.java index 1dfecf3d5..b6c4c8c11 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobLogActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobLogActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.util.JsonUtil; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobTaskPrepareActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobTaskPrepareActor.java index 7e4baabd8..7dcbb6ad3 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobTaskPrepareActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobTaskPrepareActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.common.core.context.SnailSpringContext; import com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ReduceActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ReduceActor.java index 0f4f88e6a..e51bba603 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ReduceActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ReduceActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanJobTaskActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanJobTaskActor.java index c5f0dc861..51687fed1 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanJobTaskActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanJobTaskActor.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.job.task.support.dispatch; -import akka.actor.AbstractActor; -import akka.actor.ActorRef; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.core.enums.StatusEnum; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanWorkflowTaskActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanWorkflowTaskActor.java index ab3973377..b0c75856e 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanWorkflowTaskActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanWorkflowTaskActor.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.job.task.support.dispatch; -import akka.actor.AbstractActor; -import akka.actor.ActorRef; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.RandomUtil; import com.aizuda.snailjob.common.core.constant.SystemConstants; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java index d0f666fc9..9f717fd70 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import com.aizuda.snailjob.common.core.constant.SystemConstants; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowTaskPrepareActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowTaskPrepareActor.java index e76fbf741..88cabf5a4 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowTaskPrepareActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowTaskPrepareActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import com.aizuda.snailjob.server.job.task.dto.WorkflowTaskPrepareDTO; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/BroadcastTaskJobExecutor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/BroadcastTaskJobExecutor.java index c7ae1dc99..a0b7238f4 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/BroadcastTaskJobExecutor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/BroadcastTaskJobExecutor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.executor.job; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/ClusterJobExecutor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/ClusterJobExecutor.java index 8fa81215f..d0819e98d 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/ClusterJobExecutor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/ClusterJobExecutor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.executor.job; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/MapReduceJobExecutor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/MapReduceJobExecutor.java index 569dbebff..f1da7d0b0 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/MapReduceJobExecutor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/MapReduceJobExecutor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.executor.job; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/RequestClientActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/RequestClientActor.java index 67671f700..9dbc7ce2f 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/RequestClientActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/RequestClientActor.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.job.task.support.executor.job; -import akka.actor.AbstractActor; -import akka.actor.ActorRef; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.client.model.ExecuteResult; import com.aizuda.snailjob.client.model.request.DispatchJobRequest; import com.aizuda.snailjob.common.core.context.SnailSpringContext; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/ShardingJobExecutor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/ShardingJobExecutor.java index 0bf7876a0..1e91ae16e 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/ShardingJobExecutor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/ShardingJobExecutor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.executor.job; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/workflow/JobTaskWorkflowExecutor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/workflow/JobTaskWorkflowExecutor.java index 71776f18b..295cb9442 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/workflow/JobTaskWorkflowExecutor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/workflow/JobTaskWorkflowExecutor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.executor.workflow; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.enums.*; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java index bcabf6fd5..6de16a0f5 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.handler; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/log/JobLogStorage.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/log/JobLogStorage.java index dcaabfc0c..22d309894 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/log/JobLogStorage.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/log/JobLogStorage.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.log; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.log.dto.LogContentDTO; import com.aizuda.snailjob.common.log.dto.TaskLogFieldDTO; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/MapReduceJobExecutorHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/MapReduceJobExecutorHandler.java index 105b5e26d..3017fec02 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/MapReduceJobExecutorHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/MapReduceJobExecutorHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.result.job; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/AbstractJobTaskStopHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/AbstractJobTaskStopHandler.java index 0b3d6e18b..61dacadac 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/AbstractJobTaskStopHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/AbstractJobTaskStopHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.stop; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum; import com.aizuda.snailjob.common.core.enums.JobTaskStatusEnum; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/BroadcastTaskStopHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/BroadcastTaskStopHandler.java index e683baefa..6100ffb03 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/BroadcastTaskStopHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/BroadcastTaskStopHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.stop; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import com.aizuda.snailjob.server.common.util.ClientInfoUtils; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/ClusterTaskStopHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/ClusterTaskStopHandler.java index 03e666e96..58a983f12 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/ClusterTaskStopHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/ClusterTaskStopHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.stop; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import com.aizuda.snailjob.server.common.util.ClientInfoUtils; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/MapReduceTaskStopHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/MapReduceTaskStopHandler.java index 250031220..bbcf02548 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/MapReduceTaskStopHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/MapReduceTaskStopHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.stop; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import com.aizuda.snailjob.server.common.util.ClientInfoUtils; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/RealStopTaskActor.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/RealStopTaskActor.java index b77d90137..0ff09a53f 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/RealStopTaskActor.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/RealStopTaskActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.stop; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import com.aizuda.snailjob.client.model.StopJobDTO; import com.aizuda.snailjob.common.core.model.Result; import com.aizuda.snailjob.common.core.util.JsonUtil; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/ShardingTaskStopHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/ShardingTaskStopHandler.java index dcde46ed0..40eb40ae1 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/ShardingTaskStopHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/ShardingTaskStopHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.stop; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import com.aizuda.snailjob.server.common.util.ClientInfoUtils; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/JobTimerTask.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/JobTimerTask.java index 661f28dd8..f8d3b8a4e 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/JobTimerTask.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/JobTimerTask.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.timer; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.TimerTask; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/ResidentJobTimerTask.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/ResidentJobTimerTask.java index c6918b2e0..b79d51d65 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/ResidentJobTimerTask.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/ResidentJobTimerTask.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.timer; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.TimerTask; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/RetryJobTimerTask.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/RetryJobTimerTask.java index 0b6615dc9..b97089aeb 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/RetryJobTimerTask.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/RetryJobTimerTask.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.timer; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.TimerTask; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/WorkflowTimerTask.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/WorkflowTimerTask.java index e8f81cd03..b018b9091 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/WorkflowTimerTask.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/WorkflowTimerTask.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.job.task.support.timer; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.TimerTask; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestCallbackClientActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestCallbackClientActor.java index 840a47c47..64ddee440 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestCallbackClientActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestCallbackClientActor.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.retry.task.support.dispatch; -import akka.actor.AbstractActor; -import akka.actor.ActorRef; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.client.model.request.RetryCallbackRequest; import com.aizuda.snailjob.common.core.enums.RetryTaskStatusEnum; import com.aizuda.snailjob.common.core.enums.StatusEnum; @@ -182,7 +182,7 @@ public class RequestCallbackClientActor extends AbstractActor { * 更新是执行状态 * * @param executorDTO RequestRetryExecutorDTO - * @param message 失败原因 + * @param message 失败原因 */ private static void taskExecuteFailure(RequestCallbackExecutorDTO executorDTO, String message) { ActorRef actorRef = ActorGenerator.retryTaskExecutorResultActor(); diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestRetryClientActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestRetryClientActor.java index 31e62f9f0..0d49dd5fc 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestRetryClientActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestRetryClientActor.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.retry.task.support.dispatch; -import akka.actor.AbstractActor; -import akka.actor.ActorRef; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.client.model.request.DispatchRetryRequest; import com.aizuda.snailjob.common.core.enums.RetryTaskStatusEnum; import com.aizuda.snailjob.common.core.enums.StatusEnum; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestStopClientActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestStopClientActor.java index 929752d38..0867aca84 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestStopClientActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestStopClientActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.retry.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import com.aizuda.snailjob.client.model.request.StopRetryRequest; import com.aizuda.snailjob.common.core.enums.StatusEnum; import com.aizuda.snailjob.common.core.model.Result; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java index 508b5138b..0cb7849a2 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.retry.task.support.dispatch; -import akka.actor.AbstractActor; -import akka.actor.ActorRef; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import com.aizuda.snailjob.common.core.context.SnailSpringContext; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryLogActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryLogActor.java index a73b6f955..a301dd49c 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryLogActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryLogActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.retry.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.util.JsonUtil; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryResultActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryResultActor.java index 4bd610e17..2b843472b 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryResultActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryResultActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.retry.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import com.aizuda.snailjob.server.retry.task.dto.RetryExecutorResultDTO; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryTaskPrepareActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryTaskPrepareActor.java index aaaf78709..5d317067f 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryTaskPrepareActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryTaskPrepareActor.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.retry.task.support.dispatch; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.server.common.enums.RetryTaskExecutorSceneEnum; import com.aizuda.snailjob.server.retry.task.dto.RetryTaskPrepareDTO; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java index 3081a7790..bd3d47f01 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.retry.task.support.dispatch; -import akka.actor.AbstractActor; -import akka.actor.ActorRef; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.core.enums.RetryStatusEnum; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/handler/RetryTaskStopHandler.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/handler/RetryTaskStopHandler.java index 30de1fe04..0104f6636 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/handler/RetryTaskStopHandler.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/handler/RetryTaskStopHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.retry.task.support.handler; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.enums.RetryTaskStatusEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; import com.aizuda.snailjob.server.retry.task.dto.RequestRetryExecutorDTO; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/log/RetryLogStorage.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/log/RetryLogStorage.java index f47a22db9..54a510c1f 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/log/RetryLogStorage.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/log/RetryLogStorage.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.retry.task.support.log; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.log.dto.LogContentDTO; import com.aizuda.snailjob.common.log.dto.TaskLogFieldDTO; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportCallbackResultHttpRequestHandler.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportCallbackResultHttpRequestHandler.java index 53dd64703..acd687331 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportCallbackResultHttpRequestHandler.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportCallbackResultHttpRequestHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.retry.task.support.request; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.lang.Assert; import cn.hutool.core.net.url.UrlQuery; import com.aizuda.snailjob.client.model.request.DispatchCallbackResultRequest; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportDispatchResultHttpRequestHandler.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportDispatchResultHttpRequestHandler.java index b1df0428f..549c5c070 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportDispatchResultHttpRequestHandler.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportDispatchResultHttpRequestHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.retry.task.support.request; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.lang.Assert; import cn.hutool.core.net.url.UrlQuery; import com.aizuda.snailjob.client.model.request.DispatchRetryResultRequest; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/timer/RetryTimerTask.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/timer/RetryTimerTask.java index 0a921d929..9f5f8294e 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/timer/RetryTimerTask.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/timer/RetryTimerTask.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.retry.task.support.timer; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import com.aizuda.snailjob.common.core.context.SnailSpringContext; import com.aizuda.snailjob.common.core.enums.RetryStatusEnum; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-starter/src/main/java/com/aizuda/snailjob/server/starter/dispatch/ConsumerBucketActor.java b/snail-job-server/snail-job-server-starter/src/main/java/com/aizuda/snailjob/server/starter/dispatch/ConsumerBucketActor.java index f2cfd61fc..361849398 100644 --- a/snail-job-server/snail-job-server-starter/src/main/java/com/aizuda/snailjob/server/starter/dispatch/ConsumerBucketActor.java +++ b/snail-job-server/snail-job-server-starter/src/main/java/com/aizuda/snailjob/server/starter/dispatch/ConsumerBucketActor.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.starter.dispatch; -import akka.actor.AbstractActor; -import akka.actor.ActorRef; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.server.common.akka.ActorGenerator; diff --git a/snail-job-server/snail-job-server-starter/src/main/java/com/aizuda/snailjob/server/starter/dispatch/DispatchService.java b/snail-job-server/snail-job-server-starter/src/main/java/com/aizuda/snailjob/server/starter/dispatch/DispatchService.java index 5ed5ae204..a80c66f2f 100644 --- a/snail-job-server/snail-job-server-starter/src/main/java/com/aizuda/snailjob/server/starter/dispatch/DispatchService.java +++ b/snail-job-server/snail-job-server-starter/src/main/java/com/aizuda/snailjob/server/starter/dispatch/DispatchService.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.starter.dispatch; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.log.SnailJobLog; diff --git a/snail-job-server/snail-job-server-starter/src/main/resources/snailjob.conf b/snail-job-server/snail-job-server-starter/src/main/resources/snailjob.conf index ccde87592..84aeb3588 100644 --- a/snail-job-server/snail-job-server-starter/src/main/resources/snailjob.conf +++ b/snail-job-server/snail-job-server-starter/src/main/resources/snailjob.conf @@ -1,4 +1,4 @@ -akka { +pekko { actor { common-log-dispatcher { type = "Dispatcher" diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/JobHandler.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/JobHandler.java index 4c6e0743f..309129d79 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/JobHandler.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/JobHandler.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.web.service.handler; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import com.aizuda.snailjob.client.model.ExecuteResult; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java index d4167666e..fb81d6666 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.server.web.service.impl; -import akka.actor.ActorRef; +import org.apache.pekko.actor.ActorRef; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil;