more work for #2989

Author: cowtowncoder

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

@@ -516,6 +516,56 @@ public CoercionAction findCoercionFromBlankString(LogicalType targetType,
         return _config.findCoercionFromBlankString(targetType, targetClass, actionIfBlankNotAllowed);
     }
 
+    /*
+    /**********************************************************************
+    /* Factory methods for getting appropriate TokenBuffer instances
+    /* (possibly overridden by backends for alternate data formats)
+    /**********************************************************************
+     */
+
+    /**
+     * Factory method used for creating {@link TokenBuffer} to temporarily
+     * contain copy of content read from specified parser; usually for purpose
+     * of reading contents later on (possibly augmeneted with injected additional
+     * content)
+     *
+     * @since 2.13
+     */
+    public TokenBuffer bufferForInputBuffering(JsonParser p) {
+        return new TokenBuffer(p, this);
+    }
+
+    /**
+     * Convenience method that is equivalent to:
+     *<pre>
+     *   ctxt.bufferForInputBuffering(ctxt.getParser());
+     *</pre>
+     */
+    public final TokenBuffer bufferForInputBuffering() {
+        return bufferForInputBuffering(getParser());
+    }
+
+    /**
+     * Convenience method, equivalent to:
+     *<pre>
+     * TokenBuffer buffer = ctxt.bufferForInputBuffering(parser);
+     * buffer.copyCurrentStructure(parser);
+     * return buffer;
+     *</pre>
+     *<p>
+     * NOTE: the whole "current value" that parser points to is read and
+     * buffered, including Object and Array values (if parser pointing to
+     * start marker).
+     *
+     * @since 2.9
+     */
+    public TokenBuffer bufferAsCopyOfValue(JsonParser p) throws IOException
+    {
+        TokenBuffer buf = bufferForInputBuffering(p);
+        buf.copyCurrentStructure(p);
+        return buf;
+    }
+
     /*
     /**********************************************************
     /* Public API, pass-through to DeserializerCache

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

@@ -464,27 +464,26 @@ public JsonGenerator getGenerator() {
     /*
     /**********************************************************************
     /* Factory methods for getting appropriate TokenBuffer instances
-    /* (possibly overridden based on backend data format)
+    /* (possibly overridden by backends for alternate data formats)
     /**********************************************************************
      */
 
     /**
      * Specialized factory method used when we are converting values and do not
      * typically have or use "real" parsers or generators.
      *
-     * @since 3.0
+     * @since 2.13
      */
     public TokenBuffer bufferForValueConversion(ObjectCodec oc) {
         // false -> no native type/object ids
         return new TokenBuffer(oc, false);
     }
 
-
     /**
      * Specialized factory method used when we are converting values and do not
      * typically have or use "real" parsers or generators.
      *
-     * @since 3.0
+     * @since 2.13
      */
     public final TokenBuffer bufferForValueConversion() {
         return bufferForValueConversion(null);

src/main/java/com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler.java

@@ -155,9 +155,7 @@ public boolean handlePropertyValue(JsonParser p, DeserializationContext ctxt,
                     _typeIds[it.next()] = typeId;
                 }
             } else {
-                @SuppressWarnings("resource")
-                TokenBuffer tokens = new TokenBuffer(p, ctxt);
-                tokens.copyCurrentStructure(p);
+                TokenBuffer tokens = ctxt.bufferAsCopyOfValue(p);
                 _tokens[index] = tokens;
                 while (it.hasNext()) {
                     _tokens[it.next()] = tokens;
@@ -179,8 +177,7 @@ public boolean handlePropertyValue(JsonParser p, DeserializationContext ctxt,
             canDeserialize = (bean != null) && (_tokens[index] != null);
         } else {
             @SuppressWarnings("resource")
-            TokenBuffer tokens = new TokenBuffer(p, ctxt);
-            tokens.copyCurrentStructure(p);
+            TokenBuffer tokens = ctxt.bufferAsCopyOfValue(p);
             _tokens[index] = tokens;
             canDeserialize = (bean != null) && (_typeIds[index] != null);
         }
@@ -317,7 +314,7 @@ public Object complete(JsonParser p, DeserializationContext ctxt,
                     if (typeProp.getType().hasRawClass(String.class)) {
                         v = typeId;
                     } else {
-                        TokenBuffer tb = new TokenBuffer(p, ctxt);
+                        TokenBuffer tb = ctxt.bufferForInputBuffering(p);
                         tb.writeString(typeId);
                         v = typeProp.getValueDeserializer().deserialize(tb.asParserOnFirstToken(), ctxt);
                         tb.close();
@@ -347,7 +344,7 @@ protected final Object _deserialize(JsonParser p, DeserializationContext ctxt,
         if (t == JsonToken.VALUE_NULL) {
             return null;
         }
-        TokenBuffer merged = new TokenBuffer(p, ctxt);
+        TokenBuffer merged = ctxt.bufferForInputBuffering(p);
         merged.writeStartArray();
         merged.writeString(typeId);
         merged.copyCurrentStructure(p2);
@@ -377,7 +374,7 @@ protected final void _deserializeAndSet(JsonParser p, DeserializationContext ctx
             _properties[index].getProperty().set(bean, null);
             return;
         }
-        TokenBuffer merged = new TokenBuffer(p, ctxt);
+        TokenBuffer merged = ctxt.bufferForInputBuffering(p);
         merged.writeStartArray();
         merged.writeString(typeId);
 

src/main/java/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.java

@@ -334,7 +334,7 @@ public final Object deserializeKey(String key, DeserializationContext ctxt)
             if (key == null) { // is this even legal call?
                 return null;
             }
-            TokenBuffer tb = new TokenBuffer(ctxt.getParser(), ctxt);
+            TokenBuffer tb = ctxt.bufferForInputBuffering();
             tb.writeString(key);
             try {
                 // Ugh... should not have to give parser which may or may not be correct one...