diff --git a/powerjob-client/src/main/java/tech/powerjob/client/PowerJobClient.java b/powerjob-client/src/main/java/tech/powerjob/client/PowerJobClient.java index ec2670cf..bca38b63 100644 --- a/powerjob-client/src/main/java/tech/powerjob/client/PowerJobClient.java +++ b/powerjob-client/src/main/java/tech/powerjob/client/PowerJobClient.java @@ -12,7 +12,7 @@ import tech.powerjob.common.request.query.JobInfoQuery; import tech.powerjob.common.response.*; import tech.powerjob.common.utils.CommonUtils; import tech.powerjob.common.utils.HttpUtils; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import okhttp3.FormBody; diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml index ede19a73..3859d69e 100644 --- a/powerjob-common/pom.xml +++ b/powerjob-common/pom.xml @@ -20,6 +20,8 @@ 29.0-jre 3.14.9 2.6.12 + 5.0.4 + 2.12.2 5.6.1 @@ -58,11 +60,6 @@ akka-remote_2.13 ${akka.version} - - com.typesafe.akka - akka-serialization-jackson_2.13 - ${akka.version} - com.typesafe.akka akka-slf4j_2.13 @@ -76,6 +73,26 @@ ${commons.io.version} + + + com.esotericsoftware + kryo + ${kryo.version} + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + org.junit.jupiter diff --git a/powerjob-common/src/main/java/tech/powerjob/common/response/AskResponse.java b/powerjob-common/src/main/java/tech/powerjob/common/response/AskResponse.java index 0a413e8f..7abff41a 100644 --- a/powerjob-common/src/main/java/tech/powerjob/common/response/AskResponse.java +++ b/powerjob-common/src/main/java/tech/powerjob/common/response/AskResponse.java @@ -1,7 +1,7 @@ package tech.powerjob.common.response; import tech.powerjob.common.PowerSerializable; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import lombok.*; import java.nio.charset.StandardCharsets; diff --git a/powerjob-common/src/main/java/tech/powerjob/common/utils/JsonUtils.java b/powerjob-common/src/main/java/tech/powerjob/common/serialize/JsonUtils.java similarity index 97% rename from powerjob-common/src/main/java/tech/powerjob/common/utils/JsonUtils.java rename to powerjob-common/src/main/java/tech/powerjob/common/serialize/JsonUtils.java index c45ba997..ef591aee 100644 --- a/powerjob-common/src/main/java/tech/powerjob/common/utils/JsonUtils.java +++ b/powerjob-common/src/main/java/tech/powerjob/common/serialize/JsonUtils.java @@ -1,4 +1,4 @@ -package tech.powerjob.common.utils; +package tech.powerjob.common.serialize; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/powerjob-common/src/main/java/tech/powerjob/common/serialize/PowerAkkaSerializer.java b/powerjob-common/src/main/java/tech/powerjob/common/serialize/PowerAkkaSerializer.java new file mode 100644 index 00000000..d002a08c --- /dev/null +++ b/powerjob-common/src/main/java/tech/powerjob/common/serialize/PowerAkkaSerializer.java @@ -0,0 +1,32 @@ +package tech.powerjob.common.serialize; + +import akka.serialization.JSerializer; + +/** + * Using custom serializers for akka-remote + * + * @author tjq + * @since 2021/3/21 + */ +public class PowerAkkaSerializer extends JSerializer { + + @Override + public Object fromBinaryJava(byte[] bytes, Class manifest) { + return SerializerUtils.deSerialized(bytes); + } + + @Override + public int identifier() { + return 277777; + } + + @Override + public byte[] toBinary(Object o) { + return SerializerUtils.serialize(o); + } + + @Override + public boolean includeManifest() { + return false; + } +} diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/common/utils/SerializerUtils.java b/powerjob-common/src/main/java/tech/powerjob/common/serialize/SerializerUtils.java similarity index 97% rename from powerjob-worker/src/main/java/tech/powerjob/worker/common/utils/SerializerUtils.java rename to powerjob-common/src/main/java/tech/powerjob/common/serialize/SerializerUtils.java index 0ba7a436..2d16193f 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/common/utils/SerializerUtils.java +++ b/powerjob-common/src/main/java/tech/powerjob/common/serialize/SerializerUtils.java @@ -1,4 +1,4 @@ -package tech.powerjob.worker.common.utils; +package tech.powerjob.common.serialize; import com.esotericsoftware.kryo.Kryo; diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java index ac9653e6..bd81726f 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java @@ -7,7 +7,7 @@ import tech.powerjob.common.model.GitRepoInfo; import tech.powerjob.common.request.ServerDeployContainerRequest; import tech.powerjob.common.request.ServerDestroyContainerRequest; import tech.powerjob.common.utils.CommonUtils; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.common.utils.NetUtils; import tech.powerjob.common.utils.SegmentLock; import tech.powerjob.server.common.constants.ContainerSourceType; diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/WorkerRequestHandler.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/WorkerRequestHandler.java index 5c73fce0..693ec232 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/WorkerRequestHandler.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/WorkerRequestHandler.java @@ -15,7 +15,7 @@ import tech.powerjob.server.remote.transport.starter.VertXStarter; import tech.powerjob.server.remote.worker.WorkerClusterQueryService; import tech.powerjob.server.common.module.WorkerInfo; import tech.powerjob.common.response.AskResponse; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.common.utils.NetUtils; import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.utils.SpringUtils; diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java index 324c8181..a1e6aedb 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java @@ -16,7 +16,7 @@ import tech.powerjob.common.enums.TimeExpressionType; import tech.powerjob.common.enums.WorkflowInstanceStatus; import tech.powerjob.common.enums.WorkflowNodeType; import tech.powerjob.common.model.PEWorkflowDAG; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.core.DispatchService; import tech.powerjob.server.core.instance.InstanceService; diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/algorithm/WorkflowDAGUtils.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/algorithm/WorkflowDAGUtils.java index c882dee0..e685ea37 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/algorithm/WorkflowDAGUtils.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/algorithm/WorkflowDAGUtils.java @@ -4,7 +4,7 @@ import tech.powerjob.common.enums.InstanceStatus; import tech.powerjob.common.exception.PowerJobException; import tech.powerjob.common.SystemInstanceResult; import tech.powerjob.common.model.PEWorkflowDAG; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import com.google.common.collect.*; import java.util.*; diff --git a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/FriendRequestHandler.java b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/FriendRequestHandler.java index a5865017..bbfeecf2 100644 --- a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/FriendRequestHandler.java +++ b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/FriendRequestHandler.java @@ -2,7 +2,7 @@ package tech.powerjob.server.remote.server; import akka.actor.AbstractActor; import tech.powerjob.common.response.AskResponse; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.server.remote.server.election.Ping; import tech.powerjob.server.remote.server.redirector.RemoteProcessReq; import tech.powerjob.server.remote.server.redirector.RemoteRequestProcessor; diff --git a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/election/ServerElectionService.java b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/election/ServerElectionService.java index 5b0f3c80..ac68edc5 100644 --- a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/election/ServerElectionService.java +++ b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/election/ServerElectionService.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import tech.powerjob.common.exception.PowerJobException; import tech.powerjob.common.enums.Protocol; import tech.powerjob.common.response.AskResponse; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.server.extension.LockService; import tech.powerjob.server.persistence.remote.model.AppInfoDO; import tech.powerjob.server.persistence.remote.repository.AppInfoRepository; diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/oms-server.akka.conf b/powerjob-server/powerjob-server-starter/src/main/resources/oms-server.akka.conf index 98664e1d..00afa479 100644 --- a/powerjob-server/powerjob-server-starter/src/main/resources/oms-server.akka.conf +++ b/powerjob-server/powerjob-server-starter/src/main/resources/oms-server.akka.conf @@ -8,8 +8,12 @@ akka { provider = remote allow-java-serialization = off + serializers { + power-serializer = "tech.powerjob.common.serialize.PowerAkkaSerializer" + } + serialization-bindings { - "tech.powerjob.common.PowerSerializable" = jackson-cbor + "tech.powerjob.common.PowerSerializable" = power-serializer } } remote { diff --git a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/DAGTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/DAGTest.java index 6ab1ca80..83852efa 100644 --- a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/DAGTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/DAGTest.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; import tech.powerjob.common.enums.InstanceStatus; import tech.powerjob.common.model.PEWorkflowDAG; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.server.core.workflow.algorithm.WorkflowDAGUtils; import tech.powerjob.server.core.workflow.algorithm.WorkflowDAG; import com.google.common.collect.Lists; diff --git a/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/MapProcessorDemo.java b/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/MapProcessorDemo.java index 2d3e37c1..cf5ba988 100644 --- a/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/MapProcessorDemo.java +++ b/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/MapProcessorDemo.java @@ -1,6 +1,6 @@ package tech.powerjob.samples.processors; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.samples.MysteryService; import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; diff --git a/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/MapReduceProcessorDemo.java b/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/MapReduceProcessorDemo.java index 5ce82e83..f741d1c3 100644 --- a/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/MapReduceProcessorDemo.java +++ b/powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/MapReduceProcessorDemo.java @@ -2,7 +2,7 @@ package tech.powerjob.samples.processors; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.TaskResult; diff --git a/powerjob-worker/pom.xml b/powerjob-worker/pom.xml index cb74d29c..17d0d52b 100644 --- a/powerjob-worker/pom.xml +++ b/powerjob-worker/pom.xml @@ -19,7 +19,6 @@ 1.4.200 3.4.2 5.6.1 - 5.0.0-RC5 1.2.3 @@ -53,13 +52,6 @@ ${hikaricp.version} - - - com.esotericsoftware - kryo - ${kryo.version} - - org.junit.jupiter diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/PowerJobWorker.java b/powerjob-worker/src/main/java/tech/powerjob/worker/PowerJobWorker.java index 7485aecf..b55fd18a 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/PowerJobWorker.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/PowerJobWorker.java @@ -10,7 +10,7 @@ import tech.powerjob.common.RemoteConstant; import tech.powerjob.common.response.ResultDTO; import tech.powerjob.common.utils.CommonUtils; import tech.powerjob.common.utils.HttpUtils; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.common.utils.NetUtils; import tech.powerjob.worker.actors.ProcessorTrackerActor; import tech.powerjob.worker.actors.TaskTrackerActor; diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/background/ServerDiscoveryService.java b/powerjob-worker/src/main/java/tech/powerjob/worker/background/ServerDiscoveryService.java index b610c324..7402772c 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/background/ServerDiscoveryService.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/background/ServerDiscoveryService.java @@ -3,7 +3,7 @@ package tech.powerjob.worker.background; import tech.powerjob.common.exception.PowerJobException; import tech.powerjob.common.response.ResultDTO; import tech.powerjob.common.utils.CommonUtils; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.common.utils.HttpUtils; import tech.powerjob.worker.common.PowerJobWorkerConfig; import tech.powerjob.worker.core.tracker.task.TaskTracker; diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/common/utils/WorkflowContextUtils.java b/powerjob-worker/src/main/java/tech/powerjob/worker/common/utils/WorkflowContextUtils.java index d142f8bb..80aab259 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/common/utils/WorkflowContextUtils.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/common/utils/WorkflowContextUtils.java @@ -1,6 +1,6 @@ package tech.powerjob.worker.common.utils; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import java.util.Map; diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/core/executor/ProcessorRunnable.java b/powerjob-worker/src/main/java/tech/powerjob/worker/core/executor/ProcessorRunnable.java index 92d2c44a..8a82eca1 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/core/executor/ProcessorRunnable.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/core/executor/ProcessorRunnable.java @@ -7,7 +7,7 @@ import tech.powerjob.worker.common.ThreadLocalStore; import tech.powerjob.worker.common.constants.TaskConstant; import tech.powerjob.worker.common.constants.TaskStatus; import tech.powerjob.worker.common.utils.AkkaUtils; -import tech.powerjob.worker.common.utils.SerializerUtils; +import tech.powerjob.common.serialize.SerializerUtils; import tech.powerjob.worker.common.utils.WorkflowContextUtils; import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/core/processor/WorkflowContext.java b/powerjob-worker/src/main/java/tech/powerjob/worker/core/processor/WorkflowContext.java index 0b2cb982..89cbad51 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/core/processor/WorkflowContext.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/core/processor/WorkflowContext.java @@ -1,7 +1,7 @@ package tech.powerjob.worker.core.processor; import tech.powerjob.common.WorkflowContextConstant; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import com.google.common.collect.Maps; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/core/tracker/task/TaskTracker.java b/powerjob-worker/src/main/java/tech/powerjob/worker/core/tracker/task/TaskTracker.java index 0f251e1d..20182311 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/core/tracker/task/TaskTracker.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/core/tracker/task/TaskTracker.java @@ -12,7 +12,7 @@ import tech.powerjob.common.request.TaskTrackerReportInstanceStatusReq; import tech.powerjob.common.request.WorkerQueryExecutorClusterReq; import tech.powerjob.common.response.AskResponse; import tech.powerjob.common.utils.CommonUtils; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.common.utils.SegmentLock; import tech.powerjob.worker.common.WorkerRuntime; import tech.powerjob.worker.common.constants.TaskConstant; diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/pojo/request/ProcessorMapTaskRequest.java b/powerjob-worker/src/main/java/tech/powerjob/worker/pojo/request/ProcessorMapTaskRequest.java index 3359c6ec..c35bc924 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/pojo/request/ProcessorMapTaskRequest.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/pojo/request/ProcessorMapTaskRequest.java @@ -2,7 +2,7 @@ package tech.powerjob.worker.pojo.request; import tech.powerjob.common.PowerSerializable; import tech.powerjob.worker.common.ThreadLocalStore; -import tech.powerjob.worker.common.utils.SerializerUtils; +import tech.powerjob.common.serialize.SerializerUtils; import tech.powerjob.worker.persistence.TaskDO; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; diff --git a/powerjob-worker/src/main/resources/oms-worker.akka.conf b/powerjob-worker/src/main/resources/oms-worker.akka.conf index 9af9bf95..16f7b911 100644 --- a/powerjob-worker/src/main/resources/oms-worker.akka.conf +++ b/powerjob-worker/src/main/resources/oms-worker.akka.conf @@ -8,8 +8,12 @@ akka { provider = remote allow-java-serialization = off + serializers { + power-serializer = "tech.powerjob.common.serialize.PowerAkkaSerializer" + } + serialization-bindings { - "tech.powerjob.common.PowerSerializable" = jackson-cbor + "tech.powerjob.common.PowerSerializable" = power-serializer } } remote { diff --git a/powerjob-worker/src/test/java/tech/powerjob/worker/test/function/MonitorTest.java b/powerjob-worker/src/test/java/tech/powerjob/worker/test/function/MonitorTest.java index 9d89c3f9..1aa782c5 100644 --- a/powerjob-worker/src/test/java/tech/powerjob/worker/test/function/MonitorTest.java +++ b/powerjob-worker/src/test/java/tech/powerjob/worker/test/function/MonitorTest.java @@ -1,7 +1,7 @@ package tech.powerjob.worker.test.function; import tech.powerjob.common.model.SystemMetrics; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.worker.common.utils.SystemInfoUtils; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; diff --git a/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestBasicProcessor.java b/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestBasicProcessor.java index ea56be01..70c4f994 100644 --- a/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestBasicProcessor.java +++ b/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestBasicProcessor.java @@ -1,6 +1,6 @@ package tech.powerjob.worker.test.processors; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.sdk.BasicProcessor; diff --git a/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestBroadcastProcessor.java b/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestBroadcastProcessor.java index 995dce9c..55281137 100644 --- a/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestBroadcastProcessor.java +++ b/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestBroadcastProcessor.java @@ -1,6 +1,6 @@ package tech.powerjob.worker.test.processors; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.TaskResult; diff --git a/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestMapReduceProcessor.java b/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestMapReduceProcessor.java index 3d587084..02513aa5 100644 --- a/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestMapReduceProcessor.java +++ b/powerjob-worker/src/test/java/tech/powerjob/worker/test/processors/TestMapReduceProcessor.java @@ -1,6 +1,6 @@ package tech.powerjob.worker.test.processors; -import tech.powerjob.common.utils.JsonUtils; +import tech.powerjob.common.serialize.JsonUtils; import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.TaskResult;