JavaCall should call fromAny(workflowmodel, object)

Signed-off-by: fjtirado <[email protected]>

Author: fjtirado

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaFunctionCallExecutor.java

@@ -53,7 +53,7 @@ public CompletableFuture<WorkflowModel> apply(
       WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
     WorkflowModelFactory modelFactory = workflowContext.definition().application().modelFactory();
     return CompletableFuture.completedFuture(
-        modelFactory.fromAny(function.apply(JavaFuncUtils.convertT(input, inputClass))));
+        modelFactory.fromAny(input, function.apply(JavaFuncUtils.convertT(input, inputClass))));
   }
 
   @Override

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionCallExecutor.java

@@ -50,6 +50,7 @@ public CompletableFuture<WorkflowModel> apply(
     WorkflowModelFactory modelFactory = workflowContext.definition().application().modelFactory();
     return CompletableFuture.completedFuture(
         modelFactory.fromAny(
+            input,
             function.apply(
                 input.asJavaObject(), safeObject(taskContext.variables().get(varName)))));
   }

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionIndexCallExecutor.java

@@ -54,6 +54,7 @@ public CompletableFuture<WorkflowModel> apply(
 
     return CompletableFuture.completedFuture(
         modelFactory.fromAny(
+            input,
             function.apply(
                 input.asJavaObject(),
                 safeObject(taskContext.variables().get(varName)),

experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/func/JavaExpressionFactory.java

@@ -45,7 +45,7 @@ public ObjectExpression buildExpression(ExpressionDescriptor descriptor) {
     } else if (value instanceof TypedFunction func) {
       return (w, t, n) -> func.function().apply(n.as(func.argClass()).orElseThrow());
     } else {
-      return (w, t, n) -> modelFactory.fromAny(value);
+      return (w, t, n) -> value;
     }
   }
 

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/HttpExecutor.java

@@ -110,6 +110,7 @@ public void init(
             (request, w, context, node) ->
                 converter.toModel(
                     application.modelFactory(),
+                    node,
                     request.post(
                         converter.toEntity(bodyFilter.apply(w, context, node)),
                         node.objectClass()));
@@ -118,7 +119,7 @@ public void init(
       default:
         this.requestFunction =
             (request, w, t, n) ->
-                converter.toModel(application.modelFactory(), request.get(n.objectClass()));
+                converter.toModel(application.modelFactory(), n, request.get(n.objectClass()));
     }
   }
 

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/HttpModelConverter.java

@@ -22,8 +22,8 @@
 
 public interface HttpModelConverter {
 
-  default WorkflowModel toModel(WorkflowModelFactory factory, Object entity) {
-    return factory.fromAny(entity);
+  default WorkflowModel toModel(WorkflowModelFactory factory, WorkflowModel model, Object entity) {
+    return factory.fromAny(model, entity);
   }
 
   default Entity toEntity(Map<String, Object> model) {