Merge branch '2.8'

Author: cowtowncoder

release-notes/VERSION

@@ -35,6 +35,10 @@ Project: jackson-databind
  (contributed by jdmichal@github)
 #1444: Change `ObjectMapper.setSerializationInclusion()` to apply to content inclusion too
 
+2.8.6 (not yet released)
+
+#1453: `UntypedObjectDeserializer` does not retain `float` type (over `double`)
+
 2.8.5 (14-Nov-2016)
 
 #1417: Further issues with `@JsonInclude` with `NON_DEFAULT`

src/main/java/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java

@@ -430,7 +430,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
                 if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
                     return p.getDecimalValue();
                 }
-                return Double.valueOf(p.getDoubleValue());
+                return p.getNumberValue();
 
             case JsonTokenId.ID_STRING:
                 /* Textual values are more difficult... not parsing itself, but figuring

src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java

@@ -250,13 +250,12 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
             if (_numberDeserializer != null) {
                 return _numberDeserializer.deserialize(p, ctxt);
             }
-            /* [JACKSON-72]: need to allow overriding the behavior regarding
-             *   which type to use
-             */
+            // Need to allow overriding the behavior regarding which type to use
             if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
                 return p.getDecimalValue();
             }
-            return p.getDoubleValue();
+            // as per [databind#1453] should not assume Double but:
+            return p.getNumberValue();
 
         case JsonTokenId.ID_TRUE:
             return Boolean.TRUE;
@@ -312,7 +311,7 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt, Typ
             if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
                 return p.getDecimalValue();
             }
-            return Double.valueOf(p.getDoubleValue());
+            return p.getNumberValue();
 
         case JsonTokenId.ID_TRUE:
             return Boolean.TRUE;
@@ -523,7 +522,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
                 if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
                     return p.getDecimalValue();
                 }
-                return Double.valueOf(p.getDoubleValue());
+                return p.getNumberValue();
 
             case JsonTokenId.ID_TRUE:
                 return Boolean.TRUE;
@@ -566,7 +565,7 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt, Typ
                 if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
                     return p.getDecimalValue();
                 }
-                return Double.valueOf(p.getDoubleValue());
+                return p.getNumberValue();
 
             case JsonTokenId.ID_TRUE:
                 return Boolean.TRUE;