Fixed bug where Special Values of Float and Double were not parsed from

cristianh · ejona86 · commit 926e04d07b8a · 2015-11-06T14:46:22.000-08:00
String and threw an exception. The bug consists in the fact that NaN / Infinity / -Infinity are interpreted as a String (which it is). I added a check that if the expected Class is Float / Double (or float / double) and getText() returns NaN / Infinity / -Infinity (case-insensitive), the Parses omits checking that there is no JsonString Annotation. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=101010886
diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java
@@ -35,6 +35,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
@@ -842,11 +843,19 @@ private final Object parseValue(Field fieldContext,
           }
           throw new IllegalArgumentException("expected numeric type but got " + valueType);
         case VALUE_STRING:
-          Preconditions.checkArgument(valueClass == null
+          //TODO(user): Maybe refactor this method in multiple mini-methods for readability?
+          String text = getText().trim().toLowerCase(Locale.US);
+          // If we are expecting a Float / Double and the Text is NaN (case insensitive)
+          // Then: Accept, even if the Annotation is JsonString.
+          // Otherwise: Check that the Annotation is not JsonString.
+          if (!(((valueClass == float.class || valueClass == Float.class)
+               || (valueClass == double.class || valueClass == Double.class))
+               && (text.equals("nan") || text.equals("infinity") || text.equals("-infinity")))) {
+            Preconditions.checkArgument(valueClass == null
               || !Number.class.isAssignableFrom(valueClass) || fieldContext != null
               && fieldContext.getAnnotation(JsonString.class) != null,
               "number field formatted as a JSON string must use the @JsonString annotation");
-          // TODO(yanivi): "special" values like Double.POSITIVE_INFINITY?
+          }
           return Data.parsePrimitiveValue(valueType, getText());
         case VALUE_NULL:
           Preconditions.checkArgument(valueClass == null || !valueClass.isPrimitive(),
