Fix retries properties

Signed-off-by: Tihomir Surdilovic <[email protected]>

Author: tsurdilo

api/src/main/resources/schema/retry/retrydef.json

@@ -1,4 +1,4 @@
-{
+  {
   "type": "object",
   "javaType": "io.serverlessworkflow.api.retry.RetryDefinition",
   "description": "Retry Definition",
@@ -12,6 +12,14 @@
       "type": "string",
       "description": "Time delay between retry attempts (ISO 8601 duration format)"
     },
+    "maxDelay": {
+      "type": "string",
+      "description": "Maximum time delay between retry attempts (ISO 8601 duration format)"
+    },
+    "increment": {
+      "type": "string",
+      "description": "Static value by which the delay increases during each attempt (ISO 8601 time format)"
+    },
     "multiplier": {
       "type": "string",
       "description": "Multiplier value by which interval increases during each attempt (ISO 8601 time format)"

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

@@ -24,12 +24,14 @@
 import io.serverlessworkflow.api.functions.FunctionDefinition;
 import io.serverlessworkflow.api.functions.FunctionRef;
 import io.serverlessworkflow.api.interfaces.State;
+import io.serverlessworkflow.api.retry.RetryDefinition;
 import io.serverlessworkflow.api.states.EventState;
 import io.serverlessworkflow.api.states.OperationState;
 import io.serverlessworkflow.api.states.SubflowState;
 import io.serverlessworkflow.api.states.SwitchState;
 import io.serverlessworkflow.api.switchconditions.DataCondition;
 import io.serverlessworkflow.api.test.utils.WorkflowTestUtils;
+import io.serverlessworkflow.api.workflow.Retries;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -434,4 +436,30 @@ public void testLongStart(String workflowLocation) {
         assertEquals("0 0/15 * * * ?", workflow.getStart().getSchedule().getCron().getExpression());
 
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"/features/retriesprops.json", "/features/retriesprops.yml"})
+    public void testRetriesProps(String workflowLocation) {
+        Workflow workflow = Workflow.fromSource(WorkflowTestUtils.readWorkflowFile(workflowLocation));
+
+        assertNotNull(workflow);
+        assertNotNull(workflow.getId());
+        assertNotNull(workflow.getName());
+        assertNotNull(workflow.getRetries());
+        assertNotNull(workflow.getStates());
+
+        Retries retries = workflow.getRetries();
+        assertNotNull(retries.getRetryDefs());
+        assertEquals(1, retries.getRetryDefs().size());
+
+        RetryDefinition retryDefinition = retries.getRetryDefs().get(0);
+        assertEquals("Test Retries", retryDefinition.getName());
+        assertEquals("PT1M", retryDefinition.getDelay());
+        assertEquals("PT2M", retryDefinition.getMaxDelay());
+        assertEquals("PT2S", retryDefinition.getIncrement());
+        assertEquals("1.2", retryDefinition.getMultiplier());
+        assertEquals("20", retryDefinition.getMaxAttempts());
+        assertEquals("0.4", retryDefinition.getJitter());
+
+    }
 }

api/src/test/resources/features/retriesprops.json

@@ -0,0 +1,34 @@
+{
+  "id": "TestRetriesProps",
+  "name": "Retries props test",
+  "version": "1.0",
+  "start": "Test State",
+  "retries": [
+    {
+      "name": "Test Retries",
+      "delay": "PT1M",
+      "maxDelay": "PT2M",
+      "increment": "PT2S",
+      "multiplier": "1.2",
+      "maxAttempts": "20",
+      "jitter": "0.4"
+    }
+  ],
+  "states": [
+    {
+      "name": "Test States",
+      "type": "operation",
+      "actions": [
+      ],
+      "onErrors": [
+        {
+          "error": "TimeoutError",
+          "code": "500",
+          "retryRef": "Test Retries",
+          "end": true
+        }
+      ],
+      "end": true
+    }
+  ]
+}

api/src/test/resources/features/retriesprops.yml

@@ -0,0 +1,22 @@
+id: TestRetriesProps
+name: Retries props test
+version: '1.0'
+start: Test State
+retries:
+  - name: Test Retries
+    delay: PT1M
+    maxDelay: PT2M
+    increment: PT2S
+    multiplier: '1.2'
+    maxAttempts: '20'
+    jitter: '0.4'
+states:
+  - name: Test States
+    type: operation
+    actions: []
+    onErrors:
+      - error: TimeoutError
+        code: '500'
+        retryRef: Test Retries
+        end: true
+    end: true