Refactor delegates

Signed-off-by: Ricardo Zanini <[email protected]>

Author: ricardozanini

fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentAdapters.java

@@ -31,7 +31,7 @@ public static List<AgentExecutor> toExecutors(Object... agents) {
     return agentsToExecutors(Stream.of(agents).map(AgentInstance.class::cast).toList());
   }
 
-  public static Function<Cognisphere, Object> toFn(AgentExecutor exec) {
+  public static Function<Cognisphere, Object> toFunction(AgentExecutor exec) {
     return exec::invoke;
   }
 }

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

@@ -15,28 +15,14 @@
  */
 package io.serverlessworkflow.fluent.agentic;
 
-import io.serverlessworkflow.fluent.func.FuncDoTaskBuilder;
-import io.serverlessworkflow.fluent.func.FuncTaskItemListBuilder;
+import io.serverlessworkflow.fluent.spec.BaseDoTaskBuilder;
 
-public class AgentDoTaskBuilder extends FuncDoTaskBuilder
+public class AgentDoTaskBuilder
+    extends BaseDoTaskBuilder<AgentDoTaskBuilder, AgentTaskItemListBuilder>
     implements DelegatingAgentDoTaskFluent<AgentDoTaskBuilder> {
 
-  private AgentDoTaskBuilder(AgentTaskItemListBuilder agentTaskItemListBuilder) {
-    super(agentTaskItemListBuilder);
-  }
-
-  static AgentDoTaskBuilder wrap(FuncDoTaskBuilder base) {
-    FuncTaskItemListBuilder funcList = base.internalDelegate();
-    AgentTaskItemListBuilder agentList =
-        (funcList instanceof AgentTaskItemListBuilder al)
-            ? al
-            : new AgentTaskItemListBuilder(funcList.getInternalList());
-    return new AgentDoTaskBuilder(agentList);
-  }
-
-  @Override
-  public AgentDoTaskFluent<?> agentInternalDelegate() {
-    return (AgentDoTaskFluent<?>) super.internalDelegate();
+  AgentDoTaskBuilder() {
+    super(new AgentTaskItemListBuilder());
   }
 
   @Override

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

@@ -15,22 +15,35 @@
  */
 package io.serverlessworkflow.fluent.agentic;
 
-import dev.langchain4j.agentic.internal.AgentExecutor;
-import io.serverlessworkflow.api.types.TaskItem;
 import io.serverlessworkflow.fluent.func.FuncTaskItemListBuilder;
-import java.util.List;
+import io.serverlessworkflow.fluent.spec.BaseTaskItemListBuilder;
 
-public class AgentTaskItemListBuilder extends FuncTaskItemListBuilder
+public class AgentTaskItemListBuilder extends BaseTaskItemListBuilder<AgentTaskItemListBuilder>
     implements AgentDoTaskFluent<AgentTaskItemListBuilder> {
 
-  AgentTaskItemListBuilder(final List<TaskItem> list) {
-    super(list);
+  private final FuncTaskItemListBuilder funcDelegate;
+
+  AgentTaskItemListBuilder() {
+    super();
+    this.funcDelegate = new FuncTaskItemListBuilder(super.mutableList());
+  }
+
+  @Override
+  protected AgentTaskItemListBuilder newItemListBuilder() {
+    return new AgentTaskItemListBuilder();
   }
 
   @Override
   public AgentTaskItemListBuilder agent(String name, Object agent) {
-    AgentExecutor exec = AgentAdapters.toExecutors(agent).get(0);
-    this.callFn(name, fn -> fn.function(AgentAdapters.toFn(exec)));
+    AgentAdapters.toExecutors(agent)
+        .forEach(
+            exec ->
+                this.funcDelegate.callFn(name, fn -> fn.function(AgentAdapters.toFunction(exec))));
+    return this;
+  }
+
+  @Override
+  public AgentTaskItemListBuilder self() {
     return this;
   }
 }

fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgenticWorkflowBuilder.java

@@ -15,64 +15,37 @@
  */
 package io.serverlessworkflow.fluent.agentic;
 
-import io.serverlessworkflow.api.types.Workflow;
-import io.serverlessworkflow.fluent.func.FuncWorkflowBuilder;
-import io.serverlessworkflow.fluent.spec.DocumentBuilder;
-import io.serverlessworkflow.fluent.spec.InputBuilder;
-import io.serverlessworkflow.fluent.spec.OutputBuilder;
-import io.serverlessworkflow.fluent.spec.UseBuilder;
-import java.util.function.Consumer;
+import static java.lang.constant.ConstantDescs.DEFAULT_NAME;
 
-public final class AgenticWorkflowBuilder {
+import io.serverlessworkflow.fluent.spec.BaseWorkflowBuilder;
 
-  private final FuncWorkflowBuilder delegate;
+public final class AgenticWorkflowBuilder
+    extends BaseWorkflowBuilder<
+        AgenticWorkflowBuilder, AgentDoTaskBuilder, AgentTaskItemListBuilder> {
 
-  AgenticWorkflowBuilder(final FuncWorkflowBuilder delegate) {
-    this.delegate = delegate;
+  AgenticWorkflowBuilder(final String name, final String namespace, final String version) {
+    super(name, namespace, version);
   }
 
   public static AgenticWorkflowBuilder workflow() {
-    return new AgenticWorkflowBuilder(FuncWorkflowBuilder.workflow());
+    return new AgenticWorkflowBuilder(DEFAULT_NAME, DEFAULT_NAMESPACE, DEFAULT_VERSION);
   }
 
   public static AgenticWorkflowBuilder workflow(String name) {
-    return new AgenticWorkflowBuilder(FuncWorkflowBuilder.workflow(name));
+    return new AgenticWorkflowBuilder(name, DEFAULT_NAMESPACE, DEFAULT_VERSION);
   }
 
   public static AgenticWorkflowBuilder workflow(String name, String ns) {
-    return new AgenticWorkflowBuilder(FuncWorkflowBuilder.workflow(name, ns));
+    return new AgenticWorkflowBuilder(name, ns, DEFAULT_VERSION);
   }
 
-  public AgenticWorkflowBuilder document(Consumer<DocumentBuilder> c) {
-    delegate.document(c);
-    return this;
-  }
-
-  public AgenticWorkflowBuilder input(Consumer<InputBuilder> c) {
-    delegate.input(c);
-    return this;
-  }
-
-  public AgenticWorkflowBuilder output(Consumer<OutputBuilder> c) {
-    delegate.output(c);
-    return this;
-  }
-
-  public AgenticWorkflowBuilder use(Consumer<UseBuilder> c) {
-    delegate.use(c);
-    return this;
+  @Override
+  protected AgentDoTaskBuilder newDo() {
+    return new AgentDoTaskBuilder();
   }
 
-  public AgenticWorkflowBuilder tasks(Consumer<AgentDoTaskBuilder> c) {
-    delegate.tasks(
-        funcDo -> {
-          AgentDoTaskBuilder agentDoTaskBuilder = AgentDoTaskBuilder.wrap(funcDo);
-          c.accept(agentDoTaskBuilder);
-        });
+  @Override
+  protected AgenticWorkflowBuilder self() {
     return this;
   }
-
-  public Workflow build() {
-    return delegate.build();
-  }
 }

fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/DelegatingAgentDoTaskFluent.java

@@ -15,19 +15,20 @@
  */
 package io.serverlessworkflow.fluent.agentic;
 
-public interface DelegatingAgentDoTaskFluent<SELF extends DelegatingAgentDoTaskFluent<SELF>>
-    extends AgentDoTaskFluent<SELF> {
+import io.serverlessworkflow.fluent.func.DelegatingFuncDoTaskFluent;
+import io.serverlessworkflow.fluent.spec.HasDelegate;
 
-  /** Return the underlying functional ops delegate. */
-  AgentDoTaskFluent<?> agentInternalDelegate();
+public interface DelegatingAgentDoTaskFluent<SELF extends DelegatingAgentDoTaskFluent<SELF>>
+    extends AgentDoTaskFluent<SELF>, DelegatingFuncDoTaskFluent<SELF>, HasDelegate {
 
   @SuppressWarnings("unchecked")
-  default SELF self() {
-    return (SELF) this;
+  private AgentDoTaskFluent<SELF> d() {
+    return (AgentDoTaskFluent<SELF>) this.delegate();
   }
 
+  @SuppressWarnings("unchecked")
   default SELF agent(String name, Object agent) {
-    agentInternalDelegate().agent(name, agent);
+    d().agent(name, agent);
     return (SELF) this;
   }
 }

fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgenticWorkflowBuilderTest.java

@@ -16,6 +16,7 @@
 package io.serverlessworkflow.fluent.agentic;
 
 import static io.serverlessworkflow.fluent.agentic.Models.BASE_MODEL;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.spy;
@@ -42,6 +43,7 @@ public void verifyAgentCall() {
             .build();
 
     assertNotNull(workflow);
+    assertEquals(1, workflow.getDo().size());
     assertInstanceOf(CallJava.class, workflow.getDo().get(0).getTask().getCallTask().get());
   }
 }

fluent/func/src/main/java/io/serverlessworkflow/fluent/func/DelegatingFuncDoTaskFluent.java

@@ -15,6 +15,7 @@
  */
 package io.serverlessworkflow.fluent.func;
 
+import io.serverlessworkflow.fluent.spec.HasDelegate;
 import java.util.function.Consumer;
 
 /**
@@ -23,49 +24,51 @@
  * @param <SELF> concrete builder type
  */
 public interface DelegatingFuncDoTaskFluent<SELF extends DelegatingFuncDoTaskFluent<SELF>>
-    extends FuncDoTaskFluent<SELF> {
-
-  /** Return the underlying functional ops delegate. */
-  FuncDoTaskFluent<?> funcInternalDelegate();
+    extends FuncDoTaskFluent<SELF>, HasDelegate {
 
   @SuppressWarnings("unchecked")
   default SELF self() {
     return (SELF) this;
   }
 
+  @SuppressWarnings("unchecked")
+  private FuncDoTaskFluent<SELF> d() {
+    return (FuncDoTaskFluent<SELF>) this.delegate();
+  }
+
   @Override
   default SELF callFn(String name, Consumer<FuncCallTaskBuilder> cfg) {
-    funcInternalDelegate().callFn(name, cfg);
+    d().callFn(name, cfg);
     return self();
   }
 
   @Override
   default SELF callFn(Consumer<FuncCallTaskBuilder> cfg) {
-    funcInternalDelegate().callFn(cfg);
+    d().callFn(cfg);
     return self();
   }
 
   @Override
   default SELF forFn(String name, Consumer<FuncForTaskBuilder> cfg) {
-    funcInternalDelegate().forFn(name, cfg);
+    d().forFn(name, cfg);
     return self();
   }
 
   @Override
   default SELF forFn(Consumer<FuncForTaskBuilder> cfg) {
-    funcInternalDelegate().forFn(cfg);
+    d().forFn(cfg);
     return self();
   }
 
   @Override
   default SELF switchFn(String name, Consumer<FuncSwitchTaskBuilder> cfg) {
-    funcInternalDelegate().switchFn(name, cfg);
+    d().switchFn(name, cfg);
     return self();
   }
 
   @Override
   default SELF switchFn(Consumer<FuncSwitchTaskBuilder> cfg) {
-    funcInternalDelegate().switchFn(cfg);
+    d().switchFn(cfg);
     return self();
   }
 }

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

@@ -21,21 +21,12 @@ public class FuncDoTaskBuilder extends BaseDoTaskBuilder<FuncDoTaskBuilder, Func
     implements FuncTransformations<FuncDoTaskBuilder>,
         DelegatingFuncDoTaskFluent<FuncDoTaskBuilder> {
 
-  protected FuncDoTaskBuilder(FuncTaskItemListBuilder listBuilder) {
-    super(listBuilder);
-  }
-
-  FuncDoTaskBuilder() {
+  public FuncDoTaskBuilder() {
     super(new FuncTaskItemListBuilder());
   }
 
   @Override
   public FuncDoTaskBuilder self() {
     return this;
   }
-
-  @Override
-  public FuncDoTaskFluent<FuncTaskItemListBuilder> funcInternalDelegate() {
-    return internalDelegate();
-  }
 }

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

@@ -25,11 +25,11 @@
 public class FuncTaskItemListBuilder extends BaseTaskItemListBuilder<FuncTaskItemListBuilder>
     implements FuncDoTaskFluent<FuncTaskItemListBuilder> {
 
-  protected FuncTaskItemListBuilder() {
+  public FuncTaskItemListBuilder() {
     super();
   }
 
-  protected FuncTaskItemListBuilder(final List<TaskItem> list) {
+  public FuncTaskItemListBuilder(final List<TaskItem> list) {
     super(list);
   }
 

fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncWorkflowBuilder.java

@@ -22,7 +22,7 @@ public class FuncWorkflowBuilder
     extends BaseWorkflowBuilder<FuncWorkflowBuilder, FuncDoTaskBuilder, FuncTaskItemListBuilder>
     implements FuncTransformations<FuncWorkflowBuilder> {
 
-  FuncWorkflowBuilder(final String name, final String namespace, final String version) {
+  protected FuncWorkflowBuilder(final String name, final String namespace, final String version) {
     super(name, namespace, version);
   }