Improve method U.removeMinusesAndConvertNumbers(map).

Author: javadev

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

@@ -52,8 +52,6 @@ public class U<T> extends com.github.underscore.U<T> {
     private static String lower = "[a-z\\xdf-\\xf6\\xf8-\\xff]+";
     private static java.util.regex.Pattern reWords = java.util.regex.Pattern.compile(
         upper + "+(?=" + upper + lower + ")|" + upper + "?" + lower + "|" + upper + "+|[0-9]+");
-    private static final Set<Character> NUMBER_CHARS = new HashSet<Character>(
-        Arrays.asList('.', 'e', 'E', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'));
 
     static {
         String[] deburredLetters = new String[] {
@@ -2111,23 +2109,16 @@ private static Map<String, Object> replaceKeys(Map<String, Object> map) {
     private static Object makeObject(Object value) {
         final Object result;
         if (value instanceof List) {
-            List<Map<String, Object>> values = newArrayList();
+            List<Object> values = newArrayList();
             for (Object item : (List) value) {
-                values.add(replaceKeys((Map<String, Object>) item));
+                values.add(item instanceof Map ? replaceKeys((Map<String, Object>) item) : item);
             }
             result = values;
         } else if (value instanceof Map) {
             result = replaceKeys((Map<String, Object>) value);
         } else {
             String stringValue = String.valueOf(value);
-            boolean onlyNumbers = true;
-            for (char ch : stringValue.toCharArray()) {
-                if (!NUMBER_CHARS.contains(ch)) {
-                    onlyNumbers = false;
-                    break;
-                }
-            }
-            result = onlyNumbers ? Xml.stringToNumber(stringValue) : value;
+            result = stringValue.matches("^-?\\d*([.eE])?\\d+$") ? Xml.stringToNumber(stringValue) : value;
         }
         return result;
     }
@@ -2155,7 +2146,7 @@ private static Object makeObjectSelfClose(Object value) {
         if (value instanceof List) {
             List<Object> values = newArrayList();
             for (Object item : (List) value) {
-                values.add(replaceSelfCloseWithNull((Map) item));
+                values.add(item instanceof Map ? replaceSelfCloseWithNull((Map) item) : item);
             }
             result = values;
         } else if (value instanceof Map) {

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

@@ -640,9 +640,14 @@ public void xmlToJson() {
                 + "  \"#omit-xml-declaration\": \"yes\"\n"
                 + "}",
             U.xmlToJson("<a><b/><b/></a>", U.Mode.REPLACE_SELF_CLOSING_WITH_NULL));
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = U.newLinkedHashMap();
         map.put("-self-closing", "false");
         U.replaceSelfCloseWithNull(map);
+        Map<String, Object> map2 = U.newLinkedHashMap();
+        List<Object> list = U.newArrayList();
+        list.add(U.newArrayList());
+        map2.put("list", list);
+        U.replaceSelfCloseWithNull(map2);
     }
 
     @Test
@@ -710,6 +715,12 @@ public void removeMinusesAndConvertNumbers() {
         Map<String, Object> result4 = U.removeMinusesAndConvertNumbers(
             (Map<String, Object>) U.fromXml("<a><b c=\"1\"/></a>"));
         assertEquals("{a={b={c=1}}}", result4.toString());
+        Map<String, Object> map = U.newLinkedHashMap();
+        List<Object> list = U.newArrayList();
+        list.add(U.newArrayList());
+        map.put("list", list);
+        Map<String, Object> result5 = U.removeMinusesAndConvertNumbers(map);
+        assertEquals("{list=[[]]}", result5.toString());
     }
 
     @SuppressWarnings("unchecked")