Sync with 2.16 core wrt generator/IOContext

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORGenerator.java

@@ -178,8 +178,6 @@ public int getMask() {
     /**********************************************************
      */
 
-    protected final  IOContext _ioContext;
-
     /**
      * @since 2.16
      */
@@ -286,9 +284,9 @@ public int getMask() {
     /**********************************************************
      */
 
-    public CBORGenerator(IOContext ctxt, int stdFeatures, int formatFeatures,
+    public CBORGenerator(IOContext ioCtxt, int stdFeatures, int formatFeatures,
             ObjectCodec codec, OutputStream out) {
-        super(stdFeatures, codec, /* Write Context */ null);
+        super(stdFeatures, codec, ioCtxt, /* Write Context */ null);
         DupDetector dups = JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION.enabledIn(stdFeatures)
                 ? DupDetector.rootDetector(this)
                 : null;
@@ -297,14 +295,13 @@ public CBORGenerator(IOContext ctxt, int stdFeatures, int formatFeatures,
         _formatFeatures = formatFeatures;
         _cfgMinimalInts = Feature.WRITE_MINIMAL_INTS.enabledIn(formatFeatures);
         _cfgMinimalDoubles = Feature.WRITE_MINIMAL_DOUBLES.enabledIn(formatFeatures);
-        _ioContext = ctxt;
-        _streamWriteConstraints = ctxt.streamWriteConstraints();
+        _streamWriteConstraints = ioCtxt.streamWriteConstraints();
         _out = out;
         _bufferRecyclable = true;
         _stringRefs = Feature.STRINGREF.enabledIn(formatFeatures) ? new HashMap<>() : null;
-        _outputBuffer = ctxt.allocWriteEncodingBuffer(BYTE_BUFFER_FOR_OUTPUT);
+        _outputBuffer = ioCtxt.allocWriteEncodingBuffer(BYTE_BUFFER_FOR_OUTPUT);
         _outputEnd = _outputBuffer.length;
-        _charBuffer = ctxt.allocConcatBuffer();
+        _charBuffer = ioCtxt.allocConcatBuffer();
         _charBufferLength = _charBuffer.length;
         // let's just sanity check to prevent nasty odd errors
         if (_outputEnd < MIN_BUFFER_LENGTH) {
@@ -323,10 +320,10 @@ public CBORGenerator(IOContext ctxt, int stdFeatures, int formatFeatures,
      *            Offset pointing past already buffered content; that is, number
      *            of bytes of valid content to output, within buffer.
      */
-    public CBORGenerator(IOContext ctxt, int stdFeatures, int formatFeatures,
+    public CBORGenerator(IOContext ioCtxt, int stdFeatures, int formatFeatures,
             ObjectCodec codec, OutputStream out, byte[] outputBuffer,
             int offset, boolean bufferRecyclable) {
-        super(stdFeatures, codec, /* Write Context */ null);
+        super(stdFeatures, codec, ioCtxt, /* Write Context */ null);
         DupDetector dups = JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION.enabledIn(stdFeatures)
                 ? DupDetector.rootDetector(this)
                 : null;
@@ -335,15 +332,14 @@ public CBORGenerator(IOContext ctxt, int stdFeatures, int formatFeatures,
         _formatFeatures = formatFeatures;
         _cfgMinimalInts = Feature.WRITE_MINIMAL_INTS.enabledIn(formatFeatures);
         _cfgMinimalDoubles = Feature.WRITE_MINIMAL_DOUBLES.enabledIn(formatFeatures);
-        _ioContext = ctxt;
-        _streamWriteConstraints = ctxt.streamWriteConstraints();
+        _streamWriteConstraints = ioCtxt.streamWriteConstraints();
         _out = out;
         _bufferRecyclable = bufferRecyclable;
         _outputTail = offset;
         _outputBuffer = outputBuffer;
         _stringRefs = Feature.STRINGREF.enabledIn(formatFeatures) ? new HashMap<>() : null;
         _outputEnd = _outputBuffer.length;
-        _charBuffer = ctxt.allocConcatBuffer();
+        _charBuffer = ioCtxt.allocConcatBuffer();
         _charBufferLength = _charBuffer.length;
         // let's just sanity check to prevent nasty odd errors
         if (_outputEnd < MIN_BUFFER_LENGTH) {

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

@@ -183,8 +183,6 @@ public SharedStringNode(String value, int index, SharedStringNode next)
     /**********************************************************
      */
 
-    protected final IOContext _ioContext;
-
     /**
      * @since 2.16
      */
@@ -301,22 +299,21 @@ public SharedStringNode(String value, int index, SharedStringNode next)
     /**********************************************************
      */
 
-    public SmileGenerator(IOContext ctxt, int stdFeatures, int smileFeatures,
+    public SmileGenerator(IOContext ioCtxt, int stdFeatures, int smileFeatures,
             ObjectCodec codec, OutputStream out)
     {
-        super(stdFeatures, codec, /*WriteContext*/ null);
+        super(stdFeatures, codec, ioCtxt, /*WriteContext*/ null);
         DupDetector dups = JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION.enabledIn(stdFeatures)
                 ? DupDetector.rootDetector(this)
                 : null;
                 // NOTE: we passed `null` for default write context
         _streamWriteContext = SmileWriteContext.createRootContext(dups);
         _formatFeatures = smileFeatures;
-        _ioContext = ctxt;
-        _streamWriteConstraints = ctxt.streamWriteConstraints();
+        _streamWriteConstraints = ioCtxt.streamWriteConstraints();
         _smileBufferRecycler = _smileBufferRecycler();
         _out = out;
         _bufferRecyclable = true;
-        _outputBuffer = ctxt.allocWriteEncodingBuffer();
+        _outputBuffer = ioCtxt.allocWriteEncodingBuffer();
         _outputEnd = _outputBuffer.length;
         // let's just sanity check to prevent nasty odd errors
         if (_outputEnd < MIN_BUFFER_LENGTH) {
@@ -347,19 +344,18 @@ public SmileGenerator(IOContext ctxt, int stdFeatures, int smileFeatures,
         }
     }
 
-    public SmileGenerator(IOContext ctxt, int stdFeatures, int smileFeatures,
+    public SmileGenerator(IOContext ioCtxt, int stdFeatures, int smileFeatures,
             ObjectCodec codec, OutputStream out, byte[] outputBuffer, int offset,
             boolean bufferRecyclable)
     {
-        super(stdFeatures, codec, null);
+        super(stdFeatures, codec, ioCtxt, null);
         DupDetector dups = JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION.enabledIn(stdFeatures)
                 ? DupDetector.rootDetector(this)
                 : null;
                 // NOTE: we passed `null` for default write context
         _streamWriteContext = SmileWriteContext.createRootContext(dups);
         _formatFeatures = smileFeatures;
-        _ioContext = ctxt;
-        _streamWriteConstraints = ctxt.streamWriteConstraints();
+        _streamWriteConstraints = ioCtxt.streamWriteConstraints();
         _smileBufferRecycler = _smileBufferRecycler();
         _out = out;
         _bufferRecyclable = bufferRecyclable;