Merge pull request #107 from tsurdilo/addversionstuff

adding spec version and version to subflowref

Author: tsurdilo

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

@@ -67,6 +67,10 @@ public SubFlowRef deserialize(JsonParser jp,
                 subflowRef.setWorkflowId(node.get("workflowId").asText());
             }
 
+            if (node.get("version") != null) {
+                subflowRef.setVersion(node.get("version").asText());
+            }
+
             return subflowRef;
         }
     }

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

@@ -39,7 +39,8 @@ public void serialize(SubFlowRef subflowRef,
 
         if (subflowRef != null) {
             if ((subflowRef.getWorkflowId() == null || subflowRef.getWorkflowId().isEmpty())
-                    && subflowRef.isWaitForCompletion()) {
+                    && subflowRef.isWaitForCompletion()
+                    && (subflowRef.getVersion() == null || subflowRef.getVersion().isEmpty())) {
                 gen.writeString(subflowRef.getWorkflowId());
             } else {
                 gen.writeStartObject();
@@ -52,6 +53,10 @@ public void serialize(SubFlowRef subflowRef,
                     gen.writeBooleanField("waitForCompletion", false);
                 }
 
+                if (subflowRef.getVersion() != null && subflowRef.getVersion().length() > 0) {
+                    gen.writeStringField("version", subflowRef.getVersion());
+                }
+
                 gen.writeEndObject();
             }
         }

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

@@ -87,9 +87,9 @@ public void serialize(Workflow workflow,
             gen.writeObjectField("start", workflow.getStart());
         }
 
-        if (workflow.getSchemaVersion() != null && !workflow.getSchemaVersion().isEmpty()) {
-            gen.writeStringField("schemaVersion",
-                    workflow.getSchemaVersion());
+        if (workflow.getSpecVersion() != null && !workflow.getSpecVersion().isEmpty()) {
+            gen.writeStringField("specVersion",
+                    workflow.getSpecVersion());
         }
 
         if (workflow.getExtensions() != null && !workflow.getExpressionLang().isEmpty()) {

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

@@ -10,6 +10,11 @@
     "workflowId": {
       "type": "string",
       "description": "Unique id of the sub-workflow to be invoked"
+    },
+    "version": {
+      "type": "string",
+      "description": "Version of the sub-workflow to be invoked",
+      "minLength": 1
     }
   },
   "required": [

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

@@ -35,7 +35,7 @@
       "$ref": "start/start.json",
       "description": "Defines workflow start"
     },
-    "schemaVersion": {
+    "specVersion": {
       "type": "string",
       "description": "Serverless Workflow schema version"
     },

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

@@ -499,6 +499,7 @@ public void testSubFlowRef(String workflowLocation) {
         SubFlowRef secondSubflowRef = secondAction.getSubFlowRef();
         assertEquals("subflowrefworkflowid", secondSubflowRef.getWorkflowId());
         assertFalse(secondSubflowRef.isWaitForCompletion());
+        assertEquals("1.0", secondSubflowRef.getVersion());
 
     }
 }

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

@@ -1,6 +1,7 @@
 {
   "id": "applicantrequest",
   "version": "1.0",
+  "specVersion": "0.7",
   "name": "Applicant Request Decision Workflow",
   "description": "Determine if applicant request is valid",
   "start": "CheckApplication",

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

@@ -1,5 +1,6 @@
 id: applicantrequest
 version: '1.0'
+specVersion: '0.7'
 name: Applicant Request Decision Workflow
 description: Determine if applicant request is valid
 start: CheckApplication

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

@@ -2,6 +2,7 @@
   "id": "booklending",
   "name": "Book Lending Workflow",
   "version": "1.0",
+  "specVersion": "0.7",
   "start": "Book Lending Request",
   "states": [
     {

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

@@ -1,6 +1,7 @@
 id: booklending
 name: Book Lending Workflow
 version: '1.0'
+specVersion: '0.7'
 start: Book Lending Request
 states:
   - name: Book Lending Request