Added method U.replaceNilWithNull(map).

Author: javadev

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

@@ -67,6 +67,8 @@ public class U<T> extends Underscore<T> {
     private static String upper = "[A-Z\\xc0-\\xd6\\xd8-\\xde\\u0400-\\u04FF]";
     private static String lower = "[a-z\\xdf-\\xf6\\xf8-\\xff]+";
     private static String selfClosing = "-self-closing";
+    private static String nilKey = "-nil";
+    private static String nilKeyNs = ":nil";
     private static java.util.regex.Pattern reWords =
             java.util.regex.Pattern.compile(
                     upper
@@ -2847,6 +2849,40 @@ private static Object makeReplaceFirstLevel(Object value, int level) {
         return result;
     }
 
+    public static Map<String, Object> replaceNilWithNull(Map<String, Object> map) {
+        Map<String, Object> outMap = newLinkedHashMap();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            Object outValue = makeReplaceNilWithNull(entry.getValue());
+            if (outValue instanceof Map
+                    && (nilKey.equals(Xml.XmlValue.getMapKey(outValue))
+                            || Xml.XmlValue.getMapKey(outValue).endsWith(nilKeyNs))
+                    && "true".equals(Xml.XmlValue.getMapValue(outValue))
+                    && ((Map) outValue).containsKey(selfClosing)
+                    && "true".equals(((Map) outValue).get(selfClosing))) {
+                outValue = null;
+            }
+            outMap.put(entry.getKey(), outValue);
+        }
+        return outMap;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Object makeReplaceNilWithNull(Object value) {
+        final Object result;
+        if (value instanceof List) {
+            List<Object> values = newArrayList();
+            for (Object item : (List) value) {
+                values.add(item instanceof Map ? replaceNilWithNull((Map) item) : item);
+            }
+            result = values;
+        } else if (value instanceof Map) {
+            result = replaceNilWithNull((Map) value);
+        } else {
+            result = value;
+        }
+        return result;
+    }
+
     public static Map<String, Object> deepCopyMap(Map<String, Object> map) {
         Map<String, Object> outMap = newLinkedHashMap();
         for (Map.Entry<String, Object> entry : map.entrySet()) {

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

@@ -908,8 +908,7 @@ public void formatXml() {
                         "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<root><element>1</element>"
                                 + "<element>2</element></root>"));
         assertEquals(
-                "<a>\n  <b></b>\n  <b></b>\n</a>",
-                U.formatXml("<a>\n  <b></b>\n  <b></b>\n</a>"));
+                "<a>\n  <b></b>\n  <b></b>\n</a>", U.formatXml("<a>\n  <b></b>\n  <b></b>\n</a>"));
         assertEquals(
                 "<a>\n    <b></b>\n    <b></b>\n</a>",
                 U.formatXml(
@@ -998,6 +997,66 @@ public void replaceNullWithEmptyValue() {
         U.replaceNullWithEmptyValue(map2);
     }
 
+    @Test
+    public void replaceNilWithNull() {
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                        + "<RootElm>\n"
+                        + "  <author>\n"
+                        + "    <DOB nil=\"true\"></DOB>\n"
+                        + "    <value null=\"true\"/>\n"
+                        + "  </author>\n"
+                        + "</RootElm>",
+                U.toXml(
+                        U.replaceNilWithNull(
+                                U.fromXmlMap(
+                                        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                                + "<RootElm>\n"
+                                                + "  <author>\n"
+                                                + "    <DOB nil=\"true\"></DOB>\n"
+                                                + "    <value nil=\"true\"/>\n"
+                                                + "  </author>\n"
+                                                + "</RootElm>"))));
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                        + "<RootElm xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n"
+                        + "  <author>\n"
+                        + "    <DOB xsi:nil=\"true\"></DOB>\n"
+                        + "    <value null=\"true\"/>\n"
+                        + "    <DOB2 xsi:nil=\"true1\"></DOB2>\n"
+                        + "    <value2 xsi:nil=\"true1\"/>\n"
+                        + "  </author>\n"
+                        + "</RootElm>",
+                U.toXml(
+                        U.replaceNilWithNull(
+                                U.fromXmlMap(
+                                        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                                + "<RootElm xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n"
+                                                + "  <author>\n"
+                                                + "    <DOB xsi:nil=\"true\"></DOB>\n"
+                                                + "    <value xsi:nil=\"true\"/>\n"
+                                                + "    <DOB2 xsi:nil=\"true1\"></DOB2>\n"
+                                                + "    <value2 xsi:nil=\"true1\"/>\n"
+                                                + "  </author>\n"
+                                                + "</RootElm>"))));
+        Map<String, Object> map = U.newLinkedHashMap();
+        List<Object> list = U.newArrayList();
+        list.add(U.newLinkedHashMap());
+        map.put("list", list);
+        U.replaceNilWithNull(map);
+        Map<String, Object> map2 = U.newLinkedHashMap();
+        List<Object> list2 = U.newArrayList();
+        list2.add(U.newArrayList());
+        map2.put("list", list2);
+        U.replaceNilWithNull(map2);
+        Map<String, Object> map3 = U.newLinkedHashMap();
+        map3.put("-nil", "true");
+        map3.put("-self-closing", "true1");
+        Map<String, Object> map4 = U.newLinkedHashMap();
+        map4.put("map", map3);
+        U.replaceNilWithNull(map4);
+    }
+
     @Test
     public void replaceEmptyStringWithEmptyValue() {
         assertEquals(