Merge branch 'moqui:master' into master

hotwax · Dec 2, 2024 · e29dd4e · e29dd4e
2 parents f24d4a5 + 60dd57c
commit e29dd4e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/framework/src/main/java/org/moqui/util/CollectionUtilities.java b/framework/src/main/java/org/moqui/util/CollectionUtilities.java
@@ -460,6 +460,39 @@ public static Map flattenNestedMap(Map theMap) {
         return outMap;
     }
 
+    public static Map<String, String> flattenNestedMapWithKeys(Map<String, Object> theMap) {
+        return flattenNestedMapWithKeys(theMap, "");
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, String> flattenNestedMapWithKeys(Map<String, Object> theMap, String parentKey) {
+        Map<String, String> output = new LinkedHashMap<>();
+
+        if (theMap == null) return output;
+
+        for (Map.Entry<String, Object> entry : theMap.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            String newKey = parentKey.isEmpty() ? key : parentKey + "[" + key + "]";
+
+            if (value instanceof Map) {
+                output.putAll(flattenNestedMapWithKeys((Map<String, Object>) value, newKey));
+            } else if (value instanceof Collection) {
+                int index = 0;
+                for (Object colValue : (Collection<?>) value) {
+                    if (colValue instanceof Map) {
+                        output.putAll(flattenNestedMapWithKeys((Map<String, Object>) colValue, newKey + "[" + index + "]"));
+                    } else {
+                        output.put(newKey + "[" + index + "]", colValue.toString());
+                    }
+                    index++;
+                }
+            } else {
+                output.put(newKey, value.toString());
+            }
+        }
+        return output;
+    }
     @SuppressWarnings("unchecked")
     public static void mergeNestedMap(Map<Object, Object> baseMap, Map<Object, Object> overrideMap, boolean overrideEmpty) {
         if (baseMap == null || overrideMap == null) return;

diff --git a/framework/src/main/java/org/moqui/util/RestClient.java b/framework/src/main/java/org/moqui/util/RestClient.java
@@ -14,7 +14,7 @@
 package org.moqui.util;
 
 import groovy.json.JsonBuilder;
-import groovy.json.JsonSlurper;
+import groovy.json.JsonSlurperClassic;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.client.HttpResponseException;
@@ -442,7 +442,7 @@ public String text() {
         /** Parse the response as JSON and return an Object */
         public Object jsonObject() {
             try {
-                return new JsonSlurper().parseText(text());
+                return new JsonSlurperClassic().parseText(text());
             } catch (Throwable t) {
                 throw new BaseException("Error parsing JSON response from request to " + rci.uriString, t);
             }