From 24a4d5e49f650659a95b4dcf9128a1184ad0dd82 Mon Sep 17 00:00:00 2001
From: David Stephan <David.Stephan@exense.ch>
Date: Thu, 20 Jun 2024 10:43:45 +0200
Subject: [PATCH] SED-3196 support arrays and objects (#281)

* SED-3207 Step API - support map as keyword input

* SED-3196 support nested dynamic objects

* SED-3196 bumping api
---
 .../step/core/dynamicbeans/DynamicJsonObjectResolver.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/step-core/src/main/java/step/core/dynamicbeans/DynamicJsonObjectResolver.java b/step-core/src/main/java/step/core/dynamicbeans/DynamicJsonObjectResolver.java
index 0b8b07ff8..db76b65e3 100644
--- a/step-core/src/main/java/step/core/dynamicbeans/DynamicJsonObjectResolver.java
+++ b/step-core/src/main/java/step/core/dynamicbeans/DynamicJsonObjectResolver.java
@@ -67,7 +67,11 @@ private Object evaluateJsonValue(JsonValue v, Map<String, Object> bindings) {
 		if(v instanceof JsonObject) {
 			JsonObject jsonObject = (JsonObject) v;
 			if(jsonObject.containsKey("dynamic")) {
-				return valueResolver.evaluate(jsonObject, bindings);
+				Object evaluate = valueResolver.evaluate(jsonObject, bindings);
+				if (evaluate instanceof JsonObject) {
+					return evaluate((JsonObject) evaluate, bindings);
+				}
+				return evaluate;
 			} else {
 				return evaluate(jsonObject, bindings);
 			}