Merge branch 'googleapis:main' into main

Author: GaoleMeng

.github/.OwlBot.lock.yaml

@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
  image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:bf5639d265d70f6137d57d42ae781a6f4e26d4085ff4e018e71350480f9b3996
+ digest: sha256:944c07e458ce227ca49a423affedf088e31e2ee70908dd21682238d58f1beb60

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.35.0](https://github.com/googleapis/java-bigquerystorage/compare/v2.34.2...v2.35.0) (2023-04-13)
+
+
+### Features
+
+* Add public api to stream writer to set the maximum wait time ([#2066](https://github.com/googleapis/java-bigquerystorage/issues/2066)) ([1e9a8ca](https://github.com/googleapis/java-bigquerystorage/commit/1e9a8cac19c3748515ebff7990d02fd576c7dd23))
+* Add sample about processing permanent writer failure ([#2057](https://github.com/googleapis/java-bigquerystorage/issues/2057)) ([8eda934](https://github.com/googleapis/java-bigquerystorage/commit/8eda9347a90f59ddcf99501f8b71ba17c5f3a143))
+* Add schema aware stream writer ([#2048](https://github.com/googleapis/java-bigquerystorage/issues/2048)) ([ad136b9](https://github.com/googleapis/java-bigquerystorage/commit/ad136b9fa25e774a33d02fc3a82a76fb1152b5c5))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-bigquery to v2.24.4 ([#2070](https://github.com/googleapis/java-bigquerystorage/issues/2070)) ([ce9e962](https://github.com/googleapis/java-bigquerystorage/commit/ce9e96209cbafd5a4daa981c5e5252272dc9811a))
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.7.0 ([#2077](https://github.com/googleapis/java-bigquerystorage/issues/2077)) ([b5ea788](https://github.com/googleapis/java-bigquerystorage/commit/b5ea788df26122dcdf3c7104658cc8fd35a38f72))
+
 ## [2.34.2](https://github.com/googleapis/java-bigquerystorage/compare/v2.34.1...v2.34.2) (2023-03-30)
 
 

README.md

@@ -34,35 +34,36 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
 
 ```
 
-If you are using Maven without BOM, add this to your dependencies:
+If you are using Maven without the BOM, add this to your dependencies:
 
+<!-- {x-version-update-start:google-cloud-bigquerystorage:released} -->
 
 ```xml
 <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigquerystorage</artifactId>
- <version>2.34.1</version>
+ <version>2.34.2</version>
 </dependency>
 
 ```
 
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.11.0')
+implementation platform('com.google.cloud:libraries-bom:26.12.0')
 
 implementation 'com.google.cloud:google-cloud-bigquerystorage'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-bigquerystorage:2.34.2'
+implementation 'com.google.cloud:google-cloud-bigquerystorage:2.35.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.34.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.35.0"
 ```
 <!-- {x-version-update-end} -->
 
@@ -219,15 +220,15 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigquerystorage/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigquerystorage.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigquerystorage/2.34.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigquerystorage/2.35.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
 [iam-policy]: https://cloud.google.com/iam/docs/overview#cloud-iam-policy
 [developer-console]: https://console.developers.google.com/
 [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
 [cloud-cli]: https://cloud.google.com/cli
-[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
+[troubleshooting]: https://github.com/googleapis/google-cloud-java/blob/main/TROUBLESHOOTING.md
 [contributing]: https://github.com/googleapis/java-bigquerystorage/blob/main/CONTRIBUTING.md
 [code-of-conduct]: https://github.com/googleapis/java-bigquerystorage/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
 [license]: https://github.com/googleapis/java-bigquerystorage/blob/main/LICENSE

google-cloud-bigquerystorage-bom/pom.xml

@@ -3,7 +3,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigquerystorage-bom</artifactId>
- <version>2.34.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
+ <version>2.35.0</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
  <packaging>pom</packaging>
  <parent>
  <groupId>com.google.cloud</groupId>
@@ -52,37 +52,37 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigquerystorage</artifactId>
- <version>2.34.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
+ <version>2.35.0</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>grpc-google-cloud-bigquerystorage-v1beta1</artifactId>
- <version>0.158.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta1:current} -->
+ <version>0.159.0</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta1:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>grpc-google-cloud-bigquerystorage-v1beta2</artifactId>
- <version>0.158.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta2:current} -->
+ <version>0.159.0</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta2:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>grpc-google-cloud-bigquerystorage-v1</artifactId>
- <version>2.34.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1:current} -->
+ <version>2.35.0</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>proto-google-cloud-bigquerystorage-v1beta1</artifactId>
- <version>0.158.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta1:current} -->
+ <version>0.159.0</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta1:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>proto-google-cloud-bigquerystorage-v1beta2</artifactId>
- <version>0.158.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta2:current} -->
+ <version>0.159.0</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta2:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>proto-google-cloud-bigquerystorage-v1</artifactId>
- <version>2.34.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1:current} -->
+ <version>2.35.0</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1:current} -->
  </dependency>
  </dependencies>
  </dependencyManagement>

google-cloud-bigquerystorage/pom.xml

@@ -3,15 +3,15 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigquerystorage</artifactId>
- <version>2.34.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
+ <version>2.35.0</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
  <packaging>jar</packaging>
  <name>BigQuery Storage</name>
  <url>https://github.com/googleapis/java-bigquerystorage</url>
  <description>BigQuery Storage</description>
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigquerystorage-parent</artifactId>
- <version>2.34.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
+ <version>2.35.0</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
  </parent>
  <properties>
  <site.installationModule>google-cloud-bigquerystorage</site.installationModule>

google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/Exceptions.java

@@ -243,8 +243,8 @@ public String getStreamName() {
  }
 
  /**
- * This exception is thrown from {@link JsonStreamWriter#append()} when the client side Json to
- * Proto serializtion fails. It can also be thrown by the server in case rows contains invalid
+ * This exception is thrown from {@link SchemaAwareStreamWriter#append()} when the client side
+ * Proto serialization fails. It can also be thrown by the server in case rows contains invalid
  * data. The exception contains a Map of indexes of faulty rows and the corresponding error
  * message.
  */
@@ -362,16 +362,27 @@ protected InflightBytesLimitExceededException(String writerId, long currentLimit
  currentLimit);
  }
  }
+
  /**
- * Input Json data has unknown field to the schema of the JsonStreamWriter. User can either turn
- * on IgnoreUnknownFields option on the JsonStreamWriter, or if they don't want the error to be
- * ignored, they should recreate the JsonStreamWriter with the updated table schema.
+ * This class is replaced by a generic one. It will be removed soon. Please use {@link
+ * DataHasUnknownFieldException}
  */
- public static final class JsonDataHasUnknownFieldException extends IllegalArgumentException {
+ 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 class DataHasUnknownFieldException extends IllegalArgumentException {
  private final String jsonFieldName;
 
- protected JsonDataHasUnknownFieldException(String jsonFieldName) {
- super(String.format("JSONObject has fields unknown to BigQuery: %s.", jsonFieldName));
+ public DataHasUnknownFieldException(String jsonFieldName) {
+ super(String.format("The source object has fields unknown to BigQuery: %s.", jsonFieldName));
  this.jsonFieldName = jsonFieldName;
  }