Merge pull request #57 from tsurdilo/addjq

add jq and expressionLang param

Author: Tihomir Surdilovic

README.md

@@ -122,11 +122,11 @@ states:
   - functionRef:
       refName: greetingFunction
       arguments:
-        name: "$.greet.name"
+        name: ".greet.name"
     actionDataFilter:
-      dataResultsPath: "$.payload.greeting"
+      dataResultsPath: ".payload.greeting"
   stateDataFilter:
-    dataOutputPath: "$.greeting"
+    dataOutputPath: ".greeting"
   end: true
 ```
 

api/src/main/java/io/serverlessworkflow/api/serializers/WorkflowSerializer.java

@@ -75,6 +75,11 @@ public void serialize(Workflow workflow,
                     workflow.getSchemaVersion());
         }
 
+        if (workflow.getExtensions() != null && !workflow.getExpressionLang().isEmpty()) {
+            gen.writeStringField("expressionLang",
+                    workflow.getExpressionLang());
+        }
+
         if (workflow.getExecTimeout() != null) {
             gen.writeObjectField("execTimeout", workflow.getExecTimeout());
         }

api/src/main/resources/schema/workflow.json

@@ -31,6 +31,12 @@
       "type": "string",
       "description": "Serverless Workflow schema version"
     },
+    "expressionLang": {
+      "type": "string",
+      "description": "Identifies the expression language used for workflow expressions. Default is 'jq'",
+      "default": "jq",
+      "minLength": 1
+    },
     "execTimeout": {
       "description": "Workflow execution timeout",
       "$ref": "exectimeout/exectimeout.json"

api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java

@@ -34,7 +34,6 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 import java.util.List;
-import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -240,7 +239,7 @@ public void testFunctionRefs(String workflowLocation) {
         FunctionRef functionRef2 = action2.getFunctionRef();
         assertEquals("sendRejectionEmailFunction", functionRef2.getRefName());
         assertEquals(1, functionRef2.getArguments().size());
-        assertEquals("{{ $.customer }}", functionRef2.getArguments().get("applicant").asText());
+        assertEquals("${ .customer }", functionRef2.getArguments().get("applicant").asText());
     }
 
     @ParameterizedTest
@@ -387,4 +386,18 @@ public void testSimplifiedCron(String workflowLocation) {
 
         assertEquals("0 0/15 * * * ?", operationState.getStart().getSchedule().getCron().getExpression());
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"/features/expressionlang.json", "/features/expressionlang.yml"})
+    public void testExpressionLang(String workflowLocation) {
+        Workflow workflow = Workflow.fromSource(WorkflowTestUtils.readWorkflowFile(workflowLocation));
+
+        assertNotNull(workflow);
+        assertNotNull(workflow.getId());
+        assertNotNull(workflow.getName());
+        assertNotNull(workflow.getStates());
+
+        assertNotNull(workflow.getExpressionLang());
+        assertEquals("abc", workflow.getExpressionLang());
+    }
 }

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

@@ -16,11 +16,11 @@
       "start": true,
       "dataConditions": [
         {
-          "condition": "{{ $.applicants[?(@.age >= 18)] }}",
+          "condition": "${ .applicants[?(@.age >= 18)] }",
           "transition": "StartApplication"
         },
         {
-          "condition": "{{ $.applicants[?(@.age < 18)] }}",
+          "condition": "${ .applicants[?(@.age < 18)] }",
           "transition": "RejectApplication"
         }
       ],
@@ -43,7 +43,7 @@
           "functionRef": {
             "refName": "sendRejectionEmailFunction",
             "arguments": {
-              "applicant": "{{ $.applicant }}"
+              "applicant": "${ .applicant }"
             }
           }
         }

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

@@ -11,9 +11,9 @@ states:
     type: switch
     start: true
     dataConditions:
-      - condition: "{{ $.applicants[?(@.age >= 18)] }}"
+      - condition: "${ .applicants[?(@.age >= 18)] }"
         transition: StartApplication
-      - condition: "{{ $.applicants[?(@.age < 18)] }}"
+      - condition: "${ .applicants[?(@.age < 18)] }"
         transition: RejectApplication
     default:
       transition: RejectApplication
@@ -28,5 +28,5 @@ states:
       - functionRef:
           refName: sendRejectionEmailFunction
           arguments:
-            applicant: "{{ $.applicant }}"
+            applicant: "${ .applicant }"
     end: true

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

@@ -31,7 +31,7 @@
             "functionRef": {
               "refName": "StoreBidFunction",
               "arguments": {
-                "bid": "{{ $.bid }}"
+                "bid": "${ .bid }"
               }
             }
           }]

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

@@ -23,6 +23,6 @@ states:
           - functionRef:
               refName: StoreBidFunction
               arguments:
-                bid: "{{ $.bid }}"
+                bid: "${ .bid }"
     end:
       terminate: true

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

@@ -34,7 +34,7 @@
         "functionRef": {
           "refName": "callCreditCheckMicroservice",
           "arguments": {
-            "customer": "{{ $.customer }}"
+            "customer": "${ .customer }"
           }
         }
       },
@@ -48,12 +48,12 @@
       "dataConditions": [
         {
           "name": "Approved",
-          "condition": "{{ $.creditCheck[?(@.decision == 'Approved')] }}",
+          "condition": "${ .creditCheck[?(@.decision == 'Approved')] }",
           "transition": "StartApplication"
         },
         {
           "name": "Denied",
-          "condition": "{{ $.creditCheck[?(@.decision == 'Denied')] }}",
+          "condition": "${ .creditCheck[?(@.decision == 'Denied')] }",
           "transition": "RejectApplication"
         }
       ],
@@ -76,7 +76,7 @@
           "functionRef": {
             "refName": "sendRejectionEmailFunction",
             "arguments": {
-              "applicant": "{{ $.customer }}"
+              "applicant": "${ .customer }"
             }
           }
         }

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

@@ -22,18 +22,18 @@ states:
       functionRef:
         refName: callCreditCheckMicroservice
         arguments:
-          customer: "{{ $.customer }}"
+          customer: "${ .customer }"
     eventRef: CreditCheckCompletedEvent
     timeout: PT15M
     transition: EvaluateDecision
   - name: EvaluateDecision
     type: switch
     dataConditions:
       - name: Approved
-        condition: "{{ $.creditCheck[?(@.decision == 'Approved')] }}"
+        condition: "${ .creditCheck[?(@.decision == 'Approved')] }"
         transition: StartApplication
       - name: Denied
-        condition: "{{ $.creditCheck[?(@.decision == 'Denied')] }}"
+        condition: "${ .creditCheck[?(@.decision == 'Denied')] }"
         transition: RejectApplication
     default:
       transition: RejectApplication
@@ -48,5 +48,5 @@ states:
       - functionRef:
           refName: sendRejectionEmailFunction
           arguments:
-            applicant: "{{ $.customer }}"
+            applicant: "${ .customer }"
     end: true