Ensure not workflowmodel is returned within a Map or Collection

fjtirado · fjtirado · commit 70e4f523f4f7 · 2025-07-19T10:21:43.000+02:00
Signed-off-by: fjtirado &lt;ftirados@redhat.com&gt;
diff --git a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/JavaModel.java b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/JavaModel.java
@@ -21,10 +21,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
 
-public class JavaModel implements WorkflowModel {
+class JavaModel implements WorkflowModel {
 
   private Object object;
 
@@ -33,7 +35,7 @@ public class JavaModel implements WorkflowModel {
   static final JavaModel NullModel = new JavaModel(null);
 
   JavaModel(Object object) {
-    this.object = object;
+    this.object = asJavaObject(object);
   }
 
   @Override
@@ -89,6 +91,20 @@ public Object asJavaObject() {
     return object;
   }
 
+  static Object asJavaObject(Object object) {
+    if (object instanceof WorkflowModel model) {
+      return model.asJavaObject();
+    } else if (object instanceof Map map) {
+      return ((Map<String, Object>) map)
+          .entrySet().stream()
+              .collect(Collectors.toMap(Entry::getKey, e -> asJavaObject(e.getValue())));
+    } else if (object instanceof Collection col) {
+      return col.stream().map(JavaModel::asJavaObject).collect(Collectors.toList());
+    } else {
+      return object;
+    }
+  }
+
   @Override
   public Object asIs() {
     return object;
diff --git a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/JavaModelCollection.java b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/JavaModelCollection.java
@@ -22,7 +22,7 @@
 import java.util.Iterator;
 import java.util.Optional;
 
-public class JavaModelCollection implements Collection<WorkflowModel>, WorkflowModelCollection {
+class JavaModelCollection implements Collection<WorkflowModel>, WorkflowModelCollection {
 
   private final Collection object;
 
@@ -31,7 +31,7 @@ public class JavaModelCollection implements Collection<WorkflowModel>, WorkflowM
   }
 
   JavaModelCollection(Collection<?> object) {
-    this.object = object;
+    this.object = (Collection) JavaModel.asJavaObject(object);
   }
 
   @Override
@@ -86,12 +86,12 @@ public <T> T[] toArray(T[] a) {
 
   @Override
   public boolean add(WorkflowModel e) {
-    return object.add(e.asIs());
+    return object.add(e.asJavaObject());
   }
 
   @Override
   public boolean remove(Object o) {
-    return object.remove(((WorkflowModel) o).asIs());
+    return object.remove(((WorkflowModel) o).asJavaObject());
   }
 
   @Override
diff --git a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/JavaModelFactory.java b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/JavaModelFactory.java
@@ -23,7 +23,7 @@
 import java.time.OffsetDateTime;
 import java.util.Map;
 
-public class JavaModelFactory implements WorkflowModelFactory {
+class JavaModelFactory implements WorkflowModelFactory {
 
   @Override
   public WorkflowModel combine(Map<String, WorkflowModel> workflowVariables) {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`import java.util.Iterator;`
`23`	`23`	`import java.util.Optional;`
`24`	`24`
`25`		`-public class JavaModelCollection implements Collection<WorkflowModel>, WorkflowModelCollection {`
	`25`	`+class JavaModelCollection implements Collection<WorkflowModel>, WorkflowModelCollection {`
`26`	`26`
`27`	`27`	`private final Collection object;`
`28`	`28`
`@@ -31,7 +31,7 @@ public class JavaModelCollection implements Collection<WorkflowModel>, WorkflowM`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`JavaModelCollection(Collection<?> object) {`
`34`		`- this.object = object;`
	`34`	`+ this.object = (Collection) JavaModel.asJavaObject(object);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
`@@ -86,12 +86,12 @@ public <T> T[] toArray(T[] a) {`
`86`	`86`
`87`	`87`	`@Override`
`88`	`88`	`public boolean add(WorkflowModel e) {`
`89`		`- return object.add(e.asIs());`
	`89`	`+ return object.add(e.asJavaObject());`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`@Override`
`93`	`93`	`public boolean remove(Object o) {`
`94`		`- return object.remove(((WorkflowModel) o).asIs());`
	`94`	`+ return object.remove(((WorkflowModel) o).asJavaObject());`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`@Override`