Minor cleanup wrt StreamWriteConstraints handling

Author: cowtowncoder

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

@@ -381,10 +381,8 @@ protected JsonFactory(JsonFactory src, ObjectCodec codec)
         _inputDecorator = src._inputDecorator;
         _outputDecorator = src._outputDecorator;
         _generatorDecorators = _copy(src._generatorDecorators);
-        _streamReadConstraints = src._streamReadConstraints == null ?
-            StreamReadConstraints.defaults() : src._streamReadConstraints;
-        _streamWriteConstraints = src._streamWriteConstraints == null ?
-                StreamWriteConstraints.defaults() : src._streamWriteConstraints;
+        _streamReadConstraints = Objects.requireNonNull(src._streamReadConstraints);
+        _streamWriteConstraints = Objects.requireNonNull(src._streamWriteConstraints);
 
         // JSON-specific
         _characterEscapes = src._characterEscapes;
@@ -410,10 +408,8 @@ public JsonFactory(JsonFactoryBuilder b) {
         _inputDecorator = b._inputDecorator;
         _outputDecorator = b._outputDecorator;
         _generatorDecorators = _copy(b._generatorDecorators);
-        _streamReadConstraints = b._streamReadConstraints == null ?
-                StreamReadConstraints.defaults() : b._streamReadConstraints;
-        _streamWriteConstraints = b._streamWriteConstraints == null ?
-                StreamWriteConstraints.defaults() : b._streamWriteConstraints;
+        _streamReadConstraints = Objects.requireNonNull(b._streamReadConstraints);
+        _streamWriteConstraints = Objects.requireNonNull(b._streamWriteConstraints);
 
         // JSON-specific
         _characterEscapes = b._characterEscapes;
@@ -439,10 +435,8 @@ protected JsonFactory(TSFBuilder<?,?> b, boolean bogus) {
         _inputDecorator = b._inputDecorator;
         _outputDecorator = b._outputDecorator;
         _generatorDecorators = _copy(b._generatorDecorators);
-        _streamReadConstraints = b._streamReadConstraints == null ?
-                StreamReadConstraints.defaults() : b._streamReadConstraints;
-        _streamWriteConstraints = b._streamWriteConstraints == null ?
-                StreamWriteConstraints.defaults() : b._streamWriteConstraints;
+        _streamReadConstraints = Objects.requireNonNull(b._streamReadConstraints);
+        _streamWriteConstraints = Objects.requireNonNull(b._streamWriteConstraints);
 
         // JSON-specific: need to assign even if not really used
         _characterEscapes = null;

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

@@ -107,21 +107,19 @@ public abstract class TSFBuilder<F extends JsonFactory,
      */
 
     protected TSFBuilder() {
-        _factoryFeatures = DEFAULT_FACTORY_FEATURE_FLAGS;
-        _streamReadFeatures = DEFAULT_PARSER_FEATURE_FLAGS;
-        _streamWriteFeatures = DEFAULT_GENERATOR_FEATURE_FLAGS;
-        _inputDecorator = null;
-        _outputDecorator = null;
-        _generatorDecorators = null;
+        this(DEFAULT_FACTORY_FEATURE_FLAGS,
+                DEFAULT_PARSER_FEATURE_FLAGS,
+                DEFAULT_GENERATOR_FEATURE_FLAGS);
     }
 
     protected TSFBuilder(JsonFactory base)
     {
         this(base._factoryFeatures,
                 base._parserFeatures, base._generatorFeatures);
-        _streamReadConstraints = base._streamReadConstraints;
         _inputDecorator = base._inputDecorator;
         _outputDecorator = base._outputDecorator;
+        _streamReadConstraints = base._streamReadConstraints;
+        _streamWriteConstraints = base._streamWriteConstraints;
         _generatorDecorators = _copy(base._generatorDecorators);
     }
 
@@ -131,6 +129,12 @@ protected TSFBuilder(int factoryFeatures,
         _factoryFeatures = factoryFeatures;
         _streamReadFeatures = parserFeatures;
         _streamWriteFeatures = generatorFeatures;
+
+        _inputDecorator = null;
+        _outputDecorator = null;
+        _streamReadConstraints = StreamReadConstraints.defaults();
+        _streamWriteConstraints = StreamWriteConstraints.defaults();
+        _generatorDecorators = null;
     }
 
     // @since 2.16

src/main/java/com/fasterxml/jackson/core/io/IOContext.java

@@ -63,8 +63,14 @@ public class IOContext
      */
     protected final BufferRecycler _bufferRecycler;
 
+    /**
+     * @since 2.15
+     */
     protected final StreamReadConstraints _streamReadConstraints;
 
+    /**
+     * @since 2.16
+     */
     protected final StreamWriteConstraints _streamWriteConstraints;
 
     /**
@@ -146,6 +152,7 @@ public IOContext(StreamReadConstraints src, StreamWriteConstraints swc, BufferRe
      * @since 2.15
      * @deprecated use v2.16 constructor with additional <code>StreamWriteConstraints</code>
      */
+    @Deprecated
     public IOContext(StreamReadConstraints src, BufferRecycler br,
                      ContentReference contentRef, boolean managedResource)
     {

src/main/java/com/fasterxml/jackson/core/json/JsonGeneratorImpl.java

@@ -47,6 +47,11 @@ public abstract class JsonGeneratorImpl extends GeneratorBase
 
     protected final IOContext _ioContext;
 
+    /**
+     * @since 2.16
+     */
+    protected final StreamWriteConstraints _streamWriteConstraints;
+
     /*
     /**********************************************************
     /* Configuration, output escaping
@@ -120,6 +125,7 @@ public JsonGeneratorImpl(IOContext ctxt, int features, ObjectCodec codec)
     {
         super(features, codec);
         _ioContext = ctxt;
+        _streamWriteConstraints = ctxt.streamWriteConstraints();
         if (Feature.ESCAPE_NON_ASCII.enabledIn(features)) {
             // inlined `setHighestNonEscapedChar()`
             _maximumNonEscapedChar = 127;
@@ -147,7 +153,7 @@ public Version version() {
 
     @Override
     public StreamWriteConstraints streamWriteConstraints() {
-        return _ioContext.streamWriteConstraints();
+        return _streamWriteConstraints;
     }
 
     /*

src/test/java/com/fasterxml/jackson/core/TestVersions.java

@@ -48,6 +48,7 @@ private void assertVersion(Version v)
 
     private IOContext getIOContext() {
         return new IOContext(StreamReadConstraints.defaults(),
+                StreamWriteConstraints.defaults(),
                 new BufferRecycler(), ContentReference.unknown(), false);
     }
 }

src/test/java/com/fasterxml/jackson/core/io/TestMergedStream.java

@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.JsonEncoding;
 import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.core.StreamWriteConstraints;
 import com.fasterxml.jackson.core.util.BufferRecycler;
 
 public class TestMergedStream
@@ -13,6 +14,7 @@ public void testSimple() throws Exception
     {
         BufferRecycler rec = new BufferRecycler();
         IOContext ctxt = new IOContext(StreamReadConstraints.defaults(),
+                StreamWriteConstraints.defaults(),
                 rec, ContentReference.UNKNOWN_CONTENT, false);
         // bit complicated; must use recyclable buffer...
         byte[] first = ctxt.allocReadIOBuffer();

src/test/java/com/fasterxml/jackson/core/util/ReadConstrainedTextBufferTest.java

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.core.util;
 
 import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.core.StreamWriteConstraints;
 import com.fasterxml.jackson.core.io.ContentReference;
 import com.fasterxml.jackson.core.io.IOContext;
 import org.junit.jupiter.api.Assertions;
@@ -45,6 +46,7 @@ private static TextBuffer makeConstrainedBuffer(int maxStringLen) {
                 .build();
         IOContext ioContext = new IOContext(
                 constraints,
+                StreamWriteConstraints.defaults(),
                 new BufferRecycler(),
                 ContentReference.rawReference("N/A"), true);
         return ioContext.constructReadConstrainedTextBuffer();