From d2ecc7914509dde15aedb599d5191469f73c48a4 Mon Sep 17 00:00:00 2001
From: Valentyn Kolesnikov <javadev75@gmail.com>
Date: Thu, 8 Feb 2024 16:28:58 +0200
Subject: [PATCH] Added new mode XmlToJsonMode.REPLACE_MINUS_WITH_AT

---
 checkstyle.xml                                |  2 +-
 src/main/java/com/github/underscore/U.java    | 34 ++++++++++++++++++-
 .../com/github/underscore/LodashTest.java     | 29 ++++++++++++++++
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index 5166b512..794827d0 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -112,7 +112,7 @@
 -->
         <module name="AbbreviationAsWordInName">
             <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="1"/>
+            <property name="allowedAbbreviationLength" value="4"/>
         </module>
 <!--
         <module name="OverloadMethodsDeclarationOrder"/>
diff --git a/src/main/java/com/github/underscore/U.java b/src/main/java/com/github/underscore/U.java
index b4b7f49a..739f2146 100644
--- a/src/main/java/com/github/underscore/U.java
+++ b/src/main/java/com/github/underscore/U.java
@@ -140,7 +140,8 @@ public enum XmlToJsonMode {
         REPLACE_EMPTY_TAG_WITH_NULL,
         REPLACE_EMPTY_TAG_WITH_STRING,
         REMOVE_FIRST_LEVEL,
-        WITHOUT_NAMESPACES
+        WITHOUT_NAMESPACES,
+        REPLACE_MINUS_WITH_AT
     }
 
     public enum JsonToXmlMode {
@@ -2698,6 +2699,8 @@ 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) {
                 result =
                         Json.toJson(
@@ -2974,6 +2977,35 @@ private static Object makeObjectSelfClose(Object value, String newValue) {
         return result;
     }
 
+    public static Map<String, Object> replaceMinusWithAt(Map<String, Object> map) {
+        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/test/java/com/github/underscore/LodashTest.java b/src/test/java/com/github/underscore/LodashTest.java
index 1a092883..b67c525d 100644
--- a/src/test/java/com/github/underscore/LodashTest.java
+++ b/src/test/java/com/github/underscore/LodashTest.java
@@ -954,6 +954,35 @@ 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);
+    }
+
     @Test
     void xmlToJson2() {
         assertEquals(