Merge pull request #52 from tsurdilo/functionrefparams

Tihomir Surdilovic · web-flow · commit de787cddfbf7 · 2021-02-23T10:21:15.000-05:00
update functionref params to jsonnode
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/FunctionRefDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/FunctionRefDeserializer.java
@@ -28,7 +28,6 @@
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Map;
 
 public class FunctionRefDeserializer extends StdDeserializer<FunctionRef> {
 
@@ -61,11 +60,12 @@ public FunctionRef deserialize(JsonParser jp,
 
         if (!node.isObject()) {
             functionRef.setRefName(node.asText());
-            functionRef.setParameters(new HashMap<>());
+            ObjectMapper objectMapper = new ObjectMapper();
+            functionRef.setParameters(null);
             return functionRef;
         } else {
             if(node.get("parameters") != null) {
-                functionRef.setParameters(mapper.treeToValue(node.get("parameters"), Map.class));
+                functionRef.setParameters(mapper.treeToValue(node.get("parameters"), JsonNode.class));
             }
 
             if(node.get("refName") != null) {
diff --git a/api/src/main/java/io/serverlessworkflow/api/serializers/FunctionRefSerializer.java b/api/src/main/java/io/serverlessworkflow/api/serializers/FunctionRefSerializer.java
@@ -54,7 +54,6 @@ public void serialize(FunctionRef functionRef,
                     gen.writeObjectField("parameters", functionRef.getParameters());
                 }
 
-
                 gen.writeEndObject();
             }
         }
diff --git a/api/src/main/resources/schema/functions/functionref.json b/api/src/main/resources/schema/functions/functionref.json
@@ -10,7 +10,7 @@
     "parameters": {
       "type": "object",
       "description": "Function parameters",
-      "existingJavaType": "java.util.Map<String, String>"
+      "existingJavaType": "com.fasterxml.jackson.databind.JsonNode"
     }
   },
   "required": [
diff --git a/api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java b/api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java
@@ -16,6 +16,7 @@
  */
 package io.serverlessworkflow.api.test;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.serverlessworkflow.api.Workflow;
 import io.serverlessworkflow.api.actions.Action;
 import io.serverlessworkflow.api.defaultdef.DefaultDefinition;
@@ -33,6 +34,7 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -230,15 +232,15 @@ public void testFunctionRefs(String workflowLocation) {
         assertNotNull(action1.getFunctionRef());
         FunctionRef functionRef1 = action1.getFunctionRef();
         assertEquals("creditCheckFunction", functionRef1.getRefName());
-        assertEquals(0, functionRef1.getParameters().size());
+        assertNull(functionRef1.getParameters());
 
         Action action2 = operationState.getActions().get(1);
         assertNotNull(action2);
         assertNotNull(action2.getFunctionRef());
         FunctionRef functionRef2 = action2.getFunctionRef();
         assertEquals("sendRejectionEmailFunction", functionRef2.getRefName());
         assertEquals(1, functionRef2.getParameters().size());
-        assertEquals("{{ $.customer }}", functionRef2.getParameters().get("applicant"));
+        assertEquals("{{ $.customer }}", functionRef2.getParameters().get("applicant").asText());
     }
 
     @ParameterizedTest
@@ -283,4 +285,64 @@ public void testSubflowStateRepeat(String workflowLocation) {
         assertEquals(1, subflowState.getRepeat().getStopOnEvents().size());
         assertEquals("CarTurnedOffEvent", subflowState.getRepeat().getStopOnEvents().get(0));
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"/features/functionrefjsonparams.json", "/features/functionrefjsonparams.yml"})
+    public void testFunctionRefJsonParams(String workflowLocation) {
+        Workflow workflow = Workflow.fromSource(WorkflowTestUtils.readWorkflowFile(workflowLocation));
+
+        assertNotNull(workflow);
+        assertNotNull(workflow.getId());
+        assertNotNull(workflow.getName());
+        assertNotNull(workflow.getStates());
+
+        assertNotNull(workflow.getStates());
+        assertTrue(workflow.getStates().size() == 1);
+        assertTrue(workflow.getStates().get(0) instanceof OperationState);
+
+        OperationState operationState = (OperationState) workflow.getStates().get(0);
+        assertNotNull(operationState.getActions());
+        assertEquals(1, operationState.getActions().size());
+        List<Action> actions = operationState.getActions();
+        assertNotNull(actions.get(0).getFunctionRef());
+        assertEquals("addPet", actions.get(0).getFunctionRef().getRefName());
+
+        JsonNode params = actions.get(0).getFunctionRef().getParameters();
+        assertNotNull(params);
+        assertEquals(4, params.size());
+        assertEquals(123, params.get("id").intValue());
+        assertEquals("My Address, 123 MyCity, MyCountry", params.get("address").asText());
+        assertEquals("${ .owner.name }", params.get("owner").asText());
+        assertEquals("Pluto", params.get("body").get("name").asText());
+        assertEquals("${ .pet.tagnumber }", params.get("body").get("tag").asText());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"/features/functionrefnoparams.json", "/features/functionrefnoparams.yml"})
+    public void testFunctionRefNoParams(String workflowLocation) {
+        Workflow workflow = Workflow.fromSource(WorkflowTestUtils.readWorkflowFile(workflowLocation));
+
+        assertNotNull(workflow);
+        assertNotNull(workflow.getId());
+        assertNotNull(workflow.getName());
+        assertNotNull(workflow.getStates());
+
+        assertNotNull(workflow.getStates());
+        assertTrue(workflow.getStates().size() == 1);
+        assertTrue(workflow.getStates().get(0) instanceof OperationState);
+
+        OperationState operationState = (OperationState) workflow.getStates().get(0);
+        assertNotNull(operationState.getActions());
+        assertEquals(2, operationState.getActions().size());
+        List<Action> actions = operationState.getActions();
+        assertNotNull(actions.get(0).getFunctionRef());
+        assertNotNull(actions.get(1).getFunctionRef());
+        assertEquals("addPet", actions.get(0).getFunctionRef().getRefName());
+        assertEquals("addPet", actions.get(1).getFunctionRef().getRefName());
+
+        JsonNode params = actions.get(0).getFunctionRef().getParameters();
+        assertNull(params);
+        JsonNode params2 = actions.get(1).getFunctionRef().getParameters();
+        assertNull(params);
+    }
 }
diff --git a/api/src/test/resources/features/functionrefjsonparams.json b/api/src/test/resources/features/functionrefjsonparams.json
@@ -0,0 +1,29 @@
+{
+  "id": "functionrefparams",
+  "version": "1.0",
+  "name": "Function Ref Params Test",
+  "states": [
+    {
+      "name": "AddPluto",
+      "type": "operation",
+      "start": true,
+      "actions": [
+        {
+          "functionRef": {
+            "refName": "addPet",
+            "parameters": {
+              "body": {
+                "name": "Pluto",
+                "tag": "${ .pet.tagnumber }"
+              },
+              "id": 123,
+              "address": "My Address, 123 MyCity, MyCountry",
+              "owner": "${ .owner.name }"
+            }
+          }
+        }
+      ],
+      "end": true
+    }
+  ]
+}
diff --git a/api/src/test/resources/features/functionrefjsonparams.yml b/api/src/test/resources/features/functionrefjsonparams.yml
@@ -0,0 +1,18 @@
+id: functionrefparams
+version: '1.0'
+name: Function Ref Params Test
+states:
+  - name: AddPluto
+    type: operation
+    start: true
+    actions:
+      - functionRef:
+          refName: addPet
+          parameters:
+            body:
+              name: Pluto
+              tag: "${ .pet.tagnumber }"
+            id: 123
+            address: My Address, 123 MyCity, MyCountry
+            owner: "${ .owner.name }"
+    end: true
diff --git a/api/src/test/resources/features/functionrefnoparams.json b/api/src/test/resources/features/functionrefnoparams.json
@@ -0,0 +1,23 @@
+{
+  "id": "functionrefparams",
+  "version": "1.0",
+  "name": "Function Ref Params Test",
+  "states": [
+    {
+      "name": "AddPluto",
+      "type": "operation",
+      "start": true,
+      "actions": [
+        {
+          "functionRef": {
+            "refName": "addPet"
+          }
+        },
+        {
+          "functionRef": "addPet"
+        }
+      ],
+      "end": true
+    }
+  ]
+}
diff --git a/api/src/test/resources/features/functionrefnoparams.yml b/api/src/test/resources/features/functionrefnoparams.yml
@@ -0,0 +1,12 @@
+id: functionrefparams
+version: '1.0'
+name: Function Ref Params Test
+states:
+  - name: AddPluto
+    type: operation
+    start: true
+    actions:
+      - functionRef:
+          refName: addPet
+      - functionRef: addPet
+    end: true

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ public void serialize(FunctionRef functionRef,`
`54`	`54`	`gen.writeObjectField("parameters", functionRef.getParameters());`
`55`	`55`	`}`
`56`	`56`
`57`		`-`
`58`	`57`	`gen.writeEndObject();`
`59`	`58`	`}`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"parameters": {`
`11`	`11`	`"type": "object",`
`12`	`12`	`"description": "Function parameters",`
`13`		`- "existingJavaType": "java.util.Map<String, String>"`
	`13`	`+ "existingJavaType": "com.fasterxml.jackson.databind.JsonNode"`
`14`	`14`	`}`
`15`	`15`	`},`
`16`	`16`	`"required": [`