[Fix #1414] Gonzalos comments

Signed-off-by: fjtirado <ftirados@ibm.com>

Author: fjtirado

impl/core/src/main/java/io/serverlessworkflow/impl/executors/TryExecutor.java

@@ -39,6 +39,7 @@
 import io.serverlessworkflow.impl.executors.retry.RetryExecutor;
 import io.serverlessworkflow.impl.executors.retry.RetryIntervalFunction;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -67,28 +68,23 @@ public static class TryExecutorBuilder extends RegularTaskExecutorBuilder<TryTas
     protected TryExecutorBuilder(
         WorkflowMutablePosition position, TryTask task, WorkflowDefinition definition) {
       super(position, task, definition);
-      TryTaskCatch catchInfo = task.getCatch();
+      TryTaskCatch catchInfo =
+          Objects.requireNonNull(task.getCatch(), "Catch property is mandatory for Try task");
       this.errorFilter = buildErrorFilter(catchInfo.getErrors());
       this.whenFilter = WorkflowUtils.optionalPredicate(application, catchInfo.getWhen());
       this.exceptFilter = WorkflowUtils.optionalPredicate(application, catchInfo.getExceptWhen());
+      this.errorVariable = catchInfo.getAs();
+      List<TaskItem> catchTaskDo = catchInfo.getDo();
+      this.catchTaskExecutor =
+          catchTaskDo != null && !catchTaskDo.isEmpty()
+              ? Optional.of(
+                  TaskExecutorHelper.createExecutorList(
+                      position.copy().addProperty("catch"), catchTaskDo, definition))
+              : Optional.empty();
+      Retry retry = catchInfo.getRetry();
+      this.retryIntervalExecutor = retry != null ? buildRetryInterval(retry) : Optional.empty();
       this.taskExecutor =
           TaskExecutorHelper.createExecutorList(position, task.getTry(), definition, "try");
-      TryTaskCatch catchTask = task.getCatch();
-      if (catchTask != null) {
-        this.errorVariable = catchTask.getAs();
-        List<TaskItem> catchTaskDo = catchTask.getDo();
-        this.catchTaskExecutor =
-            catchTaskDo != null && !catchTaskDo.isEmpty()
-                ? Optional.of(
-                    TaskExecutorHelper.createExecutorList(position.copy(), catchTaskDo, definition))
-                : Optional.empty();
-
-        Retry retry = catchTask.getRetry();
-        this.retryIntervalExecutor = retry != null ? buildRetryInterval(retry) : Optional.empty();
-      } else {
-        this.catchTaskExecutor = Optional.empty();
-        this.retryIntervalExecutor = Optional.empty();
-      }
     }
 
     private Optional<RetryExecutor> buildRetryInterval(Retry retry) {

impl/test/src/test/java/io/serverlessworkflow/impl/test/RetryTimeoutTest.java

@@ -20,12 +20,13 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.serverlessworkflow.api.types.TryTask;
+import io.serverlessworkflow.impl.TaskContextData;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowException;
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.jackson.JsonUtils;
 import io.serverlessworkflow.impl.lifecycle.TaskCompletedEvent;
+import io.serverlessworkflow.impl.lifecycle.TaskEvent;
 import io.serverlessworkflow.impl.lifecycle.TaskRetriedEvent;
 import io.serverlessworkflow.impl.lifecycle.WorkflowExecutionListener;
 import java.io.IOException;
@@ -65,17 +66,21 @@ void tearDown() throws IOException {
   private class RetryListener implements WorkflowExecutionListener {
 
     private Map<String, Short> taskRetried = new ConcurrentHashMap<>();
-    private Map<String, Short> tryTaskCompleted = new ConcurrentHashMap<>();
+    private Map<String, Short> taskCompleted = new ConcurrentHashMap<>();
 
+    @Override
     public void onTaskRetried(TaskRetriedEvent ev) {
-      taskRetried.put(ev.taskContext().position().jsonPointer(), ev.taskContext().retryAttempt());
+      add2Map(taskRetried, ev);
     }
 
+    @Override
     public void onTaskCompleted(TaskCompletedEvent ev) {
-      if (ev.taskContext().task() instanceof TryTask) {
-        tryTaskCompleted.put(
-            ev.taskContext().position().jsonPointer(), ev.taskContext().retryAttempt());
-      }
+      add2Map(taskCompleted, ev);
+    }
+
+    private static void add2Map(Map<String, Short> map, TaskEvent ev) {
+      TaskContextData taskContext = ev.taskContext();
+      map.put(taskContext.position().jsonPointer(), taskContext.retryAttempt());
     }
   }
 
@@ -103,7 +108,6 @@ void testRetry(String path) throws IOException {
         .until(() -> future.join().as(JsonNode.class).orElseThrow().equals(result));
     assertThat(retryListener.taskRetried).hasSize(1);
     assertThat(retryListener.taskRetried.get("do/0/tryGetPet/try/0/getPet")).isEqualTo((short) 2);
-    assertThat(retryListener.tryTaskCompleted.values()).containsOnly((short) 0);
   }
 
   @Test
@@ -136,9 +140,9 @@ void testNestedRetry() throws IOException {
             retryListener.taskRetried.get(
                 "do/0/tryServerError/try/0/tryCommunication/try/0/getPet"))
         .isEqualTo((short) 5);
-    assertThat(retryListener.tryTaskCompleted.get("do/0/tryServerError/try/0/tryCommunication/try"))
+    assertThat(retryListener.taskCompleted.get("do/0/tryServerError/try/0/tryCommunication/try"))
         .isEqualTo((short) 2);
-    assertThat(retryListener.tryTaskCompleted.get("do/0/tryServerError/try")).isEqualTo((short) 0);
+    assertThat(retryListener.taskCompleted.get("do/0/tryServerError/try")).isEqualTo((short) 0);
   }
 
   @Test
@@ -158,7 +162,9 @@ void testRetryDo() throws IOException {
                     .orElseThrow()
                     .equals(Map.of("setAfterFailingTask", "No problem")));
 
-    assertThat(retryListener.tryTaskCompleted.get("do/0/attemptTask/try")).isEqualTo((short) 0);
+    assertThat(retryListener.taskCompleted.get("do/0/attemptTask/try")).isEqualTo((short) 0);
+    assertThat(retryListener.taskCompleted)
+        .containsKey("do/0/attemptTask/catch/do/0/executeAfterFailingTask");
   }
 
   @Test