Minor tweaking for ErrorReportConfiguration handling

Author: cowtowncoder

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

@@ -285,9 +285,8 @@ public static int collectDefaults() {
     protected StreamReadConstraints _streamReadConstraints;
 
     /**
-     * Container for configuration values used when handling errorneous token inputs. 
+     * Container for configuration values used when handling erroneous token inputs. 
      *
-     * @see ErrorReportConfiguration
      * @since 2.16
      */
     protected ErrorReportConfiguration _errorReportConfiguration;

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

@@ -101,7 +101,7 @@ protected static ContentReference _wrap(Object srcRef) {
         if (srcRef instanceof ContentReference) {
             return (ContentReference) srcRef;
         }
-        return ContentReference.construct(false, srcRef);
+        return ContentReference.construct(false, srcRef, ErrorReportConfiguration.defaults());
     }
 
     /*

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

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import com.fasterxml.jackson.core.io.InputDecorator;
 import com.fasterxml.jackson.core.io.OutputDecorator;
@@ -82,32 +83,32 @@ public abstract class TSFBuilder<F extends JsonFactory,
     protected OutputDecorator _outputDecorator;
 
     /**
-     * Optional StreamReadConstraints.
+     * {@link StreamReadConstraints} to use.
      *
      * @since 2.15
      */
     protected StreamReadConstraints _streamReadConstraints;
 
     /**
-     * Optional StreamWriteConstraints.
+     * {@link StreamWriteConstraints} to use.
      *
      * @since 2.16
      */
     protected StreamWriteConstraints _streamWriteConstraints;
 
     /**
+     * {@link ErrorReportConfiguration} to use.
+     *
      * @since 2.16
      */
-    protected List<JsonGeneratorDecorator> _generatorDecorators;
+    protected ErrorReportConfiguration _errorReportConfiguration;
 
     /**
-     * Optional {@link ErrorReportConfiguration} to use.
-     *
      * @since 2.16
      */
-    protected ErrorReportConfiguration _errorReportConfiguration;
+    protected List<JsonGeneratorDecorator> _generatorDecorators;
+
 
-    /*
     /**********************************************************************
     /* Construction
     /**********************************************************************
@@ -325,34 +326,35 @@ public B addDecorator(JsonGeneratorDecorator decorator) {
      * Sets the constraints for streaming reads.
      *
      * @param streamReadConstraints constraints for streaming reads
-     * @return this factory
+     * @return this builder (for call chaining)
      * @since 2.15
      */
     public B streamReadConstraints(StreamReadConstraints streamReadConstraints) {
-        _streamReadConstraints = streamReadConstraints;
+        _streamReadConstraints = Objects.requireNonNull(streamReadConstraints);
         return _this();
     }
 
     /**
-     * Sets the configuration for error tokens.
+     * Sets the constraints for streaming writes.
      *
-     * @param errorReportConfiguration configuration values used for handling errorneous token inputs. 
-     * @return this factory
+     * @param streamWriteConstraints constraints for streaming reads
+     * @return this builder (for call chaining)
      * @since 2.16
      */
-    public B errorReportConfiguration(ErrorReportConfiguration errorReportConfiguration) {
-        _errorReportConfiguration = errorReportConfiguration;
+    public B streamWriteConstraints(StreamWriteConstraints streamWriteConstraints) {
+        _streamWriteConstraints = Objects.requireNonNull(streamWriteConstraints);
         return _this();
     }
+
     /**
-     * Sets the constraints for streaming writes.
+     * Sets the configuration for error reporting.
      *
-     * @param streamWriteConstraints constraints for streaming reads
-     * @return this factory
+     * @param errorReportConfiguration configuration values used for handling erroneous token inputs. 
+     * @return this builder (for call chaining)
      * @since 2.16
      */
-    public B streamWriteConstraints(StreamWriteConstraints streamWriteConstraints) {
-        _streamWriteConstraints = streamWriteConstraints;
+    public B errorReportConfiguration(ErrorReportConfiguration errorReportConfiguration) {
+        _errorReportConfiguration = Objects.requireNonNull(errorReportConfiguration);
         return _this();
     }