Skip to content

Commit a38b195

Browse files
garrettjonesgooglegarrettjonesgoogle
authored
Splitting core into core, core-http, and core-grpc (#1968)
1 parent 8ef9ad6 commit a38b195

203 files changed

Lines changed: 1295 additions & 678 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.

‎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>

‎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;

‎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) {

‎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;

‎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;

‎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;

‎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;

‎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;

‎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;

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,39 +44,34 @@ public void testBigqueryException() {
4444
assertNull(exception.getReason());
4545
assertNull(exception.getError());
4646
assertTrue(exception.isRetryable());
47-
assertTrue(exception.isIdempotent());
4847

4948
exception = new BigQueryException(502, "message");
5049
assertEquals(502, exception.getCode());
5150
assertEquals("message", exception.getMessage());
5251
assertNull(exception.getReason());
5352
assertNull(exception.getError());
5453
assertTrue(exception.isRetryable());
55-
assertTrue(exception.isIdempotent());
5654

5755
exception = new BigQueryException(503, "message");
5856
assertEquals(503, exception.getCode());
5957
assertEquals("message", exception.getMessage());
6058
assertNull(exception.getReason());
6159
assertNull(exception.getError());
6260
assertTrue(exception.isRetryable());
63-
assertTrue(exception.isIdempotent());
6461

6562
exception = new BigQueryException(504, "message");
6663
assertEquals(504, exception.getCode());
6764
assertEquals("message", exception.getMessage());
6865
assertNull(exception.getReason());
6966
assertNull(exception.getError());
7067
assertTrue(exception.isRetryable());
71-
assertTrue(exception.isIdempotent());
7268

7369
exception = new BigQueryException(400, "message");
7470
assertEquals(400, exception.getCode());
7571
assertEquals("message", exception.getMessage());
7672
assertNull(exception.getReason());
7773
assertNull(exception.getError());
7874
assertFalse(exception.isRetryable());
79-
assertTrue(exception.isIdempotent());
8075

8176
BigQueryError error = new BigQueryError("reason", null, null);
8277
exception = new BigQueryException(504, "message", error);
@@ -85,7 +80,6 @@ public void testBigqueryException() {
8580
assertEquals("reason", exception.getReason());
8681
assertEquals(error, exception.getError());
8782
assertTrue(exception.isRetryable());
88-
assertTrue(exception.isIdempotent());
8983

9084
IOException cause = new SocketTimeoutException("socketTimeoutMessage");
9185
exception = new BigQueryException(cause);
@@ -94,7 +88,6 @@ public void testBigqueryException() {
9488
assertEquals("socketTimeoutMessage", exception.getMessage());
9589
assertEquals(cause, exception.getCause());
9690
assertTrue(exception.isRetryable());
97-
assertTrue(exception.isIdempotent());
9891
assertSame(cause, exception.getCause());
9992

10093
exception = new BigQueryException(504, "message", cause);
@@ -103,7 +96,6 @@ public void testBigqueryException() {
10396
assertNull(exception.getReason());
10497
assertNull(exception.getError());
10598
assertTrue(exception.isRetryable());
106-
assertTrue(exception.isIdempotent());
10799
assertSame(cause, exception.getCause());
108100

109101

@@ -147,7 +139,6 @@ public void testTranslateAndThrow() throws Exception {
147139
assertEquals(503, ex.getCode());
148140
assertEquals("message", ex.getMessage());
149141
assertTrue(ex.isRetryable());
150-
assertTrue(ex.isIdempotent());
151142
} finally {
152143
verify(exceptionMock);
153144
}
@@ -162,7 +153,6 @@ public void testTranslateAndThrow() throws Exception {
162153
assertEquals(BigQueryException.UNKNOWN_CODE, ex.getCode());
163154
assertEquals("message", ex.getMessage());
164155
assertFalse(ex.isRetryable());
165-
assertTrue(ex.isIdempotent());
166156
assertSame(cause, ex.getCause());
167157
} finally {
168158
verify(exceptionMock);

0 commit comments

Comments
 (0)