Start updating databind to pass ObjectReadContext too -- couple of transient test failures now

Author: cowtowncoder

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

@@ -22,7 +22,7 @@
  */
 public final class DeserializationConfig
     extends MapperConfigBase<DeserializationFeature, DeserializationConfig>
-    implements java.io.Serializable // since 2.1
+    implements java.io.Serializable
 {
     private static final long serialVersionUID = 2;
 
@@ -389,8 +389,6 @@ public DeserializationConfig withoutFeatures(DeserializationFeature... features)
     /**
      * Fluent factory method that will construct and return a new configuration
      * object instance with specified features enabled.
-     *
-     * @since 2.5
      */
     public DeserializationConfig with(JsonParser.Feature feature)
     {
@@ -405,8 +403,6 @@ public DeserializationConfig with(JsonParser.Feature feature)
     /**
      * Fluent factory method that will construct and return a new configuration
      * object instance with specified features enabled.
-     *
-     * @since 2.5
      */
     public DeserializationConfig withFeatures(JsonParser.Feature... features)
     {
@@ -426,8 +422,6 @@ public DeserializationConfig withFeatures(JsonParser.Feature... features)
     /**
      * Fluent factory method that will construct and return a new configuration
      * object instance with specified feature disabled.
-     *
-     * @since 2.5
      */
     public DeserializationConfig without(JsonParser.Feature feature)
     {
@@ -469,8 +463,6 @@ public DeserializationConfig withoutFeatures(JsonParser.Feature... features)
     /**
      * Fluent factory method that will construct and return a new configuration
      * object instance with specified features enabled.
-     *
-     * @since 2.7
      */
     public DeserializationConfig with(FormatFeature feature)
     {
@@ -485,8 +477,6 @@ public DeserializationConfig with(FormatFeature feature)
     /**
      * Fluent factory method that will construct and return a new configuration
      * object instance with specified features enabled.
-     *
-     * @since 2.7
      */
     public DeserializationConfig withFeatures(FormatFeature... features)
     {
@@ -570,24 +560,22 @@ public DeserializationConfig withNoProblemHandlers() {
 
     /*
     /**********************************************************
-    /* JsonParser initialization
+    /* Support for ObjectReadContext
     /**********************************************************
      */
 
     /**
-     * Method called by {@link ObjectMapper} and {@link ObjectReader}
-     * to modify those {@link com.fasterxml.jackson.core.JsonParser.Feature} settings
-     * that have been configured via this config instance.
-     * 
-     * @since 2.5
+     * @since 3.0
      */
-    public void initialize(JsonParser p) {
-        if (_parserFeaturesToChange != 0) {
-            p.overrideStdFeatures(_parserFeatures, _parserFeaturesToChange);
-        }
-        if (_formatReadFeaturesToChange != 0) {
-            p.overrideFormatFeatures(_formatReadFeatures, _formatReadFeaturesToChange);
-        }
+    public int getParserFeatures(int defaults) {
+        return (defaults & ~_parserFeaturesToChange) | _parserFeatures;
+    }
+
+    /**
+     * @since 3.0
+     */
+    public int getFormatReadFeatures(int defaults) {
+        return (defaults & ~_formatReadFeaturesToChange) | _formatReadFeatures;
     }
 
     /*

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

@@ -11,7 +11,8 @@
 import com.fasterxml.jackson.annotation.ObjectIdResolver;
 
 import com.fasterxml.jackson.core.*;
-
+import com.fasterxml.jackson.core.tree.ArrayTreeNode;
+import com.fasterxml.jackson.core.tree.ObjectTreeNode;
 import com.fasterxml.jackson.databind.cfg.ContextAttributes;
 import com.fasterxml.jackson.databind.deser.*;
 import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
@@ -49,7 +50,8 @@
  */
 public abstract class DeserializationContext
     extends DatabindContext
-    implements java.io.Serializable
+    implements java.io.Serializable,
+        ObjectReadContext // 3.0
 {
     private static final long serialVersionUID = 3L;
 
@@ -100,18 +102,29 @@ public abstract class DeserializationContext
     protected final Class<?> _view;
 
     /**
-     * Currently active parser used for deserialization.
-     * May be different from the outermost parser
-     * when content is buffered.
+     * Schema for underlying parser to use, if any.
      */
-    protected transient JsonParser _parser;
-    
+    protected final FormatSchema _schema;
+
     /**
      * Object used for resolving references to injectable
      * values.
      */
     protected final InjectableValues _injectableValues;
+
+    /*
+    /**********************************************************
+    /* State (not for blueprints)
+    /**********************************************************
+     */
 
+    /**
+     * Currently active parser used for deserialization.
+     * May be different from the outermost parser
+     * when content is buffered.
+     */
+    protected transient JsonParser _parser;
+
     /*
     /**********************************************************
     /* Per-operation reusable helper objects (not for blueprints)
@@ -126,17 +139,13 @@ public abstract class DeserializationContext
 
     /**
      * Lazily-constructed holder for per-call attributes.
-     * 
-     * @since 2.3
      */
     protected transient ContextAttributes _attributes;
 
     /**
      * Type of {@link JsonDeserializer} (or, more specifically,
      *   {@link ContextualDeserializer}) that is being
      *   contextualized currently.
-     *
-     * @since 2.5
      */
     protected LinkedNode<JavaType> _currentType;
 
@@ -166,6 +175,7 @@ protected DeserializationContext(DeserializerFactory df,
         _injectableValues = null;
         _view = null;
         _attributes = null;
+        _schema = null;
     }
 
     protected DeserializationContext(DeserializationContext src,
@@ -177,7 +187,7 @@ protected DeserializationContext(DeserializationContext src,
         _config = src._config;
         _featureFlags = src._featureFlags;
         _view = src._view;
-        _parser = src._parser;
+        _schema = src._schema;
         _injectableValues = src._injectableValues;
         _attributes = src._attributes;
     }
@@ -186,7 +196,7 @@ protected DeserializationContext(DeserializationContext src,
      * Constructor used for creating actual per-call instances.
      */
     protected DeserializationContext(DeserializationContext src,
-            DeserializationConfig config, JsonParser p,
+            DeserializationConfig config, FormatSchema schema,
             InjectableValues injectableValues)
     {
         _cache = src._cache;
@@ -195,7 +205,8 @@ protected DeserializationContext(DeserializationContext src,
         _config = config;
         _featureFlags = config.getDeserializationFeatures();
         _view = config.getActiveView();
-        _parser = p;
+        _schema = schema;
+
         _injectableValues = injectableValues;
         _attributes = config.getAttributes();
     }
@@ -210,6 +221,8 @@ protected DeserializationContext(DeserializationContext src) {
         _config = src._config;
         _featureFlags = src._featureFlags;
         _view = src._view;
+        _schema = src._schema;
+
         _injectableValues = null;
     }
 
@@ -274,7 +287,7 @@ public TimeZone getTimeZone() {
 
     /*
     /**********************************************************
-    /* Access to per-call state, like generic attributes (2.3+)
+    /* Access to per-call state, like generic attributes
     /**********************************************************
      */
 
@@ -297,8 +310,6 @@ public DeserializationContext setAttribute(Object key, Object value)
      * do not get passed (or do not retain) type information when being
      * constructed: happens for example for deserializers constructed
      * from annotations.
-     * 
-     * @since 2.5
      *
      * @return Type of {@link ContextualDeserializer} being contextualized,
      *   if process is on-going; null if not.
@@ -307,6 +318,37 @@ public JavaType getContextualType() {
         return (_currentType == null) ? null : _currentType.value();
     }
 
+    /*
+    /**********************************************************
+    /* ObjectReadContext implementation
+    /**********************************************************
+     */
+    
+    @Override
+    public FormatSchema getSchema() {
+        return _schema;
+    }
+
+    @Override
+    public int getParserFeatures(int defaults) {
+        return _config.getParserFeatures(defaults);
+    }
+
+    @Override
+    public int getFormatReadFeatures(int defaults) {
+        return _config.getFormatReadFeatures(defaults);
+    }
+
+    @Override
+    public ArrayTreeNode createArrayNode() {
+        return getNodeFactory().arrayNode();
+    }
+
+    @Override
+    public ObjectTreeNode createObjectNode() {
+        return getNodeFactory().objectNode();
+    }        
+
     /*
     /**********************************************************
     /* Public API, config setting accessors
@@ -1454,8 +1496,8 @@ public JsonMappingException wrongTokenException(JsonParser p, JavaType targetTyp
     public JsonMappingException wrongTokenException(JsonParser p, Class<?> targetType,
             JsonToken expToken, String extra)
     {
-        String msg = String.format("Unexpected token (%s), expected %s",
-                p.currentToken(), expToken);
+        JsonToken t = (p == null) ? null : p.currentToken();
+        String msg = String.format("Unexpected token (%s), expected %s", t, expToken);
         msg = _colonConcat(msg, extra);
         return MismatchedInputException.from(p, targetType, msg);
     }