Part 2 of implementing #393 (#395)

Author: cowtowncoder

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.dataformat.smile;
 
 import java.io.*;
+import java.lang.ref.SoftReference;
 import java.net.URL;
 
 import com.fasterxml.jackson.core.*;
@@ -72,6 +73,19 @@ public class SmileFactory extends JsonFactory
     protected int _smileParserFeatures;
     protected int _smileGeneratorFeatures;
 
+    /*
+    /**********************************************************
+    /* Smile-specific buffer recycling (moved here in 2.16)
+    /**********************************************************
+    
+    /**
+     * This <code>ThreadLocal</code> contains a {@link java.lang.ref.SoftReference}
+     * to a buffer recycler used to provide a low-cost
+     * buffer recycling for Smile-specific buffers.
+     */
+    final protected static ThreadLocal<SoftReference<SmileBufferRecycler>> _smileRecyclerRef
+        = new ThreadLocal<SoftReference<SmileBufferRecycler>>();
+    
     /*
     /**********************************************************
     /* Factory construction, configuration
@@ -509,7 +523,8 @@ protected SmileGenerator _createGenerator(OutputStream out, IOContext ctxt) thro
          * But should we force writing, or throw exception, if settings are in conflict?
          * For now, let's error out...
          */
-        SmileGenerator gen = new SmileGenerator(ctxt, _generatorFeatures, feats, _objectCodec, out);
+        SmileGenerator gen = new SmileGenerator(ctxt, _generatorFeatures, feats, _objectCodec, out,
+                _smileBufferRecycler());
         if ((feats & SmileGenerator.Feature.WRITE_HEADER.getMask()) != 0) {
             gen.writeHeader();
         } else {
@@ -528,4 +543,16 @@ protected SmileGenerator _createGenerator(OutputStream out, IOContext ctxt) thro
         }
         return gen;
     }
+
+    protected final static SmileBufferRecycler _smileBufferRecycler()
+    {
+        SoftReference<SmileBufferRecycler> ref = _smileRecyclerRef.get();
+        SmileBufferRecycler br = (ref == null) ? null : ref.get();
+
+        if (br == null) {
+            br = new SmileBufferRecycler();
+            _smileRecyclerRef.set(new SoftReference<SmileBufferRecycler>(br));
+        }
+        return br;
+    }
 }

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java

@@ -1,7 +1,6 @@
 package com.fasterxml.jackson.dataformat.smile;
 
 import java.io.*;
-import java.lang.ref.SoftReference;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
@@ -281,26 +280,16 @@ public SharedStringNode(String value, int index, SharedStringNode next)
 
     /*
     /**********************************************************************
-    /* Thread-local recycling
+    /* Life-cycle
     /**********************************************************************
      */
 
     /**
-     * This <code>ThreadLocal</code> contains a {@link java.lang.ref.SoftReference}
-     * to a buffer recycler used to provide a low-cost
-     * buffer recycling for Smile-specific buffers.
-     */
-    final protected static ThreadLocal<SoftReference<SmileBufferRecycler>> _smileRecyclerRef
-        = new ThreadLocal<SoftReference<SmileBufferRecycler>>();
-
-    /*
-    /**********************************************************************
-    /* Life-cycle
-    /**********************************************************************
+     * @since 2.16
      */
-
     public SmileGenerator(IOContext ioCtxt, int stdFeatures, int smileFeatures,
-            ObjectCodec codec, OutputStream out)
+            ObjectCodec codec, OutputStream out,
+            SmileBufferRecycler sbr)
     {
         super(stdFeatures, codec, ioCtxt, /*WriteContext*/ null);
         DupDetector dups = JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION.enabledIn(stdFeatures)
@@ -310,7 +299,7 @@ public SmileGenerator(IOContext ioCtxt, int stdFeatures, int smileFeatures,
         _streamWriteContext = SmileWriteContext.createRootContext(dups);
         _formatFeatures = smileFeatures;
         _streamWriteConstraints = ioCtxt.streamWriteConstraints();
-        _smileBufferRecycler = _smileBufferRecycler();
+        _smileBufferRecycler = sbr;
         _out = out;
         _bufferRecyclable = true;
         _outputBuffer = ioCtxt.allocWriteEncodingBuffer();
@@ -344,9 +333,13 @@ public SmileGenerator(IOContext ioCtxt, int stdFeatures, int smileFeatures,
         }
     }
 
+    /**
+     * @since 2.16
+     */
     public SmileGenerator(IOContext ioCtxt, int stdFeatures, int smileFeatures,
-            ObjectCodec codec, OutputStream out, byte[] outputBuffer, int offset,
-            boolean bufferRecyclable)
+            ObjectCodec codec, OutputStream out,
+            SmileBufferRecycler sbr,
+            byte[] outputBuffer, int offset, boolean bufferRecyclable)
     {
         super(stdFeatures, codec, ioCtxt, null);
         DupDetector dups = JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION.enabledIn(stdFeatures)
@@ -356,7 +349,7 @@ public SmileGenerator(IOContext ioCtxt, int stdFeatures, int smileFeatures,
         _streamWriteContext = SmileWriteContext.createRootContext(dups);
         _formatFeatures = smileFeatures;
         _streamWriteConstraints = ioCtxt.streamWriteConstraints();
-        _smileBufferRecycler = _smileBufferRecycler();
+        _smileBufferRecycler = sbr;
         _out = out;
         _bufferRecyclable = bufferRecyclable;
         _outputTail = offset;
@@ -391,6 +384,29 @@ public SmileGenerator(IOContext ioCtxt, int stdFeatures, int smileFeatures,
         }
     }
 
+    /**
+     * @deprecated Since 2.16
+     */
+    @Deprecated // @since 2.16
+    public SmileGenerator(IOContext ioCtxt, int stdFeatures, int smileFeatures,
+            ObjectCodec codec, OutputStream out)
+    {
+        this(ioCtxt, stdFeatures, smileFeatures, codec, out, new SmileBufferRecycler());
+    }
+
+    /**
+     * @deprecated Since 2.16
+     */
+    @Deprecated // @since 2.16
+    public SmileGenerator(IOContext ioCtxt, int stdFeatures, int smileFeatures,
+            ObjectCodec codec, OutputStream out,
+            byte[] outputBuffer, int offset, boolean bufferRecyclable)
+    {
+        this(ioCtxt, stdFeatures, smileFeatures,
+                codec, out, new SmileBufferRecycler(),
+                outputBuffer, offset, bufferRecyclable);
+    }
+
     /**
      * Method that can be called to explicitly write Smile document header.
      * Note that usually you do not need to call this for first document to output,
@@ -413,18 +429,6 @@ public void writeHeader() throws IOException
         _writeBytes(HEADER_BYTE_1, HEADER_BYTE_2, HEADER_BYTE_3, (byte) last);
     }
 
-    protected final static SmileBufferRecycler _smileBufferRecycler()
-    {
-        SoftReference<SmileBufferRecycler> ref = _smileRecyclerRef.get();
-        SmileBufferRecycler br = (ref == null) ? null : ref.get();
-
-        if (br == null) {
-            br = new SmileBufferRecycler();
-            _smileRecyclerRef.set(new SoftReference<SmileBufferRecycler>(br));
-        }
-        return br;
-    }
-
     /*
     /**********************************************************
     /* Versioned

smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileFactoryPropertiesTest.java

@@ -3,8 +3,6 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.IOContext;
-import com.fasterxml.jackson.core.io.ContentReference;
 import com.fasterxml.jackson.dataformat.smile.async.NonBlockingByteArrayParser;
 
 import static org.junit.Assert.assertArrayEquals;