Sync with underscore-java.

Author: javadev

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

@@ -2054,7 +2054,7 @@ public static String xmlToJson(String xml, Json.JsonStringBuilder.Step identStep
         Object result = Xml.fromXml(xml);
         if (result instanceof Map) {
             return Json.toJson(mode == Mode.REPLACE_SELF_CLOSING_WITH_NULL ?
-                replaceSelfCloseWithNull((Map) result) : (Map) result, identStep);
+                replaceSelfClosingWithNull((Map) result) : (Map) result, identStep);
         }
         return Json.toJson((List) result, identStep);
     }
@@ -2083,12 +2083,8 @@ public static String formatXml(String xml) {
         return Xml.formatXml(xml);
     }
 
-    public static Map<String, Object> removeMinusesAndConvertNumbers(Map<String, Object> inMap) {
-        return replaceKeys(inMap);
-    }
-
     @SuppressWarnings("unchecked")
-    private static Map<String, Object> replaceKeys(Map<String, Object> map) {
+    public static Map<String, Object> removeMinusesAndConvertNumbers(Map<String, Object> map) {
         Map<String, Object> outMap = newLinkedHashMap();
         for (String key : map.keySet()) {
             final String newKey;
@@ -2110,11 +2106,11 @@ private static Object makeObject(Object value) {
         if (value instanceof List) {
             List<Object> values = newArrayList();
             for (Object item : (List) value) {
-                values.add(item instanceof Map ? replaceKeys((Map<String, Object>) item) : item);
+                values.add(item instanceof Map ? removeMinusesAndConvertNumbers((Map<String, Object>) item) : item);
             }
             result = values;
         } else if (value instanceof Map) {
-            result = replaceKeys((Map<String, Object>) value);
+            result = removeMinusesAndConvertNumbers((Map<String, Object>) value);
         } else {
             String stringValue = String.valueOf(value);
             result = stringValue.matches("^-?\\d*([.eE])?\\d+$") ? Xml.stringToNumber(stringValue) : value;
@@ -2123,7 +2119,7 @@ private static Object makeObject(Object value) {
     }
 
     @SuppressWarnings("unchecked")
-    static Map<String, Object> replaceSelfCloseWithNull(Map map) {
+    public static Map<String, Object> replaceSelfClosingWithNull(Map map) {
         Map<String, Object> outMap = newLinkedHashMap();
         for (Iterator it = map.entrySet().iterator(); it.hasNext(); ) {
             Map.Entry entry = (Map.Entry) it.next();
@@ -2145,11 +2141,11 @@ private static Object makeObjectSelfClose(Object value) {
         if (value instanceof List) {
             List<Object> values = newArrayList();
             for (Object item : (List) value) {
-                values.add(item instanceof Map ? replaceSelfCloseWithNull((Map) item) : item);
+                values.add(item instanceof Map ? replaceSelfClosingWithNull((Map) item) : item);
             }
             result = values;
         } else if (value instanceof Map) {
-            result = replaceSelfCloseWithNull((Map) value);
+            result = replaceSelfClosingWithNull((Map) value);
         } else {
             result = value;
         }

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

@@ -642,12 +642,12 @@ public void xmlToJson() {
             U.xmlToJson("<a><b/><b/></a>", U.Mode.REPLACE_SELF_CLOSING_WITH_NULL));
         Map<String, Object> map = U.newLinkedHashMap();
         map.put("-self-closing", "false");
-        U.replaceSelfCloseWithNull(map);
+        U.replaceSelfClosingWithNull(map);
         Map<String, Object> map2 = U.newLinkedHashMap();
         List<Object> list = U.newArrayList();
         list.add(U.newArrayList());
         map2.put("list", list);
-        U.replaceSelfCloseWithNull(map2);
+        U.replaceSelfClosingWithNull(map2);
     }
 
     @Test