[squash this commit] Fix clirr errors

arturowczarek · arturowczarek · commit 259391be304d · 2023-04-05T12:57:32.000+02:00
diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/Exceptions.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/Exceptions.java
@@ -362,13 +362,23 @@ protected InflightBytesLimitExceededException(String writerId, long currentLimit
           currentLimit);
     }
   }
+
+  /**
+   * This class is replaced by a generic one. It will be removed soon. Please use {@link
+   * DataHasUnknownFieldException}
+   */
+  public static final class JsonDataHasUnknownFieldException extends DataHasUnknownFieldException {
+    protected JsonDataHasUnknownFieldException(String jsonFieldName) {
+      super(jsonFieldName);
+    }
+  }
   /**
    * Input data object has unknown field to the schema of the SchemaAwareStreamWriter. User can
    * either turn on IgnoreUnknownFields option on the SchemaAwareStreamWriter, or if they don't want
    * the error to be ignored, they should recreate the SchemaAwareStreamWriter with the updated
    * table schema.
    */
-  public static final class DataHasUnknownFieldException extends IllegalArgumentException {
+  public static class DataHasUnknownFieldException extends IllegalArgumentException {
     private final String jsonFieldName;
 
     public DataHasUnknownFieldException(String jsonFieldName) {
diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java
@@ -306,6 +306,11 @@ public Builder setIgnoreUnknownFields(boolean ignoreUnknownFields) {
       return this;
     }
 
+    /** This parameter is not used. It will be removed soon. */
+    public Builder setReconnectAfter10M(boolean reconnectAfter10M) {
+      return this;
+    }
+
     /**
      * Enable multiplexing for this writer. In multiplexing mode tables will share the same
      * connection if possible until the connection is overwhelmed. This feature is still under
diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java
@@ -48,7 +48,7 @@
  * Converts JSON data to Protobuf messages given the Protobuf descriptor and BigQuery table schema.
  * The Protobuf descriptor must have all fields lowercased.
  */
-public final class JsonToProtoMessage implements ToProtoConverter<Object> {
+public class JsonToProtoMessage implements ToProtoConverter<Object> {
   public static final JsonToProtoMessage INSTANCE = new JsonToProtoMessage();
   private static final Logger LOG = Logger.getLogger(JsonToProtoMessage.class.getName());
   private static int NUMERIC_SCALE = 9;
@@ -103,7 +103,25 @@ public final class JsonToProtoMessage implements ToProtoConverter<Object> {
           .toFormatter()
           .withZone(ZoneOffset.UTC);
 
-  private JsonToProtoMessage() {}
+  /** You can use {@link JsonToProtoMessage.INSTANCE} instead */
+  public JsonToProtoMessage() {}
+
+  public static DynamicMessage convertJsonToProtoMessage(
+      Descriptor protoSchema,
+      TableSchema tableSchema,
+      JSONObject json,
+      boolean ignoreUnknownFields) {
+    return INSTANCE.convertToProtoMessage(protoSchema, tableSchema, json, ignoreUnknownFields);
+  }
+
+  public static DynamicMessage convertJsonToProtoMessage(Descriptor protoSchema, JSONObject json) {
+    return INSTANCE.convertToProtoMessage(protoSchema, json);
+  }
+
+  public static DynamicMessage convertJsonToProtoMessage(
+      Descriptor protoSchema, TableSchema tableSchema, JSONObject json) {
+    return INSTANCE.convertToProtoMessage(protoSchema, tableSchema, json);
+  }
 
   /**
    * Converts input message to Protobuf
