Merge pull request #105 from tsurdilo/completionconditionup

update to completion type

Author: tsurdilo

api/src/main/resources/schema/states/parallelstate.json

@@ -19,14 +19,14 @@
     },
     "completionType": {
       "type" : "string",
-      "enum": ["and", "xor", "n_of_m"],
+      "enum": ["allOf", "atLeast"],
       "description": "Option types on how to complete branch execution.",
-      "default": "and"
+      "default": "allOf"
     },
-    "n": {
+    "numCompleted": {
       "type": "string",
       "default": "0",
-      "description": "Used when completionType is set to 'n_of_m' to specify the 'N' value"
+      "description": "Used when completionType is set to 'atLeast' to specify the minimum number of branches that must complete before the state will transition."
     },
     "usedForCompensation": {
       "type": "boolean",

api/src/test/resources/examples/parallel.json

@@ -8,7 +8,7 @@
     {
       "name": "ParallelExec",
       "type": "parallel",
-      "completionType": "and",
+      "completionType": "allOf",
       "branches": [
         {
           "name": "ShortDelayBranch",

api/src/test/resources/examples/parallel.yml

@@ -6,7 +6,7 @@ start: ParallelExec
 states:
   - name: ParallelExec
     type: parallel
-    completionType: and
+    completionType: allOf
     branches:
       - name: ShortDelayBranch
         workflowId: shortdelayworkflowid

diagram/src/test/resources/examples/parallel.json

@@ -8,7 +8,7 @@
     {
       "name": "ParallelExec",
       "type": "parallel",
-      "completionType": "and",
+      "completionType": "allOf",
       "branches": [
         {
           "name": "ShortDelayBranch",

diagram/src/test/resources/examples/parallel.yml

@@ -6,7 +6,7 @@ start: ParallelExec
 states:
   - name: ParallelExec
     type: parallel
-    completionType: and
+    completionType: allOf
     branches:
       - name: ShortDelayBranch
         workflowId: shortdelayworkflowid