[Fix #1489] Alternative approach

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

Author: fjtirado

api/src/main/java/io/serverlessworkflow/api/WorkflowWriter.java

@@ -22,6 +22,8 @@
 import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Utility class for writing Serverless Workflow definitions to various outputs and formats.
@@ -32,6 +34,8 @@
  */
 public class WorkflowWriter {
 
+  private static final Logger logger = LoggerFactory.getLogger(WorkflowWriter.class);
+
   /**
    * Writes a {@link Workflow} to the given {@link OutputStream} in the specified format.
    *
@@ -95,7 +99,9 @@ public static void writeWorkflow(Path output, Workflow workflow, WorkflowFormat
    */
   public static String workflowAsString(Workflow workflow, WorkflowFormat format)
       throws IOException {
-    return format.mapper().writeValueAsString(workflow);
+    String result = format.mapper().writeValueAsString(workflow);
+    logger.trace("Workflow is {}", result);
+    return result;
   }
 
   /**

experimental/fluent/func/pom.xml

@@ -33,42 +33,17 @@
             <groupId>io.cloudevents</groupId>
             <artifactId>cloudevents-core</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <scope>test</scope>
-        </dependency>
-           <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <version>${version.org.mockito}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-experimental-fluent-serialization-jackson</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 </project>

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

@@ -15,8 +15,8 @@
  */
 package io.serverlessworkflow.fluent.func;
 
+import io.serverlessworkflow.api.types.CallTask;
 import io.serverlessworkflow.api.types.func.CallJava;
-import io.serverlessworkflow.api.types.func.CallTaskJava;
 import io.serverlessworkflow.api.types.func.ContextFunction;
 import io.serverlessworkflow.api.types.func.FilterFunction;
 import io.serverlessworkflow.fluent.func.spi.ConditionalTaskBuilder;
@@ -29,12 +29,9 @@ public class FuncCallTaskBuilder extends TaskBaseBuilder<FuncCallTaskBuilder>
     implements FuncTaskTransformations<FuncCallTaskBuilder>,
         ConditionalTaskBuilder<FuncCallTaskBuilder> {
 
-  private CallTaskJava callTaskJava;
+  private CallTask callTaskJava;
 
-  FuncCallTaskBuilder() {
-    callTaskJava = new CallTaskJava(new CallJava() {});
-    super.setTask(callTaskJava.getCallJava());
-  }
+  FuncCallTaskBuilder() {}
 
   @Override
   protected FuncCallTaskBuilder self() {
@@ -51,8 +48,9 @@ public <T, V> FuncCallTaskBuilder function(Function<T, V> function, Class<T> arg
 
   public <T, V> FuncCallTaskBuilder function(
       Function<T, V> function, Class<T> argClass, Class<V> returnClass) {
-    this.callTaskJava = new CallTaskJava(CallJava.function(function, argClass, returnClass));
-    super.setTask(this.callTaskJava.getCallJava());
+    this.callTaskJava =
+        new CallTask().withCallFunction(CallJava.function(function, argClass, returnClass));
+    super.setTask(this.callTaskJava.getCallFunction());
     return this;
   }
 
@@ -66,8 +64,9 @@ public <T, V> FuncCallTaskBuilder function(ContextFunction<T, V> function, Class
 
   public <T, V> FuncCallTaskBuilder function(
       ContextFunction<T, V> function, Class<T> argClass, Class<V> returnClass) {
-    this.callTaskJava = new CallTaskJava(CallJava.function(function, argClass, returnClass));
-    super.setTask(this.callTaskJava.getCallJava());
+    this.callTaskJava =
+        new CallTask().withCallFunction(CallJava.function(function, argClass, returnClass));
+    super.setTask(this.callTaskJava.getCallFunction());
     return this;
   }
 
@@ -81,26 +80,27 @@ public <T, V> FuncCallTaskBuilder function(FilterFunction<T, V> function, Class<
 
   public <T, V> FuncCallTaskBuilder function(
       FilterFunction<T, V> function, Class<T> argClass, Class<V> outputClass) {
-    this.callTaskJava = new CallTaskJava(CallJava.function(function, argClass, outputClass));
-    super.setTask(this.callTaskJava.getCallJava());
+    this.callTaskJava =
+        new CallTask().withCallFunction(CallJava.function(function, argClass, outputClass));
+    super.setTask(this.callTaskJava.getCallFunction());
     return this;
   }
 
   /** Accept a side-effect Consumer; engine should pass input through unchanged. */
   public <T> FuncCallTaskBuilder consumer(Consumer<T> consumer) {
-    this.callTaskJava = new CallTaskJava(CallJava.consumer(consumer));
-    super.setTask(this.callTaskJava.getCallJava());
+    this.callTaskJava = new CallTask().withCallFunction(CallJava.consumer(consumer));
+    super.setTask(this.callTaskJava.getCallFunction());
     return this;
   }
 
   /** Accept a Consumer with explicit input type hint. */
   public <T> FuncCallTaskBuilder consumer(Consumer<T> consumer, Class<T> argClass) {
-    this.callTaskJava = new CallTaskJava(CallJava.consumer(consumer, argClass));
-    super.setTask(this.callTaskJava.getCallJava());
+    this.callTaskJava = new CallTask().withCallFunction(CallJava.consumer(consumer, argClass));
+    super.setTask(this.callTaskJava.getCallFunction());
     return this;
   }
 
-  public CallTaskJava build() {
+  public CallTask build() {
     return this.callTaskJava;
   }
 }

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

@@ -15,11 +15,11 @@
  */
 package io.serverlessworkflow.fluent.func;
 
+import io.serverlessworkflow.api.types.CallTask;
 import io.serverlessworkflow.api.types.ForTaskConfiguration;
 import io.serverlessworkflow.api.types.Task;
 import io.serverlessworkflow.api.types.TaskItem;
 import io.serverlessworkflow.api.types.func.CallJava;
-import io.serverlessworkflow.api.types.func.CallTaskJava;
 import io.serverlessworkflow.api.types.func.ForTaskFunction;
 import io.serverlessworkflow.api.types.func.LoopFunction;
 import io.serverlessworkflow.api.types.func.LoopPredicate;
@@ -84,9 +84,10 @@ public <T, V, R> FuncForTaskBuilder tasks(String name, LoopFunction<T, V, R> fun
             name,
             new Task()
                 .withCallTask(
-                    new CallTaskJava(
-                        CallJava.loopFunction(
-                            function, this.forTaskFunction.getFor().getEach())))));
+                    new CallTask()
+                        .withCallFunction(
+                            CallJava.loopFunction(
+                                function, this.forTaskFunction.getFor().getEach())))));
     return this;
   }
 

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

@@ -15,10 +15,10 @@
  */
 package io.serverlessworkflow.fluent.func;
 
+import io.serverlessworkflow.api.types.CallTask;
 import io.serverlessworkflow.api.types.Task;
 import io.serverlessworkflow.api.types.TaskItem;
 import io.serverlessworkflow.api.types.func.CallJava;
-import io.serverlessworkflow.api.types.func.CallTaskJava;
 import io.serverlessworkflow.fluent.func.spi.ConditionalTaskBuilder;
 import io.serverlessworkflow.fluent.func.spi.FuncTaskTransformations;
 import io.serverlessworkflow.fluent.spec.AbstractForkTaskBuilder;
@@ -61,7 +61,8 @@ public <T, V> FuncForkTaskBuilder branch(
             this.defaultBranchName(name, this.currentOffset()),
             new Task()
                 .withCallTask(
-                    new CallTaskJava(CallJava.function(function, argParam, returnClass)))));
+                    new CallTask()
+                        .withCallFunction(CallJava.function(function, argParam, returnClass)))));
     return this;
   }
 

experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java

@@ -1599,7 +1599,7 @@ public static <T, V> FuncTaskConfigurer forEach(
   }
 
   public static <T, V> FuncTaskConfigurer forEachItem(
-      SerializableFunction<T, Collection<V>> collection, Function<V, ?> function) {
+      SerializableFunction<T, Collection<V>> collection, SerializableFunction<V, ?> function) {
     return forEachItem(null, collection, function);
   }
 

experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/FuncDSLSerializationTest.java

@@ -8,10 +8,14 @@
   <artifactId>serverlessworkflow-experimental-fluent-serialization-jackson</artifactId>
   <name>Serverless Workflow :: Experimental :: Fluent :: Serialization:: Jackson</name>
   <dependencies>
-      <dependency>
+    <dependency>
         <groupId>com.fasterxml.jackson.dataformat</groupId>
         <artifactId>jackson-dataformat-yaml</artifactId>
     </dependency>
+    <dependency>
+        <groupId>com.fasterxml.jackson.datatype</groupId>
+        <artifactId>jackson-datatype-jdk8</artifactId>
+    </dependency>
     <dependency>
         <groupId>io.serverlessworkflow</groupId>
         <artifactId>serverlessworkflow-experimental-types</artifactId>