Fix #1203

Author: cowtowncoder

release-notes/VERSION

@@ -16,6 +16,7 @@ Project: jackson-databind
 #1195: `JsonMappingException` not Serializable due to 2.7 reference to source (parser)
  (reported by mjustin@github)
 #1198: Problem with `@JsonTypeInfo.As.EXTERNAL_PROPERTY`, `defaultImpl`, missing type id, NPE
+#1203: `@JsonTypeInfo` does not work correctly for ReferenceTypes like `AtomicReference`
 - Improve handling of custom content (de)serializers for `AtomicReference`
 
 2.7.3 (16-Mar-2016)

src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java

@@ -1869,7 +1869,7 @@ protected JavaType resolveType(DeserializationContext ctxt,
             }
         }
 
-        if (type.getContentType() != null) { // container type or reference type
+        if (type.isContainerType() || type.isReferenceType()) {
             Object cdDef = intr.findContentDeserializer(member);
             JsonDeserializer<?> cd = ctxt.deserializerInstance(member, cdDef);
             if (cd != null) {

src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java

@@ -467,7 +467,10 @@ public TypeResolverBuilder<?> findPropertyTypeResolver(MapperConfig<?> config,
         /* As per definition of @JsonTypeInfo, should only apply to contents of container
          * (collection, map) types, not container types themselves:
          */
-        if (baseType.isContainerType()) return null;
+        // 17-Apr-2016, tatu: For 2.7.4 make sure ReferenceType also included
+        if (baseType.isContainerType() || baseType.isReferenceType()) {
+            return null;
+        }
         // No per-member type overrides (yet)
         return _findTypeResolver(config, am, baseType);
     }
@@ -1170,11 +1173,11 @@ protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config,
         JsonTypeIdResolver idResInfo = _findAnnotation(ann, JsonTypeIdResolver.class);
         TypeIdResolver idRes = (idResInfo == null) ? null
                 : config.typeIdResolverInstance(ann, idResInfo.value());
-        if (idRes != null) { // [JACKSON-359]
+        if (idRes != null) {
             idRes.init(baseType);
         }
         b = b.init(info.use(), idRes);
-        /* 13-Aug-2011, tatu: One complication wrt [JACKSON-453]; external id
+        /* 13-Aug-2011, tatu: One complication; external id
          *   only works for properties; so if declared for a Class, we will need
          *   to map it to "PROPERTY" instead of "EXTERNAL_PROPERTY"
          */
@@ -1186,7 +1189,7 @@ protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config,
         b = b.typeProperty(info.property());
         Class<?> defaultImpl = info.defaultImpl();
 
-        // 08-Dec-2014, tatu: To deprecated `JsonTypeInfo.None` we need to use other placeholder(s);
+        // 08-Dec-2014, tatu: To deprecate `JsonTypeInfo.None` we need to use other placeholder(s);
         //   and since `java.util.Void` has other purpose (to indicate "deser as null"), we'll instead
         //   use `JsonTypeInfo.class` itself. But any annotation type will actually do, as they have no
         //   valid use (can not instantiate as default)

src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.java

@@ -787,9 +787,8 @@ protected BeanPropertyWriter _constructWriter(SerializerProvider prov,
         // Does member specify a serializer? If so, let's use it.
         JsonSerializer<?> annotatedSerializer = findSerializerFromAnnotation(prov,
                 accessor);
-        /* 02-Feb-2012, tatu: Unlike most other code paths, serializer produced
-         *  here will NOT be resolved or contextualized, unless done here, so:
-         */
+        // Unlike most other code paths, serializer produced
+        // here will NOT be resolved or contextualized, unless done here, so:
         if (annotatedSerializer instanceof ResolvableSerializer) {
             ((ResolvableSerializer) annotatedSerializer).resolve(prov);
         }
@@ -798,8 +797,7 @@ protected BeanPropertyWriter _constructWriter(SerializerProvider prov,
         // And how about polymorphic typing? First special to cover JAXB per-field settings:
         TypeSerializer contentTypeSer = null;
         // 16-Feb-2014, cgc: contentType serializers for collection-like and map-like types
-        if (ClassUtil.isCollectionMapOrArray(type.getRawClass())
-                || type.isCollectionLikeType() || type.isMapLikeType()) {
+        if (type.isContainerType() || type.isReferenceType()) {
             contentTypeSer = findPropertyContentTypeSerializer(type, prov.getConfig(), accessor);
         }
         // and if not JAXB collection/array with annotations, maybe regular type info?

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

@@ -0,0 +1,48 @@
+package com.fasterxml.jackson.databind.jsontype;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.*;
+
+public class PolymorphicViaRefTypeTest extends BaseMapTest
+{
+    
+    @JsonSubTypes({
+        @JsonSubTypes.Type(name = "impl5", value = ImplForAtomic.class)
+    })
+    static class BaseForAtomic {
+    }
+
+    static class ImplForAtomic extends BaseForAtomic {
+        public int x;
+
+        protected ImplForAtomic() { }
+        public ImplForAtomic(int x) { this.x = x; }
+    }
+
+    static class TypeInfoAtomic {
+        @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "$type")
+        public AtomicReference<BaseForAtomic> value;
+    }
+
+    /*
+    /**********************************************************************
+    /* Test methods
+    /**********************************************************************
+     */
+
+    private final ObjectMapper MAPPER = objectMapper();
+
+    public void testOptionalWithAtomic() throws Exception
+    {
+        TypeInfoAtomic data = new TypeInfoAtomic();
+        data.value = new AtomicReference<BaseForAtomic>(new ImplForAtomic(42));
+        String json = MAPPER.writeValueAsString(data);
+System.err.println("JSON = "+json);
+        TypeInfoAtomic result = MAPPER.readValue(json, TypeInfoAtomic.class);
+        assertNotNull(result);
+    }
+
+}

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

@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.databind.*;
 
 /**
- * For [Issue#292]
+ * For [databind#292]
  */
 @SuppressWarnings("serial")
 public class TestAbstractContainers extends BaseMapTest