[Fix #933] Adding timeout support

fjtirado · fjtirado · commit 7a5bc4e4db36 · 2025-11-04T19:01:10.000+01:00
Signed-off-by: fjtirado &lt;ftirados@redhat.com&gt;
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowError.java b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowError.java
@@ -56,6 +56,10 @@ public static Builder runtime(TaskContext context, Exception ex) {
     return runtime(Errors.RUNTIME.status(), context, ex);
   }
 
+  public static Builder timeout() {
+    return error(Errors.TIMEOUT.toString(), Errors.TIMEOUT.status());
+  }
+
   public static class Builder {
 
     private final String type;
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/executors/AbstractTaskExecutor.java b/impl/core/src/main/java/io/serverlessworkflow/impl/executors/AbstractTaskExecutor.java
@@ -24,31 +24,40 @@
 import io.serverlessworkflow.api.types.Input;
 import io.serverlessworkflow.api.types.Output;
 import io.serverlessworkflow.api.types.TaskBase;
+import io.serverlessworkflow.api.types.TaskTimeout;
+import io.serverlessworkflow.api.types.Timeout;
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowDefinition;
+import io.serverlessworkflow.impl.WorkflowError;
+import io.serverlessworkflow.impl.WorkflowException;
 import io.serverlessworkflow.impl.WorkflowFilter;
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.WorkflowMutablePosition;
 import io.serverlessworkflow.impl.WorkflowPosition;
 import io.serverlessworkflow.impl.WorkflowPredicate;
 import io.serverlessworkflow.impl.WorkflowStatus;
+import io.serverlessworkflow.impl.WorkflowUtils;
+import io.serverlessworkflow.impl.WorkflowValueResolver;
 import io.serverlessworkflow.impl.lifecycle.TaskCancelledEvent;
 import io.serverlessworkflow.impl.lifecycle.TaskCompletedEvent;
 import io.serverlessworkflow.impl.lifecycle.TaskFailedEvent;
 import io.serverlessworkflow.impl.lifecycle.TaskRetriedEvent;
 import io.serverlessworkflow.impl.lifecycle.TaskStartedEvent;
 import io.serverlessworkflow.impl.resources.ResourceLoader;
 import io.serverlessworkflow.impl.schema.SchemaValidator;
+import java.time.Duration;
 import java.time.Instant;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.TimeUnit;
 
 public abstract class AbstractTaskExecutor<T extends TaskBase> implements TaskExecutor<T> {
 
@@ -62,6 +71,7 @@ public abstract class AbstractTaskExecutor<T extends TaskBase> implements TaskEx
   private final Optional<SchemaValidator> outputSchemaValidator;
   private final Optional<SchemaValidator> contextSchemaValidator;
   private final Optional<WorkflowPredicate> ifFilter;
+  private final Optional<WorkflowValueResolver<Duration>> timeout;
 
   public abstract static class AbstractTaskExecutorBuilder<
           T extends TaskBase, V extends AbstractTaskExecutor<T>>
@@ -80,6 +90,7 @@ public abstract static class AbstractTaskExecutorBuilder<
     protected final Workflow workflow;
     protected final ResourceLoader resourceLoader;
     private final WorkflowDefinition definition;
+    private Optional<WorkflowValueResolver<Duration>> timeout;
 
     private V instance;
 
@@ -113,6 +124,28 @@ protected AbstractTaskExecutorBuilder(
             getSchemaValidator(application.validatorFactory(), resourceLoader, export.getSchema());
       }
       this.ifFilter = application.expressionFactory().buildIfFilter(task);
+      this.timeout = getTaskTimeout();
+    }
+
+    private Optional<WorkflowValueResolver<Duration>> getTaskTimeout() {
+      TaskTimeout timeout = task.getTimeout();
+      if (timeout != null) {
+        Timeout timeoutDef = timeout.getTaskTimeoutDefinition();
+        if (timeoutDef == null && timeout.getTaskTimeoutReference() != null) {
+          timeoutDef =
+              Objects.requireNonNull(
+                  Objects.requireNonNull(
+                          workflow.getUse().getTimeouts(),
+                          "Timeout reference "
+                              + timeout.getTaskTimeoutReference()
+                              + " specified, but use timeout was not defined")
+                      .getAdditionalProperties()
+                      .get(timeout.getTaskTimeoutReference()),
+                  "Timeout reference " + timeout.getTaskTimeoutReference() + "cannot be found");
+        }
+        return Optional.of(WorkflowUtils.fromTimeoutAfter(application, timeoutDef.getAfter()));
+      }
+      return Optional.empty();
     }
 
     protected final TransitionInfoBuilder next(
@@ -171,6 +204,7 @@ protected AbstractTaskExecutor(AbstractTaskExecutorBuilder<T, ?> builder) {
     this.outputSchemaValidator = builder.outputSchemaValidator;
     this.contextSchemaValidator = builder.contextSchemaValidator;
     this.ifFilter = builder.ifFilter;
+    this.timeout = builder.timeout;
   }
 
   protected final CompletableFuture<TaskContext> executeNext(
@@ -200,7 +234,7 @@ public CompletableFuture<TaskContext> apply(
     } else if (taskContext.isCompleted()) {
       return executeNext(completable, workflowContext);
     } else if (ifFilter.map(f -> f.test(workflowContext, taskContext, input)).orElse(true)) {
-      return executeNext(
+      completable =
           completable
               .thenCompose(workflowContext.instance()::suspendedCheck)
               .thenApply(
@@ -247,8 +281,22 @@ public CompletableFuture<TaskContext> apply(
                             l.onTaskCompleted(
                                 new TaskCompletedEvent(workflowContext, taskContext)));
                     return t;
-                  }),
-          workflowContext);
+                  });
+      if (timeout.isPresent()) {
+        completable =
+            completable
+                .orTimeout(
+                    timeout
+                        .map(t -> t.apply(workflowContext, taskContext, input))
+                        .orElseThrow()
+                        .toMillis(),
+                    TimeUnit.MILLISECONDS)
+                .exceptionallyCompose(
+                    e ->
+                        CompletableFuture.failedFuture(
+                            new WorkflowException(WorkflowError.timeout().build(), e)));
+      }
+      return executeNext(completable, workflowContext);
     } else {
       taskContext.transition(getSkipTransition());
       return executeNext(completable, workflowContext);
diff --git a/impl/test/src/test/java/io/serverlessworkflow/impl/test/RetryTimeoutTest.java b/impl/test/src/test/java/io/serverlessworkflow/impl/test/RetryTimeoutTest.java
@@ -16,7 +16,9 @@
 package io.serverlessworkflow.impl.test;
 
 import static io.serverlessworkflow.api.WorkflowReader.readWorkflowFromClasspath;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertThat;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.serverlessworkflow.impl.WorkflowApplication;
@@ -38,7 +40,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-public class RetryTest {
+public class RetryTimeoutTest {
 
   private static WorkflowApplication app;
   private MockWebServer apiServer;
@@ -106,4 +108,17 @@ void testRetryEnd() throws IOException {
                     .join())
         .hasCauseInstanceOf(WorkflowException.class);
   }
+
+  @Test
+  void testTimeout() throws IOException {
+    Map<String, Object> result =
+        app.workflowDefinition(
+                readWorkflowFromClasspath("workflows-samples/listen-to-one-timeout.yaml"))
+            .instance(Map.of("delay", 0.01f))
+            .start()
+            .join()
+            .asMap()
+            .orElseThrow();
+    assertThat(result.get("message")).isEqualTo("Viva er Beti Balompie");
+  }
 }
diff --git a/impl/test/src/test/resources/workflows-samples/listen-to-one-timeout.yaml b/impl/test/src/test/resources/workflows-samples/listen-to-one-timeout.yaml
@@ -0,0 +1,26 @@
+document:
+  dsl: '1.0.0-alpha5'
+  namespace: test
+  name: listen-to-one-timeout
+  version: '0.1.0'
+do:
+ - tryListen:
+     try:
+        - waitingNotForever:
+              listen:
+                to:
+                  one:
+                    with:
+                      type: neven-happening-event
+              timeout:
+                after: ${"PT\(.delay)S"}
+     catch:
+        errors:
+         with:
+            type: https://serverlessworkflow.io/spec/1.0.0/errors/timeout
+            status: 408
+        do:
+          - setMessage:
+              set: 
+                message: Viva er Beti Balompie
+            

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,10 @@ public static Builder runtime(TaskContext context, Exception ex) {`
`56`	`56`	`return runtime(Errors.RUNTIME.status(), context, ex);`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ public static Builder timeout() {`
	`60`	`+ return error(Errors.TIMEOUT.toString(), Errors.TIMEOUT.status());`
	`61`	`+ }`
	`62`	`+`
`59`	`63`	`public static class Builder {`
`60`	`64`
`61`	`65`	`private final String type;`