From 558dbaae693a118aef7ef57c7cd3caa915df2055 Mon Sep 17 00:00:00 2001 From: Tihomir Surdilovic Date: Sat, 4 Sep 2021 15:58:06 -0400 Subject: [PATCH] Removing waitForCompletion for subflowref Signed-off-by: Tihomir Surdilovic --- .../api/deserializers/SubFlowRefDeserializer.java | 5 ----- .../api/serializers/SubFlowRefSerializer.java | 5 ----- api/src/main/resources/schema/functions/subflowref.json | 5 ----- .../io/serverlessworkflow/api/test/MarkupToWorkflowTest.java | 2 -- api/src/test/resources/features/checkcarvitals.json | 3 +-- api/src/test/resources/features/checkcarvitals.yml | 1 - api/src/test/resources/features/subflowref.json | 1 - api/src/test/resources/features/subflowref.yml | 1 - 8 files changed, 1 insertion(+), 22 deletions(-) diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/SubFlowRefDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/SubFlowRefDeserializer.java index 3d24fd1d..8f280c4e 100644 --- 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 index b7c4c705..6f9756d3 100644 --- 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 index e59833de..79996d01 100644 --- 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 index 7b989b87..5a472097 100644 --- 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 index 374e9a1d..d0d61234 100644 --- 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 index a93d1694..a7e1342e 100644 --- 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 index b350c960..a3b461dc 100644 --- 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 index 219787dc..17c1e18b 100644 --- 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 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy