...

Author: cowtowncoder

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

@@ -1279,10 +1279,9 @@ protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config,
             idRes.init(baseType);
         }
         b = b.init(typeInfo.getIdType(), idRes);
-        /* 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"
-         */
+        // 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"
         JsonTypeInfo.As inclusion = typeInfo.getInclusionType();
         if (inclusion == JsonTypeInfo.As.EXTERNAL_PROPERTY && (ann instanceof AnnotatedClass)) {
             inclusion = JsonTypeInfo.As.PROPERTY;

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

@@ -45,11 +45,27 @@ public class StdTypeResolverBuilder
 
     public StdTypeResolverBuilder() { }
 
+    public StdTypeResolverBuilder(JsonTypeInfo.Value settings) {
+        if (settings != null) {
+            _idType = settings.getIdType();
+            if (_idType == null) {
+                throw new IllegalArgumentException("idType cannot be null");
+            }
+            _includeAs = settings.getInclusionType();
+            _typeProperty = settings.getPropertyName();
+            _defaultImpl = settings.getDefaultImpl();
+        }
+    }
+
     /**
      * @since 2.9
      */
     protected StdTypeResolverBuilder(JsonTypeInfo.Id idType,
-            JsonTypeInfo.As idAs, String propName) {
+            JsonTypeInfo.As idAs, String propName)
+    {
+        if (idType == null) {
+            throw new IllegalArgumentException("idType cannot be null");
+        }
         _idType = idType;
         _includeAs = idAs;
         _typeProperty = propName;