fix a few more calls and comments

Author: derrickaw

sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonUtils.java

@@ -35,19 +35,8 @@
 @Internal
 public class RowJsonUtils {
 
-  //
-  private static int defaultBufferLimit;
-
-  /**
-   * Increase the default jackson-databind stream read constraint.
-   *
-   * <p>StreamReadConstraints was introduced in jackson 2.15 causing string > 20MB (5MB in 2.15.0)
-   * parsing failure. This has caused regressions in its dependencies include Beam. Here we
-   * overwrite the default buffer size limit to 100 MB, and exposes this interface for higher limit.
-   * If needed, call this method during pipeline run time, e.g. in DoFn.setup.
-   */
   // The maximum string length for the JSON parser, set to 100 MB.
-  private static final int MAX_STRING_LENGTH = 100 * 1024 * 1024;
+  public static final int MAX_STRING_LENGTH = 100 * 1024 * 1024;
 
   /**
    * Creates a thread-safe JsonFactory with custom stream read constraints.
@@ -59,7 +48,7 @@ public class RowJsonUtils {
    * factory to higher limits. If needed, call this method during pipeline run time, e.g. in
    * DoFn.setup. This avoids a data race caused by modifying the global default settings.
    */
-  private static JsonFactory createJsonFactory(int sizeLimit) {
+  public static JsonFactory createJsonFactory(int sizeLimit) {
     sizeLimit = Math.max(sizeLimit, MAX_STRING_LENGTH);
     JsonFactory jsonFactory = new JsonFactory();
     try {

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoder.java

@@ -28,6 +28,7 @@
 import org.apache.beam.sdk.coders.AtomicCoder;
 import org.apache.beam.sdk.coders.Coder;
 import org.apache.beam.sdk.coders.StringUtf8Coder;
+import org.apache.beam.sdk.util.RowJson;
 import org.apache.beam.sdk.util.RowJsonUtils;
 import org.apache.beam.sdk.values.TypeDescriptor;
 
@@ -75,10 +76,8 @@ public long getEncodedElementByteSize(TableRow value) throws Exception {
   private static final TypeDescriptor<TableRow> TYPE_DESCRIPTOR;
 
   static {
-    RowJsonUtils.increaseDefaultStreamReadConstraints(100 * 1024 * 1024);
-
     MAPPER =
-        new ObjectMapper()
+        new ObjectMapper(RowJsonUtils.createJsonFactory(RowJsonUtils.MAX_STRING_LENGTH))
             .registerModule(new JavaTimeModule())
             .registerModule(new JodaModule())
             .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)