Remove fragility of enrichOutput

Signed-off-by: Matheus Cruz <matheuscruz.dev@gmail.com>

Author: mcruzdev

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

@@ -360,7 +360,7 @@ public static <R> JavaContextFunction<Object, R> enrich(Function<WorkflowModel,
    *
    * <pre>{@code
    * function("processData", (Long input) -> input + 5, Long.class)
-   *     .outputAs(FuncDSL.enrichedOutput((taskOutput, rootInputModel) -> {
+   *     .outputAs(FuncDSL.enrichOutput((taskOutput, rootInputModel) -> {
    *         Long rootInput = rootInputModel.as(Long.class).orElse(0L);
    *         return taskOutput + rootInput;
    *     }, Long.class))
@@ -372,16 +372,60 @@ public static <R> JavaContextFunction<Object, R> enrich(Function<WorkflowModel,
    * @param <R> the type of the enriched result
    * @return a JavaContextFunction that can be used with outputAs
    */
-  public static <T, R> JavaContextFunction<T, R> enrichedOutput(
+  public static <T, R> JavaContextFunction<T, R> enrichOutput(
       EnrichWithModelBiFunction<T, R> fn, Class<T> taskOutputClass) {
     return (taskOutput, workflowContext) -> {
       Objects.requireNonNull(taskOutputClass, "taskOutputClass must not be null");
       final WorkflowModel rootInput = workflowContext.instanceData().input();
-      final T typedTaskOutput = taskOutputClass.cast(taskOutput);
+      final T typedTaskOutput = convertTaskOutput(taskOutput, taskOutputClass);
       return fn.apply(typedTaskOutput, rootInput);
     };
   }
 
+  private static <T> T convertTaskOutput(Object taskOutput, Class<T> taskOutputClass) {
+    if (taskOutput == null) {
+      return null;
+    }
+    if (taskOutputClass.isInstance(taskOutput)) {
+      return taskOutputClass.cast(taskOutput);
+    }
+    if (Number.class.isAssignableFrom(taskOutputClass) && taskOutput instanceof Number) {
+      Number number = (Number) taskOutput;
+      if (taskOutputClass == Long.class) {
+        @SuppressWarnings("unchecked")
+        T converted = (T) Long.valueOf(number.longValue());
+        return converted;
+      }
+      if (taskOutputClass == Integer.class) {
+        @SuppressWarnings("unchecked")
+        T converted = (T) Integer.valueOf(number.intValue());
+        return converted;
+      }
+      if (taskOutputClass == Short.class) {
+        @SuppressWarnings("unchecked")
+        T converted = (T) Short.valueOf(number.shortValue());
+        return converted;
+      }
+      if (taskOutputClass == Byte.class) {
+        @SuppressWarnings("unchecked")
+        T converted = (T) Byte.valueOf(number.byteValue());
+        return converted;
+      }
+      if (taskOutputClass == Double.class) {
+        @SuppressWarnings("unchecked")
+        T converted = (T) Double.valueOf(number.doubleValue());
+        return converted;
+      }
+      if (taskOutputClass == Float.class) {
+        @SuppressWarnings("unchecked")
+        T converted = (T) Float.valueOf(number.floatValue());
+        return converted;
+      }
+    }
+    // Fallback to the original behavior for incompatible types.
+    return taskOutputClass.cast(taskOutput);
+  }
+
   /**
    * Create an output transformation that uses only the root workflow input as WorkflowModel.
    *
@@ -392,14 +436,14 @@ public static <T, R> JavaContextFunction<T, R> enrichedOutput(
    *
    * <pre>{@code
    * function("processData", (Long input) -> input * 2, Long.class)
-   *     .outputAs(FuncDSL.enrichedOutput(rootInput -> rootInput.asNumber().orElseThrow()))
+   *     .outputAs(FuncDSL.enrichOutput(rootInput -> rootInput.asNumber().orElseThrow()))
    * }</pre>
    *
    * @param fn the function that receives the root workflow input and returns the enriched result
    * @param <R> the type of the enriched result
    * @return a JavaContextFunction that can be used with outputAs
    */
-  public static <R> JavaContextFunction<Object, R> enrichedOutput(Function<WorkflowModel, R> fn) {
+  public static <R> JavaContextFunction<Object, R> enrichOutput(Function<WorkflowModel, R> fn) {
     return (taskOutput, workflowContext) -> {
       final WorkflowModel rootInput = workflowContext.instanceData().input();
       return fn.apply(rootInput);

impl/test/src/test/java/io/serverlessworkflow/impl/test/FuncDSLEnrichWithTest.java

@@ -16,7 +16,7 @@
 package io.serverlessworkflow.impl.test;
 
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.enrich;
-import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.enrichedOutput;
+import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.enrichOutput;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.function;
 
 import io.serverlessworkflow.api.types.Workflow;
@@ -120,7 +120,7 @@ void test_enrich_output_with_model_in_workflow() {
                         },
                         Long.class)
                     .outputAs(
-                        enrichedOutput(
+                        enrichOutput(
                             (taskOutput, rootInputModel) -> {
                               // taskOutput is typed as Long (result from add5) = 15
                               softly.assertThat(taskOutput).isEqualTo(15L);
@@ -160,7 +160,7 @@ void test_enrich_output_with_input_in_workflow() {
                         },
                         Long.class)
                     .outputAs(
-                        enrichedOutput(
+                        enrichOutput(
                             rootInput -> {
                               Long value = rootInput.asNumber().orElseThrow().longValue();
                               softly.assertThat(value).isEqualTo(10L);