Updated CassandraExecutionDAO to return Workflow tasks in sorted order.

Netflix · Mar 26, 2019 · dcf97e6 · dcf97e6
1 parent b7d073f
commit dcf97e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...-persistence/src/main/java/com/netflix/conductor/dao/cassandra/CassandraExecutionDAO.java b/...-persistence/src/main/java/com/netflix/conductor/dao/cassandra/CassandraExecutionDAO.java
@@ -35,6 +35,7 @@
 
 import javax.inject.Inject;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
@@ -379,6 +380,7 @@ public Workflow getWorkflow(String workflowId, boolean includeTasks) {
 
                 if (workflow != null) {
                     recordCassandraDaoRequests("getWorkflow", "n/a", workflow.getWorkflowName());
+                    tasks.sort(Comparator.comparingInt(Task::getSeq));
                     workflow.setTasks(tasks);
                 }
             } else {

diff --git a/core/src/main/java/com/netflix/conductor/dao/ExecutionDAO.java b/core/src/main/java/com/netflix/conductor/dao/ExecutionDAO.java
@@ -173,7 +173,7 @@ public interface ExecutionDAO {
 	/**
 	 * 
 	 * @param workflowId workflow instance id
-	 * @param includeTasks if set, includes the tasks (pending and completed)
+	 * @param includeTasks if set, includes the tasks (pending and completed) sorted by Task Sequence number in Workflow.
 	 * @return Workflow instance details
 	 *  
 	 */