Update to switch state conditions and default param

Tihomir Surdilovic · Tihomir Surdilovic · commit 729c93744796 · 2020-09-15T16:26:53.000-04:00
Signed-off-by: Tihomir Surdilovic &lt;tsurdilo@redhat.com&gt;
diff --git a/api/src/main/resources/schema/default/defaultdef.json b/api/src/main/resources/schema/default/defaultdef.json
@@ -0,0 +1,27 @@
+{
+  "type": "object",
+  "javaType": "io.serverlessworkflow.api.defaultdef.DefaultDefinition",
+  "description": "Switch state default definition",
+  "properties": {
+    "transition": {
+      "$ref": "../transitions/transition.json",
+      "description": "Next transition of the workflow if there is valid matches"
+    },
+    "end": {
+      "$ref": "../end/end.json",
+      "description": "Explicit transition to end"
+    }
+  },
+  "oneOf": [
+    {
+      "required": [
+        "transition"
+      ]
+    },
+    {
+      "required": [
+        "end"
+      ]
+    }
+  ]
+}
diff --git a/api/src/main/resources/schema/states/switchstate.json b/api/src/main/resources/schema/states/switchstate.json
@@ -30,7 +30,7 @@
       "description": "If eventConditions is used, defines the time period to wait for events (ISO 8601 format)"
     },
     "default": {
-      "$ref": "../transitions/transition.json"
+      "$ref": "../default/defaultdef.json"
     }
   },
   "required": [
diff --git a/api/src/main/resources/schema/switchconditions/datacondition.json b/api/src/main/resources/schema/switchconditions/datacondition.json
@@ -13,6 +13,10 @@
     "transition": {
       "$ref": "../transitions/transition.json",
       "description": "Next transition of the workflow if there is valid matches"
+    },
+    "end": {
+      "$ref": "../end/end.json",
+      "description": "Explicit transition to end"
     }
   },
   "required": [
diff --git a/api/src/main/resources/schema/switchconditions/eventcondition.json b/api/src/main/resources/schema/switchconditions/eventcondition.json
@@ -15,6 +15,10 @@
     "transition": {
       "$ref": "../transitions/transition.json",
       "description": "Next transition of the workflow if there is valid matches"
+    },
+    "end": {
+      "$ref": "../end/end.json",
+      "description": "Explicit transition to end"
     }
   },
   "required": [
diff --git a/api/src/test/resources/examples/applicantrequest.json b/api/src/test/resources/examples/applicantrequest.json
@@ -31,7 +31,9 @@
         }
       ],
       "default": {
-        "nextState": "RejectApplication"
+        "transition": {
+          "nextState": "RejectApplication"
+        }
       }
     },
     {
diff --git a/api/src/test/resources/examples/applicantrequest.yml b/api/src/test/resources/examples/applicantrequest.yml
@@ -1,3 +1,4 @@
+---
 id: applicantrequest
 version: '1.0'
 name: Applicant Request Decision Workflow
@@ -18,7 +19,8 @@ states:
         transition:
           nextState: RejectApplication
     default:
-      nextState: RejectApplication
+      transition:
+        nextState: RejectApplication
   - name: StartApplication
     type: subflow
     workflowId: startApplicationWorkflowId
@@ -33,4 +35,4 @@ states:
           parameters:
             applicant: "{{ $.applicant }}"
     end:
-      kind: default
+      kind: default
diff --git a/api/src/test/resources/examples/creditcheck.json b/api/src/test/resources/examples/creditcheck.json
@@ -65,7 +65,9 @@
         }
       ],
       "default": {
-        "nextState": "RejectApplication"
+        "transition": {
+          "nextState": "RejectApplication"
+        }
       }
     },
     {
diff --git a/api/src/test/resources/examples/creditcheck.yml b/api/src/test/resources/examples/creditcheck.yml
@@ -1,3 +1,4 @@
+---
 id: customercreditcheck
 version: '1.0'
 name: Customer Credit Check Workflow
@@ -38,7 +39,8 @@ states:
         transition:
           nextState: RejectApplication
     default:
-      nextState: RejectApplication
+      transition:
+        nextState: RejectApplication
   - name: StartApplication
     type: subflow
     workflowId: startApplicationWorkflowId
@@ -53,4 +55,4 @@ states:
           parameters:
             applicant: "{{ $.customer }}"
     end:
-      kind: default
+      kind: default
diff --git a/api/src/test/resources/examples/eventbasedtransition.json b/api/src/test/resources/examples/eventbasedtransition.json
@@ -38,7 +38,9 @@
       ],
       "eventTimeout": "PT1H",
       "default": {
-        "nextState": "HandleNoVisaDecision"
+        "transition": {
+          "nextState": "HandleNoVisaDecision"
+        }
       }
     },
     {
diff --git a/api/src/test/resources/examples/eventbasedtransition.yml b/api/src/test/resources/examples/eventbasedtransition.yml
@@ -1,3 +1,4 @@
+---
 id: eventbasedswitch
 version: '1.0'
 name: Event Based Switch Transitions
@@ -23,7 +24,8 @@ states:
           nextState: HandleRejectedVisa
     eventTimeout: PT1H
     default:
-      nextState: HandleNoVisaDecision
+      transition:
+        nextState: HandleNoVisaDecision
   - name: HandleApprovedVisa
     type: subflow
     workflowId: handleApprovedVisaWorkflowID
@@ -38,4 +40,4 @@ states:
     type: subflow
     workflowId: handleNoVisaDecisionWorkfowId
     end:
-      kind: default
+      kind: default
diff --git a/api/src/test/resources/examples/jobmonitoring.json b/api/src/test/resources/examples/jobmonitoring.json
@@ -118,7 +118,9 @@
         }
       ],
       "default": {
-        "nextState": "WaitForCompletion"
+        "transition": {
+          "nextState": "WaitForCompletion"
+        }
       }
     },
     {
diff --git a/api/src/test/resources/examples/jobmonitoring.yml b/api/src/test/resources/examples/jobmonitoring.yml
@@ -1,3 +1,4 @@
+---
 id: jobmonitoring
 version: '1.0'
 name: Job Monitoring
@@ -68,7 +69,8 @@ states:
         transition:
           nextState: JobFailed
     default:
-      nextState: WaitForCompletion
+      transition:
+        nextState: WaitForCompletion
   - name: JobSucceeded
     type: operation
     actionMode: sequential
@@ -88,4 +90,4 @@ states:
           parameters:
             name: "{{ $.jobuid }}"
     end:
-      kind: default
+      kind: default

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`"description": "If eventConditions is used, defines the time period to wait for events (ISO 8601 format)"`
`31`	`31`	`},`
`32`	`32`	`"default": {`
`33`		`- "$ref": "../transitions/transition.json"`
	`33`	`+ "$ref": "../default/defaultdef.json"`
`34`	`34`	`}`
`35`	`35`	`},`
`36`	`36`	`"required": [`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,9 @@`
`31`	`31`	`}`
`32`	`32`	`],`
`33`	`33`	`"default": {`
`34`		`- "nextState": "RejectApplication"`
	`34`	`+ "transition": {`
	`35`	`+ "nextState": "RejectApplication"`
	`36`	`+ }`
`35`	`37`	`}`
`36`	`38`	`},`
`37`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,9 @@`
`65`	`65`	`}`
`66`	`66`	`],`
`67`	`67`	`"default": {`
`68`		`- "nextState": "RejectApplication"`
	`68`	`+ "transition": {`
	`69`	`+ "nextState": "RejectApplication"`
	`70`	`+ }`
`69`	`71`	`}`
`70`	`72`	`},`
`71`	`73`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,9 @@`
`38`	`38`	`],`
`39`	`39`	`"eventTimeout": "PT1H",`
`40`	`40`	`"default": {`
`41`		`- "nextState": "HandleNoVisaDecision"`
	`41`	`+ "transition": {`
	`42`	`+ "nextState": "HandleNoVisaDecision"`
	`43`	`+ }`
`42`	`44`	`}`
`43`	`45`	`},`
`44`	`46`	`{`