Update to spec - switch state data conditions

Tihomir Surdilovic · Tihomir Surdilovic · commit 383dcc2e882b · 2020-07-26T17:11:04.000-04:00
Signed-off-by: Tihomir Surdilovic &lt;tsurdilo@redhat.com&gt;
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/DataConditionOperatorDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/DataConditionOperatorDeserializer.java
diff --git a/api/src/main/java/io/serverlessworkflow/api/mapper/WorkflowModule.java b/api/src/main/java/io/serverlessworkflow/api/mapper/WorkflowModule.java
@@ -76,8 +76,6 @@ private void addDefaultDeserializers() {
                 new OperationStateActionModeDeserializer(workflowPropertySource));
         addDeserializer(DefaultState.Type.class,
                 new DefaultStateTypeDeserializer(workflowPropertySource));
-        addDeserializer(DataCondition.Operator.class,
-                new DataConditionOperatorDeserializer(workflowPropertySource));
         addDeserializer(EventDefinition.Kind.class, new EventDefinitionKindDeserializer(workflowPropertySource));
         addDeserializer(ParallelState.CompletionType.class, new ParallelStateCompletionTypeDeserializer(workflowPropertySource));
         addDeserializer(Schedule.DirectInvoke.class, new ScheduleDirectInvokeDeserializer(workflowPropertySource));
diff --git a/api/src/main/resources/schema/switchconditions/datacondition.json b/api/src/main/resources/schema/switchconditions/datacondition.json
@@ -6,42 +6,17 @@
   ],
   "description": "Switch state data based condition",
   "properties": {
-    "path": {
+    "condition": {
       "type": "string",
-      "description": "JSONPath expression that selects elements of state data"
-    },
-    "value": {
-      "type": "string",
-      "description": "Matching value"
-    },
-    "operator": {
-      "type": "string",
-      "enum": [
-        "exists",
-        "notexists",
-        "null",
-        "notnull",
-        "equals",
-        "notequals",
-        "lessthan",
-        "lessthanorequals",
-        "greaterthan",
-        "greaterthanorequals",
-        "matches",
-        "notmatches",
-        "custom"
-      ],
-      "description": "Condition operator"
+      "description": "JsonPath expression evaluated against state data. True if results are not empty"
     },
     "transition": {
       "$ref": "../transitions/transition.json",
       "description": "Next transition of the workflow if there is valid matches"
     }
   },
   "required": [
-    "path",
-    "value",
-    "operator",
+    "condition",
     "transition"
   ]
 }
diff --git a/api/src/test/resources/examples/applicantrequest.json b/api/src/test/resources/examples/applicantrequest.json
@@ -18,17 +18,13 @@
       },
       "dataConditions": [
         {
-          "path": "$.applicant.age",
-          "value": "18",
-          "operator": "greaterthanorequals",
+          "condition": "{{ $.applicants[?(@.age >= 18)] }}",
           "transition": {
             "nextState": "StartApplication"
           }
         },
         {
-          "path": "$.applicant.age",
-          "value": "18",
-          "operator": "lessthan",
+          "condition": "{{ $.applicants[?(@.age < 18)] }}",
           "transition": {
             "nextState": "RejectApplication"
           }
diff --git a/api/src/test/resources/examples/applicantrequest.yml b/api/src/test/resources/examples/applicantrequest.yml
@@ -12,14 +12,10 @@ states:
     start:
       kind: default
     dataConditions:
-      - path: "$.applicant.age"
-        value: '18'
-        operator: greaterthanorequals
+      - condition: "{{ $.applicants[?(@.age >= 18)] }}"
         transition:
           nextState: StartApplication
-      - path: "$.applicant.age"
-        value: '18'
-        operator: lessthan
+      - condition: "{{ $.applicants[?(@.age < 18)] }}"
         transition:
           nextState: RejectApplication
     default:
diff --git a/api/src/test/resources/examples/creditcheck.json b/api/src/test/resources/examples/creditcheck.json
@@ -52,17 +52,13 @@
       "type": "switch",
       "dataConditions": [
         {
-          "path": "$.creditCheck.decision",
-          "value": "Approved",
-          "operator": "equals",
+          "condition": "{{ $.creditCheck[?(@.decision == 'Approved')] }}",
           "transition": {
             "nextState": "StartApplication"
           }
         },
         {
-          "path": "$.creditCheck.decision",
-          "value": "Denied",
-          "operator": "equals",
+          "condition": "{{ $.creditCheck[?(@.decision == 'Denied')] }}",
           "transition": {
             "nextState": "RejectApplication"
           }
diff --git a/api/src/test/resources/examples/creditcheck.yml b/api/src/test/resources/examples/creditcheck.yml
@@ -32,14 +32,10 @@ states:
   - name: EvaluateDecision
     type: switch
     dataConditions:
-      - path: "$.creditCheck.decision"
-        value: Approved
-        operator: equals
+      - condition: "{{ $.creditCheck[?(@.decision == 'Approved')] }}"
         transition:
           nextState: StartApplication
-      - path: "$.creditCheck.decision"
-        value: Denied
-        operator: equals
+      - condition: "{{ $.creditCheck[?(@.decision == 'Denied')] }}"
         transition:
           nextState: RejectApplication
     default:
diff --git a/api/src/test/resources/examples/jobmonitoring.json b/api/src/test/resources/examples/jobmonitoring.json
@@ -86,17 +86,13 @@
       "type":"switch",
       "dataConditions": [
         {
-          "path": "$.jobstatus",
-          "value": "SUCCEEDED",
-          "operator": "equals",
+          "condition": "{{ $[?(@.jobstatus == 'SUCCEEDED')] }}",
           "transition": {
             "nextState": "JobSucceeded"
           }
         },
         {
-          "path": "$.jobstatus",
-          "value": "FAILED",
-          "operator": "equals",
+          "condition": "{{ $[?(@.jobstatus == 'FAILED')] }}",
           "transition": {
             "nextState": "JobFailed"
           }
diff --git a/api/src/test/resources/examples/jobmonitoring.yml b/api/src/test/resources/examples/jobmonitoring.yml
@@ -51,14 +51,10 @@ states:
   - name: DetermineCompletion
     type: switch
     dataConditions:
-      - path: "$.jobstatus"
-        value: SUCCEEDED
-        operator: equals
+      - condition: "{{ $[?(@.jobstatus == 'SUCCEEDED')] }}"
         transition:
           nextState: JobSucceeded
-      - path: "$.jobstatus"
-        value: FAILED
-        operator: equals
+      - condition: "{{ $[?(@.jobstatus == 'FAILED')] }}"
         transition:
           nextState: JobFailed
     default:

Original file line number	Diff line number	Diff line change
`@@ -18,17 +18,13 @@`
`18`	`18`	`},`
`19`	`19`	`"dataConditions": [`
`20`	`20`	`{`
`21`		`- "path": "$.applicant.age",`
`22`		`- "value": "18",`
`23`		`- "operator": "greaterthanorequals",`
	`21`	`+ "condition": "{{ $.applicants[?(@.age >= 18)] }}",`
`24`	`22`	`"transition": {`
`25`	`23`	`"nextState": "StartApplication"`
`26`	`24`	`}`
`27`	`25`	`},`
`28`	`26`	`{`
`29`		`- "path": "$.applicant.age",`
`30`		`- "value": "18",`
`31`		`- "operator": "lessthan",`
	`27`	`+ "condition": "{{ $.applicants[?(@.age < 18)] }}",`
`32`	`28`	`"transition": {`
`33`	`29`	`"nextState": "RejectApplication"`
`34`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,17 +52,13 @@`
`52`	`52`	`"type": "switch",`
`53`	`53`	`"dataConditions": [`
`54`	`54`	`{`
`55`		`- "path": "$.creditCheck.decision",`
`56`		`- "value": "Approved",`
`57`		`- "operator": "equals",`
	`55`	`+ "condition": "{{ $.creditCheck[?(@.decision == 'Approved')] }}",`
`58`	`56`	`"transition": {`
`59`	`57`	`"nextState": "StartApplication"`
`60`	`58`	`}`
`61`	`59`	`},`
`62`	`60`	`{`
`63`		`- "path": "$.creditCheck.decision",`
`64`		`- "value": "Denied",`
`65`		`- "operator": "equals",`
	`61`	`+ "condition": "{{ $.creditCheck[?(@.decision == 'Denied')] }}",`
`66`	`62`	`"transition": {`
`67`	`63`	`"nextState": "RejectApplication"`
`68`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,17 +86,13 @@`
`86`	`86`	`"type":"switch",`
`87`	`87`	`"dataConditions": [`
`88`	`88`	`{`
`89`		`- "path": "$.jobstatus",`
`90`		`- "value": "SUCCEEDED",`
`91`		`- "operator": "equals",`
	`89`	`+ "condition": "{{ $[?(@.jobstatus == 'SUCCEEDED')] }}",`
`92`	`90`	`"transition": {`
`93`	`91`	`"nextState": "JobSucceeded"`
`94`	`92`	`}`
`95`	`93`	`},`
`96`	`94`	`{`
`97`		`- "path": "$.jobstatus",`
`98`		`- "value": "FAILED",`
`99`		`- "operator": "equals",`
	`95`	`+ "condition": "{{ $[?(@.jobstatus == 'FAILED')] }}",`
`100`	`96`	`"transition": {`
`101`	`97`	`"nextState": "JobFailed"`
`102`	`98`	`}`