Trying to make TypeResolverProvider overridable

Author: cowtowncoder

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

@@ -75,22 +75,6 @@ public final class DeserializationConfig
     /**********************************************************************
      */
 
-    /**
-     * Copy-constructor used for making a copy used by new {@link ObjectMapper}.
-     */
-    /*
-    protected DeserializationConfig(DeserializationConfig src,
-            MixInHandler mixins, RootNameLookup rootNames,
-            ConfigOverrides configOverrides)
-    {
-        super(src, mixins, rootNames, configOverrides);
-        _deserFeatures = src._deserFeatures;
-        _problemHandlers = src._problemHandlers;
-        _parserFeatures = src._parserFeatures;
-        _formatParserFeatures = src._formatParserFeatures;
-    }
-*/
-
     /**
      * @since 3.0
      */
@@ -99,9 +83,7 @@ public DeserializationConfig(MapperBuilder<?,?> b, int mapperFeatures,
             MixInHandler mixins, RootNameLookup rootNames, ConfigOverrides configOverrides,
             AbstractTypeResolver[] atrs)
     {
-        super(b.baseSettings(), mapperFeatures,
-                b.classIntrospector(), b.subtypeResolver(),
-                mixins, rootNames, configOverrides);
+        super(b, mapperFeatures, mixins, rootNames, configOverrides);
         _deserFeatures = deserFeatures;
         _parserFeatures = parserFeatures;
         _formatParserFeatures = formatParserFeatures;
@@ -127,20 +109,6 @@ private DeserializationConfig(DeserializationConfig src,
         _problemHandlers = src._problemHandlers;
         _abstractTypeResolvers = src._abstractTypeResolvers;
     }
-    
-    /**
-     * Copy constructor used to create a non-shared instance with given mix-in
-     * annotation definitions and subtype resolver.
-     */
-    private DeserializationConfig(DeserializationConfig src, SubtypeResolver str)
-    {
-        super(src, str);
-        _deserFeatures = src._deserFeatures;
-        _parserFeatures = src._parserFeatures;
-        _formatParserFeatures = src._formatParserFeatures;
-        _problemHandlers = src._problemHandlers;
-        _abstractTypeResolvers = src._abstractTypeResolvers;
-    }
 
     private DeserializationConfig(DeserializationConfig src, BaseSettings base)
     {
@@ -194,16 +162,6 @@ protected DeserializationConfig(DeserializationConfig src, ContextAttributes att
         _abstractTypeResolvers = src._abstractTypeResolvers;
     }
 
-    protected DeserializationConfig(DeserializationConfig src, MixInHandler mixins)
-    {
-        super(src, mixins);
-        _deserFeatures = src._deserFeatures;
-        _problemHandlers = src._problemHandlers;
-        _parserFeatures = src._parserFeatures;
-        _formatParserFeatures = src._formatParserFeatures;
-        _abstractTypeResolvers = src._abstractTypeResolvers;
-    }
-
     // for unit tests only:
     protected BaseSettings getBaseSettings() { return _base; }
 
@@ -230,11 +188,6 @@ protected final DeserializationConfig _withMapperFeatures(int mapperFeatures) {
     /**********************************************************************
      */
 
-    @Override
-    public DeserializationConfig with(SubtypeResolver str) {
-        return (_subtypeResolver == str) ? this : new DeserializationConfig(this, str);
-    }
-
     @Override
     public DeserializationConfig withRootName(PropertyName rootName) {
         if (rootName == null) {
@@ -410,9 +363,9 @@ public DeserializationConfig withoutFeatures(JsonParser.Feature... features)
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Life-cycle, JsonParser.FormatFeature-based factory methods
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**

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

@@ -48,9 +48,9 @@ public class ObjectReader
     protected final static JavaType JSON_NODE_TYPE = SimpleType.constructUnsafe(JsonNode.class);
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Immutable configuration from ObjectMapper
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -80,11 +80,11 @@ public class ObjectReader
      * Default value to be null as filter not considered.
      */
     private final TokenFilter _filter;
-    
+
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Configuration that can be changed during building
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -127,9 +127,9 @@ public class ObjectReader
     protected final InjectableValues _injectableValues;
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Caching
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -139,9 +139,9 @@ public class ObjectReader
     final protected ConcurrentHashMap<JavaType, JsonDeserializer<Object>> _rootDeserializers;
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Life-cycle, construction
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -214,26 +214,7 @@ protected ObjectReader(ObjectReader base, DeserializationConfig config)
         _unwrapRoot = config.useRootWrapping();
         _filter = base._filter;
     }
-    
-    protected ObjectReader(ObjectReader base, TokenStreamFactory f)
-    {
-        // may need to override ordering, based on data format capabilities
-        _config = base._config
-            .with(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, f.requiresPropertyOrdering());
-        _context = base._context;
 
-        _rootDeserializers = base._rootDeserializers;
-        _parserFactory = f;
-
-        _valueType = base._valueType;
-        _rootDeserializer = base._rootDeserializer;
-        _valueToUpdate = base._valueToUpdate;
-        _schema = base._schema;
-        _injectableValues = base._injectableValues;
-        _unwrapRoot = base._unwrapRoot;
-        _filter = base._filter;
-    }
-    
     protected ObjectReader(ObjectReader base, TokenFilter filter) {
         _config = base._config;
         _context = base._context;
@@ -258,11 +239,11 @@ public Version version() {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Helper methods used internally for invoking constructors
     /* Need to be overridden if sub-classing (not recommended)
     /* is used.
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -294,9 +275,9 @@ protected <T> MappingIterator<T> _newIterator(JsonParser p, DeserializationConte
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Methods for initializing parser instance to use
-    /**********************************************************
+    /**********************************************************************
      */
 
     protected JsonToken _initForReading(DefaultDeserializationContext ctxt, JsonParser p)
@@ -333,9 +314,9 @@ protected void _initForMultiRead(DefaultDeserializationContext ctxt, JsonParser
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Life-cycle, fluent factory methods for DeserializationFeatures
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -390,9 +371,9 @@ public ObjectReader withoutFeatures(DeserializationFeature... features) {
     }    
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Life-cycle, fluent factory methods for JsonParser.Features
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -428,9 +409,9 @@ public ObjectReader withoutFeatures(JsonParser.Feature... features) {
     }
 
     /*
-    /**********************************************************
-    /* Life-cycle, fluent factory methods for FormatFeature (2.7)
-    /**********************************************************
+    /**********************************************************************
+    /* Life-cycle, fluent factory methods for FormatFeature
+    /**********************************************************************
      */
 
     /**
@@ -466,9 +447,9 @@ public ObjectReader withoutFeatures(FormatFeature... features) {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Life-cycle, fluent factory methods, other
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -689,9 +670,9 @@ public ObjectReader withoutAttribute(Object key) {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Internal factory methods
-    /**********************************************************
+    /**********************************************************************
      */
 
     protected final ObjectReader _with(DeserializationConfig newConfig) {
@@ -700,11 +681,11 @@ protected final ObjectReader _with(DeserializationConfig newConfig) {
         }
         return _new(this, newConfig);
     }
-    
+
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Simple accessors
-    /**********************************************************
+    /**********************************************************************
      */
 
     public boolean isEnabled(DeserializationFeature f) {
@@ -764,10 +745,10 @@ public TypeFactory getTypeFactory() {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Public API: constructing Parsers that are properly linked
     /* to `ObjectReadContext`
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -914,9 +895,9 @@ public JsonParser createNonBlockingByteArrayParser() throws IOException {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Convenience methods for JsonNode creation
-    /**********************************************************
+    /**********************************************************************
      */
 
     public ObjectNode createObjectNode() {
@@ -928,10 +909,9 @@ public ArrayNode createArrayNode() {
     }
 
     /*
-    /**********************************************************
-    /* Deserialization methods; first ones for pre-constructed
-    /* parsers
-    /**********************************************************
+    /**********************************************************************
+    /* Deserialization methods; first ones for pre-constructed parsers
+    /**********************************************************************
      */
 
     /**
@@ -1101,9 +1081,9 @@ public <T> Iterator<T> readValues(JsonParser p, JavaType valueType) throws IOExc
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* TreeCodec impl
-    /**********************************************************
+    /**********************************************************************
      */
 
     public JsonParser treeAsTokens(TreeNode n) {
@@ -1131,9 +1111,9 @@ public <T extends TreeNode> T readTree(JsonParser p) throws IOException {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Deserialization methods; others similar to what ObjectMapper has
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -1307,9 +1287,9 @@ public JsonNode readTree(DataInput src) throws IOException
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Deserialization methods; reading sequence of values
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -1433,9 +1413,9 @@ public <T> MappingIterator<T> readValues(DataInput src) throws IOException
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Implementation of rest of ObjectCodec methods
-    /**********************************************************
+    /**********************************************************************
      */
 
     public <T> T treeToValue(TreeNode n, Class<T> valueType) throws JsonProcessingException
@@ -1450,9 +1430,9 @@ public <T> T treeToValue(TreeNode n, Class<T> valueType) throws JsonProcessingEx
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Helper methods, data-binding
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -1644,9 +1624,9 @@ protected final void _verifyNoTrailingTokens(JsonParser p, DeserializationContex
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Internal methods, other
-    /**********************************************************
+    /**********************************************************************
      */
 
     protected void _verifySchemaType(FormatSchema schema)
@@ -1689,9 +1669,9 @@ protected void _reportUndetectableSource(Object src) throws JsonProcessingExcept
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Helper methods, locating deserializers etc
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**