Changes to sync with core/1304 (StreamReadConstraints refactoring)

FasterXML · Jun 13, 2024 · c2af857 · c2af857
1 parent 93ab77a
commit c2af857
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 30 deletions.
diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java
@@ -4,6 +4,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.LinkedHashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import com.fasterxml.jackson.core.*;
@@ -315,11 +316,6 @@ private Feature(boolean defaultState) {
      */
     protected ObjectCodec _objectCodec;
 
-    /**
-     * @since 2.15
-     */
-    protected final StreamReadConstraints _streamReadConstraints;
-
     /**
      * @since 2.16
      */
@@ -433,29 +429,21 @@ private Feature(boolean defaultState) {
     public CsvParser(IOContext ctxt, int stdFeatures, int csvFeatures,
                      ObjectCodec codec, Reader reader)
     {
-        super(stdFeatures);
-        if (reader == null) {
-            throw new IllegalArgumentException("Can not pass `null` as `java.io.Reader` to read from");
-        }
+        super(stdFeatures, ctxt.streamReadConstraints());
+        Objects.requireNonNull(reader, "Can not pass `null` as `java.io.Reader` to read from");
         _objectCodec = codec;
         _ioContext = ctxt;
-        _streamReadConstraints = ctxt.streamReadConstraints();
-        _textBuffer = ctxt.constructReadConstrainedTextBuffer();
+        _formatFeatures = csvFeatures;
         DupDetector dups = JsonParser.Feature.STRICT_DUPLICATE_DETECTION.enabledIn(stdFeatures)
                 ? DupDetector.rootDetector(this) : null;
-        _formatFeatures = csvFeatures;
         _parsingContext = JsonReadContext.createRootContext(dups);
+        _textBuffer = ctxt.constructReadConstrainedTextBuffer();
         _reader = new CsvDecoder(this, ctxt, reader, _schema, _textBuffer,
                 stdFeatures, csvFeatures);
         _cfgEmptyStringAsNull = CsvParser.Feature.EMPTY_STRING_AS_NULL.enabledIn(csvFeatures);
         _cfgEmptyUnquotedStringAsNull = Feature.EMPTY_UNQUOTED_STRING_AS_NULL.enabledIn(csvFeatures);
     }
 
-    @Override
-    public StreamReadConstraints streamReadConstraints() {
-        return _streamReadConstraints;
-    }
-
     /*
     /**********************************************************
     /* Versioned                                                                             

diff --git a/properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java b/properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java
@@ -41,11 +41,6 @@ public class JavaPropsParser extends ParserMinimalBase
      */
     protected ObjectCodec _objectCodec;
 
-    /**
-     * @since 2.15
-     */
-    protected final StreamReadConstraints _streamReadConstraints;
-
     /**
      * @since 2.16
      */
@@ -105,19 +100,13 @@ public JavaPropsParser(IOContext ctxt, Object inputSource,
     public JavaPropsParser(IOContext ctxt, int parserFeatures, Object inputSource,
             ObjectCodec codec, Map<?,?> sourceMap)
     {
-        super(parserFeatures);
+        super(parserFeatures, ctxt.streamReadConstraints());
         _ioContext = ctxt;
-        _streamReadConstraints = ctxt.streamReadConstraints();
         _objectCodec = codec;
         _inputSource = inputSource;
         _sourceContent = sourceMap;
     }
 
-    @Override
-    public StreamReadConstraints streamReadConstraints() {
-        return _streamReadConstraints;
-    }
-
     @Override
     public Version version() {
         return PackageVersion.VERSION;
@@ -255,7 +244,7 @@ public JsonToken nextToken() throws IOException {
             if (_readContext == null) { // end of content
                 return null;
             }
-            _streamReadConstraints.validateNestingDepth(_readContext.getNestingDepth());
+            streamReadConstraints().validateNestingDepth(_readContext.getNestingDepth());
         }
         return _currToken;
     }