Merge pull request #55 from tsurdilo/funcdefparamstoargs

change functionref parameters to arguments

Author: Tihomir Surdilovic

README.md

@@ -121,7 +121,7 @@ states:
   actions:
   - functionRef:
       refName: greetingFunction
-      parameters:
+      arguments:
         name: "$.greet.name"
     actionDataFilter:
       dataResultsPath: "$.payload.greeting"

api/src/main/java/io/serverlessworkflow/api/deserializers/FunctionRefDeserializer.java

@@ -61,11 +61,11 @@ public FunctionRef deserialize(JsonParser jp,
         if (!node.isObject()) {
             functionRef.setRefName(node.asText());
             ObjectMapper objectMapper = new ObjectMapper();
-            functionRef.setParameters(null);
+            functionRef.setArguments(null);
             return functionRef;
         } else {
-            if(node.get("parameters") != null) {
-                functionRef.setParameters(mapper.treeToValue(node.get("parameters"), JsonNode.class));
+            if(node.get("arguments") != null) {
+                functionRef.setArguments(mapper.treeToValue(node.get("arguments"), JsonNode.class));
             }
 
             if(node.get("refName") != null) {

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

@@ -39,7 +39,7 @@ public void serialize(FunctionRef functionRef,
                           SerializerProvider provider) throws IOException {
 
         if(functionRef != null) {
-            if((functionRef.getParameters() == null || functionRef.getParameters().isEmpty())
+            if((functionRef.getArguments() == null || functionRef.getArguments().isEmpty())
                     && functionRef.getRefName() != null
                     && functionRef.getRefName().length() > 0) {
                 gen.writeString(functionRef.getRefName());
@@ -50,8 +50,8 @@ public void serialize(FunctionRef functionRef,
                     gen.writeStringField("refName", functionRef.getRefName());
                 }
 
-                if (functionRef.getParameters() != null && !functionRef.getParameters().isEmpty()) {
-                    gen.writeObjectField("parameters", functionRef.getParameters());
+                if (functionRef.getArguments() != null && !functionRef.getArguments().isEmpty()) {
+                    gen.writeObjectField("arguments", functionRef.getArguments());
                 }
 
                 gen.writeEndObject();

api/src/main/resources/schema/functions/functionref.json

@@ -7,9 +7,9 @@
       "description": "Name of the referenced function",
       "minLength": 1
     },
-    "parameters": {
+    "arguments": {
       "type": "object",
-      "description": "Function parameters",
+      "description": "Function arguments",
       "existingJavaType": "com.fasterxml.jackson.databind.JsonNode"
     }
   },

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

@@ -232,15 +232,15 @@ public void testFunctionRefs(String workflowLocation) {
         assertNotNull(action1.getFunctionRef());
         FunctionRef functionRef1 = action1.getFunctionRef();
         assertEquals("creditCheckFunction", functionRef1.getRefName());
-        assertNull(functionRef1.getParameters());
+        assertNull(functionRef1.getArguments());
 
         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").asText());
+        assertEquals(1, functionRef2.getArguments().size());
+        assertEquals("{{ $.customer }}", functionRef2.getArguments().get("applicant").asText());
     }
 
     @ParameterizedTest
@@ -307,7 +307,7 @@ public void testFunctionRefJsonParams(String workflowLocation) {
         assertNotNull(actions.get(0).getFunctionRef());
         assertEquals("addPet", actions.get(0).getFunctionRef().getRefName());
 
-        JsonNode params = actions.get(0).getFunctionRef().getParameters();
+        JsonNode params = actions.get(0).getFunctionRef().getArguments();
         assertNotNull(params);
         assertEquals(4, params.size());
         assertEquals(123, params.get("id").intValue());
@@ -340,9 +340,9 @@ public void testFunctionRefNoParams(String workflowLocation) {
         assertEquals("addPet", actions.get(0).getFunctionRef().getRefName());
         assertEquals("addPet", actions.get(1).getFunctionRef().getRefName());
 
-        JsonNode params = actions.get(0).getFunctionRef().getParameters();
+        JsonNode params = actions.get(0).getFunctionRef().getArguments();
         assertNull(params);
-        JsonNode params2 = actions.get(1).getFunctionRef().getParameters();
+        JsonNode params2 = actions.get(1).getFunctionRef().getArguments();
         assertNull(params);
     }
 }

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

@@ -42,7 +42,7 @@
         {
           "functionRef": {
             "refName": "sendRejectionEmailFunction",
-            "parameters": {
+            "arguments": {
               "applicant": "{{ $.applicant }}"
             }
           }

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

@@ -27,6 +27,6 @@ states:
     actions:
       - functionRef:
           refName: sendRejectionEmailFunction
-          parameters:
+          arguments:
             applicant: "{{ $.applicant }}"
     end: true

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

@@ -32,7 +32,7 @@
           "actions": [{
             "functionRef": {
               "refName": "StoreBidFunction",
-              "parameters": {
+              "arguments": {
                 "bid": "{{ $.bid }}"
               }
             }

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

@@ -22,7 +22,7 @@ states:
         actions:
           - functionRef:
               refName: StoreBidFunction
-              parameters:
+              arguments:
                 bid: "{{ $.bid }}"
     end:
       terminate: true

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

@@ -33,7 +33,7 @@
       "action": {
         "functionRef": {
           "refName": "callCreditCheckMicroservice",
-          "parameters": {
+          "arguments": {
             "customer": "{{ $.customer }}"
           }
         }
@@ -75,7 +75,7 @@
         {
           "functionRef": {
             "refName": "sendRejectionEmailFunction",
-            "parameters": {
+            "arguments": {
               "applicant": "{{ $.customer }}"
             }
           }