refactoring

Author: cowtowncoder

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

@@ -676,11 +676,7 @@ public ObjectMapper enableDefaultTyping(DefaultTyping applicability, JsonTypeInf
         if (includeAs == JsonTypeInfo.As.EXTERNAL_PROPERTY) {
             throw new IllegalArgumentException("Cannot use includeAs of "+includeAs);
         }
-        TypeResolverBuilder<?> typer = new DefaultTypeResolverBuilder(applicability);
-        // we'll always use full class name, when using defaulting
-        typer = typer.init(JsonTypeInfo.Id.CLASS, null);
-        typer = typer.inclusion(includeAs);
-        return setDefaultTyping(typer);
+        return setDefaultTyping(new DefaultTypeResolverBuilder(applicability, includeAs));
     }
 
     /**
@@ -699,12 +695,7 @@ public ObjectMapper enableDefaultTyping(DefaultTyping applicability, JsonTypeInf
      */
     public ObjectMapper enableDefaultTypingAsProperty(DefaultTyping applicability, String propertyName)
     {
-        TypeResolverBuilder<?> typer = new DefaultTypeResolverBuilder(applicability);
-        // we'll always use full class name, when using defaulting
-        typer = typer.init(JsonTypeInfo.Id.CLASS, null);
-        typer = typer.inclusion(JsonTypeInfo.As.PROPERTY);
-        typer = typer.typeProperty(propertyName);
-        return setDefaultTyping(typer);
+        return setDefaultTyping(new DefaultTypeResolverBuilder(applicability, propertyName));
     }
 
     /**

src/main/java/com/fasterxml/jackson/databind/annotation/JsonNaming.java

@@ -10,8 +10,6 @@
  * Note that if the {@link #value} property is omitted, its default value
  * means "use default naming" (that is, no alternate naming method is used).
  * This can be used as an override with mix-ins.
- * 
- * @since 2.1
  */
 @Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)

src/main/java/com/fasterxml/jackson/databind/annotation/JsonTypeIdResolver.java

@@ -18,11 +18,9 @@
  * for converting between java types and type id included in JSON content.
  * In simplest cases this can be a simple class with static mapping between
  * type names and matching classes.
- *<p>
- * NOTE: since 2.4, applicable to properties as well (should have been long time
- *  ago, but problem only found then)
  */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.PARAMETER})
+@Target({ElementType.ANNOTATION_TYPE,
+    ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotation
 public @interface JsonTypeIdResolver

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

@@ -1278,7 +1278,7 @@ protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config,
         if (idRes != null) {
             idRes.init(baseType);
         }
-        b = b.init(typeInfo.getIdType(), idRes);
+        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"

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

@@ -69,15 +69,11 @@ public interface TypeIdResolver
 
     /**
      * Method called to resolve type from given type identifier.
-     * 
-     * @since 2.5 (throws clause added in 2.8)
      */
     public JavaType typeFromId(DatabindContext context, String id) throws IOException;
 
     /**
      * Method called for error-reporting and diagnostics purposes.
-     * 
-     * @since 2.7 -- but since 2.5 has existed in {@link com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase}
      */
     public String getDescForKnownTypeIds();
 

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

@@ -88,16 +88,16 @@ public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
 
     /**
      * Initialization method that is called right after constructing
-     * the builder instance.
+     * the builder instance, in cases where information could not be
+     * passed directly (for example when instantiated for an annotation)
      *
-     * @param idType Which type metadata is used
-     * @param res (optional) Custom type id resolver used, if any
+     * @param settings Configuration settings to apply.
      * 
      * @return Resulting builder instance (usually this builder,
      *   but not necessarily)
      */
-    public T init(JsonTypeInfo.Id idType, TypeIdResolver res);
-    
+    public T init(JsonTypeInfo.Value settings, TypeIdResolver res);
+
     /*
     /**********************************************************
     /* Methods for configuring resolver to build 

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

@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.TreeNode;
 import com.fasterxml.jackson.databind.DeserializationConfig;
 import com.fasterxml.jackson.databind.JavaType;
@@ -34,8 +35,29 @@ public class DefaultTypeResolverBuilder
      */
     protected final DefaultTyping _appliesFor;
 
-    public DefaultTypeResolverBuilder(DefaultTyping t) {
+    public DefaultTypeResolverBuilder(DefaultTyping t, JsonTypeInfo.As includeAs) {
         _appliesFor = t;
+        _idType = JsonTypeInfo.Id.CLASS;
+        _includeAs = includeAs;
+        _typeProperty = _idType.getDefaultPropertyName();
+    }
+
+    public DefaultTypeResolverBuilder(DefaultTyping t, String propertyName) {
+        _appliesFor = t;
+        _idType = JsonTypeInfo.Id.CLASS;
+        _includeAs = JsonTypeInfo.As.PROPERTY;
+        _typeProperty = propertyName;
+    }
+
+    public DefaultTypeResolverBuilder(DefaultTyping t, JsonTypeInfo.As includeAs,
+            JsonTypeInfo.Id idType, String propertyName) {
+        _appliesFor = t;
+        _idType = idType;
+        _includeAs = includeAs;
+        if (propertyName == null) {
+            propertyName = _idType.getDefaultPropertyName();
+        }
+        _typeProperty = propertyName;
     }
 
     @Override

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

@@ -52,40 +52,54 @@ public StdTypeResolverBuilder(JsonTypeInfo.Value settings) {
                 throw new IllegalArgumentException("idType cannot be null");
             }
             _includeAs = settings.getInclusionType();
-            _typeProperty = settings.getPropertyName();
+            _typeProperty = _propName(settings.getPropertyName(), _idType);
             _defaultImpl = settings.getDefaultImpl();
         }
     }
 
     /**
      * @since 2.9
      */
-    protected StdTypeResolverBuilder(JsonTypeInfo.Id idType,
+    public StdTypeResolverBuilder(JsonTypeInfo.Id idType,
             JsonTypeInfo.As idAs, String propName)
     {
         if (idType == null) {
             throw new IllegalArgumentException("idType cannot be null");
         }
         _idType = idType;
         _includeAs = idAs;
-        _typeProperty = propName;
+        _typeProperty = _propName(propName, _idType);
+    }
+
+    protected static String _propName(String propName, JsonTypeInfo.Id idType) {
+        if (propName == null) {
+            propName = idType.getDefaultPropertyName();
+        }
+        return propName;
     }
 
     public static StdTypeResolverBuilder noTypeInfoBuilder() {
-        return new StdTypeResolverBuilder().init(JsonTypeInfo.Id.NONE, null);
+        return new StdTypeResolverBuilder(JsonTypeInfo.Id.NONE, null, null);
     }
 
     @Override
-    public StdTypeResolverBuilder init(JsonTypeInfo.Id idType, TypeIdResolver idRes)
+    public StdTypeResolverBuilder init(JsonTypeInfo.Value settings, TypeIdResolver idRes)
     {
-        // sanity checks
-        if (idType == null) {
+        _idType = settings.getIdType();
+        if (_idType == null) {
             throw new IllegalArgumentException("idType cannot be null");
         }
-        _idType = idType;
         _customIdResolver = idRes;
+        _includeAs = settings.getInclusionType();
+
         // Let's also initialize property name as per idType default
-        _typeProperty = idType.getDefaultPropertyName();
+        _typeProperty = settings.getPropertyName();
+        if (_typeProperty == null) {
+            _typeProperty = _idType.getDefaultPropertyName();
+        }
+        _typeIdVisible = settings.getIdVisible();
+        _defaultImpl = settings.getDefaultImpl();
+        
         return this;
     }
 

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

@@ -26,10 +26,8 @@ public void testDefaultTypingWithLong() throws Exception
         ObjectMapper mapper = ObjectMapper.builder()
                 .enable(SerializationFeature.INDENT_OUTPUT)
                 .build();
-        StdTypeResolverBuilder resolver = new StdTypeResolverBuilder();
-        resolver.init(JsonTypeInfo.Id.CLASS, null);
-        resolver.inclusion(JsonTypeInfo.As.PROPERTY);
-        resolver.typeProperty("__t");
+        StdTypeResolverBuilder resolver = new StdTypeResolverBuilder(JsonTypeInfo.Id.CLASS,
+                JsonTypeInfo.As.PROPERTY, "__t");
         mapper.setDefaultTyping(resolver);
 
         // Serialize

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

@@ -73,9 +73,10 @@ public void testJackson428() throws Exception
     {
         ObjectMapper serMapper = new ObjectMapper();
 
-        TypeResolverBuilder<?> serializerTyper = new DefaultTypeResolverBuilder(ObjectMapper.DefaultTyping.NON_FINAL);
-        serializerTyper = serializerTyper.init(JsonTypeInfo.Id.NAME, createTypeNameIdResolver(true));
-        serializerTyper = serializerTyper.inclusion(JsonTypeInfo.As.PROPERTY);
+        TypeResolverBuilder<?> serializerTyper = new DefaultTypeResolverBuilder(ObjectMapper.DefaultTyping.NON_FINAL,
+                JsonTypeInfo.As.PROPERTY);
+//        serializerTyper = serializerTyper.init(JsonTypeInfo.Id.NAME, createTypeNameIdResolver(true));
+//        serializerTyper = serializerTyper.inclusion(JsonTypeInfo.As.PROPERTY);
         serMapper.setDefaultTyping(serializerTyper);
 
         // Let's start by constructing something to serialize first
@@ -88,9 +89,10 @@ public void testJackson428() throws Exception
 
         // Then deserialize: need separate mapper to initialize type id resolver appropriately
         ObjectMapper deserMapper = new ObjectMapper();
-        TypeResolverBuilder<?> deserializerTyper = new DefaultTypeResolverBuilder(ObjectMapper.DefaultTyping.NON_FINAL);
-        deserializerTyper = deserializerTyper.init(JsonTypeInfo.Id.NAME, createTypeNameIdResolver(false));
-        deserializerTyper = deserializerTyper.inclusion(JsonTypeInfo.As.PROPERTY);
+        TypeResolverBuilder<?> deserializerTyper = new DefaultTypeResolverBuilder(ObjectMapper.DefaultTyping.NON_FINAL,
+                JsonTypeInfo.As.PROPERTY);
+//        deserializerTyper = deserializerTyper.init(JsonTypeInfo.Id.NAME, createTypeNameIdResolver(false));
+//        deserializerTyper = deserializerTyper.inclusion(JsonTypeInfo.As.PROPERTY);
         deserMapper.setDefaultTyping(deserializerTyper);
 
         MapHolder result = deserMapper.readValue(json, MapHolder.class);