Add U.replaceSelfClosingWithEmpty(map) method.

Author: javadev

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

@@ -83,7 +83,8 @@ public class U<T> extends com.github.underscore.U<T> {
     }
 
     public enum Mode {
-        REPLACE_SELF_CLOSING_WITH_NULL;
+        REPLACE_SELF_CLOSING_WITH_NULL,
+        REPLACE_SELF_CLOSING_WITH_EMPTY;
     }
 
     public U(final Iterable<T> iterable) {
@@ -2256,12 +2257,19 @@ public static String jsonToXml(String json) {
 
     @SuppressWarnings("unchecked")
     public static String xmlToJson(String xml, Json.JsonStringBuilder.Step identStep, Mode mode) {
-        Object result = Xml.fromXml(xml);
-        if (result instanceof Map) {
-            return Json.toJson(mode == Mode.REPLACE_SELF_CLOSING_WITH_NULL ?
-                replaceSelfClosingWithNull((Map) result) : (Map) result, identStep);
+        Object object = Xml.fromXml(xml);
+        final String result;
+        if (object instanceof Map) {
+            if (mode == Mode.REPLACE_SELF_CLOSING_WITH_NULL) {
+                result = Json.toJson(replaceSelfClosingWithNull((Map) object), identStep);
+            } else if (mode == Mode.REPLACE_SELF_CLOSING_WITH_EMPTY) {
+                result = Json.toJson(replaceSelfClosingWithEmpty((Map) object), identStep);
+            } else {
+                result = Json.toJson((Map) object, identStep);
+            }
+            return result;
         }
-        return Json.toJson((List) result, identStep);
+        return Json.toJson((List) object, identStep);
     }
 
     public static String xmlToJson(String xml) {
@@ -2361,21 +2369,50 @@ public static boolean isJsonNumber(final String string) {
         return numberEncountered;
     }
 
+    @SuppressWarnings("unchecked")
     public static Map<String, Object> replaceSelfClosingWithNull(Map<String, Object> map) {
-        Map<String, Object> outMap = newLinkedHashMap();
+        return (Map<String, Object>) replaceSelfClosingWithValue(map, null);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Map<String, Object> replaceSelfClosingWithEmpty(Map<String, Object> map) {
+        return (Map<String, Object>) replaceSelfClosingWithValue(map, "");
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Object replaceSelfClosingWithValue(Map<String, Object> map, String value) {
+        Object outMap = newLinkedHashMap();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             if ("-self-closing".equals(entry.getKey()) && "true".equals(entry.getValue())) {
                 if (map.size() == 1) {
-                    outMap = null;
+                    outMap = value;
                     break;
                 }
                 continue;
             }
-            outMap.put(String.valueOf(entry.getKey()), makeObjectSelfClose(entry.getValue()));
+            ((Map<String, Object>) outMap).put(String.valueOf(entry.getKey()),
+                makeObjectSelfClose(entry.getValue(), value));
         }
         return outMap;
     }
 
+    @SuppressWarnings("unchecked")
+    private static Object makeObjectSelfClose(Object value, String newValue) {
+        final Object result;
+        if (value instanceof List) {
+            List<Object> values = newArrayList();
+            for (Object item : (List) value) {
+                values.add(item instanceof Map ? replaceSelfClosingWithValue((Map) item, newValue) : item);
+            }
+            result = values;
+        } else if (value instanceof Map) {
+            result = replaceSelfClosingWithValue((Map) value, newValue);
+        } else {
+            result = value;
+        }
+        return result;
+    }
+
     public static long gcd(long value1, long value2) {
         if (value1 == 0) {
             return value2;
@@ -2391,23 +2428,6 @@ public static long findGcd(long ... array) {
         return result;
     }
 
-    @SuppressWarnings("unchecked")
-    private static Object makeObjectSelfClose(Object value) {
-        final Object result;
-        if (value instanceof List) {
-            List<Object> values = newArrayList();
-            for (Object item : (List) value) {
-                values.add(item instanceof Map ? replaceSelfClosingWithNull((Map) item) : item);
-            }
-            result = values;
-        } else if (value instanceof Map) {
-            result = replaceSelfClosingWithNull((Map) value);
-        } else {
-            result = value;
-        }
-        return result;
-    }
-
     public static Builder objectBuilder() {
         return new U.Builder();
     }

src/test/java/com/github/underscore/lodash/LodashTest.java

@@ -623,6 +623,11 @@ public void xmlToJson() {
                 + "  \"#omit-xml-declaration\": \"yes\"\n"
                 + "}",
             U.xmlToJson("<a/>", U.Mode.REPLACE_SELF_CLOSING_WITH_NULL));
+        assertEquals("{\n"
+                + "  \"a\": \"\",\n"
+                + "  \"#omit-xml-declaration\": \"yes\"\n"
+                + "}",
+            U.xmlToJson("<a/>", U.Mode.REPLACE_SELF_CLOSING_WITH_EMPTY));
         assertEquals("{\n"
                 + "  \"a\": {\n"
                 + "    \"-b\": \"c\"\n"