Merge pull request #217 from conductor-oss/workflow_ops

Refactor WorkflowExecutor
conductor-oss · Jul 22, 2024 · 4df0e80 · 4df0e80
2 parents 55a31af + 3b85d6c
commit 4df0e80
Show file tree

Hide file tree

Showing 24 changed files with 2,108 additions and 2,226 deletions.
diff --git a/core/src/main/java/com/netflix/conductor/core/event/WorkflowCreationEvent.java b/core/src/main/java/com/netflix/conductor/core/event/WorkflowCreationEvent.java
diff --git a/core/src/main/java/com/netflix/conductor/core/event/WorkflowEvaluationEvent.java b/core/src/main/java/com/netflix/conductor/core/event/WorkflowEvaluationEvent.java
diff --git a/core/src/main/java/com/netflix/conductor/core/events/SimpleActionProcessor.java b/core/src/main/java/com/netflix/conductor/core/events/SimpleActionProcessor.java
@@ -27,7 +27,6 @@
 import com.netflix.conductor.common.utils.TaskUtils;
 import com.netflix.conductor.core.execution.StartWorkflowInput;
 import com.netflix.conductor.core.execution.WorkflowExecutor;
-import com.netflix.conductor.core.operation.StartWorkflowOperation;
 import com.netflix.conductor.core.utils.JsonUtils;
 import com.netflix.conductor.core.utils.ParametersUtils;
 import com.netflix.conductor.metrics.Monitors;
@@ -46,17 +45,14 @@ public class SimpleActionProcessor implements ActionProcessor {
     private final WorkflowExecutor workflowExecutor;
     private final ParametersUtils parametersUtils;
     private final JsonUtils jsonUtils;
-    private final StartWorkflowOperation startWorkflowOperation;
 
     public SimpleActionProcessor(
             WorkflowExecutor workflowExecutor,
             ParametersUtils parametersUtils,
-            JsonUtils jsonUtils,
-            StartWorkflowOperation startWorkflowOperation) {
+            JsonUtils jsonUtils) {
         this.workflowExecutor = workflowExecutor;
         this.parametersUtils = parametersUtils;
         this.jsonUtils = jsonUtils;
-        this.startWorkflowOperation = startWorkflowOperation;
     }
 
     public Map<String, Object> execute(
@@ -218,7 +214,7 @@ private Map<String, Object> startWorkflow(
             startWorkflowInput.setEvent(event);
             startWorkflowInput.setTaskToDomain(params.getTaskToDomain());
 
-            String workflowId = startWorkflowOperation.execute(startWorkflowInput);
+            String workflowId = workflowExecutor.startWorkflow(startWorkflowInput);
 
             output.put("workflowId", workflowId);
             LOGGER.debug(