Skip to content

Commit ec325fb

Browse files
garrettjonesgooglegarrettjonesgoogle
authored
---
yaml --- r: 8023 b: refs/heads/tswast-patch-1 c: a38b195 h: refs/heads/master i: 8021: a9e7ee2 8019: 190cd5b 8015: 1418476
1 parent 3e7803e commit ec325fb

204 files changed

Lines changed: 1296 additions & 679 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 8ef9ad6925fb405292cbaab6e00844fa243016eb
60+
refs/heads/tswast-patch-1: a38b19560855b940c11d173845a277853f00d103
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/google-cloud-bigquery/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
<artifactId>google-cloud-core</artifactId>
2525
<version>${core.version}</version>
2626
</dependency>
27+
<dependency>
28+
<groupId>${project.groupId}</groupId>
29+
<artifactId>google-cloud-core-http</artifactId>
30+
<version>${core-http.version}</version>
31+
</dependency>
2732
<dependency>
2833
<groupId>${project.groupId}</groupId>
2934
<artifactId>google-cloud-storage</artifactId>

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static com.google.common.base.Preconditions.checkArgument;
2020

21-
import com.google.api.gax.core.Page;
21+
import com.google.api.gax.paging.Page;
2222
import com.google.cloud.FieldSelector;
2323
import com.google.cloud.FieldSelector.Helper;
2424
import com.google.cloud.Service;

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.google.cloud.BaseServiceException;
2020
import com.google.cloud.RetryHelper.RetryHelperException;
21+
import com.google.cloud.http.BaseHttpServiceException;
2122
import com.google.common.collect.ImmutableSet;
22-
2323
import java.io.IOException;
2424
import java.util.Objects;
2525
import java.util.Set;
@@ -30,7 +30,7 @@
3030
* @see <a href="https://cloud.google.com/bigquery/troubleshooting-errors">Google Cloud
3131
* BigQuery error codes</a>
3232
*/
33-
public final class BigQueryException extends BaseServiceException {
33+
public final class BigQueryException extends BaseHttpServiceException {
3434

3535
// see: https://cloud.google.com/bigquery/troubleshooting-errors
3636
private static final Set<Error> RETRYABLE_ERRORS = ImmutableSet.of(
@@ -47,17 +47,17 @@ public BigQueryException(int code, String message) {
4747
}
4848

4949
public BigQueryException(int code, String message, Throwable cause) {
50-
super(code, message, null, true, cause);
50+
super(code, message, null, true, RETRYABLE_ERRORS, cause);
5151
this.error = null;
5252
}
5353

5454
public BigQueryException(int code, String message, BigQueryError error) {
55-
super(code, message, error != null ? error.getReason() : null, true);
55+
super(code, message, error != null ? error.getReason() : null, true, RETRYABLE_ERRORS);
5656
this.error = error;
5757
}
5858

5959
public BigQueryException(IOException exception) {
60-
super(exception, true);
60+
super(exception, true, RETRYABLE_ERRORS);
6161
BigQueryError error = null;
6262
if (getReason() != null) {
6363
error = new BigQueryError(getReason(), getLocation(), getMessage(), getDebugInfo());
@@ -74,11 +74,6 @@ public BigQueryError getError() {
7474
return error;
7575
}
7676

77-
@Override
78-
protected Set<Error> getRetryableErrors() {
79-
return RETRYABLE_ERRORS;
80-
}
81-
8277
@Override
8378
public boolean equals(Object obj) {
8479
if (obj == this) {

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.google.api.services.bigquery.model.TableDataInsertAllRequest.Rows;
2525
import com.google.api.services.bigquery.model.TableRow;
2626
import com.google.cloud.BaseService;
27-
import com.google.api.gax.core.Page;
27+
import com.google.api.gax.paging.Page;
2828
import com.google.cloud.PageImpl;
2929
import com.google.cloud.PageImpl.NextPageFetcher;
3030
import com.google.cloud.RetryHelper;

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.cloud.bigquery;
1818

19-
import com.google.cloud.HttpTransportOptions;
19+
import com.google.cloud.http.HttpTransportOptions;
2020
import com.google.cloud.ServiceDefaults;
2121
import com.google.cloud.ServiceOptions;
2222
import com.google.cloud.ServiceRpc;

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21-
import com.google.api.gax.core.Page;
21+
import com.google.api.gax.paging.Page;
2222
import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption;
2323
import com.google.cloud.bigquery.BigQuery.DatasetOption;
2424
import com.google.cloud.bigquery.BigQuery.TableListOption;

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21-
import com.google.api.gax.core.Page;
21+
import com.google.api.gax.paging.Page;
2222
import com.google.cloud.bigquery.BigQuery.JobOption;
2323
import com.google.cloud.bigquery.BigQuery.TableDataListOption;
2424
import com.google.cloud.bigquery.BigQuery.TableOption;

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
import com.google.api.services.bigquery.model.TableList;
5050
import com.google.api.services.bigquery.model.TableReference;
5151
import com.google.api.services.bigquery.model.TableRow;
52-
import com.google.cloud.HttpTransportOptions;
5352
import com.google.cloud.bigquery.BigQueryException;
5453
import com.google.cloud.bigquery.BigQueryOptions;
54+
import com.google.cloud.http.HttpTransportOptions;
5555
import com.google.common.base.Function;
5656
import com.google.common.collect.ImmutableList;
5757
import com.google.common.collect.Iterables;

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelper.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616

1717
package com.google.cloud.bigquery.testing;
1818

19+
import com.google.api.gax.retrying.RetrySettings;
1920
import com.google.auth.oauth2.ServiceAccountCredentials;
20-
import com.google.cloud.HttpTransportOptions;
21-
import com.google.api.gax.core.RetrySettings;
2221
import com.google.cloud.bigquery.BigQuery;
2322
import com.google.cloud.bigquery.BigQueryException;
2423
import com.google.cloud.bigquery.BigQueryOptions;
25-
24+
import com.google.cloud.http.HttpTransportOptions;
2625
import java.io.IOException;
2726
import java.io.InputStream;
2827
import java.util.UUID;

0 commit comments

Comments
 (0)