Further fixes to make use of ObjectReadContext instead of ObjectCodec, almost there

Author: cowtowncoder

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

@@ -13,6 +13,8 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.tree.ArrayTreeNode;
 import com.fasterxml.jackson.core.tree.ObjectTreeNode;
+import com.fasterxml.jackson.core.type.ResolvedType;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.cfg.ContextAttributes;
 import com.fasterxml.jackson.databind.deser.*;
 import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
@@ -320,7 +322,7 @@ public JavaType getContextualType() {
 
     /*
     /**********************************************************
-    /* ObjectReadContext implementation
+    /* ObjectReadContext impl, config access
     /**********************************************************
      */
 
@@ -339,6 +341,12 @@ public int getFormatReadFeatures(int defaults) {
         return _config.getFormatReadFeatures(defaults);
     }
 
+    /*
+    /**********************************************************
+    /* ObjectReadContext impl, Tree creation
+    /**********************************************************
+     */
+    
     @Override
     public ArrayTreeNode createArrayNode() {
         return getNodeFactory().arrayNode();
@@ -349,6 +357,68 @@ public ObjectTreeNode createObjectNode() {
         return getNodeFactory().objectNode();
     }        
 
+    /*
+    /**********************************************************
+    /* ObjectReadContext impl, databind
+    /**********************************************************
+     */
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends TreeNode> T readTree(JsonParser p) throws IOException {
+        // NOTE: inlined version of `_bindAsTree()` from `ObjectReader`
+        JsonToken t = p.currentToken();
+        if (t == null) {
+            t = p.nextToken();
+            if (t == null) { // [databind#1406]: expose end-of-input as `null`
+                return null;
+            }
+        }
+        if (t == JsonToken.VALUE_NULL) {
+            return (T) getNodeFactory().nullNode();
+        }
+        JsonDeserializer<Object> deser = findRootValueDeserializer(ObjectReader.JSON_NODE_TYPE);
+        return (T) deser.deserialize(p, this);
+    }
+
+    /**
+     * Convenience method that may be used by composite or container deserializers,
+     * for reading one-off values contained (for sequences, it is more efficient
+     * to actually fetch deserializer once for the whole collection).
+     *<p>
+     * NOTE: when deserializing values of properties contained in composite types,
+     * rather use {@link #readPropertyValue(JsonParser, BeanProperty, Class)};
+     * this method does not allow use of contextual annotations.
+     */
+    @Override
+    public <T> T readValue(JsonParser p, Class<T> type) throws IOException {
+        return readValue(p, getTypeFactory().constructType(type));
+    }
+
+    @Override
+    public <T> T readValue(JsonParser p, TypeReference<?> refType) throws IOException {
+        return readValue(p, getTypeFactory().constructType(refType));
+    }
+    
+    @Override
+    public <T> T readValue(JsonParser p, ResolvedType type) throws IOException {
+        if (!(type instanceof JavaType)) {
+            throw new UnsupportedOperationException(
+"Only support `JavaType` implementation of `ResolvedType`, not: "+type.getClass().getName());
+        }
+        return readValue(p, (JavaType) type);
+    }
+    
+    @SuppressWarnings("unchecked")
+    public <T> T readValue(JsonParser p, JavaType type) throws IOException {
+        JsonDeserializer<Object> deser = findRootValueDeserializer(type);
+        if (deser == null) {
+            reportBadDefinition(type,
+                    "Could not find JsonDeserializer for type "+type);
+        }
+        return (T) deser.deserialize(p, this);
+    }
+
     /*
     /**********************************************************
     /* Public API, config setting accessors
@@ -455,9 +525,6 @@ public final JsonNodeFactory getNodeFactory() {
     /**
      * Method for checking whether we could find a deserializer
      * for given type.
-     *
-     * @param type
-     * @since 2.3
      */
     public boolean hasValueDeserializerFor(JavaType type, AtomicReference<Throwable> cause) {
         try {
@@ -772,50 +839,17 @@ public Calendar constructCalendar(Date d) {
     /* Convenience methods for reading parsed values
     /**********************************************************
      */
-
-    /**
-     * Convenience method that may be used by composite or container deserializers,
-     * for reading one-off values contained (for sequences, it is more efficient
-     * to actually fetch deserializer once for the whole collection).
-     *<p>
-     * NOTE: when deserializing values of properties contained in composite types,
-     * rather use {@link #readPropertyValue(JsonParser, BeanProperty, Class)};
-     * this method does not allow use of contextual annotations.
-     * 
-     * @since 2.4
-     */
-    public <T> T readValue(JsonParser p, Class<T> type) throws IOException {
-        return readValue(p, getTypeFactory().constructType(type));
-    }
-
-    /**
-     * @since 2.4
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(JsonParser p, JavaType type) throws IOException {
-        JsonDeserializer<Object> deser = findRootValueDeserializer(type);
-        if (deser == null) {
-            reportBadDefinition(type,
-                    "Could not find JsonDeserializer for type "+type);
-        }
-        return (T) deser.deserialize(p, this);
-    }
-
+    
     /**
      * Convenience method that may be used by composite or container deserializers,
      * for reading one-off values for the composite type, taking into account
      * annotations that the property (passed to this method -- usually property that
      * has custom serializer that called this method) has.
-     * 
-     * @since 2.4
      */
     public <T> T readPropertyValue(JsonParser p, BeanProperty prop, Class<T> type) throws IOException {
         return readPropertyValue(p, prop, getTypeFactory().constructType(type));
     }
 
-    /**
-     * @since 2.4
-     */
     @SuppressWarnings("unchecked")
     public <T> T readPropertyValue(JsonParser p, BeanProperty prop, JavaType type) throws IOException {
         JsonDeserializer<Object> deser = findContextualValueDeserializer(type, prop);

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

@@ -119,19 +119,15 @@ public static interface SetupContext
          * however, instance will always be of that type.
          * This is why return value is declared generic, to allow caller to
          * specify context to often avoid casting.
-         * 
-         * @since 2.0
          */
-        public <C extends ObjectCodec> C getOwner();
+        public Object getOwner();
 
         /**
          * Accessor for finding {@link TypeFactory} that is currently configured
          * by the context.
          *<p>
          * NOTE: since it is possible that other modules might change or replace
          * TypeFactory, use of this method adds order-dependency for registrations.
-         * 
-         * @since 2.0
          */
         public TypeFactory getTypeFactory();
 

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

@@ -67,13 +67,6 @@
   // and find values by, for example, using a {@link com.fasterxml.jackson.core.JsonPointer} expression:
   int age = root.at("/personal/age").getValueAsInt(); 
 </pre>
- *<p>
- * The main conversion API is defined in {@link ObjectCodec}, so that
- * implementation details of this class need not be exposed to
- * streaming parser and generator classes. Usage via {@link ObjectCodec} is,
- * however, usually only for cases where dependency to {@link ObjectMapper} is
- * either not possible (from Streaming API), or undesireable (when only relying
- * on Streaming API).
  *<p> 
  * Mapper instances are fully thread-safe provided that ALL configuration of the
  * instance occurs before ANY read or write calls. If configuration of a mapper instance
@@ -116,7 +109,6 @@
  * (using {@link #setDefaultTyping}).
  */
 public class ObjectMapper
-    extends ObjectCodec
     implements Versioned,
         java.io.Serializable
 {
@@ -490,7 +482,6 @@ public ObjectMapper(TokenStreamFactory jf) {
     protected ObjectMapper(ObjectMapper src)
     {
         _jsonFactory = src._jsonFactory.copy();
-        _jsonFactory.setCodec(this);
         _subtypeResolver = src._subtypeResolver;
         _typeFactory = src._typeFactory;
         _injectableValues = src._injectableValues;
@@ -535,14 +526,9 @@ public ObjectMapper(TokenStreamFactory jf,
         // 06-OCt-2017, tatu: Should probably change dependency one of these days...
         //   but not today.
         if (jf == null) {
-            _jsonFactory = new JsonFactory();
-            _jsonFactory.setCodec(this);
-        } else {
-            _jsonFactory = jf;
-            if (jf.getCodec() == null) { // as per [JACKSON-741]
-                _jsonFactory.setCodec(this);
-            }
+            jf = new JsonFactory();
         }
+        _jsonFactory = jf;
         _subtypeResolver = new StdSubtypeResolver();
         RootNameLookup rootNames = new RootNameLookup();
         // and default type factory is shared one
@@ -732,9 +718,9 @@ public Version getMapperVersion() {
 
             @SuppressWarnings("unchecked")
             @Override
-            public <C extends ObjectCodec> C getOwner() {
+            public Object getOwner() {
                 // why do we need the cast here?!?
-                return (C) ObjectMapper.this;
+                return ObjectMapper.this;
             }
 
             @Override
@@ -1733,7 +1719,6 @@ public ObjectMapper setConfig(SerializationConfig config) {
      * @return {@link TokenStreamFactory} that this mapper uses when it needs to
      *   construct Json parser and generators
      */
-    @Override
     public TokenStreamFactory getFactory() { return _jsonFactory; }
 
     /**
@@ -1753,9 +1738,6 @@ public ObjectMapper setDateFormat(DateFormat dateFormat)
         return this;
     }
 
-    /**
-     * @since 2.5
-     */
     public DateFormat getDateFormat() {
         // arbitrary choice but let's do:
         return _serializationConfig.getDateFormat();
@@ -2152,7 +2134,6 @@ public boolean isEnabled(JsonFactory.Feature f) {
      * @throws JsonMappingException if the input JSON structure does not match structure
      *   expected for result type (or has other mismatch issues)
      */
-    @Override
     @SuppressWarnings("unchecked")
     public <T> T readValue(JsonParser p, Class<T> valueType)
         throws IOException, JsonParseException, JsonMappingException
@@ -2177,7 +2158,6 @@ public <T> T readValue(JsonParser p, Class<T> valueType)
      * @throws JsonMappingException if the input JSON structure does not match structure
      *   expected for result type (or has other mismatch issues)
      */
-    @Override
     @SuppressWarnings("unchecked")
     public <T> T readValue(JsonParser p, TypeReference<?> valueTypeRef)
         throws IOException, JsonParseException, JsonMappingException
@@ -2201,7 +2181,6 @@ public <T> T readValue(JsonParser p, TypeReference<?> valueTypeRef)
      * @throws JsonMappingException if the input JSON structure does not match structure
      *   expected for result type (or has other mismatch issues)
      */
-    @Override
     @SuppressWarnings("unchecked")
     public final <T> T readValue(JsonParser p, ResolvedType valueType)
         throws IOException, JsonParseException, JsonMappingException
@@ -2250,7 +2229,6 @@ public <T> T readValue(JsonParser p, JavaType valueType)
      * @throws JsonParseException if underlying input contains invalid content
      *    of type {@link JsonParser} supports (JSON for default case)
      */
-    @Override
     public <T extends TreeNode> T readTree(JsonParser p)
         throws IOException, JsonProcessingException
     {
@@ -2296,21 +2274,6 @@ public <T extends TreeNode> T readTree(JsonParser p)
      *<p>
      * Note that {@link ObjectReader} has more complete set of variants.
      */
-    @Override
-    public <T> MappingIterator<T> readValues(JsonParser p, ResolvedType valueType)
-        throws IOException, JsonProcessingException
-    {
-        return readValues(p, (JavaType) valueType);
-    }
-
-    /**
-     * Convenience method, equivalent in function to:
-     *<pre>
-     *   readerFor(valueType).readValues(p);
-     *</pre>
-     *<p>
-     * Type-safe overload of {@link #readValues(JsonParser, ResolvedType)}.
-     */
     public <T> MappingIterator<T> readValues(JsonParser p, JavaType valueType)
         throws IOException, JsonProcessingException
     {
@@ -2327,25 +2290,14 @@ public <T> MappingIterator<T> readValues(JsonParser p, JavaType valueType)
      *   readerFor(valueType).readValues(p);
      *</pre>
      *<p>
-     * Type-safe overload of {@link #readValues(JsonParser, ResolvedType)}.
+     * Type-safe overload of {@link #readValues(JsonParser, JavaType)}.
      */
-    @Override
     public <T> MappingIterator<T> readValues(JsonParser p, Class<T> valueType)
         throws IOException, JsonProcessingException
     {
         return readValues(p, _typeFactory.constructType(valueType));
     }
 
-    /**
-     * Method for reading sequence of Objects from parser stream.
-     */
-    @Override
-    public <T> MappingIterator<T> readValues(JsonParser p, TypeReference<?> valueTypeRef)
-        throws IOException, JsonProcessingException
-    {
-        return readValues(p, _typeFactory.constructType(valueTypeRef));
-    }
-    
     /*
     /**********************************************************
     /* Public API not included in ObjectCodec: deserialization
@@ -2550,11 +2502,10 @@ public void writeValue(JsonGenerator g, Object value)
 
     /*
     /**********************************************************
-    /* Public API (from TreeCodec via ObjectCodec): Tree Model support
+    /* Public API: Tree Model support
     /**********************************************************
      */
 
-    @Override
     public void writeTree(JsonGenerator g, TreeNode rootNode)
         throws IOException, JsonProcessingException
     {
@@ -2586,7 +2537,6 @@ public void writeTree(JsonGenerator g, JsonNode rootNode)
      * part of core package, whereas impls are part of mapper
      * package)
      */
-    @Override
     public ObjectNode createObjectNode() {
         return _deserializationConfig.getNodeFactory().objectNode();
     }
@@ -2598,7 +2548,6 @@ public ObjectNode createObjectNode() {
      * part of core package, whereas impls are part of mapper
      * package)
      */
-    @Override
     public ArrayNode createArrayNode() {
         return _deserializationConfig.getNodeFactory().arrayNode();
     }
@@ -2609,7 +2558,6 @@ public ArrayNode createArrayNode() {
      * 
      * @param n Root node of the tree that resulting parser will read from
      */
-    @Override
     public JsonParser treeAsTokens(TreeNode n) {
         DeserializationContext ctxt = createDeserializationContext();
         return new TreeTraversingParser((JsonNode) n, ctxt);
@@ -2625,7 +2573,6 @@ public JsonParser treeAsTokens(TreeNode n) {
      *</pre>
      */
     @SuppressWarnings("unchecked")
-    @Override
     public <T> T treeToValue(TreeNode n, Class<T> valueType)
         throws JsonProcessingException
     {