Merge pull request #104 from tsurdilo/switchstatedefaultup

tsurdilo · web-flow · commit 0eb97e5a0b55 · 2021-06-26T15:16:14.000-04:00
update to switch state default condition
diff --git a/api/src/main/resources/schema/defaultcondition/defaultconditiondef.json b/api/src/main/resources/schema/defaultcondition/defaultconditiondef.json
@@ -1,7 +1,7 @@
 {
   "type": "object",
-  "javaType": "io.serverlessworkflow.api.defaultdef.DefaultDefinition",
-  "description": "Switch state default definition",
+  "javaType": "io.serverlessworkflow.api.defaultdef.DefaultConditionDefinition",
+  "description": "Switch state default condition definition",
   "properties": {
     "transition": {
       "$ref": "../transitions/transition.json",
diff --git a/api/src/main/resources/schema/states/switchstate.json b/api/src/main/resources/schema/states/switchstate.json
@@ -29,9 +29,9 @@
       "type": "string",
       "description": "If eventConditions is used, defines the time period to wait for events (ISO 8601 format)"
     },
-    "default": {
+    "defaultCondition": {
       "description": "Default transition of the workflow if there is no matching data conditions. Can include a transition or end definition",
-      "$ref": "../default/defaultdef.json"
+      "$ref": "../defaultcondition/defaultconditiondef.json"
     },
     "usedForCompensation": {
       "type": "boolean",
diff --git a/api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java b/api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java
@@ -19,7 +19,7 @@
 import io.serverlessworkflow.api.Workflow;
 import io.serverlessworkflow.api.actions.Action;
 import io.serverlessworkflow.api.datainputschema.DataInputSchema;
-import io.serverlessworkflow.api.defaultdef.DefaultDefinition;
+import io.serverlessworkflow.api.defaultdef.DefaultConditionDefinition;
 import io.serverlessworkflow.api.exectimeout.ExecTimeout;
 import io.serverlessworkflow.api.functions.FunctionDefinition;
 import io.serverlessworkflow.api.functions.FunctionRef;
@@ -196,8 +196,8 @@ public void testTransitions(String workflowLocation) {
         assertFalse(cond2.getTransition().isCompensate());
 
 
-        assertNotNull(switchState.getDefault());
-        DefaultDefinition defaultDefinition = switchState.getDefault();
+        assertNotNull(switchState.getDefaultCondition());
+        DefaultConditionDefinition defaultDefinition = switchState.getDefaultCondition();
         assertNotNull(defaultDefinition.getTransition());
         assertEquals("RejectApplication", defaultDefinition.getTransition().getNextState());
         assertNotNull(defaultDefinition.getTransition().getProduceEvents());
diff --git a/api/src/test/resources/examples/applicantrequest.json b/api/src/test/resources/examples/applicantrequest.json
@@ -24,7 +24,7 @@
           "transition": "RejectApplication"
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "RejectApplication"
       }
     },
diff --git a/api/src/test/resources/examples/applicantrequest.yml b/api/src/test/resources/examples/applicantrequest.yml
@@ -14,7 +14,7 @@ states:
         transition: StartApplication
       - condition: "${ .applicants | .age < 18 }"
         transition: RejectApplication
-    default:
+    defaultCondition:
       transition: RejectApplication
   - name: StartApplication
     type: operation
diff --git a/api/src/test/resources/examples/checkcarvitals.json b/api/src/test/resources/examples/checkcarvitals.json
@@ -41,7 +41,7 @@
           }
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "WaitTwoMinutes"
       }
     },
@@ -76,7 +76,7 @@
           }
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "CheckVitals"
       }
     }
diff --git a/api/src/test/resources/examples/checkcarvitals.yml b/api/src/test/resources/examples/checkcarvitals.yml
@@ -20,7 +20,7 @@ states:
           produceEvents:
             - eventRef: DisplayFailedChecksOnDashboard
               data: "${ .evaluations }"
-    default:
+    defaultCondition:
       transition: WaitTwoMinutes
   - name: WaitTwoMinutes
     type: event
@@ -39,7 +39,7 @@ states:
         end:
           produceEvents:
             - eventRef: VitalsCheckingStopped
-    default:
+    defaultCondition:
       transition: CheckVitals
 events:
   - name: StopVitalsCheck
diff --git a/api/src/test/resources/examples/creditcheck.json b/api/src/test/resources/examples/creditcheck.json
@@ -55,7 +55,7 @@
           "transition": "RejectApplication"
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "RejectApplication"
       }
     },
diff --git a/api/src/test/resources/examples/creditcheck.yml b/api/src/test/resources/examples/creditcheck.yml
@@ -32,7 +32,7 @@ states:
         transition: StartApplication
       - condition: ${ .creditCheck | .decision == "Denied" }
         transition: RejectApplication
-    default:
+    defaultCondition:
       transition: RejectApplication
   - name: StartApplication
     type: operation
diff --git a/api/src/test/resources/examples/eventbasedtransition.json b/api/src/test/resources/examples/eventbasedtransition.json
@@ -31,7 +31,7 @@
         }
       ],
       "eventTimeout": "PT1H",
-      "default": {
+      "defaultCondition": {
         "transition": "HandleNoVisaDecision"
       }
     },
diff --git a/api/src/test/resources/examples/eventbasedtransition.yml b/api/src/test/resources/examples/eventbasedtransition.yml
@@ -19,7 +19,7 @@ states:
       - eventRef: visaRejectedEvent
         transition: HandleRejectedVisa
     eventTimeout: PT1H
-    default:
+    defaultCondition:
       transition: HandleNoVisaDecision
   - name: HandleApprovedVisa
     type: operation
diff --git a/api/src/test/resources/examples/jobmonitoring.json b/api/src/test/resources/examples/jobmonitoring.json
@@ -102,7 +102,7 @@
           "transition": "JobFailed"
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "WaitForCompletion"
       }
     },
diff --git a/api/src/test/resources/examples/jobmonitoring.yml b/api/src/test/resources/examples/jobmonitoring.yml
@@ -58,7 +58,7 @@ states:
         transition: JobSucceeded
       - condition: ${ .jobStatus == "FAILED" }
         transition: JobFailed
-    default:
+    defaultCondition:
       transition: WaitForCompletion
   - name: JobSucceeded
     type: operation
diff --git a/api/src/test/resources/features/applicantrequest.json b/api/src/test/resources/features/applicantrequest.json
@@ -24,7 +24,7 @@
           "transition": "RejectApplication"
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "RejectApplication"
       }
     },
diff --git a/api/src/test/resources/features/applicantrequest.yml b/api/src/test/resources/features/applicantrequest.yml
@@ -14,7 +14,7 @@ states:
         transition: StartApplication
       - condition: "${ .applicants | .age < 18 }"
         transition: RejectApplication
-    default:
+    defaultCondition:
       transition: RejectApplication
   - name: StartApplication
     type: operation
diff --git a/api/src/test/resources/features/transitions.json b/api/src/test/resources/features/transitions.json
@@ -28,7 +28,7 @@
           }
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": {
           "nextState": "RejectApplication",
           "compensate": true
diff --git a/api/src/test/resources/features/transitions.yml b/api/src/test/resources/features/transitions.yml
@@ -17,7 +17,7 @@ states:
           produceEvents:
             - eventRef: provisioningCompleteEvent
               data: "${ .provisionedOrders }"
-    default:
+    defaultCondition:
       transition:
         nextState: RejectApplication
         compensate: true
diff --git a/diagram/src/main/java/io/serverlessworkflow/diagram/model/WorkflowDiagramModel.java b/diagram/src/main/java/io/serverlessworkflow/diagram/model/WorkflowDiagramModel.java
@@ -191,25 +191,25 @@ private void inspectStatesConnections(Workflow workflow) {
                 }
 
                 // default
-                if (switchState.getDefault() != null) {
-                    if (switchState.getDefault().getTransition() != null) {
-                        if (switchState.getDefault().getTransition().getProduceEvents() != null && switchState.getDefault().getTransition().getProduceEvents().size() > 0) {
-                            List<String> producedEvents = switchState.getDefault().getTransition().getProduceEvents().stream()
+                if (switchState.getDefaultCondition() != null) {
+                    if (switchState.getDefaultCondition().getTransition() != null) {
+                        if (switchState.getDefaultCondition().getTransition().getProduceEvents() != null && switchState.getDefaultCondition().getTransition().getProduceEvents().size() > 0) {
+                            List<String> producedEvents = switchState.getDefaultCondition().getTransition().getProduceEvents().stream()
                                     .map(t -> t.getEventRef())
                                     .collect(Collectors.toList());
 
                             String desc = "default - ";
                             desc += " Produced Events: " + producedEvents.stream().collect(Collectors.joining(","));
-                            modelConnections.add(new ModelConnection(switchState.getName(), switchState.getDefault().getTransition().getNextState(), desc));
+                            modelConnections.add(new ModelConnection(switchState.getName(), switchState.getDefaultCondition().getTransition().getNextState(), desc));
                         } else {
                             String desc = "default";
-                            modelConnections.add(new ModelConnection(switchState.getName(), switchState.getDefault().getTransition().getNextState(), desc));
+                            modelConnections.add(new ModelConnection(switchState.getName(), switchState.getDefaultCondition().getTransition().getNextState(), desc));
                         }
                     }
 
-                    if (switchState.getDefault().getEnd() != null) {
-                        if (switchState.getDefault().getEnd().getProduceEvents() != null && switchState.getDefault().getEnd().getProduceEvents().size() > 0) {
-                            List<String> producedEvents = switchState.getDefault().getEnd().getProduceEvents().stream()
+                    if (switchState.getDefaultCondition().getEnd() != null) {
+                        if (switchState.getDefaultCondition().getEnd().getProduceEvents() != null && switchState.getDefaultCondition().getEnd().getProduceEvents().size() > 0) {
+                            List<String> producedEvents = switchState.getDefaultCondition().getEnd().getProduceEvents().stream()
                                     .map(t -> t.getEventRef())
                                     .collect(Collectors.toList());
 
@@ -292,12 +292,12 @@ private void inspectStatesInfo(Workflow workflow) {
                     modelState.addInfo("Num. of conditions: " + switchState.getEventConditions().size());
                 }
 
-                if (switchState.getDefault() != null) {
-                    if (switchState.getDefault().getTransition() != null) {
-                        modelState.addInfo("Default to: " + switchState.getDefault().getTransition().getNextState());
+                if (switchState.getDefaultCondition() != null) {
+                    if (switchState.getDefaultCondition().getTransition() != null) {
+                        modelState.addInfo("Default to: " + switchState.getDefaultCondition().getTransition().getNextState());
                     }
 
-                    if (switchState.getDefault().getEnd() != null) {
+                    if (switchState.getDefaultCondition().getEnd() != null) {
                         modelState.addInfo("Default to: End");
                     }
                 }
diff --git a/diagram/src/test/resources/examples/applicantrequest.json b/diagram/src/test/resources/examples/applicantrequest.json
@@ -24,7 +24,7 @@
           "transition": "RejectApplication"
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "RejectApplication"
       }
     },
diff --git a/diagram/src/test/resources/examples/applicantrequest.yml b/diagram/src/test/resources/examples/applicantrequest.yml
@@ -14,7 +14,7 @@ states:
         transition: StartApplication
       - condition: "${ .applicants | .age < 18 }"
         transition: RejectApplication
-    default:
+    defaultCondition:
       transition: RejectApplication
   - name: StartApplication
     type: operation
diff --git a/diagram/src/test/resources/examples/checkcarvitals.json b/diagram/src/test/resources/examples/checkcarvitals.json
@@ -41,7 +41,7 @@
           }
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "WaitTwoMinutes"
       }
     },
@@ -76,7 +76,7 @@
           }
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "CheckVitals"
       }
     }
diff --git a/diagram/src/test/resources/examples/checkcarvitals.yml b/diagram/src/test/resources/examples/checkcarvitals.yml
@@ -20,7 +20,7 @@ states:
           produceEvents:
             - eventRef: DisplayFailedChecksOnDashboard
               data: "${ .evaluations }"
-    default:
+    defaultCondition:
       transition: WaitTwoMinutes
   - name: WaitTwoMinutes
     type: event
@@ -39,7 +39,7 @@ states:
         end:
           produceEvents:
             - eventRef: VitalsCheckingStopped
-    default:
+    defaultCondition:
       transition: CheckVitals
 events:
   - name: StopVitalsCheck
diff --git a/diagram/src/test/resources/examples/creditcheck.json b/diagram/src/test/resources/examples/creditcheck.json
@@ -55,7 +55,7 @@
           "transition": "RejectApplication"
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "RejectApplication"
       }
     },
diff --git a/diagram/src/test/resources/examples/creditcheck.yml b/diagram/src/test/resources/examples/creditcheck.yml
@@ -32,7 +32,7 @@ states:
         transition: StartApplication
       - condition: ${ .creditCheck | .decision == "Denied" }
         transition: RejectApplication
-    default:
+    defaultCondition:
       transition: RejectApplication
   - name: StartApplication
     type: operation
diff --git a/diagram/src/test/resources/examples/eventbasedtransition.json b/diagram/src/test/resources/examples/eventbasedtransition.json
@@ -31,7 +31,7 @@
         }
       ],
       "eventTimeout": "PT1H",
-      "default": {
+      "defaultCondition": {
         "transition": "HandleNoVisaDecision"
       }
     },
diff --git a/diagram/src/test/resources/examples/eventbasedtransition.yml b/diagram/src/test/resources/examples/eventbasedtransition.yml
@@ -19,7 +19,7 @@ states:
       - eventRef: visaRejectedEvent
         transition: HandleRejectedVisa
     eventTimeout: PT1H
-    default:
+    defaultCondition:
       transition: HandleNoVisaDecision
   - name: HandleApprovedVisa
     type: operation
diff --git a/diagram/src/test/resources/examples/jobmonitoring.json b/diagram/src/test/resources/examples/jobmonitoring.json
@@ -102,7 +102,7 @@
           "transition": "JobFailed"
         }
       ],
-      "default": {
+      "defaultCondition": {
         "transition": "WaitForCompletion"
       }
     },
diff --git a/diagram/src/test/resources/examples/jobmonitoring.yml b/diagram/src/test/resources/examples/jobmonitoring.yml
@@ -58,7 +58,7 @@ states:
         transition: JobSucceeded
       - condition: ${ .jobStatus == "FAILED" }
         transition: JobFailed
-    default:
+    defaultCondition:
       transition: WaitForCompletion
   - name: JobSucceeded
     type: operation
diff --git a/validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java b/validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java
@@ -270,7 +270,7 @@ public List<ValidationError> validate() {
                                     ValidationError.WORKFLOW_VALIDATION);
                         }
 
-                        if (switchState.getDefault() == null) {
+                        if (switchState.getDefaultCondition() == null) {
                             addValidationError("Switch state should define a default transition",
                                     ValidationError.WORKFLOW_VALIDATION);
                         }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"transition": "RejectApplication"`
`25`	`25`	`}`
`26`	`26`	`],`
`27`		`- "default": {`
	`27`	`+ "defaultCondition": {`
`28`	`28`	`"transition": "RejectApplication"`
`29`	`29`	`}`
`30`	`30`	`},`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`],`
`44`		`- "default": {`
	`44`	`+ "defaultCondition": {`
`45`	`45`	`"transition": "WaitTwoMinutes"`
`46`	`46`	`}`
`47`	`47`	`},`
`@@ -76,7 +76,7 @@`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`],`
`79`		`- "default": {`
	`79`	`+ "defaultCondition": {`
`80`	`80`	`"transition": "CheckVitals"`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`"transition": "RejectApplication"`
`56`	`56`	`}`
`57`	`57`	`],`
`58`		`- "default": {`
	`58`	`+ "defaultCondition": {`
`59`	`59`	`"transition": "RejectApplication"`
`60`	`60`	`}`
`61`	`61`	`},`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`}`
`32`	`32`	`],`
`33`	`33`	`"eventTimeout": "PT1H",`
`34`		`- "default": {`
	`34`	`+ "defaultCondition": {`
`35`	`35`	`"transition": "HandleNoVisaDecision"`
`36`	`36`	`}`
`37`	`37`	`},`