Merge pull request #106 from tsurdilo/removeworkflowid

remove workflowid from parallel and foreach states

Author: tsurdilo

api/src/main/resources/schema/branches/branch.json

@@ -14,10 +14,6 @@
         "type": "object",
         "$ref": "../actions/action.json"
       }
-    },
-    "workflowId": {
-      "type": "string",
-      "description": "Unique Id of a workflow to be executed in this branch"
     }
   },
   "oneOf": [
@@ -29,8 +25,7 @@
     },
     {
       "required": [
-        "name",
-        "workflowId "
+        "name"
       ]
     }
   ]

api/src/main/resources/schema/states/foreachstate.json

@@ -35,10 +35,6 @@
         "$ref": "../actions/action.json"
       }
     },
-    "workflowId": {
-      "type": "string",
-      "description": "Unique Id of a workflow to be executed for each of the elements of inputCollection"
-    },
     "usedForCompensation": {
       "type": "boolean",
       "default": false,
@@ -52,7 +48,6 @@
         "type",
         "inputCollection",
         "inputParameter",
-        "workflowId",
         "end"
       ]
     },
@@ -62,7 +57,6 @@
         "type",
         "inputCollection",
         "inputParameter",
-        "workflowId",
         "transition"
       ]
     },
@@ -73,7 +67,6 @@
         "type",
         "inputCollection",
         "inputParameter",
-        "workflowId",
         "end"
       ]
     },
@@ -84,7 +77,6 @@
         "type",
         "inputCollection",
         "inputParameter",
-        "workflowId",
         "transition"
       ]
     },

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

@@ -11,12 +11,10 @@
       "completionType": "allOf",
       "branches": [
         {
-          "name": "ShortDelayBranch",
-          "workflowId": "shortdelayworkflowid"
+          "name": "ShortDelayBranch"
         },
         {
-          "name": "LongDelayBranch",
-          "workflowId": "longdelayworkflowid"
+          "name": "LongDelayBranch"
         }
       ],
       "end": true

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

@@ -9,7 +9,5 @@ states:
     completionType: allOf
     branches:
       - name: ShortDelayBranch
-        workflowId: shortdelayworkflowid
       - name: LongDelayBranch
-        workflowId: longdelayworkflowid
     end: true

diagram/src/main/java/io/serverlessworkflow/diagram/model/WorkflowDiagramModel.java

@@ -331,10 +331,6 @@ private void inspectStatesInfo(Workflow workflow) {
                 if (forEachState.getActions() != null && forEachState.getActions().size() > 0) {
                     modelState.addInfo("Num. of actions: " + forEachState.getActions().size());
                 }
-
-                if (forEachState.getWorkflowId() != null && forEachState.getWorkflowId().length() > 0) {
-                    modelState.addInfo("Workflow ID: " + forEachState.getWorkflowId());
-                }
             }
 
             if (state instanceof CallbackState) {

diagram/src/test/resources/examples/parallel.json

@@ -11,12 +11,10 @@
       "completionType": "allOf",
       "branches": [
         {
-          "name": "ShortDelayBranch",
-          "workflowId": "shortdelayworkflowid"
+          "name": "ShortDelayBranch"
         },
         {
-          "name": "LongDelayBranch",
-          "workflowId": "longdelayworkflowid"
+          "name": "LongDelayBranch"
         }
       ],
       "end": true

diagram/src/test/resources/examples/parallel.yml

@@ -9,7 +9,5 @@ states:
     completionType: allOf
     branches:
       - name: ShortDelayBranch
-        workflowId: shortdelayworkflowid
       - name: LongDelayBranch
-        workflowId: longdelayworkflowid
     end: true

validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java

@@ -314,14 +314,6 @@ public List<ValidationError> validate() {
                                     ValidationError.WORKFLOW_VALIDATION);
                         }
 
-
-                        List<Branch> branches = parallelState.getBranches();
-                        for (Branch branch : branches) {
-                            if (branch.getWorkflowId() == null || branch.getWorkflowId().length() < 1) {
-                                addValidationError("Parallel state should define workflow id",
-                                        ValidationError.WORKFLOW_VALIDATION);
-                            }
-                        }
                     }
 
                     if (s instanceof InjectState) {
@@ -343,11 +335,6 @@ public List<ValidationError> validate() {
                             addValidationError("ForEach state should have a valid iteration parameter",
                                     ValidationError.WORKFLOW_VALIDATION);
                         }
-
-                        if (forEachState.getWorkflowId() == null || forEachState.getWorkflowId().length() < 1) {
-                            addValidationError("ForEach state should define a workflow id",
-                                    ValidationError.WORKFLOW_VALIDATION);
-                        }
                     }
 
                     if (s instanceof CallbackState) {

validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java

@@ -124,7 +124,6 @@ public void testOperationStateNoFunctionRef() {
                 "        \"type\": \"foreach\",\n" +
                 "        \"inputCollection\": \"${ .message }\",\n" +
                 "        \"iterationParam\": \"${ .singlemessage }\",\n" +
-                "        \"workflowId\": \"sendMessageWorkflowId\",\n" +
                 "        \"end\": {\n" +
                 "            \"kind\": \"default\"\n" +
                 "        }\n" +