Merge pull request #111 from tsurdilo/timeoutsadd

Adding timeouts

Author: tsurdilo

api/src/main/java/io/serverlessworkflow/api/interfaces/State.java

@@ -19,6 +19,7 @@
 import io.serverlessworkflow.api.error.Error;
 import io.serverlessworkflow.api.filters.StateDataFilter;
 import io.serverlessworkflow.api.states.DefaultState.Type;
+import io.serverlessworkflow.api.timeouts.TimeoutsDefinition;
 import io.serverlessworkflow.api.transitions.Transition;
 
 import java.util.List;
@@ -43,4 +44,6 @@ public interface State {
     String getCompensatedBy();
 
     Map<String, String> getMetadata();
+
+    TimeoutsDefinition getTimeouts();
 }

api/src/main/java/io/serverlessworkflow/api/mapper/WorkflowModule.java

@@ -34,6 +34,7 @@
 import io.serverlessworkflow.api.states.DefaultState;
 import io.serverlessworkflow.api.states.OperationState;
 import io.serverlessworkflow.api.states.ParallelState;
+import io.serverlessworkflow.api.timeouts.TimeoutsDefinition;
 import io.serverlessworkflow.api.transitions.Transition;
 import io.serverlessworkflow.api.workflow.*;
 

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

@@ -98,10 +98,6 @@ public void serialize(Workflow workflow,
                     workflow.getExpressionLang());
         }
 
-        if (workflow.getExecTimeout() != null) {
-            gen.writeObjectField("execTimeout", workflow.getExecTimeout());
-        }
-
         if (workflow.isKeepActive()) {
             gen.writeBooleanField("keepActive", workflow.isKeepActive());
         }
@@ -159,6 +155,10 @@ public void serialize(Workflow workflow,
             gen.writeObjectField("constants", workflow.getConstants().getConstantsDef());
         }
 
+        if(workflow.getTimeouts() != null ) {
+            gen.writeObjectField("timeouts", workflow.getTimeouts());
+        }
+
         if (workflow.getStates() != null && !workflow.getStates().isEmpty()) {
             gen.writeArrayFieldStart("states");
             for (State state : workflow.getStates()) {

api/src/main/java/io/serverlessworkflow/api/workflow/Constants.java

@@ -23,6 +23,16 @@ public class Constants {
     private String refValue;
     private JsonNode constantsDef;
 
+    public Constants() {}
+
+    public Constants(String refValue) {
+        this.refValue = refValue;
+    }
+
+    public Constants(JsonNode constantsDef) {
+        this.constantsDef = constantsDef;
+    }
+
     public String getRefValue() {
         return refValue;
     }

api/src/main/java/io/serverlessworkflow/api/workflow/Secrets.java

@@ -21,6 +21,16 @@ public class Secrets {
     private String refValue;
     private List<String> secretDefs;
 
+    public Secrets() {}
+
+    public Secrets(String refValue) {
+        this.refValue = refValue;
+    }
+
+    public Secrets(List<String> secretDefs) {
+        this.secretDefs = secretDefs;
+    }
+
     public String getRefValue() {
         return refValue;
     }

api/src/main/resources/schema/actions/action.json

@@ -19,10 +19,6 @@
       "description": "References a sub-workflow to invoke",
       "$ref": "../functions/subflowref.json"
     },
-    "timeout": {
-      "type": "string",
-      "description": "Time period to wait for function execution to complete"
-    },
     "actionDataFilter": {
       "$ref": "../filters/actiondatafilter.json"
     }

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

@@ -14,6 +14,9 @@
         "type": "object",
         "$ref": "../actions/action.json"
       }
+    },
+    "timeouts": {
+      "$ref": "../timeouts/timeoutsdef.json"
     }
   },
   "oneOf": [

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

@@ -17,10 +17,6 @@
       "type" : "string",
       "description": "References an unique callback event name in the defined workflow events"
     },
-    "timeout": {
-      "type": "string",
-      "description": "Time period to wait for incoming events (ISO 8601 format)"
-    },
     "eventDataFilter": {
       "description": "Callback event data filter definition",
       "$ref": "../filters/eventdatafilter.json"

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

@@ -57,6 +57,9 @@
       "type": "string",
       "minLength": 1,
       "description": "Unique Name of a workflow state which is responsible for compensation of this state"
+    },
+    "timeouts": {
+      "$ref": "../timeouts/timeoutsdef.json"
     }
   },
   "required": [

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

@@ -21,10 +21,6 @@
         "type": "object",
         "$ref": "../events/onevents.json"
       }
-    },
-    "timeout": {
-      "type": "string",
-      "description": "Time period to wait for incoming events (ISO 8601 format)"
     }
   },
   "required": [