diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java index e8ac8e89..40b5b240 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java @@ -57,10 +57,7 @@ public class ActionDispatcher extends PostRunningModule { immediateActions.add(actionInfo); } } - val actionExecutorInput = ActionExecutorInput.builder() - .actions(immediateActions) - .build(); - actionExecutor.execute(actionExecutorInput); + actionExecutor.execute(new ActionExecutorInput(immediateActions)); actionScheduler.execute(scheduledActions); }); } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/entity/ActionExecutorInput.kt b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/entity/ActionExecutorInput.kt index 69a7d55e..f21db99d 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/entity/ActionExecutorInput.kt +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/entity/ActionExecutorInput.kt @@ -1,16 +1,5 @@ -package work.slhaf.partner.module.modules.action.dispatcher.executor.entity; +package work.slhaf.partner.module.modules.action.dispatcher.executor.entity -import lombok.Builder; -import lombok.Data; -import work.slhaf.partner.core.action.entity.ActionData; +import work.slhaf.partner.core.action.entity.ActionData -import java.util.Set; - -@Data -@Builder -public class ActionExecutorInput { - /** - * 将执行的行动数据列表 - */ - private Set actions; -} +data class ActionExecutorInput(val actions: Set) diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt index 00878b5a..9f211e64 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt @@ -47,10 +47,7 @@ class ActionScheduler : AgentRunningSubModule, Void>() .map { actionData -> actionData as ScheduledActionData } .collect(Collectors.toSet()) timeWheel = TimeWheel(actions) { actionDataSet -> - val input = ActionExecutorInput.builder() - .actions(actionDataSet) - .build() - actionExecutor.execute(input) + actionExecutor.execute(ActionExecutorInput(actionDataSet)) } } diff --git a/Partner-Main/src/test/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutorTest.java b/Partner-Main/src/test/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutorTest.java index b336ae2d..262dea16 100644 --- a/Partner-Main/src/test/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutorTest.java +++ b/Partner-Main/src/test/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutorTest.java @@ -369,9 +369,7 @@ class ActionExecutorTest { } private ActionExecutorInput buildInput(String userId, ImmediateActionData actionData) { - return ActionExecutorInput.builder() - .actions(Set.of(actionData)) - .build(); + return new ActionExecutorInput(Set.of(actionData)); } private ImmediateActionData buildActionData(Map> actionChain) {