Fix #1114: make BufferRecyclerPool generic (#1115)

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/core/JsonFactory.java

@@ -262,7 +262,7 @@ public static int collectDefaults() {
     /**
      * @since 2.16
      */
-    protected BufferRecyclerPool _bufferRecyclerPool;
+    protected BufferRecyclerPool<BufferRecycler> _bufferRecyclerPool;
 
     /**
      * Object that implements conversion functionality between
@@ -368,7 +368,7 @@ public static int collectDefaults() {
     public JsonFactory() { this((ObjectCodec) null); }
 
     public JsonFactory(ObjectCodec oc) {
-        _bufferRecyclerPool = BufferRecyclerPool.defaultPool();
+        _bufferRecyclerPool = JsonBufferRecyclers.defaultPool();
         _objectCodec = oc;
         _quoteChar = DEFAULT_QUOTE_CHAR;
         _streamReadConstraints = StreamReadConstraints.defaults();
@@ -1152,7 +1152,7 @@ public String getRootValueSeparator() {
     /**********************************************************
      */
 
-    public JsonFactory setBufferRecyclerPool(BufferRecyclerPool p) {
+    public JsonFactory setBufferRecyclerPool(BufferRecyclerPool<BufferRecycler> p) {
         _bufferRecyclerPool = Objects.requireNonNull(p);
         return this;
     }
@@ -2150,7 +2150,7 @@ protected JsonGenerator _decorate(JsonGenerator g) {
      */
     public BufferRecycler _getBufferRecycler()
     {
-        return _getBufferRecyclerPool().acquireAndLinkBufferRecycler();
+        return _getBufferRecyclerPool().acquireAndLinkPooled();
     }
 
     /**
@@ -2159,12 +2159,12 @@ public BufferRecycler _getBufferRecycler()
      *
      * @since 2.16
      */
-    public BufferRecyclerPool _getBufferRecyclerPool() {
+    public BufferRecyclerPool<BufferRecycler> _getBufferRecyclerPool() {
         // 23-Apr-2015, tatu: Let's allow disabling of buffer recycling
         //   scheme, for cases where it is considered harmful (possibly
         //   on Android, for example)
         if (!Feature.USE_THREAD_LOCAL_FOR_BUFFER_RECYCLING.enabledIn(_factoryFeatures)) {
-            return BufferRecyclerPool.nonRecyclingPool();
+            return JsonBufferRecyclers.nonRecyclingPool();
         }
         return _bufferRecyclerPool;
     }

src/main/java/com/fasterxml/jackson/core/TSFBuilder.java

@@ -8,7 +8,9 @@
 import com.fasterxml.jackson.core.io.OutputDecorator;
 import com.fasterxml.jackson.core.json.JsonReadFeature;
 import com.fasterxml.jackson.core.json.JsonWriteFeature;
+import com.fasterxml.jackson.core.util.BufferRecycler;
 import com.fasterxml.jackson.core.util.BufferRecyclerPool;
+import com.fasterxml.jackson.core.util.JsonBufferRecyclers;
 import com.fasterxml.jackson.core.util.JsonGeneratorDecorator;
 
 /**
@@ -74,7 +76,7 @@ public abstract class TSFBuilder<F extends JsonFactory,
     /**
      * @since 2.16
      */
-    protected BufferRecyclerPool _bufferRecyclerPool;
+    protected BufferRecyclerPool<BufferRecycler> _bufferRecyclerPool;
 
     /**
      * Optional helper object that may decorate input sources, to do
@@ -141,7 +143,7 @@ protected TSFBuilder(JsonFactory base)
     protected TSFBuilder(int factoryFeatures,
             int parserFeatures, int generatorFeatures)
     {
-        _bufferRecyclerPool = BufferRecyclerPool.defaultPool();
+        _bufferRecyclerPool = JsonBufferRecyclers.defaultPool();
 
         _factoryFeatures = factoryFeatures;
         _streamReadFeatures = parserFeatures;
@@ -169,7 +171,7 @@ protected static <T> List<T> _copy(List<T> src) {
     public int streamReadFeatures() { return _streamReadFeatures; }
     public int streamWriteFeatures() { return _streamWriteFeatures; }
 
-    public BufferRecyclerPool bufferRecyclerPool() {
+    public BufferRecyclerPool<BufferRecycler> bufferRecyclerPool() {
         return _bufferRecyclerPool;
     }
 
@@ -321,7 +323,7 @@ public B configure(JsonWriteFeature f, boolean state) {
      *
      * @since 2.16
      */
-    public B bufferRecyclerPool(BufferRecyclerPool p) {
+    public B bufferRecyclerPool(BufferRecyclerPool<BufferRecycler> p) {
         _bufferRecyclerPool = Objects.requireNonNull(p);
         return _this();
     }

src/main/java/com/fasterxml/jackson/core/util/BufferRecycler.java

@@ -18,6 +18,7 @@
  * Rewritten in 2.16 to work with {@link BufferRecyclerPool} abstraction.
  */
 public class BufferRecycler
+    implements BufferRecyclerPool.WithPool<BufferRecycler>
 {
     /**
      * Buffer used for reading byte-based input.
@@ -86,7 +87,7 @@ public class BufferRecycler
     // Note: changed from simple array in 2.10:
     protected final AtomicReferenceArray<char[]> _charBuffers;
 
-    private BufferRecyclerPool _pool;
+    private BufferRecyclerPool<BufferRecycler> _pool;
 
     /*
     /**********************************************************
@@ -202,7 +203,8 @@ protected int charBufferLength(int ix) {
      *
      * @since 2.16
      */
-    BufferRecycler withPool(BufferRecyclerPool pool) {
+    @Override
+    public BufferRecycler withPool(BufferRecyclerPool<BufferRecycler> pool) {
         if (this._pool != null) {
             throw new IllegalStateException("BufferRecycler already linked to pool: "+pool);
         }
@@ -220,11 +222,11 @@ BufferRecycler withPool(BufferRecyclerPool pool) {
      */
     public void release() {
         if (_pool != null) {
-            BufferRecyclerPool tmpPool = _pool;
+            BufferRecyclerPool<BufferRecycler> tmpPool = _pool;
             // nullify the reference to the pool in order to avoid the risk of releasing
             // the same BufferRecycler more than once, thus compromising the pool integrity
             _pool = null;
-            tmpPool.releaseBufferRecycler(this);
+            tmpPool.releasePooled(this);
         }
     }
 }