Refactoring HTTP request builder (#1046)

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

Author: fjtirado

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowUtils.java

@@ -21,6 +21,9 @@
 import io.serverlessworkflow.api.types.OutputAs;
 import io.serverlessworkflow.api.types.SchemaUnion;
 import io.serverlessworkflow.api.types.SecretBasedAuthenticationPolicy;
+import io.serverlessworkflow.api.types.TaskBase;
+import io.serverlessworkflow.api.types.TaskTimeout;
+import io.serverlessworkflow.api.types.Timeout;
 import io.serverlessworkflow.api.types.TimeoutAfter;
 import io.serverlessworkflow.api.types.UriTemplate;
 import io.serverlessworkflow.api.types.Workflow;
@@ -34,6 +37,7 @@
 import java.net.URISyntaxException;
 import java.time.Duration;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -208,6 +212,28 @@ public static WorkflowValueResolver<Duration> fromTimeoutAfter(
     }
   }
 
+  public static Optional<WorkflowValueResolver<Duration>> getTaskTimeout(
+      WorkflowApplication appl, Workflow workflow, TaskBase task) {
+    TaskTimeout timeout = task.getTimeout();
+    if (timeout == null) {
+      return Optional.empty();
+    }
+    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(appl, timeoutDef.getAfter()));
+  }
+
   public static final String secretProp(WorkflowContext context, String secretName, String prop) {
     return (String) secret(context, secretName).get(prop);
   }

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

@@ -24,8 +24,6 @@
 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;
@@ -52,7 +50,6 @@
 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;
@@ -124,28 +121,7 @@ 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) {
-        return Optional.empty();
-      }
-      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()));
+      this.timeout = WorkflowUtils.getTaskTimeout(application, workflow, task);
     }
 
     protected final TransitionInfoBuilder next(

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/AbstractHttpExecutorBuilder.java

@@ -52,7 +52,7 @@ public WorkflowModel apply(
   private void validateStatus(TaskContext task, Response response, HttpModelConverter converter) {
     Family statusFamily = response.getStatusInfo().getFamily();
 
-    if (statusFamily != SUCCESSFUL || (!this.redirect && statusFamily == REDIRECTION)) {
+    if (statusFamily != SUCCESSFUL && (!this.redirect || statusFamily != REDIRECTION)) {
       throw new WorkflowException(
           converter
               .errorFromResponse(WorkflowError.communication(response.getStatus(), task), response)

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/AbstractRequestSupplier.java

@@ -23,54 +23,64 @@
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 import io.serverlessworkflow.impl.WorkflowMutablePosition;
+import io.serverlessworkflow.impl.WorkflowUtils;
+import io.serverlessworkflow.impl.WorkflowValueResolver;
+import io.serverlessworkflow.impl.executors.CallableTask;
 import io.serverlessworkflow.impl.executors.CallableTaskBuilder;
-import java.util.Optional;
+import java.net.URI;
 
-public class CallableTaskHttpExecutorBuilder extends AbstractHttpExecutorBuilder
-    implements CallableTaskBuilder<CallHTTP> {
+public class CallableTaskHttpExecutorBuilder implements CallableTaskBuilder<CallHTTP> {
+
+  private HttpExecutorBuilder builder;
+  private WorkflowValueResolver<URI> uriSupplier;
 
   @Override
   public void init(CallHTTP task, WorkflowDefinition definition, WorkflowMutablePosition position) {
+
+    builder = HttpExecutorBuilder.builder(definition);
     final HTTPArguments httpArgs = task.getWith();
     final Endpoint endpoint = httpArgs.getEndpoint();
 
-    this.authProvider =
-        endpoint.getEndpointConfiguration() == null
-            ? Optional.empty()
-            : AuthProviderFactory.getAuth(
-                definition, endpoint.getEndpointConfiguration().getAuthentication());
+    if (endpoint.getEndpointConfiguration() != null) {
+      builder.withAuth(endpoint.getEndpointConfiguration().getAuthentication());
+    }
 
-    this.targetSupplier = getTargetSupplier(definition.resourceLoader().uriSupplier(endpoint));
+    uriSupplier = definition.resourceLoader().uriSupplier(endpoint);
 
     if (httpArgs.getHeaders() != null) {
-      this.headersMap =
+      builder.withHeaders(
           buildMapResolver(
               definition.application(),
               httpArgs.getHeaders().getRuntimeExpression(),
               httpArgs.getHeaders().getHTTPHeaders() != null
                   ? httpArgs.getHeaders().getHTTPHeaders().getAdditionalProperties()
-                  : null);
+                  : null));
     }
 
     if (httpArgs.getQuery() != null) {
-      queryMap =
+      builder.withQueryMap(
           buildMapResolver(
               definition.application(),
               httpArgs.getQuery().getRuntimeExpression(),
               httpArgs.getQuery().getHTTPQuery() != null
                   ? httpArgs.getQuery().getHTTPQuery().getAdditionalProperties()
-                  : null);
+                  : null));
     }
-    this.requestFunction =
-        buildRequestSupplier(
-            httpArgs.getMethod().toUpperCase(),
-            httpArgs.getBody(),
-            httpArgs.isRedirect(),
-            definition.application());
+
+    builder.withBody(httpArgs.getBody());
+    builder.withMethod(httpArgs.getMethod().toUpperCase());
+    builder.redirect(httpArgs.isRedirect());
+    builder.timeout(
+        WorkflowUtils.getTaskTimeout(definition.application(), definition.workflow(), task));
   }
 
   @Override
   public boolean accept(Class<? extends TaskBase> clazz) {
     return clazz.equals(CallHTTP.class);
   }
+
+  @Override
+  public CallableTask build() {
+    return builder.build(uriSupplier);
+  }
 }

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/CallableTaskHttpExecutorBuilder.java

@@ -16,9 +16,12 @@
 package io.serverlessworkflow.impl.executors.http;
 
 import io.serverlessworkflow.impl.TaskContext;
+import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowContext;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
+import java.time.Duration;
+import java.util.Optional;
 
 public class HttpClientResolver {
 
@@ -29,10 +32,16 @@ private static class DefaultHolder {
   }
 
   public static Client client(WorkflowContext workflowContext, TaskContext taskContext) {
-    return workflowContext
-        .definition()
-        .application()
-        .<Client>additionalObject(HTTP_CLIENT_PROVIDER, workflowContext, taskContext)
+    return client(workflowContext, taskContext, false, Optional.empty());
+  }
+
+  public static Client client(
+      WorkflowContext workflowContext,
+      TaskContext taskContext,
+      boolean redirect,
+      Optional<Duration> timeout) {
+    WorkflowApplication appl = workflowContext.definition().application();
+    return appl.<Client>additionalObject(HTTP_CLIENT_PROVIDER, workflowContext, taskContext)
         .orElseGet(() -> DefaultHolder.client);
   }