Fix #2989 (redirect TokenBuffer construction to allow overrides)

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -12,6 +12,8 @@ Project: jackson-databind
 #2828: Add `DatabindException` as intermediate subtype of `JsonMappingException`
 #2900: Jackson does not support deserializing new Java 9 unmodifiable collections
  (reported by Daniel H)
+#2989: Allocate TokenBuffer instance via context objects (to allow format-specific
+  buffer types)
 #3001: Add mechanism for setting default `ContextAttributes` for `ObjectMapper`
 #3002: Add `DeserializationContext.readTreeAsValue()` methods for more convenient
   conversions for deserializers to use

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java

@@ -733,7 +733,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
                 continue;
             }
             // Need to copy to a separate buffer first
-            TokenBuffer b2 = TokenBuffer.asCopyOfValue(p);
+            TokenBuffer b2 = ctxt.bufferAsCopyOfValue(p);
             tokens.writeFieldName(propName);
             tokens.append(b2);
             try {
@@ -789,7 +789,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
                 tokens.copyCurrentStructure(p);
             } else {
                 // Need to copy to a separate buffer first
-                TokenBuffer b2 = TokenBuffer.asCopyOfValue(p);
+                TokenBuffer b2 = ctxt.bufferAsCopyOfValue(p);
                 tokens.writeFieldName(propName);
                 tokens.append(b2);
                 try {
@@ -888,7 +888,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
                 tokens.copyCurrentStructure(p);
             } else {
                 // Need to copy to a separate buffer first
-                TokenBuffer b2 = TokenBuffer.asCopyOfValue(p);
+                TokenBuffer b2 = ctxt.bufferAsCopyOfValue(p);
                 tokens.writeFieldName(propName);
                 tokens.append(b2);
                 try {

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

@@ -35,10 +35,6 @@ public LogicalType logicalType() {
     @Override
     @SuppressWarnings("resource")
     public TokenBuffer deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        return createBufferInstance(p).deserialize(p, ctxt);
+        return ctxt.bufferForInputBuffering(p).deserialize(p, ctxt);
     }
-
-    protected TokenBuffer createBufferInstance(JsonParser p) {
-        return new TokenBuffer(p);
-    }
-}
+}

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

@@ -103,7 +103,7 @@ protected Object _deserialize(JsonParser p, DeserializationContext ctxt) throws
                 && !_usesExternalId()
                 && p.hasToken(JsonToken.START_OBJECT)) {
             // but what if there's nowhere to add it in? Error? Or skip? For now, skip.
-            TokenBuffer tb = new TokenBuffer(null, false);
+            TokenBuffer tb = ctxt.bufferForInputBuffering(p);
             tb.writeStartObject(); // recreate START_OBJECT
             tb.writeFieldName(_typePropertyName);
             tb.writeString(typeId);

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

@@ -123,7 +123,7 @@ public Object deserializeTypedFromObject(JsonParser p, DeserializationContext ct
         // Keep track of processed tokens as we must rewind once after deducing
         // the deserializer to use
         @SuppressWarnings("resource")
-        TokenBuffer tb = new TokenBuffer(p, ctxt);
+        final TokenBuffer tb = ctxt.bufferForInputBuffering(p);
         boolean ignoreCase = ctxt.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES);
 
         for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) {

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

@@ -107,7 +107,7 @@ public Object deserializeTypedFromObject(JsonParser p, DeserializationContext ct
                 return _deserializeTypedForId(p, ctxt, tb, p.getText());
             }
             if (tb == null) {
-                tb = new TokenBuffer(p, ctxt);
+                tb = ctxt.bufferForInputBuffering(p);
             }
             tb.writeFieldName(name);
             tb.copyCurrentStructure(p);
@@ -120,7 +120,7 @@ protected Object _deserializeTypedForId(JsonParser p, DeserializationContext ctx
         JsonDeserializer<Object> deser = _findDeserializer(ctxt, typeId);
         if (_typeIdVisible) { // need to merge id back in JSON input?
             if (tb == null) {
-                tb = new TokenBuffer(p, ctxt);
+                tb = ctxt.bufferForInputBuffering(p);
             }
             tb.writeFieldName(p.currentName());
             tb.writeString(typeId);

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

@@ -107,7 +107,7 @@ protected Object _deserialize(JsonParser p, DeserializationContext ctxt) throws
         // Minor complication: we may need to merge type id in?
         if (_typeIdVisible && p.hasToken(JsonToken.START_OBJECT)) {
             // but what if there's nowhere to add it in? Error? Or skip? For now, skip.
-            TokenBuffer tb = new TokenBuffer(null, false);
+            TokenBuffer tb = ctxt.bufferForInputBuffering(p);
             tb.writeStartObject(); // recreate START_OBJECT
             tb.writeFieldName(_typePropertyName);
             tb.writeString(typeId);

src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java

@@ -191,7 +191,10 @@ public TokenBuffer(JsonParser p, DeserializationContext ctxt)
      *</pre>
      *
      * @since 2.9
+     *
+     * @deprecated Since 2.13: use {@link DeserializationContext#bufferAsCopyOfValue} instead.
      */
+    @Deprecated // since 2.13
     public static TokenBuffer asCopyOfValue(JsonParser p) throws IOException {
         TokenBuffer b = new TokenBuffer(p);
         b.copyCurrentStructure(p);
@@ -488,10 +491,9 @@ public TokenBuffer deserialize(JsonParser p, DeserializationContext ctxt) throws
             copyCurrentStructure(p);
             return this;
         }
-        /* 28-Oct-2014, tatu: As per [databind#592], need to support a special case of starting from
-         *    FIELD_NAME, which is taken to mean that we are missing START_OBJECT, but need
-         *    to assume one did exist.
-         */
+        // 28-Oct-2014, tatu: As per [databind#592], need to support a special case of starting from
+        //    FIELD_NAME, which is taken to mean that we are missing START_OBJECT, but need
+        //    to assume one did exist.
         JsonToken t;
         writeStartObject();
         do {

src/test/java/com/fasterxml/jackson/databind/introspect/IntrospectorPairTest.java

@@ -657,9 +657,9 @@ public ReadableInjectedBean(@JacksonInject(useInput = OptBoolean.FALSE) Unreadab
             this.injectBean = injectBean;
         }
         @JsonProperty
-        private String foo;
+        String foo;
         @JsonIgnore
-        private UnreadableBean injectBean;
+        UnreadableBean injectBean;
     }
 
     static class UnreadableInjectedBean {
@@ -688,7 +688,7 @@ public void testMergingIntrospectorsForInjection() throws Exception {
 
         boolean successReadingUnreadableInjectedBean;
         try {
-            UnreadableInjectedBean noBean = mapper.readValue("{\"foo\": \"bob\"}", UnreadableInjectedBean.class);
+            /*UnreadableInjectedBean noBean =*/ mapper.readValue("{\"foo\": \"bob\"}", UnreadableInjectedBean.class);
             successReadingUnreadableInjectedBean = true;
         } catch (JsonMappingException e) {
             successReadingUnreadableInjectedBean = false;

src/test/java/com/fasterxml/jackson/databind/misc/ParsingContext2525Test.java

@@ -70,8 +70,10 @@ private TokenBuffer _readAsTokenBuffer(String doc) throws IOException
     {
         try (JsonParser p = MAPPER.createParser(doc)) {
             p.nextToken();
-            return TokenBuffer.asCopyOfValue(p)
-                    .overrideParentContext(null);
+            try (TokenBuffer tb = new TokenBuffer(p, null)) {
+                tb.copyCurrentStructure(p);
+                return tb.overrideParentContext(null);
+            }
         }
     }