Sync with underscore-java.

Author: javadev

pom-pack.xml

@@ -116,6 +116,7 @@
             <option>-keep public class com.github.underscore.Xml$XmlStringBuilder$Step { *; }</option>
             <option>-keep public class com.github.underscore.Xml$XmlStringBuilder { *; }</option>
             <option>-keep public class com.github.underscore.Xml$FromType { *; }</option>
+            <option>-keep public class com.github.underscore.Xml$ArrayTrue { *; }</option>
             <option>-keepclassmembers class * { *** newArrayList(); *** newLinkedHashSet(); *** newHashSet(java.lang.Iterable); *** newLinkedHashMap(); }</option>
             <option>-dontnote com.github.underscore.*$ClassForName</option>
             <option>-dontnote com.github.underscore.*$OperationType</option>

pom-pack17.xml

@@ -116,6 +116,7 @@
             <option>-keep public class com.github.underscore.Xml$XmlStringBuilder$Step { *; }</option>
             <option>-keep public class com.github.underscore.Xml$XmlStringBuilder { *; }</option>
             <option>-keep public class com.github.underscore.Xml$FromType { *; }</option>
+            <option>-keep public class com.github.underscore.Xml$ArrayTrue { *; }</option>
             <option>-keepclassmembers class * { *** newArrayList(); *** newLinkedHashSet(); *** newHashSet(java.lang.Iterable); *** newLinkedHashMap(); }</option>
             <option>-dontnote com.github.underscore.*$ClassForName</option>
             <option>-dontnote com.github.underscore.*$OperationType</option>

src/main/java/com/github/underscore/U.java

@@ -62,6 +62,7 @@
     "java:S4423",
     "java:S4830",
     "java:S5843",
+    "java:S5996",
     "java:S5998"
 })
 public class U<T> extends Underscore<T> {
@@ -134,7 +135,9 @@ public enum Mode {
         REPLACE_NULL_WITH_EMPTY_VALUE,
         REPLACE_EMPTY_STRING_WITH_EMPTY_VALUE,
         REMOVE_FIRST_LEVEL_XML_TO_JSON,
-        FORCE_ADD_ROOT_JSON_TO_XML
+        FORCE_ADD_ROOT_JSON_TO_XML,
+        FORCE_REMOVE_ARRAY_ATTRIBUTE_JSON_TO_XML,
+        FORCE_REMOVE_ARRAY_BOOLEAN_NUMBER_ATTRIBUTES_JSON_TO_XML
     }
 
     public U(final Iterable<T> iterable) {
@@ -2573,6 +2576,15 @@ public static String jsonToXml(
                 final Map<String, Object> map = U.newLinkedHashMap();
                 map.put(newRootName, object);
                 result = Xml.toXml(map, identStep);
+            } else if (mode == Mode.FORCE_REMOVE_ARRAY_ATTRIBUTE_JSON_TO_XML) {
+                result = Xml.toXml((Map) object, identStep, newRootName, Xml.ArrayTrue.SKIP);
+            } else if (mode == Mode.FORCE_REMOVE_ARRAY_BOOLEAN_NUMBER_ATTRIBUTES_JSON_TO_XML) {
+                result =
+                        Xml.toXml(
+                                replaceNumberAndBooleanWithString((Map) object),
+                                identStep,
+                                newRootName,
+                                Xml.ArrayTrue.SKIP);
             } else {
                 result = Xml.toXml((Map) object, identStep);
             }
@@ -2937,6 +2949,36 @@ private static Object makeReplaceEmptyString(Object value) {
         return result;
     }
 
+    public static Map<String, Object> replaceNumberAndBooleanWithString(Map<String, Object> map) {
+        Map<String, Object> outMap = newLinkedHashMap();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            outMap.put(
+                    entry.getKey(),
+                    entry.getValue() instanceof Boolean || entry.getValue() instanceof Number
+                            ? String.valueOf(entry.getValue())
+                            : makeReplaceNumberAndBoolean(entry.getValue()));
+        }
+        return outMap;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Object makeReplaceNumberAndBoolean(Object value) {
+        final Object result;
+        if (value instanceof List) {
+            List<Object> values = newArrayList();
+            for (Object item : (List) value) {
+                values.add(
+                        item instanceof Map ? replaceNumberAndBooleanWithString((Map) item) : item);
+            }
+            result = values;
+        } else if (value instanceof Map) {
+            result = replaceNumberAndBooleanWithString((Map) value);
+        } else {
+            result = value;
+        }
+        return result;
+    }
+
     public static Map<String, Object> replaceFirstLevel(Map<String, Object> map) {
         return replaceFirstLevel(map, 0);
     }