Add U.isJsonNumber(string).

Author: javadev

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

@@ -2144,11 +2144,42 @@ private static Object makeObject(Object value) {
             result = removeMinusesAndConvertNumbers((Map<String, Object>) value);
         } else {
             String stringValue = String.valueOf(value);
-            result = stringValue.matches("^-?\\d*([.eE])?\\d+$") ? Xml.stringToNumber(stringValue) : value;
+            result = isJsonNumber(stringValue) ? Xml.stringToNumber(stringValue) : value;
         }
         return result;
     }
 
+    public static boolean isJsonNumber(final String string) {
+        boolean eFound = false;
+        boolean periodValid = true;
+        boolean pmValid = true;
+        boolean numberEncountered = false;
+        for (char ch : string.toCharArray()) {
+            if (pmValid) {
+                pmValid = false;
+                if (ch == '-') {
+                    continue;
+                }
+            }
+            if (!eFound && (ch == 'e' || ch == 'E')) {
+                eFound = true;
+                periodValid = false;
+                pmValid = true;
+                numberEncountered = false;
+                continue;
+            }
+            if (periodValid && ch == '.') {
+                periodValid = false;
+                continue;
+            }
+            if (ch < '0' || ch > '9') {
+                return false;
+            }
+            numberEncountered = true;
+        }
+        return numberEncountered;
+    }
+
     @SuppressWarnings("unchecked")
     public static Map<String, Object> replaceSelfClosingWithNull(Map map) {
         Map<String, Object> outMap = newLinkedHashMap();

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

@@ -715,12 +715,27 @@ 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> result5 = U.removeMinusesAndConvertNumbers(
+            (Map<String, Object>) U.fromXml("<a><b c=\"-1e1\"/></a>"));
+        assertEquals("{a={b={c=-10.0}}}", result5.toString());
+        Map<String, Object> result6 = U.removeMinusesAndConvertNumbers(
+            (Map<String, Object>) U.fromXml("<a><b c=\"-1E1\"/></a>"));
+        assertEquals("{a={b={c=-10.0}}}", result6.toString());
+        Map<String, Object> result7 = U.removeMinusesAndConvertNumbers(
+            (Map<String, Object>) U.fromXml("<a><b c=\"1.a\"/></a>"));
+        assertEquals("{a={b={c=1.a}}}", result7.toString());
+        Map<String, Object> result8 = U.removeMinusesAndConvertNumbers(
+            (Map<String, Object>) U.fromXml("<a><b c=\"1.-\"/></a>"));
+        assertEquals("{a={b={c=1.-}}}", result8.toString());
+        Map<String, Object> result9 = U.removeMinusesAndConvertNumbers(
+            (Map<String, Object>) U.fromXml("<a><b c=\"+1ee\"/></a>"));
+        assertEquals("{a={b={c=+1ee}}}", result9.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());
+        Map<String, Object> result10 = U.removeMinusesAndConvertNumbers(map);
+        assertEquals("{list=[[]]}", result10.toString());
     }
 
     @SuppressWarnings("unchecked")