From c2ee799ef23828edc91195b20ee1715f136de2a0 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <ricardozanini@gmail.com>
Date: Mon, 17 Nov 2025 18:44:29 -0500
Subject: [PATCH 1/3] Adjust openapi step

Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com>
---
 .../fluent/func/dsl/FuncCallHttpSpec.java     |  34 ------
 .../fluent/func/dsl/FuncCallHttpStep.java     |  67 +++++++++++
 ...nAPISpec.java => FuncCallOpenAPIStep.java} |  58 +++++++---
 .../fluent/func/dsl/FuncDSL.java              | 105 ++++++++++--------
 .../fluent/func/dsl/Step.java                 |   2 +-
 .../fluent/func/FuncDSLTest.java              |   9 +-
 .../fluent/spec/dsl/BaseCallHttpSpec.java     |  76 +++++++------
 .../fluent/spec/dsl/CallHttpSpec.java         |  22 +++-
 8 files changed, 235 insertions(+), 138 deletions(-)
 delete mode 100644 experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpSpec.java
 create mode 100644 experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpStep.java
 rename experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/{FuncCallOpenAPISpec.java => FuncCallOpenAPIStep.java} (56%)

diff --git a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpSpec.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpSpec.java
deleted file mode 100644
index 58259b80..00000000
--- a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpSpec.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2020-Present The Serverless Workflow Specification Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.serverlessworkflow.fluent.func.dsl;
-
-import io.serverlessworkflow.fluent.func.FuncCallHttpTaskBuilder;
-import io.serverlessworkflow.fluent.func.configurers.FuncCallHttpConfigurer;
-import io.serverlessworkflow.fluent.spec.dsl.BaseCallHttpSpec;
-
-public class FuncCallHttpSpec extends BaseCallHttpSpec<FuncCallHttpSpec>
-    implements FuncCallHttpConfigurer {
-
-  @Override
-  protected FuncCallHttpSpec self() {
-    return this;
-  }
-
-  @Override
-  public void accept(FuncCallHttpTaskBuilder funcCallHttpTaskBuilder) {
-    super.accept(funcCallHttpTaskBuilder);
-  }
-}
diff --git a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpStep.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpStep.java
new file mode 100644
index 00000000..2cb56f1c
--- /dev/null
+++ b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpStep.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.fluent.func.dsl;
+
+import io.serverlessworkflow.fluent.func.FuncCallHttpTaskBuilder;
+import io.serverlessworkflow.fluent.func.FuncTaskItemListBuilder;
+import io.serverlessworkflow.fluent.spec.dsl.BaseCallHttpSpec;
+import io.serverlessworkflow.fluent.spec.spi.CallHttpTaskFluent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+public class FuncCallHttpStep extends Step<FuncCallHttpStep, FuncCallHttpTaskBuilder>
+    implements BaseCallHttpSpec<FuncCallHttpStep> {
+
+  private final List<Consumer<CallHttpTaskFluent<?>>> steps = new ArrayList<>();
+
+  private String name;
+
+  public FuncCallHttpStep(String name) {
+    this.name = name;
+  }
+
+  public FuncCallHttpStep() {}
+
+  @Override
+  public FuncCallHttpStep self() {
+    return this;
+  }
+
+  protected void configure(FuncTaskItemListBuilder list, Consumer<FuncCallHttpTaskBuilder> post) {
+    if (name == null) {
+      list.http(
+          builder -> {
+            // Apply HTTP config (BaseCallHttpSpec)
+            this.accept(builder); // default method from BaseCallHttpSpec
+            // Apply Step’s post-configurers (when / inputFrom / outputAs / exportAs)
+            post.accept(builder);
+          });
+    } else {
+      list.http(
+          name,
+          builder -> {
+            this.accept(builder);
+            post.accept(builder);
+          });
+    }
+  }
+
+  @Override
+  public List<Consumer<CallHttpTaskFluent<?>>> steps() {
+    return steps;
+  }
+}
diff --git a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallOpenAPISpec.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallOpenAPIStep.java
similarity index 56%
rename from experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallOpenAPISpec.java
rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallOpenAPIStep.java
index 5915920b..c46bd051 100644
--- a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallOpenAPISpec.java
+++ b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallOpenAPIStep.java
@@ -17,7 +17,7 @@
 
 import io.serverlessworkflow.api.types.OpenAPIArguments;
 import io.serverlessworkflow.fluent.func.FuncCallOpenAPITaskBuilder;
-import io.serverlessworkflow.fluent.func.configurers.FuncCallOpenAPIConfigurer;
+import io.serverlessworkflow.fluent.func.FuncTaskItemListBuilder;
 import io.serverlessworkflow.fluent.spec.configurers.AuthenticationConfigurer;
 import io.serverlessworkflow.fluent.spec.spi.CallOpenAPITaskFluent;
 import java.net.URI;
@@ -26,65 +26,93 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-public class FuncCallOpenAPISpec implements FuncCallOpenAPIConfigurer {
+public class FuncCallOpenAPIStep extends Step<FuncCallOpenAPIStep, FuncCallOpenAPITaskBuilder> {
 
   private final List<Consumer<CallOpenAPITaskFluent<?>>> steps = new ArrayList<>();
 
-  public FuncCallOpenAPISpec document(String uri) {
+  private String name;
+
+  public FuncCallOpenAPIStep(String name) {
+    this.name = name;
+  }
+
+  public FuncCallOpenAPIStep() {}
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public FuncCallOpenAPIStep document(String uri) {
     steps.add(b -> b.document(uri));
     return this;
   }
 
-  public FuncCallOpenAPISpec document(
+  public FuncCallOpenAPIStep document(
       String uri, AuthenticationConfigurer authenticationConfigurer) {
     steps.add(b -> b.document(uri, authenticationConfigurer));
     return this;
   }
 
-  public FuncCallOpenAPISpec document(URI uri) {
+  public FuncCallOpenAPIStep document(URI uri) {
     steps.add(b -> b.document(uri));
     return this;
   }
 
-  public FuncCallOpenAPISpec document(URI uri, AuthenticationConfigurer authenticationConfigurer) {
+  public FuncCallOpenAPIStep document(URI uri, AuthenticationConfigurer authenticationConfigurer) {
     steps.add(b -> b.document(uri, authenticationConfigurer));
     return this;
   }
 
-  public FuncCallOpenAPISpec operation(String operationId) {
+  public FuncCallOpenAPIStep operation(String operationId) {
     steps.add(b -> b.operation(operationId));
     return this;
   }
 
-  public FuncCallOpenAPISpec parameters(Map<String, Object> params) {
+  public FuncCallOpenAPIStep parameters(Map<String, Object> params) {
     steps.add(b -> b.parameters(params));
     return this;
   }
 
-  public FuncCallOpenAPISpec parameter(String name, String value) {
+  public FuncCallOpenAPIStep parameter(String name, String value) {
     steps.add(b -> b.parameter(name, value));
     return this;
   }
 
-  public FuncCallOpenAPISpec redirect(boolean redirect) {
+  public FuncCallOpenAPIStep redirect(boolean redirect) {
     steps.add(b -> b.redirect(redirect));
     return this;
   }
 
-  public FuncCallOpenAPISpec authentication(AuthenticationConfigurer authenticationConfigurer) {
+  public FuncCallOpenAPIStep authentication(AuthenticationConfigurer authenticationConfigurer) {
     steps.add(b -> b.authentication(authenticationConfigurer));
     return this;
   }
 
-  public FuncCallOpenAPISpec output(OpenAPIArguments.WithOpenAPIOutput output) {
+  public FuncCallOpenAPIStep output(OpenAPIArguments.WithOpenAPIOutput output) {
     steps.add(b -> b.output(output));
     return this;
   }
 
   @Override
-  public void accept(FuncCallOpenAPITaskBuilder builder) {
-    for (var s : steps) {
-      s.accept(builder);
+  protected void configure(
+      FuncTaskItemListBuilder list, Consumer<FuncCallOpenAPITaskBuilder> post) {
+    if (name == null) {
+      list.openapi(
+          builder -> {
+            for (Consumer<CallOpenAPITaskFluent<?>> c : steps) {
+              c.accept(builder); // OpenAPI DSL
+            }
+            post.accept(builder); // when/inputFrom/outputAs/exportAs
+          });
+    } else {
+      list.openapi(
+          name,
+          builder -> {
+            for (Consumer<CallOpenAPITaskFluent<?>> c : steps) {
+              c.accept(builder);
+            }
+            post.accept(builder);
+          });
     }
   }
 }
diff --git a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java
index a98153fc..c2100d2f 100644
--- a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java
+++ b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java
@@ -24,6 +24,7 @@
 import io.serverlessworkflow.fluent.func.FuncSwitchTaskBuilder;
 import io.serverlessworkflow.fluent.func.FuncTaskItemListBuilder;
 import io.serverlessworkflow.fluent.func.configurers.FuncCallHttpConfigurer;
+import io.serverlessworkflow.fluent.func.configurers.FuncCallOpenAPIConfigurer;
 import io.serverlessworkflow.fluent.func.configurers.FuncPredicateEventConfigurer;
 import io.serverlessworkflow.fluent.func.configurers.FuncTaskConfigurer;
 import io.serverlessworkflow.fluent.func.configurers.SwitchCaseConfigurer;
@@ -883,7 +884,7 @@ public static FuncTaskConfigurer call(String name, FuncCallHttpConfigurer config
   }
 
   /**
-   * HTTP call using a fluent {@link FuncCallHttpSpec}.
+   * HTTP call using a fluent {@link FuncCallHttpStep}.
    *
    * <p>This overload creates an unnamed HTTP task.
    *
@@ -900,12 +901,12 @@ public static FuncTaskConfigurer call(String name, FuncCallHttpConfigurer config
    * @param spec fluent HTTP spec built via {@link #http()}
    * @return a {@link FuncTaskConfigurer} that adds an HTTP task
    */
-  public static FuncTaskConfigurer call(FuncCallHttpSpec spec) {
+  public static FuncTaskConfigurer call(FuncCallHttpStep spec) {
     return call(null, spec);
   }
 
   /**
-   * HTTP call using a fluent {@link FuncCallHttpSpec} with explicit task name.
+   * HTTP call using a fluent {@link FuncCallHttpStep} with explicit task name.
    *
    * <pre>{@code
    * tasks(
@@ -921,13 +922,13 @@ public static FuncTaskConfigurer call(FuncCallHttpSpec spec) {
    * @param spec fluent HTTP spec built via {@link #http()}
    * @return a {@link FuncTaskConfigurer} that adds an HTTP task
    */
-  public static FuncTaskConfigurer call(String name, FuncCallHttpSpec spec) {
+  public static FuncTaskConfigurer call(String name, FuncCallHttpStep spec) {
     Objects.requireNonNull(spec, "spec");
-    return call(name, spec::accept);
+    return call(name, (FuncCallHttpConfigurer) spec::accept);
   }
 
   /**
-   * OpenAPI call using a fluent {@link FuncCallOpenAPISpec}.
+   * OpenAPI call using a fluent {@link FuncCallOpenAPIStep}.
    *
    * <p>This overload creates an unnamed OpenAPI call task.
    *
@@ -946,12 +947,12 @@ public static FuncTaskConfigurer call(String name, FuncCallHttpSpec spec) {
    * @param spec fluent OpenAPI spec built via {@link #openapi()}
    * @return a {@link FuncTaskConfigurer} that adds an OpenAPI call task to the workflow
    */
-  public static FuncTaskConfigurer call(FuncCallOpenAPISpec spec) {
+  public static FuncTaskConfigurer call(FuncCallOpenAPIStep spec) {
     return call(null, spec);
   }
 
   /**
-   * OpenAPI call using a fluent {@link FuncCallOpenAPISpec} with an explicit task name.
+   * OpenAPI call using a fluent {@link FuncCallOpenAPIStep} with an explicit task name.
    *
    * <p>Example:
    *
@@ -973,13 +974,23 @@ public static FuncTaskConfigurer call(FuncCallOpenAPISpec spec) {
    * @param spec fluent OpenAPI spec built via {@link #openapi()}
    * @return a {@link FuncTaskConfigurer} that adds a named OpenAPI call task
    */
-  public static FuncTaskConfigurer call(String name, FuncCallOpenAPISpec spec) {
+  public static FuncTaskConfigurer call(String name, FuncCallOpenAPIStep spec) {
     Objects.requireNonNull(spec, "spec");
-    return list -> list.openapi(name, spec);
+    spec.setName(name);
+    return spec;
+  }
+
+  public static FuncTaskConfigurer call(FuncCallOpenAPIConfigurer configurer) {
+    return call(null, configurer);
+  }
+
+  public static FuncTaskConfigurer call(String name, FuncCallOpenAPIConfigurer configurer) {
+    Objects.requireNonNull(configurer, "configurer");
+    return list -> list.openapi(name, configurer);
   }
 
   /**
-   * Create a new OpenAPI specification to be used with {@link #call(FuncCallOpenAPISpec)}.
+   * Create a new OpenAPI specification to be used with {@link #call(FuncCallOpenAPIStep)}.
    *
    * <p>Typical usage:
    *
@@ -996,14 +1007,18 @@ public static FuncTaskConfigurer call(String name, FuncCallOpenAPISpec spec) {
    * parameters, authentication, etc.) and applies them to the underlying OpenAPI call task at build
    * time.
    *
-   * @return a new {@link FuncCallOpenAPISpec}
+   * @return a new {@link FuncCallOpenAPIStep}
    */
-  public static FuncCallOpenAPISpec openapi() {
-    return new FuncCallOpenAPISpec();
+  public static FuncCallOpenAPIStep openapi() {
+    return new FuncCallOpenAPIStep();
+  }
+
+  public static FuncCallOpenAPIStep openapi(String name) {
+    return new FuncCallOpenAPIStep(name);
   }
 
   /**
-   * Create a new, empty HTTP specification to be used with {@link #call(FuncCallHttpSpec)}.
+   * Create a new, empty HTTP specification to be used with {@link #call(FuncCallHttpStep)}.
    *
    * <p>Typical usage:
    *
@@ -1016,10 +1031,14 @@ public static FuncCallOpenAPISpec openapi() {
    * );
    * }</pre>
    *
-   * @return a new {@link FuncCallHttpSpec}
+   * @return a new {@link FuncCallHttpStep}
    */
-  public static FuncCallHttpSpec http() {
-    return new FuncCallHttpSpec();
+  public static FuncCallHttpStep http() {
+    return new FuncCallHttpStep();
+  }
+
+  public static FuncCallHttpStep http(String name) {
+    return new FuncCallHttpStep(name);
   }
 
   /**
@@ -1034,10 +1053,10 @@ public static FuncCallHttpSpec http() {
    *
    * @param urlExpr expression or literal string for the endpoint URL
    * @param auth authentication configurer (e.g. {@code auth -> auth.use("my-auth")})
-   * @return a {@link FuncCallHttpSpec} preconfigured with endpoint + auth
+   * @return a {@link FuncCallHttpStep} preconfigured with endpoint + auth
    */
-  public static FuncCallHttpSpec http(String urlExpr, AuthenticationConfigurer auth) {
-    return new FuncCallHttpSpec().endpoint(urlExpr, auth);
+  public static FuncCallHttpStep http(String urlExpr, AuthenticationConfigurer auth) {
+    return new FuncCallHttpStep().endpoint(urlExpr, auth);
   }
 
   /**
@@ -1045,10 +1064,10 @@ public static FuncCallHttpSpec http(String urlExpr, AuthenticationConfigurer aut
    *
    * @param url concrete URI to call
    * @param auth authentication configurer
-   * @return a {@link FuncCallHttpSpec} preconfigured with URI + auth
+   * @return a {@link FuncCallHttpStep} preconfigured with URI + auth
    */
-  public static FuncCallHttpSpec http(URI url, AuthenticationConfigurer auth) {
-    return new FuncCallHttpSpec().uri(url, auth);
+  public static FuncCallHttpStep http(URI url, AuthenticationConfigurer auth) {
+    return new FuncCallHttpStep().uri(url, auth);
   }
 
   /**
@@ -1063,7 +1082,7 @@ public static FuncCallHttpSpec http(URI url, AuthenticationConfigurer auth) {
    * @param endpoint literal or expression for the endpoint URL
    * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
    */
-  public static FuncTaskConfigurer get(String endpoint) {
+  public static FuncCallHttpStep get(String endpoint) {
     return get(null, endpoint);
   }
 
@@ -1080,8 +1099,8 @@ public static FuncTaskConfigurer get(String endpoint) {
    * @param endpoint literal or expression for the endpoint URL
    * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
    */
-  public static FuncTaskConfigurer get(String name, String endpoint) {
-    return call(name, http().GET().endpoint(endpoint));
+  public static FuncCallHttpStep get(String name, String endpoint) {
+    return http(name).GET().endpoint(endpoint);
   }
 
   /**
@@ -1097,7 +1116,7 @@ public static FuncTaskConfigurer get(String name, String endpoint) {
    * @param auth authentication configurer
    * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
    */
-  public static FuncTaskConfigurer get(String endpoint, AuthenticationConfigurer auth) {
+  public static FuncCallHttpStep get(String endpoint, AuthenticationConfigurer auth) {
     return get(null, endpoint, auth);
   }
 
@@ -1109,9 +1128,8 @@ public static FuncTaskConfigurer get(String endpoint, AuthenticationConfigurer a
    * @param auth authentication configurer
    * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
    */
-  public static FuncTaskConfigurer get(
-      String name, String endpoint, AuthenticationConfigurer auth) {
-    return call(name, http().GET().endpoint(endpoint, auth));
+  public static FuncCallHttpStep get(String name, String endpoint, AuthenticationConfigurer auth) {
+    return http(name).GET().endpoint(endpoint, auth);
   }
 
   /**
@@ -1120,7 +1138,7 @@ public static FuncTaskConfigurer get(
    * @param endpoint concrete URI to call
    * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
    */
-  public static FuncTaskConfigurer get(URI endpoint) {
+  public static FuncCallHttpStep get(URI endpoint) {
     return get(null, endpoint);
   }
 
@@ -1131,8 +1149,8 @@ public static FuncTaskConfigurer get(URI endpoint) {
    * @param endpoint concrete URI to call
    * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
    */
-  public static FuncTaskConfigurer get(String name, URI endpoint) {
-    return call(name, http().GET().uri(endpoint));
+  public static FuncCallHttpStep get(String name, URI endpoint) {
+    return http(name).GET().uri(endpoint);
   }
 
   /**
@@ -1142,7 +1160,7 @@ public static FuncTaskConfigurer get(String name, URI endpoint) {
    * @param auth authentication configurer
    * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
    */
-  public static FuncTaskConfigurer get(URI endpoint, AuthenticationConfigurer auth) {
+  public static FuncCallHttpStep get(URI endpoint, AuthenticationConfigurer auth) {
     return get(null, endpoint, auth);
   }
 
@@ -1154,8 +1172,8 @@ public static FuncTaskConfigurer get(URI endpoint, AuthenticationConfigurer auth
    * @param auth authentication configurer
    * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
    */
-  public static FuncTaskConfigurer get(String name, URI endpoint, AuthenticationConfigurer auth) {
-    return call(name, http().GET().uri(endpoint, auth));
+  public static FuncCallHttpStep get(String name, URI endpoint, AuthenticationConfigurer auth) {
+    return http(name).GET().uri(endpoint, auth);
   }
 
   /**
@@ -1174,7 +1192,7 @@ public static FuncTaskConfigurer get(String name, URI endpoint, AuthenticationCo
    * @param endpointExpr literal or expression for the endpoint URL
    * @return a {@link FuncTaskConfigurer} adding a {@code POST} HTTP task
    */
-  public static FuncTaskConfigurer post(Object body, String endpointExpr) {
+  public static FuncCallHttpStep post(Object body, String endpointExpr) {
     return post(null, body, endpointExpr);
   }
 
@@ -1186,8 +1204,8 @@ public static FuncTaskConfigurer post(Object body, String endpointExpr) {
    * @param endpoint literal or expression for the endpoint URL
    * @return a {@link FuncTaskConfigurer} adding a {@code POST} HTTP task
    */
-  public static FuncTaskConfigurer post(String name, Object body, String endpoint) {
-    return call(name, http().POST().endpoint(endpoint).body(body));
+  public static FuncCallHttpStep post(String name, Object body, String endpoint) {
+    return http(name).POST().endpoint(endpoint).body(body);
   }
 
   /**
@@ -1198,8 +1216,7 @@ public static FuncTaskConfigurer post(String name, Object body, String endpoint)
    * @param auth authentication configurer
    * @return a {@link FuncTaskConfigurer} adding an authenticated {@code POST} HTTP task
    */
-  public static FuncTaskConfigurer post(
-      Object body, String endpoint, AuthenticationConfigurer auth) {
+  public static FuncCallHttpStep post(Object body, String endpoint, AuthenticationConfigurer auth) {
     return post(null, body, endpoint, auth);
   }
 
@@ -1212,9 +1229,9 @@ public static FuncTaskConfigurer post(
    * @param auth authentication configurer
    * @return a {@link FuncTaskConfigurer} adding an authenticated {@code POST} HTTP task
    */
-  public static FuncTaskConfigurer post(
+  public static FuncCallHttpStep post(
       String name, Object body, String endpoint, AuthenticationConfigurer auth) {
 
-    return call(name, http().POST().endpoint(endpoint, auth).body(body));
+    return http(name).POST().endpoint(endpoint, auth).body(body);
   }
 }
diff --git a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/Step.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/Step.java
index 9ce49b97..6e302126 100644
--- a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/Step.java
+++ b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/Step.java
@@ -37,7 +37,7 @@ abstract class Step<SELF extends Step<SELF, B>, B> implements FuncTaskConfigurer
   private final List<Consumer<B>> postConfigurers = new ArrayList<>();
 
   @SuppressWarnings("unchecked")
-  protected final SELF self() {
+  protected SELF self() {
     return (SELF) this;
   }
 
diff --git a/experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/FuncDSLTest.java b/experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/FuncDSLTest.java
index 2425eb6d..c89ad019 100644
--- a/experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/FuncDSLTest.java
+++ b/experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/FuncDSLTest.java
@@ -15,10 +15,12 @@
  */
 package io.serverlessworkflow.fluent.func;
 
+import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.call;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.emit;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.event;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.function;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.get;
+import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.http;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.listen;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.toOne;
 import static io.serverlessworkflow.fluent.spec.dsl.DSL.auth;
@@ -213,8 +215,7 @@ void switchWhenOrElse_jq_to_directive() {
   void http_spec_via_call_builds_call_http_task() {
     Workflow wf =
         FuncWorkflowBuilder.workflow("http-call-spec")
-            .tasks(
-                FuncDSL.call("checkHealth", FuncDSL.http().GET().endpoint("http://service/health")))
+            .tasks(call("checkHealth", http().GET().endpoint("http://service/health")))
             .build();
 
     List<TaskItem> items = wf.getDo();
@@ -401,9 +402,9 @@ void call_with_preconfigured_http_spec() {
     Workflow wf =
         FuncWorkflowBuilder.workflow("http-call-preconfigured")
             .tasks(
-                FuncDSL.call(
+                call(
                     "preconfigured",
-                    FuncDSL.http("http://service/api", auth -> auth.use("svc-auth"))
+                    http("http://service/api", auth -> auth.use("svc-auth"))
                         .POST()
                         .body(Map.of("foo", "bar"))))
             .build();
diff --git a/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/dsl/BaseCallHttpSpec.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/dsl/BaseCallHttpSpec.java
index 1348a0a3..ece52bca 100644
--- a/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/dsl/BaseCallHttpSpec.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/dsl/BaseCallHttpSpec.java
@@ -18,92 +18,98 @@
 import io.serverlessworkflow.fluent.spec.configurers.AuthenticationConfigurer;
 import io.serverlessworkflow.fluent.spec.spi.CallHttpTaskFluent;
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
-public abstract class BaseCallHttpSpec<SELF extends BaseCallHttpSpec<SELF>> {
+public interface BaseCallHttpSpec<SELF extends BaseCallHttpSpec<SELF>> {
 
-  private final List<Consumer<CallHttpTaskFluent<?>>> steps = new ArrayList<>();
+  /** Implementors must return the concrete SELF instance (usually {@code return this;}). */
+  SELF self();
 
-  protected abstract SELF self();
+  /**
+   * Internal list of configuration steps that will be replayed against the underlying {@link
+   * CallHttpTaskFluent}.
+   */
+  List<Consumer<CallHttpTaskFluent<?>>> steps();
 
-  public SELF GET() {
-    steps.add(c -> c.method("GET"));
+  default SELF GET() {
+    steps().add(c -> c.method("GET"));
     return self();
   }
 
-  public SELF POST() {
-    steps.add(c -> c.method("POST"));
+  default SELF POST() {
+    steps().add(c -> c.method("POST"));
     return self();
   }
 
-  public SELF acceptJSON() {
+  default SELF acceptJSON() {
     return header("Accept", "application/json");
   }
 
-  public SELF endpoint(String urlExpr) {
-    steps.add(b -> b.endpoint(urlExpr));
+  default SELF endpoint(String urlExpr) {
+    steps().add(b -> b.endpoint(urlExpr));
     return self();
   }
 
-  public SELF endpoint(String urlExpr, AuthenticationConfigurer auth) {
-    steps.add(b -> b.endpoint(urlExpr, auth));
+  default SELF endpoint(String urlExpr, AuthenticationConfigurer auth) {
+    steps().add(b -> b.endpoint(urlExpr, auth));
     return self();
   }
 
-  public SELF uri(String url) {
-    steps.add(b -> b.endpoint(URI.create(url)));
+  default SELF uri(String url) {
+    steps().add(b -> b.endpoint(URI.create(url)));
     return self();
   }
 
-  public SELF uri(String url, AuthenticationConfigurer auth) {
-    steps.add(b -> b.endpoint(URI.create(url), auth));
+  default SELF uri(String url, AuthenticationConfigurer auth) {
+    steps().add(b -> b.endpoint(URI.create(url), auth));
     return self();
   }
 
-  public SELF uri(URI uri) {
-    steps.add(b -> b.endpoint(uri));
+  default SELF uri(URI uri) {
+    steps().add(b -> b.endpoint(uri));
     return self();
   }
 
-  public SELF uri(URI uri, AuthenticationConfigurer auth) {
-    steps.add(b -> b.endpoint(uri, auth));
+  default SELF uri(URI uri, AuthenticationConfigurer auth) {
+    steps().add(b -> b.endpoint(uri, auth));
     return self();
   }
 
-  public SELF body(String bodyExpr) {
-    steps.add(c -> c.body(bodyExpr));
+  default SELF body(String bodyExpr) {
+    steps().add(c -> c.body(bodyExpr));
     return self();
   }
 
-  public SELF body(Map<String, Object> body) {
-    steps.add(c -> c.body(body));
+  default SELF body(Map<String, Object> body) {
+    steps().add(c -> c.body(body));
     return self();
   }
 
-  public SELF body(Object bodyExpr) {
-    steps.add(c -> c.body(bodyExpr));
+  default SELF body(Object bodyExpr) {
+    steps().add(c -> c.body(bodyExpr));
     return self();
   }
 
-  public SELF method(String method) {
-    steps.add(b -> b.method(method));
+  default SELF method(String method) {
+    steps().add(b -> b.method(method));
     return self();
   }
 
-  public SELF header(String name, String value) {
-    steps.add(c -> c.headers(h -> h.header(name, value)));
+  default SELF header(String name, String value) {
+    steps().add(c -> c.headers(h -> h.header(name, value)));
     return self();
   }
 
-  public SELF headers(Map<String, String> headers) {
-    steps.add(b -> b.headers(headers));
+  default SELF headers(Map<String, String> headers) {
+    steps().add(b -> b.headers(headers));
     return self();
   }
 
-  public void accept(CallHttpTaskFluent<?> b) {
-    for (var s : steps) s.accept(b);
+  default void accept(CallHttpTaskFluent<?> b) {
+    for (var s : steps()) {
+      s.accept(b);
+    }
   }
 }
diff --git a/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/dsl/CallHttpSpec.java b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/dsl/CallHttpSpec.java
index 4c9b85d3..0cc53fa2 100644
--- a/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/dsl/CallHttpSpec.java
+++ b/fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/dsl/CallHttpSpec.java
@@ -17,17 +17,29 @@
 
 import io.serverlessworkflow.fluent.spec.CallHttpTaskBuilder;
 import io.serverlessworkflow.fluent.spec.configurers.CallHttpConfigurer;
+import io.serverlessworkflow.fluent.spec.spi.CallHttpTaskFluent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
 
-public final class CallHttpSpec extends BaseCallHttpSpec<CallHttpSpec>
-    implements CallHttpConfigurer {
+public final class CallHttpSpec implements BaseCallHttpSpec<CallHttpSpec>, CallHttpConfigurer {
+
+  private final List<Consumer<CallHttpTaskFluent<?>>> steps = new ArrayList<>();
+
+  public CallHttpSpec() {}
 
   @Override
-  protected CallHttpSpec self() {
+  public CallHttpSpec self() {
     return this;
   }
 
   @Override
-  public void accept(CallHttpTaskBuilder callHttpTaskBuilder) {
-    super.accept(callHttpTaskBuilder);
+  public List<Consumer<CallHttpTaskFluent<?>>> steps() {
+    return steps;
+  }
+
+  @Override
+  public void accept(CallHttpTaskBuilder builder) {
+    BaseCallHttpSpec.super.accept(builder);
   }
 }

From cbc4398bfd9856018dab1957a23c78640bf86162 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <ricardozanini@gmail.com>
Date: Mon, 17 Nov 2025 18:53:03 -0500
Subject: [PATCH 2/3] Update javadoc

Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com>
---
 .../fluent/func/dsl/FuncDSL.java              | 308 ++++++++++++------
 1 file changed, 200 insertions(+), 108 deletions(-)

diff --git a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java
index c2100d2f..2f06a81e 100644
--- a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java
+++ b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java
@@ -32,6 +32,7 @@
 import io.serverlessworkflow.fluent.spec.configurers.AuthenticationConfigurer;
 import io.serverlessworkflow.impl.TaskContextData;
 import io.serverlessworkflow.impl.WorkflowContextData;
+
 import java.net.URI;
 import java.util.Collection;
 import java.util.List;
@@ -48,22 +49,23 @@
  *
  * <ul>
  *   <li>Infer input types for Java lambdas where possible.
- *   <li>Expose chainable steps (e.g., {@code emit(...).exportAs(...).when(...)}) via {@code Step}s.
+ *   <li>Expose chainable steps (e.g., {@code emit(...).exportAs(...).when(...)}) via {@link Step}
+ *       subclasses.
  *   <li>Provide opinionated helpers for CloudEvents (JSON/bytes) and listen strategies.
- *   <li>Offer context-aware function variants ({@code withContext}, {@code withInstanceId}, {@code
- *       agent}).
+ *   <li>Offer context-aware function variants ({@code withContext}, {@code withInstanceId},
+ *       {@code withUniqueId}, {@code agent}).
  * </ul>
  *
  * <p>Typical usage:
  *
  * <pre>{@code
- * Workflow wf = FuncWorkflowBuilder.workflow()
+ * Workflow wf = FuncWorkflowBuilder.workflow("example")
  *   .tasks(
  *     FuncDSL.function(String::trim, String.class),
  *     FuncDSL.emitJson("org.acme.started", MyPayload.class),
  *     FuncDSL.listen(FuncDSL.toAny("type.one", "type.two"))
  *       .outputAs(map -> map.get("value")),
- *     FuncDSL.switchWhenOrElse((Integer v) -> v > 0, "positive", FlowDirectiveEnum.END)
+ *     FuncDSL.switchWhenOrElse((Integer v) -> v > 0, "positive", FlowDirectiveEnum.END, Integer.class)
  *   ).build();
  * }</pre>
  */
@@ -73,8 +75,8 @@ public final class FuncDSL {
   private FuncDSL() {}
 
   /**
-   * Create a builder configurer for a {@link FuncCallTaskBuilder} that invokes a plain Java {@link
-   * Function} with an explicit input type.
+   * Create a builder configurer for a {@link FuncCallTaskBuilder} that invokes a plain Java
+   * {@link Function} with an explicit input type.
    *
    * @param function the function to call during task execution
    * @param argClass the expected input class for type-safe model conversion
@@ -83,13 +85,13 @@ private FuncDSL() {}
    * @return a consumer that configures a {@code FuncCallTaskBuilder}
    */
   public static <T, V> Consumer<FuncCallTaskBuilder> fn(
-      Function<T, V> function, Class<T> argClass) {
+          Function<T, V> function, Class<T> argClass) {
     return OPS.fn(function, argClass);
   }
 
   /**
-   * Create a builder configurer for a {@link FuncCallTaskBuilder} that invokes a plain Java {@link
-   * Function}. The input type is inferred when possible.
+   * Create a builder configurer for a {@link FuncCallTaskBuilder} that invokes a plain Java
+   * {@link Function}. The input type is inferred when possible.
    *
    * @param function the function to call during task execution
    * @param <T> input type
@@ -145,8 +147,8 @@ public static SwitchCaseConfigurer caseDefault(String task) {
   }
 
   /**
-   * Default branch for a switch that uses a {@link FlowDirectiveEnum} (e.g. {@code END}, {@code
-   * CONTINUE}).
+   * Default branch for a switch that uses a {@link FlowDirectiveEnum} (e.g. {@code END},
+   * {@code CONTINUE}).
    *
    * @param directive fallback directive when no predicate matches
    * @return switch case configurer
@@ -203,8 +205,8 @@ public static FuncListenSpec toAny(String... types) {
   }
 
   /**
-   * Build an {@code emit} event configurer by supplying a type and a function that produces {@link
-   * CloudEventData}. The function is invoked at runtime with the current payload.
+   * Build an {@code emit} event configurer by supplying a type and a function that produces
+   * {@link CloudEventData}. The function is invoked at runtime with the current payload.
    *
    * @param type CloudEvent type
    * @param function function that maps workflow input to {@link CloudEventData}
@@ -212,7 +214,7 @@ public static FuncListenSpec toAny(String... types) {
    * @return a consumer to configure {@link FuncEmitTaskBuilder}
    */
   public static <T> Consumer<FuncEmitTaskBuilder> event(
-      String type, Function<T, CloudEventData> function) {
+          String type, Function<T, CloudEventData> function) {
     return OPS.event(type, function);
   }
 
@@ -226,13 +228,14 @@ public static <T> Consumer<FuncEmitTaskBuilder> event(
    * @return a consumer to configure {@link FuncEmitTaskBuilder}
    */
   public static <T> Consumer<FuncEmitTaskBuilder> event(
-      String type, Function<T, CloudEventData> function, Class<T> clazz) {
+          String type, Function<T, CloudEventData> function, Class<T> clazz) {
     return OPS.event(type, function, clazz);
   }
 
   /**
-   * Emit a JSON CloudEvent for a POJO input type. Sets {@code contentType=application/json} and
-   * serializes the input to bytes using the configured JSON mapper.
+   * Emit a JSON CloudEvent for a POJO input type. Sets
+   * {@code contentType=application/json} and serializes the input to bytes using the configured
+   * JSON mapper.
    *
    * @param type CloudEvent type
    * @param clazz input POJO class (used for typing and conversion)
@@ -253,7 +256,7 @@ public static <T> Consumer<FuncEmitTaskBuilder> eventJson(String type, Class<T>
    * @return a consumer to configure {@link FuncEmitTaskBuilder}
    */
   public static <T> Consumer<FuncEmitTaskBuilder> eventBytes(
-      String type, Function<T, byte[]> serializer, Class<T> clazz) {
+          String type, Function<T, byte[]> serializer, Class<T> clazz) {
     return b -> new FuncEmitSpec().type(type).bytesData(serializer, clazz).accept(b);
   }
 
@@ -298,7 +301,7 @@ public static <T, R> FuncCallStep<T, R> function(Function<T, R> fn, Class<T> cla
    *
    * <p>Signature expected: {@code (ctx, payload) -> result}
    *
-   * @param fn context-aware bi-function
+   * @param fn context-aware function
    * @param in payload input class
    * @param <T> input type
    * @param <R> result type
@@ -314,14 +317,14 @@ public static <T, R> FuncCallStep<T, R> withContext(JavaContextFunction<T, R> fn
    *
    * <p>Signature expected: {@code (instanceId, payload) -> result}
    *
-   * @param fn instance-id-aware bi-function
+   * @param fn instance-id-aware function
    * @param in payload input class
    * @param <T> input type
    * @param <R> result type
    * @return a call step
    */
   public static <T, R> FuncCallStep<T, R> withInstanceId(
-      InstanceIdBiFunction<T, R> fn, Class<T> in) {
+          InstanceIdBiFunction<T, R> fn, Class<T> in) {
     return withInstanceId(null, fn, in);
   }
 
@@ -329,25 +332,25 @@ public static <T, R> FuncCallStep<T, R> withInstanceId(
    * Named variant of {@link #withContext(JavaContextFunction, Class)}.
    *
    * @param name task name
-   * @param fn context-aware bi-function
+   * @param fn context-aware function
    * @param in payload input class
    * @param <T> input type
    * @param <R> result type
    * @return a named call step
    */
   public static <T, R> FuncCallStep<T, R> withContext(
-      String name, JavaContextFunction<T, R> fn, Class<T> in) {
+          String name, JavaContextFunction<T, R> fn, Class<T> in) {
     return new FuncCallStep<>(name, fn, in);
   }
 
   /**
-   * Build a call step for functions that need {@link WorkflowContextData} and {@link
-   * io.serverlessworkflow.impl.TaskContextData} as the first and second parameter. The DSL wraps it
-   * as a {@link JavaFilterFunction} and injects the runtime context.
+   * Build a call step for functions that need {@link WorkflowContextData} and
+   * {@link TaskContextData} as the first and second parameter. The DSL wraps it as a
+   * {@link JavaFilterFunction} and injects the runtime context.
    *
-   * <p>Signature expected: {@code (wctx, tctx, payload) -> result}
+   * <p>Signature expected: {@code (payload, wctx, tctx) -> result}
    *
-   * @param fn context-aware bi-function
+   * @param fn context-aware filter function
    * @param in payload input class
    * @param <T> input type
    * @param <R> result type
@@ -361,14 +364,14 @@ public static <T, R> FuncCallStep<T, R> withFilter(JavaFilterFunction<T, R> fn,
    * Named variant of {@link #withFilter(JavaFilterFunction, Class)}.
    *
    * @param name task name
-   * @param fn context-aware bi-function
+   * @param fn context-aware filter function
    * @param in payload input class
    * @param <T> input type
    * @param <R> result type
    * @return a named call step
    */
   public static <T, R> FuncCallStep<T, R> withFilter(
-      String name, JavaFilterFunction<T, R> fn, Class<T> in) {
+          String name, JavaFilterFunction<T, R> fn, Class<T> in) {
     return new FuncCallStep<>(name, fn, in);
   }
 
@@ -376,46 +379,61 @@ public static <T, R> FuncCallStep<T, R> withFilter(
    * Named variant of {@link #withInstanceId(InstanceIdBiFunction, Class)}.
    *
    * @param name task name
-   * @param fn instance-id-aware bi-function
+   * @param fn instance-id-aware function
    * @param in payload input class
    * @param <T> input type
    * @param <R> result type
    * @return a named call step
    */
   public static <T, R> FuncCallStep<T, R> withInstanceId(
-      String name, InstanceIdBiFunction<T, R> fn, Class<T> in) {
+          String name, InstanceIdBiFunction<T, R> fn, Class<T> in) {
     JavaContextFunction<T, R> jcf = (payload, wctx) -> fn.apply(wctx.instanceData().id(), payload);
     return new FuncCallStep<>(name, jcf, in);
   }
 
   /**
    * Builds a composition of the current workflow instance id and the definition of the task
-   * position as a JSON pointer.
+   * position as a JSON pointer, used as a stable "unique id" for the task.
+   *
+   * @param wctx workflow context
+   * @param tctx task context
+   * @return a unique id in the form {@code "<instanceId>-<jsonPointer>"}
    */
   static String defaultUniqueId(WorkflowContextData wctx, TaskContextData tctx) {
     return String.format("%s-%s", wctx.instanceData().id(), tctx.position().jsonPointer());
   }
 
   /**
-   * Build a call step for functions that expect a composition with the workflow instance id and the
-   * task position as the first parameter. The instance ID is extracted from the runtime context,
-   * the task position from the definition.
+   * Build a call step for functions that expect a composite "unique id" as the first parameter.
+   * This id is derived from the workflow instance id and the task definition position, encoded as
+   * a JSON pointer.
    *
    * <p>Signature expected: {@code (uniqueId, payload) -> result}
    *
-   * @param fn unique-id-aware bi-function
+   * @param name task name (or {@code null} for an anonymous task)
+   * @param fn unique-id-aware function
    * @param in payload input class
    * @param <T> input type
    * @param <R> result type
    * @return a call step
    */
   public static <T, R> FuncCallStep<T, R> withUniqueId(
-      String name, UniqueIdBiFunction<T, R> fn, Class<T> in) {
+          String name, UniqueIdBiFunction<T, R> fn, Class<T> in) {
     JavaFilterFunction<T, R> jff =
-        (payload, wctx, tctx) -> fn.apply(defaultUniqueId(wctx, tctx), payload);
+            (payload, wctx, tctx) -> fn.apply(defaultUniqueId(wctx, tctx), payload);
     return new FuncCallStep<>(name, jff, in);
   }
 
+  /**
+   * Variant of {@link #withUniqueId(String, UniqueIdBiFunction, Class)} without an explicit task
+   * name.
+   *
+   * @param fn unique-id-aware function
+   * @param in payload input class
+   * @param <T> input type
+   * @param <R> result type
+   * @return a call step
+   */
   public static <T, R> FuncCallStep<T, R> withUniqueId(UniqueIdBiFunction<T, R> fn, Class<T> in) {
     return withUniqueId(null, fn, in);
   }
@@ -426,7 +444,7 @@ public static <T, R> FuncCallStep<T, R> withUniqueId(UniqueIdBiFunction<T, R> fn
    * @param consumer side-effect function
    * @param clazz expected input class for conversion
    * @param <T> input type
-   * @return a consume step
+   * @return a {@link ConsumeStep} which can be chained and added via {@link #tasks(FuncTaskConfigurer...)}
    */
   public static <T> ConsumeStep<T> consume(Consumer<T> consumer, Class<T> clazz) {
     return new ConsumeStep<>(consumer, clazz);
@@ -439,19 +457,20 @@ public static <T> ConsumeStep<T> consume(Consumer<T> consumer, Class<T> clazz) {
    * @param consumer side-effect function
    * @param clazz expected input class
    * @param <T> input type
-   * @return a consume step
+   * @return a named {@link ConsumeStep}
    */
   public static <T> ConsumeStep<T> consume(String name, Consumer<T> consumer, Class<T> clazz) {
     return new ConsumeStep<>(name, consumer, clazz);
   }
 
   /**
-   * Agent-style sugar for methods that receive a "memory id" as first parameter. We reuse the
-   * workflow instance id for that purpose.
+   * Agent-style sugar for methods that receive a "memory id" as first parameter. The DSL uses a
+   * derived unique id composed of the workflow instance id and the task position (JSON pointer),
+   * via {@link #withUniqueId(UniqueIdBiFunction, Class)}.
    *
-   * <p>Equivalent to {@link #withInstanceId(InstanceIdBiFunction, Class)}.
+   * <p>Signature expected: {@code (uniqueId, payload) -> result}
    *
-   * @param fn (instanceId, payload) -> result
+   * @param fn (uniqueId, payload) -> result
    * @param in payload input class
    * @param <T> input type
    * @param <R> result type
@@ -464,15 +483,17 @@ public static <T, R> FuncCallStep<T, R> agent(UniqueIdBiFunction<T, R> fn, Class
   /**
    * Named agent-style sugar. See {@link #agent(UniqueIdBiFunction, Class)}.
    *
+   * <p>Signature expected: {@code (uniqueId, payload) -> result}
+   *
    * @param name task name
-   * @param fn (instanceId, payload) -> result
+   * @param fn (uniqueId, payload) -> result
    * @param in payload input class
    * @param <T> input type
    * @param <R> result type
    * @return a named call step
    */
   public static <T, R> FuncCallStep<T, R> agent(
-      String name, UniqueIdBiFunction<T, R> fn, Class<T> in) {
+          String name, UniqueIdBiFunction<T, R> fn, Class<T> in) {
     return withUniqueId(name, fn, in);
   }
 
@@ -514,7 +535,8 @@ public static <T, R> FuncCallStep<T, R> function(String name, Function<T, R> fn)
    * @param <R> output type
    * @return a named call step
    */
-  public static <T, R> FuncCallStep<T, R> function(String name, Function<T, R> fn, Class<T> clazz) {
+  public static <T, R> FuncCallStep<T, R> function(
+          String name, Function<T, R> fn, Class<T> clazz) {
     return new FuncCallStep<>(name, fn, clazz);
   }
 
@@ -549,7 +571,7 @@ public static EmitStep emit(Consumer<FuncEmitTaskBuilder> cfg) {
    *
    * @param name task name
    * @param cfg emit builder configurer
-   * @return a named emit step
+   * @return a named {@link EmitStep}
    */
   public static EmitStep emit(String name, Consumer<FuncEmitTaskBuilder> cfg) {
     return new EmitStep(name, cfg);
@@ -591,11 +613,19 @@ public static <T> EmitStep emit(String name, String type, Function<T, CloudEvent
    * @return a named {@link EmitStep}
    */
   public static <T> EmitStep emit(
-      String name, String type, Function<T, byte[]> serializer, Class<T> clazz) {
+          String name, String type, Function<T, byte[]> serializer, Class<T> clazz) {
     return new EmitStep(name, eventBytes(type, serializer, clazz));
   }
 
-  /** Unnamed variant of {@link #emit(String, String, Function, Class)}. */
+  /**
+   * Unnamed variant of {@link #emit(String, String, Function, Class)}.
+   *
+   * @param type CloudEvent type
+   * @param serializer function producing bytes
+   * @param clazz expected input class
+   * @param <T> input type
+   * @return an {@link EmitStep}
+   */
   public static <T> EmitStep emit(String type, Function<T, byte[]> serializer, Class<T> clazz) {
     return new EmitStep(null, eventBytes(type, serializer, clazz));
   }
@@ -647,26 +677,30 @@ public static ListenStep listen(String name, FuncListenSpec spec) {
   }
 
   /**
-   * Low-level switch case configurer using a custom builder consumer. Prefer the {@link
-   * #caseOf(Predicate)} helpers when possible.
+   * Low-level switch case configurer using a custom builder consumer. Prefer the
+   * {@link #caseOf(Predicate)} helpers when possible.
    *
    * @param taskName optional task name
    * @param switchCase consumer to configure the {@link FuncSwitchTaskBuilder}
    * @return a list configurer
    */
   public static FuncTaskConfigurer switchCase(
-      String taskName, Consumer<FuncSwitchTaskBuilder> switchCase) {
+          String taskName, Consumer<FuncSwitchTaskBuilder> switchCase) {
     return list -> list.switchCase(taskName, switchCase);
   }
 
-  /** Variant of {@link #switchCase(String, Consumer)} without a name. */
+  /**
+   * Variant of {@link #switchCase(String, Consumer)} without a name.
+   *
+   * @param switchCase consumer to configure the {@link FuncSwitchTaskBuilder}
+   * @return a list configurer
+   */
   public static FuncTaskConfigurer switchCase(Consumer<FuncSwitchTaskBuilder> switchCase) {
     return list -> list.switchCase(switchCase);
   }
 
   /**
-   * Convenience to apply multiple {@link SwitchCaseConfigurer} built via {@link
-   * #caseOf(Predicate)}.
+   * Convenience to apply multiple {@link SwitchCaseConfigurer} built via {@link #caseOf(Predicate)}.
    *
    * @param cases case configurers
    * @return list configurer
@@ -698,7 +732,7 @@ public static FuncTaskConfigurer switchCase(String taskName, SwitchCaseConfigure
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer switchWhen(
-      Predicate<T> pred, String thenTask, Class<T> predClass) {
+          Predicate<T> pred, String thenTask, Class<T> predClass) {
     return list -> list.switchCase(cases(caseOf(pred, predClass).then(thenTask)));
   }
 
@@ -732,10 +766,10 @@ public static FuncTaskConfigurer switchWhen(String jqExpression, String thenTask
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer switchWhenOrElse(
-      Predicate<T> pred, String thenTask, FlowDirectiveEnum otherwise, Class<T> predClass) {
+          Predicate<T> pred, String thenTask, FlowDirectiveEnum otherwise, Class<T> predClass) {
     return list ->
-        list.switchCase(
-            FuncDSL.cases(caseOf(pred, predClass).then(thenTask), caseDefault(otherwise)));
+            list.switchCase(
+                    FuncDSL.cases(caseOf(pred, predClass).then(thenTask), caseDefault(otherwise)));
   }
 
   /**
@@ -749,9 +783,10 @@ public static <T> FuncTaskConfigurer switchWhenOrElse(
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer switchWhenOrElse(
-      Predicate<T> pred, String thenTask, String otherwiseTask, Class<T> predClass) {
+          Predicate<T> pred, String thenTask, String otherwiseTask, Class<T> predClass) {
     return list ->
-        list.switchCase(cases(caseOf(pred, predClass).then(thenTask), caseDefault(otherwiseTask)));
+            list.switchCase(
+                    cases(caseOf(pred, predClass).then(thenTask), caseDefault(otherwiseTask)));
   }
 
   /**
@@ -763,16 +798,22 @@ public static <T> FuncTaskConfigurer switchWhenOrElse(
    * </pre>
    *
    * <p>The JQ expression is evaluated against the task input at runtime.
+   *
+   * @param jqExpression JQ expression evaluated against the current task input
+   * @param thenTask task to jump to if the expression evaluates truthy
+   * @param otherwise default flow directive when the expression is falsy
+   * @return list configurer
    */
   public static FuncTaskConfigurer switchWhenOrElse(
-      String jqExpression, String thenTask, FlowDirectiveEnum otherwise) {
+          String jqExpression, String thenTask, FlowDirectiveEnum otherwise) {
 
     Objects.requireNonNull(jqExpression, "jqExpression");
     Objects.requireNonNull(thenTask, "thenTask");
     Objects.requireNonNull(otherwise, "otherwise");
 
     return list ->
-        list.switchCase(sw -> sw.on(c -> c.when(jqExpression).then(thenTask)).onDefault(otherwise));
+            list.switchCase(
+                    sw -> sw.on(c -> c.when(jqExpression).then(thenTask)).onDefault(otherwise));
   }
 
   /**
@@ -784,17 +825,22 @@ public static FuncTaskConfigurer switchWhenOrElse(
    * </pre>
    *
    * <p>The JQ expression is evaluated against the task input at runtime.
+   *
+   * @param jqExpression JQ expression evaluated against the current task input
+   * @param thenTask task name when truthy
+   * @param otherwiseTask task name when falsy
+   * @return list configurer
    */
   public static FuncTaskConfigurer switchWhenOrElse(
-      String jqExpression, String thenTask, String otherwiseTask) {
+          String jqExpression, String thenTask, String otherwiseTask) {
 
     Objects.requireNonNull(jqExpression, "jqExpression");
     Objects.requireNonNull(thenTask, "thenTask");
     Objects.requireNonNull(otherwiseTask, "otherwiseTask");
 
     return list ->
-        list.switchCase(
-            sw -> sw.on(c -> c.when(jqExpression).then(thenTask)).onDefault(otherwiseTask));
+            list.switchCase(
+                    sw -> sw.on(c -> c.when(jqExpression).then(thenTask)).onDefault(otherwiseTask));
   }
 
   /**
@@ -806,7 +852,7 @@ public static FuncTaskConfigurer switchWhenOrElse(
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer forEach(
-      Function<T, Collection<?>> collection, Consumer<FuncTaskItemListBuilder> body) {
+          Function<T, Collection<?>> collection, Consumer<FuncTaskItemListBuilder> body) {
     return list -> list.forEach(j -> j.collection(collection).tasks(body));
   }
 
@@ -819,7 +865,7 @@ public static <T> FuncTaskConfigurer forEach(
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer forEach(
-      Collection<?> collection, Consumer<FuncTaskItemListBuilder> body) {
+          Collection<?> collection, Consumer<FuncTaskItemListBuilder> body) {
     Function<T, Collection<?>> f = ctx -> (Collection<?>) collection;
     return list -> list.forEach(j -> j.collection(f).tasks(body));
   }
@@ -833,12 +879,12 @@ public static <T> FuncTaskConfigurer forEach(
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer forEach(
-      List<T> collection, Consumer<FuncTaskItemListBuilder> body) {
+          List<T> collection, Consumer<FuncTaskItemListBuilder> body) {
     return list -> list.forEach(j -> j.collection(ctx -> collection).tasks(body));
   }
 
   /**
-   * Set a raw JQ-like expression on the current list (advanced).
+   * Set a raw expression on the current list (advanced).
    *
    * @param expr expression string
    * @return list configurer
@@ -848,7 +894,7 @@ public static FuncTaskConfigurer set(String expr) {
   }
 
   /**
-   * Set a map-based expression on the current list (advanced).
+   * Set values on the current list from a map (advanced).
    *
    * @param map map of values to set
    * @return list configurer
@@ -857,6 +903,10 @@ public static FuncTaskConfigurer set(Map<String, Object> map) {
     return list -> list.set(s -> s.expr(map));
   }
 
+  // ---------------------------------------------------------------------------
+  // HTTP / OpenAPI
+  // ---------------------------------------------------------------------------
+
   /**
    * Low-level HTTP call entrypoint using a {@link FuncCallHttpConfigurer}.
    *
@@ -980,10 +1030,27 @@ public static FuncTaskConfigurer call(String name, FuncCallOpenAPIStep spec) {
     return spec;
   }
 
+  /**
+   * Low-level OpenAPI call entrypoint using a {@link FuncCallOpenAPIConfigurer}.
+   *
+   * <p>This overload creates an unnamed OpenAPI call task.
+   *
+   * @param configurer configurer that mutates the underlying OpenAPI call builder
+   * @return a {@link FuncTaskConfigurer} that adds an OpenAPI call task
+   */
   public static FuncTaskConfigurer call(FuncCallOpenAPIConfigurer configurer) {
     return call(null, configurer);
   }
 
+  /**
+   * Low-level OpenAPI call entrypoint using a {@link FuncCallOpenAPIConfigurer}.
+   *
+   * <p>This overload allows assigning an explicit task name.
+   *
+   * @param name task name, or {@code null} for an anonymous task
+   * @param configurer configurer that mutates the underlying OpenAPI call builder
+   * @return a {@link FuncTaskConfigurer} that adds an OpenAPI call task
+   */
   public static FuncTaskConfigurer call(String name, FuncCallOpenAPIConfigurer configurer) {
     Objects.requireNonNull(configurer, "configurer");
     return list -> list.openapi(name, configurer);
@@ -1013,6 +1080,12 @@ public static FuncCallOpenAPIStep openapi() {
     return new FuncCallOpenAPIStep();
   }
 
+  /**
+   * Named variant of {@link #openapi()}.
+   *
+   * @param name task name to be used when the spec is attached via {@link #call(FuncCallOpenAPIStep)}
+   * @return a new named {@link FuncCallOpenAPIStep}
+   */
   public static FuncCallOpenAPIStep openapi(String name) {
     return new FuncCallOpenAPIStep(name);
   }
@@ -1037,6 +1110,12 @@ public static FuncCallHttpStep http() {
     return new FuncCallHttpStep();
   }
 
+  /**
+   * Named variant of {@link #http()}.
+   *
+   * @param name task name to be used when the spec is attached via {@link #call(FuncCallHttpStep)}
+   * @return a new named {@link FuncCallHttpStep}
+   */
   public static FuncCallHttpStep http(String name) {
     return new FuncCallHttpStep(name);
   }
@@ -1071,166 +1150,179 @@ public static FuncCallHttpStep http(URI url, AuthenticationConfigurer auth) {
   }
 
   /**
-   * Convenience for adding an unnamed {@code GET} HTTP task using a string endpoint.
+   * Convenience for building an unnamed {@code GET} HTTP step using a string endpoint.
    *
    * <pre>{@code
    * tasks(
-   *   FuncDSL.get("http://service/health")
+   *   FuncDSL.call(
+   *     FuncDSL.get("http://service/health")
+   *   )
    * );
    * }</pre>
    *
    * @param endpoint literal or expression for the endpoint URL
-   * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
+   * @return a {@link FuncCallHttpStep} that can be chained and later passed to {@link #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep get(String endpoint) {
     return get(null, endpoint);
   }
 
   /**
-   * Convenience for adding a named {@code GET} HTTP task using a string endpoint.
+   * Convenience for building a named {@code GET} HTTP step using a string endpoint.
    *
    * <pre>{@code
    * tasks(
-   *   FuncDSL.get("checkHealth", "http://service/health")
+   *   FuncDSL.call(
+   *     FuncDSL.get("checkHealth", "http://service/health")
+   *   )
    * );
    * }</pre>
    *
    * @param name task name
    * @param endpoint literal or expression for the endpoint URL
-   * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
+   * @return a named {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep get(String name, String endpoint) {
     return http(name).GET().endpoint(endpoint);
   }
 
   /**
-   * Convenience for adding an unnamed authenticated {@code GET} HTTP task using a string endpoint.
+   * Convenience for building an unnamed authenticated {@code GET} HTTP step using a string
+   * endpoint.
    *
    * <pre>{@code
    * tasks(
-   *   FuncDSL.get("http://service/api/users", auth -> auth.use("user-service-auth"))
+   *   FuncDSL.call(
+   *     FuncDSL.get("http://service/api/users", auth -> auth.use("user-service-auth"))
+   *   )
    * );
    * }</pre>
    *
    * @param endpoint literal or expression for the endpoint URL
    * @param auth authentication configurer
-   * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
+   * @return a {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep get(String endpoint, AuthenticationConfigurer auth) {
     return get(null, endpoint, auth);
   }
 
   /**
-   * Convenience for adding a named authenticated {@code GET} HTTP task using a string endpoint.
+   * Convenience for building a named authenticated {@code GET} HTTP step using a string endpoint.
    *
    * @param name task name
    * @param endpoint literal or expression for the endpoint URL
    * @param auth authentication configurer
-   * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
+   * @return a named {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
-  public static FuncCallHttpStep get(String name, String endpoint, AuthenticationConfigurer auth) {
+  public static FuncCallHttpStep get(
+          String name, String endpoint, AuthenticationConfigurer auth) {
     return http(name).GET().endpoint(endpoint, auth);
   }
 
   /**
-   * Convenience for adding an unnamed {@code GET} HTTP task using a {@link URI}.
+   * Convenience for building an unnamed {@code GET} HTTP step using a {@link URI}.
    *
    * @param endpoint concrete URI to call
-   * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
+   * @return a {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep get(URI endpoint) {
     return get(null, endpoint);
   }
 
   /**
-   * Convenience for adding a named {@code GET} HTTP task using a {@link URI}.
+   * Convenience for building a named {@code GET} HTTP step using a {@link URI}.
    *
    * @param name task name
    * @param endpoint concrete URI to call
-   * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
+   * @return a named {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep get(String name, URI endpoint) {
     return http(name).GET().uri(endpoint);
   }
 
   /**
-   * Convenience for adding an unnamed authenticated {@code GET} HTTP task using a {@link URI}.
+   * Convenience for building an unnamed authenticated {@code GET} HTTP step using a {@link URI}.
    *
    * @param endpoint concrete URI to call
    * @param auth authentication configurer
-   * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
+   * @return a {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep get(URI endpoint, AuthenticationConfigurer auth) {
     return get(null, endpoint, auth);
   }
 
   /**
-   * Convenience for adding a named authenticated {@code GET} HTTP task using a {@link URI}.
+   * Convenience for building a named authenticated {@code GET} HTTP step using a {@link URI}.
    *
    * @param name task name
    * @param endpoint concrete URI to call
    * @param auth authentication configurer
-   * @return a {@link FuncTaskConfigurer} adding a {@code GET} HTTP task
+   * @return a named {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
-  public static FuncCallHttpStep get(String name, URI endpoint, AuthenticationConfigurer auth) {
+  public static FuncCallHttpStep get(
+          String name, URI endpoint, AuthenticationConfigurer auth) {
     return http(name).GET().uri(endpoint, auth);
   }
 
   /**
-   * Convenience for adding an unnamed {@code POST} HTTP task with a body and string endpoint.
+   * Convenience for building an unnamed {@code POST} HTTP step with a body and string endpoint.
    *
    * <pre>{@code
    * tasks(
-   *   FuncDSL.post(
-   *     Map.of("name", "Ricardo"),
-   *     "http://service/api/users"
+   *   FuncDSL.call(
+   *     FuncDSL.post(
+   *       Map.of("name", "Ricardo"),
+   *       "http://service/api/users"
+   *     )
    *   )
    * );
    * }</pre>
    *
    * @param body HTTP request body (literal value or expression-compatible object)
    * @param endpointExpr literal or expression for the endpoint URL
-   * @return a {@link FuncTaskConfigurer} adding a {@code POST} HTTP task
+   * @return a {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep post(Object body, String endpointExpr) {
     return post(null, body, endpointExpr);
   }
 
   /**
-   * Convenience for adding a named {@code POST} HTTP task with a body and string endpoint.
+   * Convenience for building a named {@code POST} HTTP step with a body and string endpoint.
    *
    * @param name task name
    * @param body HTTP request body (literal value or expression-compatible object)
    * @param endpoint literal or expression for the endpoint URL
-   * @return a {@link FuncTaskConfigurer} adding a {@code POST} HTTP task
+   * @return a named {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep post(String name, Object body, String endpoint) {
     return http(name).POST().endpoint(endpoint).body(body);
   }
 
   /**
-   * Convenience for adding an unnamed authenticated {@code POST} HTTP task with body and endpoint.
+   * Convenience for building an unnamed authenticated {@code POST} HTTP step with body and
+   * endpoint.
    *
    * @param body HTTP request body
    * @param endpoint literal or expression for the endpoint URL
    * @param auth authentication configurer
-   * @return a {@link FuncTaskConfigurer} adding an authenticated {@code POST} HTTP task
+   * @return a {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
-  public static FuncCallHttpStep post(Object body, String endpoint, AuthenticationConfigurer auth) {
+  public static FuncCallHttpStep post(
+          Object body, String endpoint, AuthenticationConfigurer auth) {
     return post(null, body, endpoint, auth);
   }
 
   /**
-   * Convenience for adding a named authenticated {@code POST} HTTP task with body and endpoint.
+   * Convenience for building a named authenticated {@code POST} HTTP step with body and endpoint.
    *
    * @param name task name
    * @param body HTTP request body
    * @param endpoint literal or expression for the endpoint URL
    * @param auth authentication configurer
-   * @return a {@link FuncTaskConfigurer} adding an authenticated {@code POST} HTTP task
+   * @return a named {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep post(
-      String name, Object body, String endpoint, AuthenticationConfigurer auth) {
+          String name, Object body, String endpoint, AuthenticationConfigurer auth) {
 
     return http(name).POST().endpoint(endpoint, auth).body(body);
   }

From d45507c5af79cd182fa338f73d1196e0737fd5e1 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <ricardozanini@gmail.com>
Date: Tue, 18 Nov 2025 10:50:05 -0500
Subject: [PATCH 3/3] Inforporate fjtirado review; format

Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com>
---
 .../fluent/func/dsl/FuncCallHttpStep.java     |  22 +---
 .../fluent/func/dsl/FuncCallOpenAPIStep.java  |  26 ++--
 .../fluent/func/dsl/FuncDSL.java              | 122 +++++++++---------
 3 files changed, 73 insertions(+), 97 deletions(-)

diff --git a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpStep.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpStep.java
index 2cb56f1c..5e724628 100644
--- a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpStep.java
+++ b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallHttpStep.java
@@ -42,22 +42,12 @@ public FuncCallHttpStep self() {
   }
 
   protected void configure(FuncTaskItemListBuilder list, Consumer<FuncCallHttpTaskBuilder> post) {
-    if (name == null) {
-      list.http(
-          builder -> {
-            // Apply HTTP config (BaseCallHttpSpec)
-            this.accept(builder); // default method from BaseCallHttpSpec
-            // Apply Step’s post-configurers (when / inputFrom / outputAs / exportAs)
-            post.accept(builder);
-          });
-    } else {
-      list.http(
-          name,
-          builder -> {
-            this.accept(builder);
-            post.accept(builder);
-          });
-    }
+    list.http(
+        name,
+        builder -> {
+          this.accept(builder);
+          post.accept(builder);
+        });
   }
 
   @Override
diff --git a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallOpenAPIStep.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallOpenAPIStep.java
index c46bd051..b6530cbf 100644
--- a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallOpenAPIStep.java
+++ b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallOpenAPIStep.java
@@ -96,23 +96,13 @@ public FuncCallOpenAPIStep output(OpenAPIArguments.WithOpenAPIOutput output) {
   @Override
   protected void configure(
       FuncTaskItemListBuilder list, Consumer<FuncCallOpenAPITaskBuilder> post) {
-    if (name == null) {
-      list.openapi(
-          builder -> {
-            for (Consumer<CallOpenAPITaskFluent<?>> c : steps) {
-              c.accept(builder); // OpenAPI DSL
-            }
-            post.accept(builder); // when/inputFrom/outputAs/exportAs
-          });
-    } else {
-      list.openapi(
-          name,
-          builder -> {
-            for (Consumer<CallOpenAPITaskFluent<?>> c : steps) {
-              c.accept(builder);
-            }
-            post.accept(builder);
-          });
-    }
+    list.openapi(
+        name,
+        builder -> {
+          for (Consumer<CallOpenAPITaskFluent<?>> c : steps) {
+            c.accept(builder);
+          }
+          post.accept(builder);
+        });
   }
 }
diff --git a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java
index 2f06a81e..ff2db37e 100644
--- a/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java
+++ b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java
@@ -32,7 +32,6 @@
 import io.serverlessworkflow.fluent.spec.configurers.AuthenticationConfigurer;
 import io.serverlessworkflow.impl.TaskContextData;
 import io.serverlessworkflow.impl.WorkflowContextData;
-
 import java.net.URI;
 import java.util.Collection;
 import java.util.List;
@@ -52,8 +51,8 @@
  *   <li>Expose chainable steps (e.g., {@code emit(...).exportAs(...).when(...)}) via {@link Step}
  *       subclasses.
  *   <li>Provide opinionated helpers for CloudEvents (JSON/bytes) and listen strategies.
- *   <li>Offer context-aware function variants ({@code withContext}, {@code withInstanceId},
- *       {@code withUniqueId}, {@code agent}).
+ *   <li>Offer context-aware function variants ({@code withContext}, {@code withInstanceId}, {@code
+ *       withUniqueId}, {@code agent}).
  * </ul>
  *
  * <p>Typical usage:
@@ -75,8 +74,8 @@ public final class FuncDSL {
   private FuncDSL() {}
 
   /**
-   * Create a builder configurer for a {@link FuncCallTaskBuilder} that invokes a plain Java
-   * {@link Function} with an explicit input type.
+   * Create a builder configurer for a {@link FuncCallTaskBuilder} that invokes a plain Java {@link
+   * Function} with an explicit input type.
    *
    * @param function the function to call during task execution
    * @param argClass the expected input class for type-safe model conversion
@@ -85,13 +84,13 @@ private FuncDSL() {}
    * @return a consumer that configures a {@code FuncCallTaskBuilder}
    */
   public static <T, V> Consumer<FuncCallTaskBuilder> fn(
-          Function<T, V> function, Class<T> argClass) {
+      Function<T, V> function, Class<T> argClass) {
     return OPS.fn(function, argClass);
   }
 
   /**
-   * Create a builder configurer for a {@link FuncCallTaskBuilder} that invokes a plain Java
-   * {@link Function}. The input type is inferred when possible.
+   * Create a builder configurer for a {@link FuncCallTaskBuilder} that invokes a plain Java {@link
+   * Function}. The input type is inferred when possible.
    *
    * @param function the function to call during task execution
    * @param <T> input type
@@ -147,8 +146,8 @@ public static SwitchCaseConfigurer caseDefault(String task) {
   }
 
   /**
-   * Default branch for a switch that uses a {@link FlowDirectiveEnum} (e.g. {@code END},
-   * {@code CONTINUE}).
+   * Default branch for a switch that uses a {@link FlowDirectiveEnum} (e.g. {@code END}, {@code
+   * CONTINUE}).
    *
    * @param directive fallback directive when no predicate matches
    * @return switch case configurer
@@ -205,8 +204,8 @@ public static FuncListenSpec toAny(String... types) {
   }
 
   /**
-   * Build an {@code emit} event configurer by supplying a type and a function that produces
-   * {@link CloudEventData}. The function is invoked at runtime with the current payload.
+   * Build an {@code emit} event configurer by supplying a type and a function that produces {@link
+   * CloudEventData}. The function is invoked at runtime with the current payload.
    *
    * @param type CloudEvent type
    * @param function function that maps workflow input to {@link CloudEventData}
@@ -214,7 +213,7 @@ public static FuncListenSpec toAny(String... types) {
    * @return a consumer to configure {@link FuncEmitTaskBuilder}
    */
   public static <T> Consumer<FuncEmitTaskBuilder> event(
-          String type, Function<T, CloudEventData> function) {
+      String type, Function<T, CloudEventData> function) {
     return OPS.event(type, function);
   }
 
@@ -228,14 +227,13 @@ public static <T> Consumer<FuncEmitTaskBuilder> event(
    * @return a consumer to configure {@link FuncEmitTaskBuilder}
    */
   public static <T> Consumer<FuncEmitTaskBuilder> event(
-          String type, Function<T, CloudEventData> function, Class<T> clazz) {
+      String type, Function<T, CloudEventData> function, Class<T> clazz) {
     return OPS.event(type, function, clazz);
   }
 
   /**
-   * Emit a JSON CloudEvent for a POJO input type. Sets
-   * {@code contentType=application/json} and serializes the input to bytes using the configured
-   * JSON mapper.
+   * Emit a JSON CloudEvent for a POJO input type. Sets {@code contentType=application/json} and
+   * serializes the input to bytes using the configured JSON mapper.
    *
    * @param type CloudEvent type
    * @param clazz input POJO class (used for typing and conversion)
@@ -256,7 +254,7 @@ public static <T> Consumer<FuncEmitTaskBuilder> eventJson(String type, Class<T>
    * @return a consumer to configure {@link FuncEmitTaskBuilder}
    */
   public static <T> Consumer<FuncEmitTaskBuilder> eventBytes(
-          String type, Function<T, byte[]> serializer, Class<T> clazz) {
+      String type, Function<T, byte[]> serializer, Class<T> clazz) {
     return b -> new FuncEmitSpec().type(type).bytesData(serializer, clazz).accept(b);
   }
 
@@ -324,7 +322,7 @@ public static <T, R> FuncCallStep<T, R> withContext(JavaContextFunction<T, R> fn
    * @return a call step
    */
   public static <T, R> FuncCallStep<T, R> withInstanceId(
-          InstanceIdBiFunction<T, R> fn, Class<T> in) {
+      InstanceIdBiFunction<T, R> fn, Class<T> in) {
     return withInstanceId(null, fn, in);
   }
 
@@ -339,14 +337,14 @@ public static <T, R> FuncCallStep<T, R> withInstanceId(
    * @return a named call step
    */
   public static <T, R> FuncCallStep<T, R> withContext(
-          String name, JavaContextFunction<T, R> fn, Class<T> in) {
+      String name, JavaContextFunction<T, R> fn, Class<T> in) {
     return new FuncCallStep<>(name, fn, in);
   }
 
   /**
-   * Build a call step for functions that need {@link WorkflowContextData} and
-   * {@link TaskContextData} as the first and second parameter. The DSL wraps it as a
-   * {@link JavaFilterFunction} and injects the runtime context.
+   * Build a call step for functions that need {@link WorkflowContextData} and {@link
+   * TaskContextData} as the first and second parameter. The DSL wraps it as a {@link
+   * JavaFilterFunction} and injects the runtime context.
    *
    * <p>Signature expected: {@code (payload, wctx, tctx) -> result}
    *
@@ -371,7 +369,7 @@ public static <T, R> FuncCallStep<T, R> withFilter(JavaFilterFunction<T, R> fn,
    * @return a named call step
    */
   public static <T, R> FuncCallStep<T, R> withFilter(
-          String name, JavaFilterFunction<T, R> fn, Class<T> in) {
+      String name, JavaFilterFunction<T, R> fn, Class<T> in) {
     return new FuncCallStep<>(name, fn, in);
   }
 
@@ -386,7 +384,7 @@ public static <T, R> FuncCallStep<T, R> withFilter(
    * @return a named call step
    */
   public static <T, R> FuncCallStep<T, R> withInstanceId(
-          String name, InstanceIdBiFunction<T, R> fn, Class<T> in) {
+      String name, InstanceIdBiFunction<T, R> fn, Class<T> in) {
     JavaContextFunction<T, R> jcf = (payload, wctx) -> fn.apply(wctx.instanceData().id(), payload);
     return new FuncCallStep<>(name, jcf, in);
   }
@@ -405,8 +403,8 @@ static String defaultUniqueId(WorkflowContextData wctx, TaskContextData tctx) {
 
   /**
    * Build a call step for functions that expect a composite "unique id" as the first parameter.
-   * This id is derived from the workflow instance id and the task definition position, encoded as
-   * a JSON pointer.
+   * This id is derived from the workflow instance id and the task definition position, encoded as a
+   * JSON pointer.
    *
    * <p>Signature expected: {@code (uniqueId, payload) -> result}
    *
@@ -418,9 +416,9 @@ static String defaultUniqueId(WorkflowContextData wctx, TaskContextData tctx) {
    * @return a call step
    */
   public static <T, R> FuncCallStep<T, R> withUniqueId(
-          String name, UniqueIdBiFunction<T, R> fn, Class<T> in) {
+      String name, UniqueIdBiFunction<T, R> fn, Class<T> in) {
     JavaFilterFunction<T, R> jff =
-            (payload, wctx, tctx) -> fn.apply(defaultUniqueId(wctx, tctx), payload);
+        (payload, wctx, tctx) -> fn.apply(defaultUniqueId(wctx, tctx), payload);
     return new FuncCallStep<>(name, jff, in);
   }
 
@@ -444,7 +442,8 @@ public static <T, R> FuncCallStep<T, R> withUniqueId(UniqueIdBiFunction<T, R> fn
    * @param consumer side-effect function
    * @param clazz expected input class for conversion
    * @param <T> input type
-   * @return a {@link ConsumeStep} which can be chained and added via {@link #tasks(FuncTaskConfigurer...)}
+   * @return a {@link ConsumeStep} which can be chained and added via {@link
+   *     #tasks(FuncTaskConfigurer...)}
    */
   public static <T> ConsumeStep<T> consume(Consumer<T> consumer, Class<T> clazz) {
     return new ConsumeStep<>(consumer, clazz);
@@ -493,7 +492,7 @@ public static <T, R> FuncCallStep<T, R> agent(UniqueIdBiFunction<T, R> fn, Class
    * @return a named call step
    */
   public static <T, R> FuncCallStep<T, R> agent(
-          String name, UniqueIdBiFunction<T, R> fn, Class<T> in) {
+      String name, UniqueIdBiFunction<T, R> fn, Class<T> in) {
     return withUniqueId(name, fn, in);
   }
 
@@ -535,8 +534,7 @@ public static <T, R> FuncCallStep<T, R> function(String name, Function<T, R> fn)
    * @param <R> output type
    * @return a named call step
    */
-  public static <T, R> FuncCallStep<T, R> function(
-          String name, Function<T, R> fn, Class<T> clazz) {
+  public static <T, R> FuncCallStep<T, R> function(String name, Function<T, R> fn, Class<T> clazz) {
     return new FuncCallStep<>(name, fn, clazz);
   }
 
@@ -613,7 +611,7 @@ public static <T> EmitStep emit(String name, String type, Function<T, CloudEvent
    * @return a named {@link EmitStep}
    */
   public static <T> EmitStep emit(
-          String name, String type, Function<T, byte[]> serializer, Class<T> clazz) {
+      String name, String type, Function<T, byte[]> serializer, Class<T> clazz) {
     return new EmitStep(name, eventBytes(type, serializer, clazz));
   }
 
@@ -677,15 +675,15 @@ public static ListenStep listen(String name, FuncListenSpec spec) {
   }
 
   /**
-   * Low-level switch case configurer using a custom builder consumer. Prefer the
-   * {@link #caseOf(Predicate)} helpers when possible.
+   * Low-level switch case configurer using a custom builder consumer. Prefer the {@link
+   * #caseOf(Predicate)} helpers when possible.
    *
    * @param taskName optional task name
    * @param switchCase consumer to configure the {@link FuncSwitchTaskBuilder}
    * @return a list configurer
    */
   public static FuncTaskConfigurer switchCase(
-          String taskName, Consumer<FuncSwitchTaskBuilder> switchCase) {
+      String taskName, Consumer<FuncSwitchTaskBuilder> switchCase) {
     return list -> list.switchCase(taskName, switchCase);
   }
 
@@ -700,7 +698,8 @@ public static FuncTaskConfigurer switchCase(Consumer<FuncSwitchTaskBuilder> swit
   }
 
   /**
-   * Convenience to apply multiple {@link SwitchCaseConfigurer} built via {@link #caseOf(Predicate)}.
+   * Convenience to apply multiple {@link SwitchCaseConfigurer} built via {@link
+   * #caseOf(Predicate)}.
    *
    * @param cases case configurers
    * @return list configurer
@@ -732,7 +731,7 @@ public static FuncTaskConfigurer switchCase(String taskName, SwitchCaseConfigure
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer switchWhen(
-          Predicate<T> pred, String thenTask, Class<T> predClass) {
+      Predicate<T> pred, String thenTask, Class<T> predClass) {
     return list -> list.switchCase(cases(caseOf(pred, predClass).then(thenTask)));
   }
 
@@ -766,10 +765,10 @@ public static FuncTaskConfigurer switchWhen(String jqExpression, String thenTask
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer switchWhenOrElse(
-          Predicate<T> pred, String thenTask, FlowDirectiveEnum otherwise, Class<T> predClass) {
+      Predicate<T> pred, String thenTask, FlowDirectiveEnum otherwise, Class<T> predClass) {
     return list ->
-            list.switchCase(
-                    FuncDSL.cases(caseOf(pred, predClass).then(thenTask), caseDefault(otherwise)));
+        list.switchCase(
+            FuncDSL.cases(caseOf(pred, predClass).then(thenTask), caseDefault(otherwise)));
   }
 
   /**
@@ -783,10 +782,9 @@ public static <T> FuncTaskConfigurer switchWhenOrElse(
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer switchWhenOrElse(
-          Predicate<T> pred, String thenTask, String otherwiseTask, Class<T> predClass) {
+      Predicate<T> pred, String thenTask, String otherwiseTask, Class<T> predClass) {
     return list ->
-            list.switchCase(
-                    cases(caseOf(pred, predClass).then(thenTask), caseDefault(otherwiseTask)));
+        list.switchCase(cases(caseOf(pred, predClass).then(thenTask), caseDefault(otherwiseTask)));
   }
 
   /**
@@ -805,15 +803,14 @@ public static <T> FuncTaskConfigurer switchWhenOrElse(
    * @return list configurer
    */
   public static FuncTaskConfigurer switchWhenOrElse(
-          String jqExpression, String thenTask, FlowDirectiveEnum otherwise) {
+      String jqExpression, String thenTask, FlowDirectiveEnum otherwise) {
 
     Objects.requireNonNull(jqExpression, "jqExpression");
     Objects.requireNonNull(thenTask, "thenTask");
     Objects.requireNonNull(otherwise, "otherwise");
 
     return list ->
-            list.switchCase(
-                    sw -> sw.on(c -> c.when(jqExpression).then(thenTask)).onDefault(otherwise));
+        list.switchCase(sw -> sw.on(c -> c.when(jqExpression).then(thenTask)).onDefault(otherwise));
   }
 
   /**
@@ -832,15 +829,15 @@ public static FuncTaskConfigurer switchWhenOrElse(
    * @return list configurer
    */
   public static FuncTaskConfigurer switchWhenOrElse(
-          String jqExpression, String thenTask, String otherwiseTask) {
+      String jqExpression, String thenTask, String otherwiseTask) {
 
     Objects.requireNonNull(jqExpression, "jqExpression");
     Objects.requireNonNull(thenTask, "thenTask");
     Objects.requireNonNull(otherwiseTask, "otherwiseTask");
 
     return list ->
-            list.switchCase(
-                    sw -> sw.on(c -> c.when(jqExpression).then(thenTask)).onDefault(otherwiseTask));
+        list.switchCase(
+            sw -> sw.on(c -> c.when(jqExpression).then(thenTask)).onDefault(otherwiseTask));
   }
 
   /**
@@ -852,7 +849,7 @@ public static FuncTaskConfigurer switchWhenOrElse(
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer forEach(
-          Function<T, Collection<?>> collection, Consumer<FuncTaskItemListBuilder> body) {
+      Function<T, Collection<?>> collection, Consumer<FuncTaskItemListBuilder> body) {
     return list -> list.forEach(j -> j.collection(collection).tasks(body));
   }
 
@@ -865,7 +862,7 @@ public static <T> FuncTaskConfigurer forEach(
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer forEach(
-          Collection<?> collection, Consumer<FuncTaskItemListBuilder> body) {
+      Collection<?> collection, Consumer<FuncTaskItemListBuilder> body) {
     Function<T, Collection<?>> f = ctx -> (Collection<?>) collection;
     return list -> list.forEach(j -> j.collection(f).tasks(body));
   }
@@ -879,7 +876,7 @@ public static <T> FuncTaskConfigurer forEach(
    * @return list configurer
    */
   public static <T> FuncTaskConfigurer forEach(
-          List<T> collection, Consumer<FuncTaskItemListBuilder> body) {
+      List<T> collection, Consumer<FuncTaskItemListBuilder> body) {
     return list -> list.forEach(j -> j.collection(ctx -> collection).tasks(body));
   }
 
@@ -1083,7 +1080,8 @@ public static FuncCallOpenAPIStep openapi() {
   /**
    * Named variant of {@link #openapi()}.
    *
-   * @param name task name to be used when the spec is attached via {@link #call(FuncCallOpenAPIStep)}
+   * @param name task name to be used when the spec is attached via {@link
+   *     #call(FuncCallOpenAPIStep)}
    * @return a new named {@link FuncCallOpenAPIStep}
    */
   public static FuncCallOpenAPIStep openapi(String name) {
@@ -1161,7 +1159,8 @@ public static FuncCallHttpStep http(URI url, AuthenticationConfigurer auth) {
    * }</pre>
    *
    * @param endpoint literal or expression for the endpoint URL
-   * @return a {@link FuncCallHttpStep} that can be chained and later passed to {@link #call(FuncCallHttpStep)}
+   * @return a {@link FuncCallHttpStep} that can be chained and later passed to {@link
+   *     #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep get(String endpoint) {
     return get(null, endpoint);
@@ -1214,8 +1213,7 @@ public static FuncCallHttpStep get(String endpoint, AuthenticationConfigurer aut
    * @param auth authentication configurer
    * @return a named {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
-  public static FuncCallHttpStep get(
-          String name, String endpoint, AuthenticationConfigurer auth) {
+  public static FuncCallHttpStep get(String name, String endpoint, AuthenticationConfigurer auth) {
     return http(name).GET().endpoint(endpoint, auth);
   }
 
@@ -1259,8 +1257,7 @@ public static FuncCallHttpStep get(URI endpoint, AuthenticationConfigurer auth)
    * @param auth authentication configurer
    * @return a named {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
-  public static FuncCallHttpStep get(
-          String name, URI endpoint, AuthenticationConfigurer auth) {
+  public static FuncCallHttpStep get(String name, URI endpoint, AuthenticationConfigurer auth) {
     return http(name).GET().uri(endpoint, auth);
   }
 
@@ -1307,8 +1304,7 @@ public static FuncCallHttpStep post(String name, Object body, String endpoint) {
    * @param auth authentication configurer
    * @return a {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
-  public static FuncCallHttpStep post(
-          Object body, String endpoint, AuthenticationConfigurer auth) {
+  public static FuncCallHttpStep post(Object body, String endpoint, AuthenticationConfigurer auth) {
     return post(null, body, endpoint, auth);
   }
 
@@ -1322,7 +1318,7 @@ public static FuncCallHttpStep post(
    * @return a named {@link FuncCallHttpStep} that can be passed to {@link #call(FuncCallHttpStep)}
    */
   public static FuncCallHttpStep post(
-          String name, Object body, String endpoint, AuthenticationConfigurer auth) {
+      String name, Object body, String endpoint, AuthenticationConfigurer auth) {
 
     return http(name).POST().endpoint(endpoint, auth).body(body);
   }