cleanup & refactoring: removed unnecessary methods + fixed switch task

Author: mp-orkes

conductor-client/src/main/java/com/netflix/conductor/common/run/tasks/DoWhileTask.java

@@ -79,10 +79,4 @@ public boolean isFirstIteration() {
         return getCurrentIteration() <= 1;
     }
 
-    /**
-     * Returns true if the loop task is part of a loop iteration (iteration > 0).
-     */
-    public boolean isLoopOverTask() {
-        return task.isLoopOverTask();
-    }
 }

conductor-client/src/main/java/com/netflix/conductor/common/run/tasks/SubWorkflowTask.java

@@ -99,10 +99,4 @@ public String getSubWorkflowId() {
         return task.getSubWorkflowId();
     }
 
-    /**
-     * Returns true if the sub-workflow has been started (has an ID).
-     */
-    public boolean isSubWorkflowStarted() {
-        return getSubWorkflowId() != null;
-    }
 }

conductor-client/src/main/java/com/netflix/conductor/common/run/tasks/SwitchTask.java

@@ -31,7 +31,7 @@ public class SwitchTask extends TypedTask {
 
     public static final String EVALUATOR_TYPE_INPUT = "evaluatorType";
     public static final String EXPRESSION_INPUT = "expression";
-    public static final String CASE_VALUE_OUTPUT = "caseOutput";
+    public static final String SELECTED_CASE = "selectedCase";
 
     public static final String EVALUATOR_TYPE_VALUE_PARAM = "value-param";
     public static final String EVALUATOR_TYPE_JAVASCRIPT = "javascript";
@@ -85,14 +85,9 @@ public String getExpression() {
     }
 
     /**
-     * Returns the evaluated case value that was selected, or null if not available.
+     * Returns the case that was selected, or null if not available.
      */
-    public String getEvaluatedCase() {
-        // The evaluated case is typically in the output
-        String caseOutput = getOutputString(CASE_VALUE_OUTPUT);
-        if (caseOutput != null) {
-            return caseOutput;
-        }
-        return getOutputString("selectedCase");
+    public String getSelectedCase() {
+        return getOutputString(SELECTED_CASE);
     }
 }

conductor-client/src/test/java/com/netflix/conductor/common/run/tasks/TypedTaskTest.java

@@ -275,7 +275,7 @@ void testSwitchTask() throws IOException {
             assertFalse(switchTask.isValueParamEvaluator());
 
             assertEquals("$.type == 'premium' ? 'premium' : 'standard'", switchTask.getExpression());
-            assertEquals("premium", switchTask.getEvaluatedCase());
+            assertEquals("premium", switchTask.getSelectedCase());
         }
 
         @Test
@@ -284,7 +284,7 @@ void testSwitchTaskViaTaskAs() throws IOException {
 
             SwitchTask switchTask = task.as(SwitchTask.class);
 
-            assertEquals("premium", switchTask.getEvaluatedCase());
+            assertEquals("premium", switchTask.getSelectedCase());
         }
 
         @Test
@@ -309,7 +309,6 @@ void testSubWorkflowTask() throws IOException {
             assertEquals("order_processing_workflow", subWf.getSubWorkflowName());
             assertEquals(2, subWf.getSubWorkflowVersion());
             assertEquals("sub-workflow-123", subWf.getSubWorkflowId());
-            assertTrue(subWf.isSubWorkflowStarted());
         }
 
         @Test

conductor-client/src/test/resources/tasks/switch.json

@@ -9,6 +9,9 @@
     "expression": "$.type == 'premium' ? 'premium' : 'standard'"
   },
   "outputData": {
-    "caseOutput": "premium"
+    "evaluationResult": [
+      "premium"
+    ],
+    "selectedCase": "premium"
   }
 }