Merge branch 'dev' into Improvement-18151-suyc

Author: njnu-seafish

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/exceptions/WorkflowExecutionGraphInitializeFailureException.java

@@ -22,7 +22,6 @@
 import org.apache.dolphinscheduler.common.thread.ThreadUtils;
 import org.apache.dolphinscheduler.server.master.engine.system.event.AbstractSystemEvent;
 import org.apache.dolphinscheduler.server.master.engine.system.event.ISystemEventHandler;
-import org.apache.dolphinscheduler.server.master.failover.FailoverCoordinator;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.time.StopWatch;
@@ -43,9 +42,6 @@ public class SystemEventBusFireWorker extends BaseDaemonThread implements AutoCl
     @Autowired
     private SystemEventBus systemEventBus;
 
-    @Autowired
-    private FailoverCoordinator failoverCoordinator;
-
     @Autowired
     private List<ISystemEventHandler> systemEventHandlers;
 

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/system/SystemEventBusFireWorker.java

@@ -20,19 +20,13 @@
 import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
 import org.apache.dolphinscheduler.dao.entity.WorkflowInstance;
-import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
 import org.apache.dolphinscheduler.dao.utils.EnvironmentUtils;
 import org.apache.dolphinscheduler.dao.utils.WorkerGroupUtils;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
 public abstract class AbstractTaskInstanceFactory<BUILDER extends ITaskInstanceFactory.ITaskInstanceBuilder>
         implements
             ITaskInstanceFactory<BUILDER> {
 
-    @Autowired
-    protected EnvironmentMapper environmentMapper;
-
     protected TaskInstance cloneTaskInstance(TaskInstance originTaskInstance) {
         final TaskInstance result = new TaskInstance();
         result.setId(originTaskInstance.getId());

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/execution/AbstractTaskInstanceFactory.java

@@ -30,7 +30,6 @@
 import org.apache.dolphinscheduler.plugin.task.api.utils.VarPoolUtils;
 import org.apache.dolphinscheduler.server.master.engine.AbstractLifecycleEvent;
 import org.apache.dolphinscheduler.server.master.engine.ITaskGroupCoordinator;
-import org.apache.dolphinscheduler.server.master.engine.IWorkflowRepository;
 import org.apache.dolphinscheduler.server.master.engine.graph.IWorkflowExecutionGraph;
 import org.apache.dolphinscheduler.server.master.engine.task.client.ITaskExecutorClient;
 import org.apache.dolphinscheduler.server.master.engine.task.execution.ITaskExecution;
@@ -66,9 +65,6 @@ public abstract class AbstractTaskStateAction implements ITaskStateAction {
     @Autowired
     protected TaskInstanceDao taskInstanceDao;
 
-    @Autowired
-    protected IWorkflowRepository workflowRepository;
-
     @Autowired
     protected ITaskExecutorClient taskExecutorClient;
 

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/listener/ITaskExecutionLifecycleListener.java

@@ -20,7 +20,6 @@
 import org.apache.dolphinscheduler.common.enums.CommandType;
 import org.apache.dolphinscheduler.dao.entity.Command;
 import org.apache.dolphinscheduler.dao.repository.CommandDao;
-import org.apache.dolphinscheduler.dao.repository.WorkflowInstanceDao;
 import org.apache.dolphinscheduler.server.master.engine.command.ICommandHandler;
 import org.apache.dolphinscheduler.server.master.engine.exceptions.CommandDuplicateHandleException;
 
@@ -39,9 +38,6 @@ public class WorkflowExecutionFactory {
     @Autowired
     private List<ICommandHandler> commandHandlers;
 
-    @Autowired
-    private WorkflowInstanceDao workflowInstanceDao;
-
     @Autowired
     private CommandDao commandDao;
 

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/statemachine/AbstractTaskStateAction.java

@@ -18,17 +18,13 @@
 package org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.handler;
 
 import org.apache.dolphinscheduler.server.master.engine.ILifecycleEventType;
-import org.apache.dolphinscheduler.server.master.engine.IWorkflowRepository;
-import org.apache.dolphinscheduler.server.master.engine.WorkflowEventBusCoordinator;
 import org.apache.dolphinscheduler.server.master.engine.workflow.execution.IWorkflowExecution;
 import org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.WorkflowLifecycleEventType;
 import org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.event.WorkflowFinalizeLifecycleEvent;
 import org.apache.dolphinscheduler.server.master.engine.workflow.statemachine.IWorkflowStateAction;
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -40,13 +36,6 @@ public class WorkflowFinalizeLifecycleEventHandler
         extends
             AbstractWorkflowLifecycleEventHandler<WorkflowFinalizeLifecycleEvent> {
 
-    @Lazy
-    @Autowired
-    private WorkflowEventBusCoordinator workflowEventBusCoordinator;
-
-    @Autowired
-    private IWorkflowRepository workflowRepository;
-
     @Override
     public void handle(final IWorkflowStateAction workflowStateAction,
                        final IWorkflowExecution workflowExecution,

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/execution/WorkflowExecutionFactory.java

@@ -22,7 +22,6 @@
 import org.apache.dolphinscheduler.common.utils.DateUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.dao.entity.WorkflowInstance;
-import org.apache.dolphinscheduler.dao.repository.CommandDao;
 import org.apache.dolphinscheduler.extract.master.command.BackfillWorkflowCommandParam;
 import org.apache.dolphinscheduler.extract.master.command.ICommandParam;
 import org.apache.dolphinscheduler.extract.master.transportor.workflow.WorkflowBackfillTriggerRequest;
@@ -48,9 +47,6 @@ public class WorkflowSuccessLifecycleListener implements IWorkflowLifecycleListe
     @Autowired
     private WorkflowBackfillTrigger workflowBackfillTrigger;
 
-    @Autowired
-    private CommandDao commandDao;
-
     @Override
     public void notifyWorkflowLifecycleEvent(final IWorkflowExecution workflowExecution,
                                              final AbstractWorkflowLifecycleLifecycleEvent lifecycleEvent) {

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/lifecycle/handler/WorkflowFinalizeLifecycleEventHandler.java

@@ -26,4 +26,5 @@ public MasterTaskExecuteException(String message) {
     public MasterTaskExecuteException(String message, Throwable cause) {
         super(message, cause);
     }
+
 }