Update WorkflowExecutor.java

Netflix · Dec 1, 2023 · 2348851 · 2348851
1 parent 41d4334
commit 2348851
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/executor/WorkflowExecutor.java b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/executor/WorkflowExecutor.java
@@ -154,36 +154,35 @@ public void initWorkers(String packagesToScan) {
         annotatedWorkerExecutor.initWorkers(packagesToScan);
     }
 
-    public CompletableFuture<Workflow> executeWorkflow(String name, Integer version, Object input) {
+    private String doExecuteWorkflow(String name, Integer version, WorkflowDef workflowDef, Object input) {
         CompletableFuture<Workflow> future = new CompletableFuture<>();
         Map<String, Object> inputMap = objectMapper.convertValue(input, Map.class);
 
         StartWorkflowRequest request = new StartWorkflowRequest();
         request.setInput(inputMap);
         request.setName(name);
         request.setVersion(version);
+        request.setWorkflowDef(conductorWorkflow.toWorkflowDef());
 
-        String workflowId = workflowClient.startWorkflow(request);
+        return workflowClient.startWorkflow(request);
+    }
+
+    public String executeWorkflow(String name, Integer version, Object input) {
+        String workflowId = this.doExecuteWorkflow(name, version, input);
+        runningWorkflowFutures.put(workflowId, future);
+        return workflowId;
+    }
+
+    public CompletableFuture<Workflow> executeWorkflow(String name, Integer version, Object input) {
+        String workflowId = this.doExecuteWorkflow(name, version, input);
         runningWorkflowFutures.put(workflowId, future);
         return future;
     }
 
     public CompletableFuture<Workflow> executeWorkflow(
             ConductorWorkflow conductorWorkflow, Object input) {
-
-        CompletableFuture<Workflow> future = new CompletableFuture<>();
-
-        Map<String, Object> inputMap = objectMapper.convertValue(input, Map.class);
-
-        StartWorkflowRequest request = new StartWorkflowRequest();
-        request.setInput(inputMap);
-        request.setName(conductorWorkflow.getName());
-        request.setVersion(conductorWorkflow.getVersion());
-        request.setWorkflowDef(conductorWorkflow.toWorkflowDef());
-
-        String workflowId = workflowClient.startWorkflow(request);
+        String workflowId = this.doExecuteWorkflow(conductorWorkflow.getName(), conductorWorkflow.getVersion(), conductorWorkflow.toWorkflowDef(), input);
         runningWorkflowFutures.put(workflowId, future);
-
         return future;
     }