Fix #973 - Refine support for http calls on func

Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com>

Author: ricardozanini

experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentDoTaskBuilder.java

@@ -70,8 +70,8 @@ public AgentDoTaskBuilder parallel(String name, Object... agents) {
   }
 
   @Override
-  public AgentDoTaskBuilder callFn(String name, Consumer<FuncCallTaskBuilder> cfg) {
-    this.listBuilder().callFn(name, cfg);
+  public AgentDoTaskBuilder function(String name, Consumer<FuncCallTaskBuilder> cfg) {
+    this.listBuilder().function(name, cfg);
     return self();
   }
 

experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentTaskItemListBuilder.java

@@ -56,7 +56,7 @@ public AgentTaskItemListBuilder agent(String name, Object agent) {
     AgentAdapters.toExecutors(agent)
         .forEach(
             exec ->
-                this.delegate.callFn(
+                this.delegate.function(
                     name,
                     fn -> fn.function(AgentAdapters.toFunction(exec), DefaultAgenticScope.class)));
     return self();
@@ -103,8 +103,8 @@ public AgentTaskItemListBuilder parallel(String name, Object... agents) {
   }
 
   @Override
-  public AgentTaskItemListBuilder callFn(String name, Consumer<FuncCallTaskBuilder> cfg) {
-    this.delegate.callFn(name, cfg);
+  public AgentTaskItemListBuilder function(String name, Consumer<FuncCallTaskBuilder> cfg) {
+    this.delegate.function(name, cfg);
     return self();
   }
 

experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/LoopAgentsBuilder.java

@@ -49,7 +49,7 @@ public LoopAgentsBuilder subAgents(String baseName, Object... agents) {
     forEachIndexed(
         execs,
         (exec, idx) ->
-            funcDelegate.callFn(
+            funcDelegate.function(
                 baseName + "-" + idx, fn -> fn.function(AgentAdapters.toFunction(exec))));
     return this;
   }

experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/dsl/AgenticDSL.java

@@ -143,12 +143,12 @@ public static Consumer<AgentDoTaskBuilder> doTasks(AgentTaskConfigurer... steps)
   }
 
   public static <T, V> AgentTaskConfigurer function(Function<T, V> function, Class<T> argClass) {
-    return list -> list.callFn(fn(function, argClass));
+    return list -> list.function(fn(function, argClass));
   }
 
   public static <T, V> AgentTaskConfigurer function(Function<T, V> function) {
     Class<T> clazz = ReflectionUtils.inferInputType(function);
-    return list -> list.callFn(fn(function, clazz));
+    return list -> list.function(fn(function, clazz));
   }
 
   public static AgentTaskConfigurer agent(Object agent) {

experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentDslWorkflowTest.java

@@ -68,7 +68,7 @@ private void assertSequentialAgents(Workflow wf) {
   void dslCallFnBare() {
     Workflow wf =
         workflow("beanCall")
-            .tasks(tasks -> tasks.callFn("plainCall", fn -> fn.function(ctx -> "pong")))
+            .tasks(tasks -> tasks.function("plainCall", fn -> fn.function(ctx -> "pong")))
             .build();
 
     List<TaskItem> items = wf.getDo();

experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentWorkflowBuilderTest.java

@@ -177,7 +177,7 @@ void parallelAgents() {
   void testWorkflowCallFnBare() {
     Workflow wf =
         AgentWorkflowBuilder.workflow()
-            .tasks(d -> d.callFn("myCall", fn -> fn.function(ctx -> "hello")))
+            .tasks(d -> d.function("myCall", fn -> fn.function(ctx -> "hello")))
             .build();
 
     assertThat(wf.getDo()).hasSize(1);
@@ -193,7 +193,7 @@ void testWorkflowCallFnWithPredicate() {
 
     Workflow wf =
         AgentWorkflowBuilder.workflow()
-            .tasks(d -> d.callFn("guarded", fn -> fn.function(ctx -> "x").when(guard)))
+            .tasks(d -> d.function("guarded", fn -> fn.function(ctx -> "x").when(guard)))
             .build();
 
     TaskItem ti = wf.getDo().get(0);

experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/EmailDrafterIT.java

@@ -62,8 +62,8 @@ void email_drafter_agent() {
                 tasks ->
                     tasks
                         .agent("agentEmailDrafter", emailDrafter)
-                        .callFn("parseDraft", fn(EmailDrafts::parse, String.class))
-                        .callFn("policyCheck", fn(EmailPolicies::policyCheck, EmailDraft.class))
+                        .function("parseDraft", fn(EmailDrafts::parse, String.class))
+                        .function("policyCheck", fn(EmailPolicies::policyCheck, EmailDraft.class))
                         .switchCase(
                             "needsHumanReview?",
                             cases(

experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallHttpTaskBuilder.java

@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+import io.serverlessworkflow.api.types.CallHTTP;
+import io.serverlessworkflow.api.types.HTTPArguments;
+import io.serverlessworkflow.fluent.func.spi.ConditionalTaskBuilder;
+import io.serverlessworkflow.fluent.func.spi.FuncTaskTransformations;
+import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
+import io.serverlessworkflow.fluent.spec.spi.CallHttpTaskFluent;
+
+public class FuncCallHttpTaskBuilder extends TaskBaseBuilder<FuncCallHttpTaskBuilder>
+    implements CallHttpTaskFluent<FuncCallHttpTaskBuilder>,
+        FuncTaskTransformations<FuncCallHttpTaskBuilder>,
+        ConditionalTaskBuilder<FuncCallHttpTaskBuilder> {
+
+  private final CallHTTP callHTTP;
+
+  protected FuncCallHttpTaskBuilder() {
+    callHTTP = new CallHTTP();
+    callHTTP.setWith(new HTTPArguments());
+    callHTTP.getWith().setOutput(HTTPArguments.HTTPOutput.CONTENT);
+    super.setTask(this.callHTTP);
+  }
+
+  @Override
+  public CallHTTP build() {
+    return callHTTP;
+  }
+
+  @Override
+  public FuncCallHttpTaskBuilder self() {
+    return this;
+  }
+}

experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncDoTaskBuilder.java

@@ -73,8 +73,8 @@ public FuncDoTaskBuilder switchCase(
   }
 
   @Override
-  public FuncDoTaskBuilder callFn(String name, Consumer<FuncCallTaskBuilder> cfg) {
-    this.listBuilder().callFn(name, cfg);
+  public FuncDoTaskBuilder function(String name, Consumer<FuncCallTaskBuilder> cfg) {
+    this.listBuilder().function(name, cfg);
     return this;
   }
 
@@ -83,4 +83,10 @@ public FuncDoTaskBuilder fork(String name, Consumer<FuncForkTaskBuilder> itemsCo
     this.listBuilder().fork(name, itemsConfigurer);
     return this;
   }
+
+  @Override
+  public FuncDoTaskBuilder http(String name, Consumer<FuncCallHttpTaskBuilder> itemsConfigurer) {
+    this.listBuilder().http(name, itemsConfigurer);
+    return this;
+  }
 }

experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTaskItemListBuilder.java

@@ -15,6 +15,8 @@
  */
 package io.serverlessworkflow.fluent.func;
 
+import io.serverlessworkflow.api.types.CallHTTP;
+import io.serverlessworkflow.api.types.CallTask;
 import io.serverlessworkflow.api.types.Task;
 import io.serverlessworkflow.api.types.TaskItem;
 import io.serverlessworkflow.fluent.func.spi.FuncDoFluent;
@@ -45,16 +47,16 @@ protected FuncTaskItemListBuilder newItemListBuilder() {
   }
 
   @Override
-  public FuncTaskItemListBuilder callFn(String name, Consumer<FuncCallTaskBuilder> consumer) {
+  public FuncTaskItemListBuilder function(String name, Consumer<FuncCallTaskBuilder> consumer) {
     name = this.defaultNameAndRequireConfig(name, consumer);
     final FuncCallTaskBuilder callTaskJavaBuilder = new FuncCallTaskBuilder();
     consumer.accept(callTaskJavaBuilder);
     return addTaskItem(new TaskItem(name, new Task().withCallTask(callTaskJavaBuilder.build())));
   }
 
   @Override
-  public FuncTaskItemListBuilder callFn(Consumer<FuncCallTaskBuilder> consumer) {
-    return this.callFn(UUID.randomUUID().toString(), consumer);
+  public FuncTaskItemListBuilder function(Consumer<FuncCallTaskBuilder> consumer) {
+    return this.function(UUID.randomUUID().toString(), consumer);
   }
 
   @Override
@@ -116,4 +118,19 @@ public FuncTaskItemListBuilder fork(String name, Consumer<FuncForkTaskBuilder> i
     return this.addTaskItem(
         new TaskItem(name, new Task().withForkTask(forkTaskJavaBuilder.build())));
   }
+
+  @Override
+  public FuncTaskItemListBuilder http(
+      String name, Consumer<FuncCallHttpTaskBuilder> itemsConfigurer) {
+    name = this.defaultNameAndRequireConfig(name, itemsConfigurer);
+    final FuncCallHttpTaskBuilder httpTaskJavaBuilder = new FuncCallHttpTaskBuilder();
+    itemsConfigurer.accept(httpTaskJavaBuilder);
+    final CallHTTP callHTTP = httpTaskJavaBuilder.build();
+    final CallTask callTask = new CallTask();
+    callTask.setCallHTTP(callHTTP);
+    final Task task = new Task();
+    task.setCallTask(callTask);
+
+    return this.addTaskItem(new TaskItem(name, task));
+  }
 }