Fix #1395

Author: cowtowncoder

release-notes/VERSION

@@ -13,6 +13,8 @@ Project: jackson-databind
  (reported by TomMarkuske@github)
 #1389 Problem with handling of multi-argument creator with Enums
  (fix contributed by Pavel P)
+#1395: Problems deserializing primitive `long` field while using `TypeResolverBuilder`
+ (reported by UghZan3@github)
 
 2.8.3 (17-Sep-2016)
 

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

@@ -133,7 +133,10 @@ public class ObjectMapper
      * Since 2.4 there are special exceptions for JSON Tree model
      * types (sub-types of {@link TreeNode}: default typing is never
      * applied to them
-     * (see <a href="https://github.com/FasterXML/jackson-databind/issues/88">Issue#88</a> for details)
+     * (see <a href="https://github.com/FasterXML/jackson-databind/issues/88">databind#88</a> for details)
+     *<p>
+     * Since 2.8(.4) additional checks are made to avoid attempts at default
+     * typing primitive-valued properties.
      */
     public enum DefaultTyping {
         /**
@@ -224,6 +227,12 @@ public TypeSerializer buildTypeSerializer(SerializationConfig config,
          */
         public boolean useForType(JavaType t)
         {
+            // 03-Oct-2016, tatu: As per [databind#1395], need to skip
+            //  primitive types too, regardless
+            if (t.isPrimitive()) {
+                return false;
+            }
+
             switch (_appliesFor) {
             case NON_CONCRETE_AND_ARRAYS:
                 while (t.isArrayType()) {

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java

@@ -69,6 +69,11 @@ public TypeSerializer buildTypeSerializer(SerializationConfig config,
             JavaType baseType, Collection<NamedType> subtypes)
     {
         if (_idType == JsonTypeInfo.Id.NONE) { return null; }
+        // 03-Oct-2016, tatu: As per [databind#1395] better prevent use for primitives,
+        //    regardless of setting
+        if (baseType.isPrimitive()) {
+            return null;
+        }
         TypeIdResolver idRes = idResolver(config, baseType, subtypes, true, false);
         switch (_includeAs) {
         case WRAPPER_ARRAY:
@@ -97,6 +102,11 @@ public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
             JavaType baseType, Collection<NamedType> subtypes)
     {
         if (_idType == JsonTypeInfo.Id.NONE) { return null; }
+        // 03-Oct-2016, tatu: As per [databind#1395] better prevent use for primitives,
+        //    regardless of setting
+        if (baseType.isPrimitive()) {
+            return null;
+        }
 
         TypeIdResolver idRes = idResolver(config, baseType, subtypes, false, true);
 

src/test/java/com/fasterxml/jackson/databind/jsontype/DefaultTypingWithPrimitivesTest.java

@@ -0,0 +1,42 @@
+package com.fasterxml.jackson.databind.jsontype;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
+
+import java.util.*;
+
+// [databind#1395]: prevent attempts at including type info for primitives
+public class DefaultTypingWithPrimitivesTest extends BaseMapTest
+{
+    static class Data {
+        public long key;
+    }
+
+    public void testDefaultTypingWithLong() throws Exception
+    {
+        Data data = new Data();
+        data.key = 1L;
+        Map<String, Object> mapData = new HashMap<String, Object>();
+        mapData.put("longInMap", 2L);
+        mapData.put("longAsField", data);
+
+        // Configure Jackson to preserve types
+        ObjectMapper mapper = new ObjectMapper();
+        StdTypeResolverBuilder resolver = new StdTypeResolverBuilder();
+        resolver.init(JsonTypeInfo.Id.CLASS, null);
+        resolver.inclusion(JsonTypeInfo.As.PROPERTY);
+        resolver.typeProperty("__t");
+        mapper.setDefaultTyping(resolver);
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+
+        // Serialize
+        String json = mapper.writeValueAsString(mapData);
+
+        // Deserialize
+        Map<?,?> result = mapper.readValue(json, Map.class);
+        assertNotNull(result);
+        assertEquals(2, result.size());
+    }
+}