[Fix #1601] Implement then on catch (#1609)

* [Fix #1601] Implement then on catch

Signed-off-by: Francisco Javier Tirado Sarti <ftirados@ibm.com>

* [Fix #1601] Coverting retry and then

Signed-off-by: Francisco Javier Tirado Sarti <ftirados@ibm.com>

---------

Signed-off-by: Francisco Javier Tirado Sarti <ftirados@ibm.com>

Author: fjtirado

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

@@ -29,7 +29,7 @@ public class CallTaskExecutor<T extends TaskBase> extends RegularTaskExecutor<T>
   private final CallableTask callable;
 
   public static class CallTaskExecutorBuilder<T extends TaskBase>
-      extends RegularTaskExecutorBuilder<T> {
+      extends RegularTaskExecutorBuilder<T, CallTaskExecutor<T>> {
     private CallableTaskFactory callableFactory;
     private List<CallableTaskProxyBuilder> callableProxyBuilders;
     private CallableTask callable;

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

@@ -28,7 +28,7 @@ public class DoExecutor extends RegularTaskExecutor<DoTask> {
 
   private final TaskExecutor<?> taskExecutor;
 
-  public static class DoExecutorBuilder extends RegularTaskExecutorBuilder<DoTask> {
+  public static class DoExecutorBuilder extends RegularTaskExecutorBuilder<DoTask, DoExecutor> {
     private TaskExecutor<?> taskExecutor;
 
     protected DoExecutorBuilder(

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

@@ -53,7 +53,8 @@ public class EmitExecutor extends RegularTaskExecutor<EmitTask> {
           .toList();
   private final EventPropertiesBuilder props;
 
-  public static class EmitExecutorBuilder extends RegularTaskExecutorBuilder<EmitTask> {
+  public static class EmitExecutorBuilder
+      extends RegularTaskExecutorBuilder<EmitTask, EmitExecutor> {
 
     private EventPropertiesBuilder eventBuilder;
 

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

@@ -37,7 +37,7 @@ public class ForExecutor extends RegularTaskExecutor<ForTask> {
   private final Optional<WorkflowPredicate> whileExpr;
   private final TaskExecutor<?> taskExecutor;
 
-  public static class ForExecutorBuilder extends RegularTaskExecutorBuilder<ForTask> {
+  public static class ForExecutorBuilder extends RegularTaskExecutorBuilder<ForTask, ForExecutor> {
     private TaskExecutor<?> taskExecutor;
 
     protected ForExecutorBuilder(

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

@@ -39,7 +39,8 @@ public class ForkExecutor extends RegularTaskExecutor<ForkTask> {
 
   private final boolean compete;
 
-  public static class ForkExecutorBuilder extends RegularTaskExecutorBuilder<ForkTask> {
+  public static class ForkExecutorBuilder
+      extends RegularTaskExecutorBuilder<ForkTask, ForkExecutor> {
 
     private final Map<String, TaskExecutor<?>> taskExecutors;
     private final boolean compete;

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

@@ -47,7 +47,8 @@ public abstract class ListenExecutor extends RegularTaskExecutor<ListenTask> {
   protected final Function<CloudEvent, WorkflowModel> converter;
   protected final EventConsumer eventConsumer;
 
-  public static class ListenExecutorBuilder extends RegularTaskExecutorBuilder<ListenTask> {
+  public static class ListenExecutorBuilder
+      extends RegularTaskExecutorBuilder<ListenTask, ListenExecutor> {
 
     private EventRegistrationBuilderInfo registrationInfo;
     private TaskExecutor<?> loop;

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

@@ -42,7 +42,8 @@ public class RaiseExecutor extends RegularTaskExecutor<RaiseTask> {
 
   private final BiFunction<WorkflowContext, TaskContext, WorkflowError> errorBuilder;
 
-  public static class RaiseExecutorBuilder extends RegularTaskExecutorBuilder<RaiseTask> {
+  public static class RaiseExecutorBuilder
+      extends RegularTaskExecutorBuilder<RaiseTask, RaiseExecutor> {
 
     private final BiFunction<WorkflowContext, TaskContext, WorkflowError> errorBuilder;
     private final WorkflowValueResolver<String> typeFilter;

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

@@ -28,12 +28,14 @@ public abstract class RegularTaskExecutor<T extends TaskBase> extends AbstractTa
 
   protected TransitionInfo transition;
 
-  protected RegularTaskExecutor(RegularTaskExecutorBuilder<T> builder) {
+  protected <V extends RegularTaskExecutor<T>> RegularTaskExecutor(
+      RegularTaskExecutorBuilder<T, V> builder) {
     super(builder);
   }
 
-  public abstract static class RegularTaskExecutorBuilder<T extends TaskBase>
-      extends AbstractTaskExecutorBuilder<T, RegularTaskExecutor<T>> {
+  public abstract static class RegularTaskExecutorBuilder<
+          T extends TaskBase, V extends RegularTaskExecutor<T>>
+      extends AbstractTaskExecutorBuilder<T, V> {
 
     private TransitionInfoBuilder transition;
 
@@ -42,12 +44,13 @@ protected RegularTaskExecutorBuilder(
       super(position, task, definition);
     }
 
+    @Override
     public void connect(Map<String, TaskExecutorBuilder<?>> connections) {
       this.transition = next(task.getThen(), connections);
     }
 
     @Override
-    protected void buildTransition(RegularTaskExecutor<T> instance) {
+    protected void buildTransition(V instance) {
       instance.transition = TransitionInfo.build(transition);
     }
   }
@@ -59,10 +62,8 @@ protected TransitionInfo getSkipTransition() {
 
   protected CompletableFuture<TaskContext> execute(
       WorkflowContext workflow, TaskContext taskContext) {
-    CompletableFuture<TaskContext> future =
-        internalExecute(workflow, taskContext)
-            .thenApply(node -> taskContext.rawOutput(node).transition(transition));
-    return future;
+    return internalExecute(workflow, taskContext)
+        .thenApply(node -> taskContext.rawOutput(node).transition(transition));
   }
 
   protected abstract CompletableFuture<WorkflowModel> internalExecute(

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

@@ -33,7 +33,8 @@ public class RunTaskExecutor extends RegularTaskExecutor<RunTask> {
   private static final ServiceLoader<RunnableTaskBuilder> runnables =
       ServiceLoader.load(RunnableTaskBuilder.class);
 
-  public static class RunTaskExecutorBuilder extends RegularTaskExecutorBuilder<RunTask> {
+  public static class RunTaskExecutorBuilder
+      extends RegularTaskExecutorBuilder<RunTask, RunTaskExecutor> {
     private CallableTask runnable;
 
     protected RunTaskExecutorBuilder(

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

@@ -31,7 +31,7 @@ public class SetExecutor extends RegularTaskExecutor<SetTask> {
 
   private final WorkflowFilter setFilter;
 
-  public static class SetExecutorBuilder extends RegularTaskExecutorBuilder<SetTask> {
+  public static class SetExecutorBuilder extends RegularTaskExecutorBuilder<SetTask, SetExecutor> {
 
     private final WorkflowFilter setFilter;