[Fix #786] Evaluate embedded properties

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

Author: fjtirado

impl/core/src/main/java/io/serverlessworkflow/impl/expressions/ObjectExpressionFactory.java

@@ -53,7 +53,11 @@ protected Object toJavaObject(Object eval) {
   private Map<String, Object> buildExpressionMap(
       Map<String, Object> origMap, ExpressionFactory factory) {
     return new ProxyMap(
-        origMap, o -> ExpressionUtils.isExpr(o) ? buildExpression(o.toString()) : o);
+        origMap,
+        o ->
+            ExpressionUtils.isExpr(o)
+                ? buildExpression(o.toString())
+                : buildExpressionObject(o, factory));
   }
 
   private Object buildExpressionObject(Object obj, ExpressionFactory factory) {
@@ -64,9 +68,14 @@ private Map<String, Object> evaluateExpressionMap(
       Map<String, Object> origMap, WorkflowContext workflow, TaskContext task, WorkflowModel n) {
     return new ProxyMap(
         origMap,
-        o ->
-            o instanceof ObjectExpression
-                ? toJavaObject(((ObjectExpression) o).eval(workflow, task, n))
-                : o);
+        o -> {
+          if (o instanceof ObjectExpression expr) {
+            return toJavaObject(expr.eval(workflow, task, n));
+          } else if (o instanceof Map map) {
+            return evaluateExpressionMap(map, workflow, task, n);
+          } else {
+            return o;
+          }
+        });
   }
 }

impl/jackson/pom.xml

@@ -28,5 +28,17 @@
             <groupId>net.thisptr</groupId>
             <artifactId>jackson-jq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.mockito</groupId>
+          <artifactId>mockito-core</artifactId>
+        </dependency>
     </dependencies>
 </project>

impl/jackson/src/test/java/io/serverlessworkflow/impl/expressions/jq/JQExpressionFactoryTest.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl.expressions.jq;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.serverlessworkflow.impl.WorkflowContext;
+import io.serverlessworkflow.impl.WorkflowValueResolver;
+import io.serverlessworkflow.impl.expressions.ExpressionDescriptor;
+import io.serverlessworkflow.impl.jackson.JsonUtils;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+class JQExpressionFactoryTest {
+
+  @Test
+  void testNestedMap() {
+    WorkflowContext workflowContext = Mockito.mock(WorkflowContext.class);
+    JQExpressionFactory factory = new JQExpressionFactory();
+    WorkflowValueResolver<Map<String, Object>> expr =
+        factory.resolveMap(
+            ExpressionDescriptor.object(
+                Map.of(
+                    "name",
+                    "${.name}",
+                    "surname",
+                    "Doe",
+                    "nested",
+                    Map.of("name", "${.name}", "surname", "Doe"))));
+    Map<String, Object> result =
+        expr.apply(
+            workflowContext,
+            null,
+            new JacksonModel(JsonUtils.mapper().createObjectNode().put("name", "John")));
+    assertThat(result.get("name")).isEqualTo("John");
+    assertThat(result.get("surname")).isEqualTo("Doe");
+    Map<String, Object> nested = (Map<String, Object>) result.get("nested");
+    assertThat(result.get("name")).isEqualTo("John");
+    assertThat(result.get("surname")).isEqualTo("Doe");
+  }
+}