Sync with underscore-java

javadev · Feb 15, 2024 · 8baa95a · 8baa95a
1 parent 8c98771
commit 8baa95a
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 4 deletions.
diff --git a/src/main/java/com/github/underscore/Json.java b/src/main/java/com/github/underscore/Json.java
@@ -404,8 +404,8 @@ private static void escape(String s, StringBuilder sb) {
                     case '\t':
                         sb.append("\\t");
                         break;
-                    case '€':
-                        sb.append('€');
+                    case '\u20AC':
+                        sb.append('\u20AC');
                         break;
                     default:
                         if (ch <= '\u001F'

diff --git a/src/main/java/com/github/underscore/U.java b/src/main/java/com/github/underscore/U.java
@@ -140,7 +140,9 @@ public enum XmlToJsonMode {
         REPLACE_EMPTY_TAG_WITH_NULL,
         REPLACE_EMPTY_TAG_WITH_STRING,
         REMOVE_FIRST_LEVEL,
-        WITHOUT_NAMESPACES
+        WITHOUT_NAMESPACES,
+        REPLACE_MINUS_WITH_AT,
+        REPLACE_EMPTY_TAG_WITH_NULL_AND_MINUS_WITH_AT
     }
 
     public enum JsonToXmlMode {
@@ -2698,6 +2700,15 @@ public static String xmlToJson(
                 result = Json.toJson(replaceSelfClosingWithEmpty((Map) object), identStep);
             } else if (mode == XmlToJsonMode.REPLACE_EMPTY_VALUE_WITH_NULL) {
                 result = Json.toJson(replaceEmptyValueWithNull((Map) object), identStep);
+            } else if (mode == XmlToJsonMode.REPLACE_MINUS_WITH_AT) {
+                result = Json.toJson(replaceMinusWithAt((Map) object), identStep);
+            } else if (mode == XmlToJsonMode.REPLACE_EMPTY_TAG_WITH_NULL_AND_MINUS_WITH_AT) {
+                result =
+                        Json.toJson(
+                                replaceMinusWithAt(
+                                        replaceEmptyValueWithNull(
+                                                replaceSelfClosingWithNull((Map) object))),
+                                identStep);
             } else if (mode == XmlToJsonMode.REPLACE_EMPTY_TAG_WITH_NULL) {
                 result =
                         Json.toJson(
@@ -2974,6 +2985,38 @@ private static Object makeObjectSelfClose(Object value, String newValue) {
         return result;
     }
 
+    public static Map<String, Object> replaceMinusWithAt(Map<String, Object> map) {
+        if (map == null) {
+            return null;
+        }
+        Map<String, Object> outMap = new LinkedHashMap<>();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            outMap.put(
+                    String.valueOf(entry.getKey()).startsWith("-")
+                            ? "@" + String.valueOf(entry.getKey()).substring(1)
+                            : String.valueOf(entry.getKey()),
+                    replaceMinusWithAtValue(entry.getValue()));
+        }
+        return outMap;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Object replaceMinusWithAtValue(Object value) {
+        final Object result;
+        if (value instanceof List) {
+            List<Object> values = new ArrayList<>();
+            for (Object item : (List) value) {
+                values.add(item instanceof Map ? replaceMinusWithAt((Map) item) : item);
+            }
+            result = values;
+        } else if (value instanceof Map) {
+            result = replaceMinusWithAt((Map) value);
+        } else {
+            result = value;
+        }
+        return result;
+    }
+
     public static Map<String, Object> replaceEmptyValueWithNull(Map<String, Object> map) {
         if (map == null || map.isEmpty()) {
             return null;

diff --git a/src/main/java/com/github/underscore/Xml.java b/src/main/java/com/github/underscore/Xml.java
@@ -1029,7 +1029,7 @@ private static void escape(String s, StringBuilder sb) {
                     case '\t':
                         sb.append("\t");
                         break;
-                    case '€':
+                    case '\u20AC':
                         sb.append("€");
                         break;
                     default:

diff --git a/src/test/java/com/github/underscore/LodashTest.java b/src/test/java/com/github/underscore/LodashTest.java
@@ -954,6 +954,39 @@ void xmlToJson() {
         U.replaceEmptyValueWithEmptyString(map4);
     }
 
+    @Test
+    void xmpToJson3() {
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        List<Object> list = new ArrayList<>();
+        list.add(new ArrayList<Object>());
+        map2.put("list", list);
+        U.replaceMinusWithAt(map2);
+        assertEquals(
+                "{\n"
+                        + "  \"a\": {\n"
+                        + "    \"@c\": \"1\",\n"
+                        + "    \"b\": [\n"
+                        + "      {\n"
+                        + "      },\n"
+                        + "      {\n"
+                        + "      }\n"
+                        + "    ]\n"
+                        + "  },\n"
+                        + "  \"#omit-xml-declaration\": \"yes\"\n"
+                        + "}",
+                U.xmlToJson(
+                        "<a c=\"1\"><b></b><b></b></a>", U.XmlToJsonMode.REPLACE_MINUS_WITH_AT));
+        Map<String, Object> map3 = new LinkedHashMap<>();
+        List<Object> list2 = new ArrayList<>();
+        list2.add(new ArrayList<Object>());
+        map3.put("list", list2);
+        U.replaceMinusWithAt(map3);
+        U.replaceMinusWithAt(null);
+        U.xmlToJson(
+                "<a c=\"1\"><b></b><b></b></a>",
+                U.XmlToJsonMode.REPLACE_EMPTY_TAG_WITH_NULL_AND_MINUS_WITH_AT);
+    }
+
     @Test
     void xmlToJson2() {
         assertEquals(