Merge branch 'main' into jdbc/feat-strict-url-parse-and-sync-dataSource

Author: keshavdandeva

.github/CODEOWNERS

@@ -4,8 +4,8 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-bigquery is the default owner for changes in this repo
-*                       @googleapis/cloud-sdk-java-team @googleapis/api-bigquery
+# The @googleapis/bigquery-team is the default owner for changes in this repo
+*                       @googleapis/cloud-sdk-java-team @googleapis/bigquery-team
 
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/cloud-sdk-java-team @googleapis/java-samples-reviewers

.github/sync-repo-settings.yaml

@@ -163,9 +163,9 @@ branchProtectionRules:
       - javadoc
       - unmanaged_dependency_check
 permissionRules:
-  - team: api-bigquery
+  - team: bigquery-team
     permission: admin
-  - team: yoshi-java
+  - team: cloud-sdk-java-team
     permission: push
   - team: yoshi-admins
     permission: admin

.repo-metadata.json

@@ -10,7 +10,7 @@
   "repo": "googleapis/java-bigquery",
   "repo_short": "java-bigquery",
   "distribution_name": "com.google.cloud:google-cloud-bigquery",
-  "codeowner_team": "@googleapis/api-bigquery",
+  "codeowner_team": "@googleapis/bigquery-team",
   "api_id": "bigquery.googleapis.com",
   "library_type": "GAPIC_MANUAL",
   "requires_billing": true,

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryRetryAlgorithm.java

@@ -25,8 +25,8 @@
 import com.google.api.gax.retrying.TimedAttemptSettings;
 import com.google.api.gax.retrying.TimedRetryAlgorithm;
 import com.google.api.gax.retrying.TimedRetryAlgorithmWithContext;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import com.google.api.services.bigquery.model.ErrorProto;
+import com.google.api.services.bigquery.model.Job;
 import java.time.Duration;
 import java.util.Iterator;
 import java.util.UUID;
@@ -222,21 +222,11 @@ private String getErrorDescFromResponse(ResponseT previousResponse) {
     following logic based on response body of jobs.insert method, so far the only
     known case where a response with status code 200 may contain an error message
      */
-    try {
-      JsonObject responseJson =
-          JsonParser.parseString(previousResponse.toString()).getAsJsonObject();
-      if (responseJson.has("status") && responseJson.getAsJsonObject("status").has("errorResult")) {
-        return responseJson
-            .getAsJsonObject("status")
-            .getAsJsonObject("errorResult")
-            .get("message")
-            .toString();
-      } else {
-        return null;
-      }
-    } catch (Exception e) {
-      // exceptions here implies no error message present in response, returning null
-      return null;
+    if (previousResponse instanceof Job) {
+      Job job = (Job) previousResponse;
+      ErrorProto error = job.getStatus() != null ? job.getStatus().getErrorResult() : null;
+      return error != null ? error.getMessage() : null;
     }
+    return null;
   }
 }