Merge pull request #114 from tsurdilo/removewaitforcompletionforsubflow

tsurdilo · web-flow · commit 03ae9b824738 · 2021-09-04T15:59:50.000-04:00
Removing waitForCompletion for subflowref
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/SubFlowRefDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/SubFlowRefDeserializer.java
@@ -56,13 +56,8 @@ public SubFlowRef deserialize(JsonParser jp,
 
         if (!node.isObject()) {
             subflowRef.setWorkflowId(node.asText());
-            subflowRef.setWaitForCompletion(true);
             return subflowRef;
         } else {
-            if (node.get("waitForCompletion") != null) {
-                subflowRef.setWaitForCompletion(node.get("waitForCompletion").asBoolean());
-            }
-
             if (node.get("workflowId") != null) {
                 subflowRef.setWorkflowId(node.get("workflowId").asText());
             }
diff --git a/api/src/main/java/io/serverlessworkflow/api/serializers/SubFlowRefSerializer.java b/api/src/main/java/io/serverlessworkflow/api/serializers/SubFlowRefSerializer.java
@@ -39,7 +39,6 @@ public void serialize(SubFlowRef subflowRef,
 
         if (subflowRef != null) {
             if ((subflowRef.getWorkflowId() == null || subflowRef.getWorkflowId().isEmpty())
-                    && subflowRef.isWaitForCompletion()
                     && (subflowRef.getVersion() == null || subflowRef.getVersion().isEmpty())) {
                 gen.writeString(subflowRef.getWorkflowId());
             } else {
@@ -49,10 +48,6 @@ public void serialize(SubFlowRef subflowRef,
                     gen.writeStringField("workflowId", subflowRef.getWorkflowId());
                 }
 
-                if (!subflowRef.isWaitForCompletion()) {
-                    gen.writeBooleanField("waitForCompletion", false);
-                }
-
                 if (subflowRef.getVersion() != null && subflowRef.getVersion().length() > 0) {
                     gen.writeStringField("version", subflowRef.getVersion());
                 }
diff --git a/api/src/main/resources/schema/functions/subflowref.json b/api/src/main/resources/schema/functions/subflowref.json
@@ -2,11 +2,6 @@
   "type": "object",
   "javaType": "io.serverlessworkflow.api.functions.SubFlowRef",
   "properties": {
-    "waitForCompletion": {
-      "type": "boolean",
-      "default": true,
-      "description": "Workflow execution must wait for sub-workflow to finish before continuing"
-    },
     "workflowId": {
       "type": "string",
       "description": "Unique id of the sub-workflow to be invoked"
diff --git a/api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java b/api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java
@@ -498,13 +498,11 @@ public void testSubFlowRef(String workflowLocation) {
         assertNotNull(firstAction.getSubFlowRef());
         SubFlowRef firstSubflowRef = firstAction.getSubFlowRef();
         assertEquals("subflowRefReference", firstSubflowRef.getWorkflowId());
-        assertTrue(firstSubflowRef.isWaitForCompletion());
 
         Action secondAction = operationState.getActions().get(1);
         assertNotNull(secondAction.getSubFlowRef());
         SubFlowRef secondSubflowRef = secondAction.getSubFlowRef();
         assertEquals("subflowrefworkflowid", secondSubflowRef.getWorkflowId());
-        assertFalse(secondSubflowRef.isWaitForCompletion());
         assertEquals("1.0", secondSubflowRef.getVersion());
 
     }
diff --git a/api/src/test/resources/features/checkcarvitals.json b/api/src/test/resources/features/checkcarvitals.json
@@ -21,8 +21,7 @@
       "actions": [
         {
           "subFlowRef": {
-            "workflowId": "vitalscheck",
-            "waitForCompletion": false
+            "workflowId": "vitalscheck"
           }
         }
       ],
diff --git a/api/src/test/resources/features/checkcarvitals.yml b/api/src/test/resources/features/checkcarvitals.yml
@@ -15,7 +15,6 @@ states:
     actions:
       - subFlowRef:
           workflowId: vitalscheck
-          waitForCompletion: false
     transition: WaitForCarStopped
   - name: WaitForCarStopped
     type: event
diff --git a/api/src/test/resources/features/subflowref.json b/api/src/test/resources/features/subflowref.json
@@ -15,7 +15,6 @@
         {
           "subFlowRef": {
             "workflowId": "subflowrefworkflowid",
-            "waitForCompletion": false,
             "version": "1.0"
           }
         }
diff --git a/api/src/test/resources/features/subflowref.yml b/api/src/test/resources/features/subflowref.yml
@@ -11,6 +11,5 @@ states:
       - subFlowRef: subflowRefReference
       - subFlowRef:
           workflowId: subflowrefworkflowid
-          waitForCompletion: false
           version: '1.0'
     end: true

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@`
`21`	`21`	`"actions": [`
`22`	`22`	`{`
`23`	`23`	`"subFlowRef": {`
`24`		`- "workflowId": "vitalscheck",`
`25`		`- "waitForCompletion": false`
	`24`	`+ "workflowId": "vitalscheck"`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`	`],`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`{`
`16`	`16`	`"subFlowRef": {`
`17`	`17`	`"workflowId": "subflowrefworkflowid",`
`18`		`- "waitForCompletion": false,`
`19`	`18`	`"version": "1.0"`
`20`	`19`	`}`
`21`	`20`	`}`