Further streamlining of TypeResolverBuilder

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java

@@ -40,7 +40,8 @@ public final class BaseSettings
     protected final static BaseSettings DEFAULT_BASE = new BaseSettings(
             DEFAULT_ANNOTATION_INTROSPECTOR,
              null, TypeFactory.defaultInstance(),
-            null, StdDateFormat.instance, null,
+            null, // no default typing, by default
+            StdDateFormat.instance, null,
             Locale.getDefault(),
             null, // to indicate "use Jackson default TimeZone" (UTC since Jackson 2.7)
             Base64Variants.getDefaultVariant(),
@@ -77,11 +78,10 @@ public final class BaseSettings
      */
 
     /**
-     * Type information handler used for "untyped" values (ones declared
-     * to have type <code>Object.class</code>)
+     * Type information handler used for "default typing".
      */
-    protected final TypeResolverBuilder<?> _typeResolverBuilder;
-    
+    protected final TypeResolverBuilder<?> _defaultTyper;
+
     /*
     /**********************************************************
     /* Configuration settings; other
@@ -142,14 +142,14 @@ public final class BaseSettings
 
     public BaseSettings(AnnotationIntrospector ai,
             PropertyNamingStrategy pns, TypeFactory tf,
-            TypeResolverBuilder<?> typer, DateFormat dateFormat, HandlerInstantiator hi,
+            TypeResolverBuilder<?> defaultTyper, DateFormat dateFormat, HandlerInstantiator hi,
             Locale locale, TimeZone tz, Base64Variant defaultBase64,
             JsonNodeFactory nodeFactory)
     {
         _annotationIntrospector = ai;
         _propertyNamingStrategy = pns;
         _typeFactory = tf;
-        _typeResolverBuilder = typer;
+        _defaultTyper = defaultTyper;
         _dateFormat = dateFormat;
         _handlerInstantiator = hi;
         _locale = locale;
@@ -176,7 +176,7 @@ public BaseSettings withAnnotationIntrospector(AnnotationIntrospector ai) {
             return this;
         }
         return new BaseSettings(ai, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+                _defaultTyper, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _nodeFactory);
     }
 
@@ -193,7 +193,7 @@ public BaseSettings with(PropertyNamingStrategy pns) {
             return this;
         }
         return new BaseSettings(_annotationIntrospector, pns, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+                _defaultTyper, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _nodeFactory);
     }
 
@@ -202,12 +202,12 @@ public BaseSettings with(TypeFactory tf) {
             return this;
         }
         return new BaseSettings(_annotationIntrospector, _propertyNamingStrategy, tf,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+                _defaultTyper, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _nodeFactory);
     }
 
     public BaseSettings with(TypeResolverBuilder<?> typer) {
-        if (_typeResolverBuilder == typer) {
+        if (_defaultTyper == typer) {
             return this;
         }
         return new BaseSettings(_annotationIntrospector, _propertyNamingStrategy, _typeFactory,
@@ -225,7 +225,7 @@ public BaseSettings with(DateFormat df) {
             df = _force(df, _timeZone);
         }
         return new BaseSettings(_annotationIntrospector, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, df, _handlerInstantiator, _locale,
+                _defaultTyper, df, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, _nodeFactory);
     }
 
@@ -234,7 +234,7 @@ public BaseSettings with(HandlerInstantiator hi) {
             return this;
         }
         return new BaseSettings(_annotationIntrospector, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, hi, _locale,
+                _defaultTyper, _dateFormat, hi, _locale,
                 _timeZone, _defaultBase64, _nodeFactory);
     }
 
@@ -243,7 +243,7 @@ public BaseSettings with(Locale l) {
             return this;
         }
         return new BaseSettings(_annotationIntrospector, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, l,
+                _defaultTyper, _dateFormat, _handlerInstantiator, l,
                 _timeZone, _defaultBase64, _nodeFactory);
     }
 
@@ -264,7 +264,7 @@ public BaseSettings with(TimeZone tz)
         DateFormat df = _force(_dateFormat, tz);
         return new BaseSettings(_annotationIntrospector,
                 _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, df, _handlerInstantiator, _locale,
+                _defaultTyper, df, _handlerInstantiator, _locale,
                 tz, _defaultBase64, _nodeFactory);
     }
 
@@ -274,7 +274,7 @@ public BaseSettings with(Base64Variant base64) {
         }
         return new BaseSettings(_annotationIntrospector,
                 _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+                _defaultTyper, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, base64, _nodeFactory);
     }
 
@@ -284,7 +284,7 @@ public BaseSettings with(JsonNodeFactory nodeFactory) {
         }
         return new BaseSettings(_annotationIntrospector,
                 _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
+                _defaultTyper, _dateFormat, _handlerInstantiator, _locale,
                 _timeZone, _defaultBase64, nodeFactory);
     }
 
@@ -306,8 +306,8 @@ public TypeFactory getTypeFactory() {
         return _typeFactory;
     }
 
-    public TypeResolverBuilder<?> getTypeResolverBuilder() {
-        return _typeResolverBuilder;
+    public TypeResolverBuilder<?> getDefaultTyper() {
+        return _defaultTyper;
     }
 
     public DateFormat getDateFormat() {

src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java

@@ -243,13 +243,13 @@ public final HandlerInstantiator getHandlerInstantiator() {
     /**
      * Method called to locate a type info handler for types that do not have
      * one explicitly declared via annotations (or other configuration).
-     * If such default handler is configured, it is returned; otherwise
+     * If such a default handler is configured, it is returned; otherwise
      * null is returned.
      */
     public final TypeResolverBuilder<?> getDefaultTyper(JavaType baseType) {
-        return _base.getTypeResolverBuilder();
+        return _base.getDefaultTyper();
     }
-    
+
     public abstract SubtypeResolver getSubtypeResolver();
 
     public final TypeFactory getTypeFactory() {

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

@@ -1255,21 +1255,28 @@ protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config,
         // First: maybe we have explicit type resolver?
         TypeResolverBuilder<?> b;
         JsonTypeResolver resAnn = _findAnnotation(ann, JsonTypeResolver.class);
-        
         if (resAnn != null) {
-            if (!JsonTypeInfo.Value.isEnabled(typeInfo)) {
+            // 08-Mar-2018, tatu: Should `NONE` block custom one? Or not?
+            if ((typeInfo != null) && (typeInfo.getIdType() == JsonTypeInfo.Id.NONE)) {
                 return null;
             }
             b = config.typeResolverBuilderInstance(ann, resAnn.value());
-        } else { // if not, use standard one, if indicated by annotations
+        } else { // if not, use standard one, but only if indicated by annotations
             if (typeInfo == null) {
                 return null;
             }
             // bit special; must return 'marker' to block use of default typing:
             if (typeInfo.getIdType() == JsonTypeInfo.Id.NONE) {
                 return _constructNoTypeResolverBuilder();
             }
-            b = _constructStdTypeResolverBuilder();
+            // 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)) {
+                typeInfo = typeInfo.withInclusionType(JsonTypeInfo.As.PROPERTY);
+            }
+            b = _constructStdTypeResolverBuilder(typeInfo);
         }
         // Does it define a custom type id resolver?
         JsonTypeIdResolver idResInfo = _findAnnotation(ann, JsonTypeIdResolver.class);
@@ -1279,26 +1286,15 @@ protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config,
             idRes.init(baseType);
         }
         b = b.init(typeInfo, 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"
-        JsonTypeInfo.As inclusion = typeInfo.getInclusionType();
-        if (inclusion == JsonTypeInfo.As.EXTERNAL_PROPERTY && (ann instanceof AnnotatedClass)) {
-            inclusion = JsonTypeInfo.As.PROPERTY;
-        }
-        b = b.inclusion(inclusion);
-        b = b.typeProperty(typeInfo.getPropertyName());
-        b = b.defaultImpl(typeInfo.getDefaultImpl());
-        b = b.typeIdVisibility(typeInfo.getIdVisible());
         return b;
     }
 
     /**
      * Helper method for constructing standard {@link TypeResolverBuilder}
      * implementation.
      */
-    protected StdTypeResolverBuilder _constructStdTypeResolverBuilder() {
-        return new StdTypeResolverBuilder();
+    protected StdTypeResolverBuilder _constructStdTypeResolverBuilder(JsonTypeInfo.Value typeInfo) {
+        return new StdTypeResolverBuilder(typeInfo);
     }
 
     /**

src/main/java/com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder.java

@@ -3,7 +3,7 @@
 import java.util.Collection;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+
 import com.fasterxml.jackson.databind.DeserializationConfig;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.SerializationConfig;
@@ -15,8 +15,7 @@
  * handling type information embedded in JSON to allow for safe
  * polymorphic type handling.
  *<p>
- * Builder is first initialized by calling {@link #init} method, and then
- * configured using 'set' methods like {@link #inclusion}.
+ * Builder is first initialized by calling {@link #init} method.
  * Finally, after calling all configuration methods,
  * {@link #buildTypeSerializer} or {@link #buildTypeDeserializer}
  * will be called to get actual type resolver constructed
@@ -103,35 +102,6 @@ public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
     /* Methods for configuring resolver to build 
     /**********************************************************
      */
-    
-    /**
-     * Method for specifying mechanism to use for including type metadata
-     * in JSON.
-     * If not explicitly called, setting defaults to
-     * {@link As#PROPERTY}.
-     * 
-     * @param includeAs Mechanism used for including type metadata in JSON
-     * 
-     * @return Resulting builder instance (usually this builder,
-     *   but may be a newly constructed instance for immutable builders}
-     */
-    public T inclusion(As includeAs);
-
-    /**
-     * Method for specifying name of property used for including type
-     * information. Not used for all inclusion mechanisms;
-     * usually only used with {@link As#PROPERTY}.
-     *<p>
-     * If not explicitly called, name of property to use is based on
-     * defaults for {@link com.fasterxml.jackson.annotation.JsonTypeInfo.Id} configured.
-     * 
-     * @param propName Name of JSON property to use for including
-     *    type information
-     * 
-     * @return Resulting builder instance (usually this builder,
-     *   but may be a newly constructed instance for immutable builders}
-     */
-    public T typeProperty(String propName);
 
     /**
      * Method for specifying default implementation to use if type id 
@@ -141,13 +111,4 @@ public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
      *   but may be a newly constructed instance for immutable builders}
      */
     public T defaultImpl(Class<?> defaultImpl);
-
-    /**
-     * Method for specifying whether type id should be visible to
-     * {@link com.fasterxml.jackson.databind.JsonDeserializer}s or not.
-     * 
-     * @return Resulting builder instance (usually this builder,
-     *   but may be a newly constructed instance for immutable builders}
-     */
-    public T typeIdVisibility(boolean isVisible);
 }

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

@@ -74,6 +74,11 @@ public TypeSerializer buildTypeSerializer(SerializationConfig config,
         return useForType(baseType) ? super.buildTypeSerializer(config, baseType, subtypes) : null;            
     }
 
+    public DefaultTypeResolverBuilder typeIdVisibility(boolean isVisible) {
+        _typeIdVisible = isVisible;
+        return this;
+    }
+
     /**
      * Method called to check if the default type handler should be
      * used for given type.

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

@@ -192,41 +192,12 @@ public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
     /**********************************************************
      */
 
-    @Override
-    public StdTypeResolverBuilder inclusion(JsonTypeInfo.As includeAs) {
-        if (includeAs == null) {
-            throw new IllegalArgumentException("includeAs cannot be null");
-        }
-        _includeAs = includeAs;
-        return this;
-    }
-
-    /**
-     * Method for constructing an instance with specified type property name
-     * (property name to use for type id when using "as-property" inclusion).
-     */
-    @Override
-    public StdTypeResolverBuilder typeProperty(String typeIdPropName) {
-        // ok to have null/empty; will restore to use defaults
-        if (typeIdPropName == null || typeIdPropName.length() == 0) {
-            typeIdPropName = _idType.getDefaultPropertyName();
-        }
-        _typeProperty = typeIdPropName;
-        return this;
-    }
-
     @Override
     public StdTypeResolverBuilder defaultImpl(Class<?> defaultImpl) {
         _defaultImpl = defaultImpl;
         return this;
     }
 
-    @Override
-    public StdTypeResolverBuilder typeIdVisibility(boolean isVisible) {
-        _typeIdVisible = isVisible;
-        return this;
-    }
-    
     /*
     /**********************************************************
     /* Accessors

src/test/java/com/fasterxml/jackson/databind/introspect/TestJacksonAnnotationIntrospector.java

@@ -125,7 +125,6 @@ public static class DummyBuilder extends StdTypeResolverBuilder
     @JsonTypeResolver(DummyBuilder.class)
     static class TypeResolverBean { }
 
-    // @since 1.7
     @JsonIgnoreType
     static class IgnoredType { }
 

src/test/java/com/fasterxml/jackson/databind/ser/TestKeySerializers.java

@@ -210,9 +210,8 @@ public void testUnWrappedMapWithDefaultType() throws Exception{
                 .addModule(mod)
                 .build();
         TypeResolverBuilder<?> typer = new DefaultTypeResolverBuilder(ObjectMapper.DefaultTyping.NON_FINAL,
-                JsonTypeInfo.As.PROPERTY, JsonTypeInfo.Id.NAME, null);
-        //typer = typer.typeProperty(TYPE_FIELD);
-        typer = typer.typeIdVisibility(true);
+                JsonTypeInfo.As.PROPERTY, JsonTypeInfo.Id.NAME, null)
+            .typeIdVisibility(true);
         mapper.setDefaultTyping(typer);
 
         Map<ABC,String> stuff = new HashMap<ABC,String>();