Splitting core into core, core-http, and core-grpc

google-cloud-bigquery/pom.xml

@@ -24,6 +24,11 @@
       <artifactId>google-cloud-core</artifactId>
       <version>${core.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>google-cloud-core-http</artifactId>
+      <version>${core-http.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-storage</artifactId>

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

@@ -18,7 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.google.api.gax.core.Page;
+import com.google.api.gax.paging.Page;
 import com.google.cloud.FieldSelector;
 import com.google.cloud.FieldSelector.Helper;
 import com.google.cloud.Service;

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

@@ -18,8 +18,8 @@
 
 import com.google.cloud.BaseServiceException;
 import com.google.cloud.RetryHelper.RetryHelperException;
+import com.google.cloud.http.BaseHttpServiceException;
 import com.google.common.collect.ImmutableSet;
-
 import java.io.IOException;
 import java.util.Objects;
 import java.util.Set;
@@ -30,7 +30,7 @@
  * @see <a href="https://cloud.google.com/bigquery/troubleshooting-errors">Google Cloud
  *      BigQuery error codes</a>
  */
-public final class BigQueryException extends BaseServiceException {
+public final class BigQueryException extends BaseHttpServiceException {
 
   // see: https://cloud.google.com/bigquery/troubleshooting-errors
   private static final Set<Error> RETRYABLE_ERRORS = ImmutableSet.of(
@@ -47,17 +47,17 @@ public BigQueryException(int code, String message) {
   }
 
   public BigQueryException(int code, String message, Throwable cause) {
-    super(code, message, null, true, cause);
+    super(code, message, null, true, RETRYABLE_ERRORS, cause);
     this.error = null;
   }
 
   public BigQueryException(int code, String message, BigQueryError error) {
-    super(code, message, error != null ? error.getReason() : null, true);
+    super(code, message, error != null ? error.getReason() : null, true, RETRYABLE_ERRORS);
     this.error = error;
   }
 
   public BigQueryException(IOException exception) {
-    super(exception, true);
+    super(exception, true, RETRYABLE_ERRORS);
     BigQueryError error = null;
     if (getReason() != null) {
       error = new BigQueryError(getReason(), getLocation(), getMessage(), getDebugInfo());
@@ -74,11 +74,6 @@ public BigQueryError getError() {
     return error;
   }
 
-  @Override
-  protected Set<Error> getRetryableErrors() {
-    return RETRYABLE_ERRORS;
-  }
-
   @Override
   public boolean equals(Object obj) {
     if (obj == this) {

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

@@ -24,7 +24,7 @@
 import com.google.api.services.bigquery.model.TableDataInsertAllRequest.Rows;
 import com.google.api.services.bigquery.model.TableRow;
 import com.google.cloud.BaseService;
-import com.google.api.gax.core.Page;
+import com.google.api.gax.paging.Page;
 import com.google.cloud.PageImpl;
 import com.google.cloud.PageImpl.NextPageFetcher;
 import com.google.cloud.RetryHelper;

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

@@ -16,7 +16,7 @@
 
 package com.google.cloud.bigquery;
 
-import com.google.cloud.HttpTransportOptions;
+import com.google.cloud.http.HttpTransportOptions;
 import com.google.cloud.ServiceDefaults;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.ServiceRpc;

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

@@ -18,7 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.api.gax.core.Page;
+import com.google.api.gax.paging.Page;
 import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption;
 import com.google.cloud.bigquery.BigQuery.DatasetOption;
 import com.google.cloud.bigquery.BigQuery.TableListOption;

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

@@ -18,7 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.api.gax.core.Page;
+import com.google.api.gax.paging.Page;
 import com.google.cloud.bigquery.BigQuery.JobOption;
 import com.google.cloud.bigquery.BigQuery.TableDataListOption;
 import com.google.cloud.bigquery.BigQuery.TableOption;

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java

@@ -49,9 +49,9 @@
 import com.google.api.services.bigquery.model.TableList;
 import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.TableRow;
-import com.google.cloud.HttpTransportOptions;
 import com.google.cloud.bigquery.BigQueryException;
 import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.http.HttpTransportOptions;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelper.java

@@ -16,13 +16,12 @@
 
 package com.google.cloud.bigquery.testing;
 
+import com.google.api.gax.retrying.RetrySettings;
 import com.google.auth.oauth2.ServiceAccountCredentials;
-import com.google.cloud.HttpTransportOptions;
-import com.google.api.gax.core.RetrySettings;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQueryException;
 import com.google.cloud.bigquery.BigQueryOptions;
-
+import com.google.cloud.http.HttpTransportOptions;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.UUID;

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

@@ -44,39 +44,34 @@ public void testBigqueryException() {
     assertNull(exception.getReason());
     assertNull(exception.getError());
     assertTrue(exception.isRetryable());
-    assertTrue(exception.isIdempotent());
 
     exception = new BigQueryException(502, "message");
     assertEquals(502, exception.getCode());
     assertEquals("message", exception.getMessage());
     assertNull(exception.getReason());
     assertNull(exception.getError());
     assertTrue(exception.isRetryable());
-    assertTrue(exception.isIdempotent());
 
     exception = new BigQueryException(503, "message");
     assertEquals(503, exception.getCode());
     assertEquals("message", exception.getMessage());
     assertNull(exception.getReason());
     assertNull(exception.getError());
     assertTrue(exception.isRetryable());
-    assertTrue(exception.isIdempotent());
 
     exception = new BigQueryException(504, "message");
     assertEquals(504, exception.getCode());
     assertEquals("message", exception.getMessage());
     assertNull(exception.getReason());
     assertNull(exception.getError());
     assertTrue(exception.isRetryable());
-    assertTrue(exception.isIdempotent());
 
     exception = new BigQueryException(400, "message");
     assertEquals(400, exception.getCode());
     assertEquals("message", exception.getMessage());
     assertNull(exception.getReason());
     assertNull(exception.getError());
     assertFalse(exception.isRetryable());
-    assertTrue(exception.isIdempotent());
 
     BigQueryError error = new BigQueryError("reason", null, null);
     exception = new BigQueryException(504, "message", error);
@@ -85,7 +80,6 @@ public void testBigqueryException() {
     assertEquals("reason", exception.getReason());
     assertEquals(error, exception.getError());
     assertTrue(exception.isRetryable());
-    assertTrue(exception.isIdempotent());
 
     IOException cause = new SocketTimeoutException("socketTimeoutMessage");
     exception = new BigQueryException(cause);
@@ -94,7 +88,6 @@ public void testBigqueryException() {
     assertEquals("socketTimeoutMessage", exception.getMessage());
     assertEquals(cause, exception.getCause());
     assertTrue(exception.isRetryable());
-    assertTrue(exception.isIdempotent());
     assertSame(cause, exception.getCause());
 
     exception = new BigQueryException(504, "message", cause);
@@ -103,7 +96,6 @@ public void testBigqueryException() {
     assertNull(exception.getReason());
     assertNull(exception.getError());
     assertTrue(exception.isRetryable());
-    assertTrue(exception.isIdempotent());
     assertSame(cause, exception.getCause());
 
 
@@ -147,7 +139,6 @@ public void testTranslateAndThrow() throws Exception {
       assertEquals(503, ex.getCode());
       assertEquals("message", ex.getMessage());
       assertTrue(ex.isRetryable());
-      assertTrue(ex.isIdempotent());
     } finally {
       verify(exceptionMock);
     }
@@ -162,7 +153,6 @@ public void testTranslateAndThrow() throws Exception {
       assertEquals(BigQueryException.UNKNOWN_CODE, ex.getCode());
       assertEquals("message", ex.getMessage());
       assertFalse(ex.isRetryable());
-      assertTrue(ex.isIdempotent());
       assertSame(cause, ex.getCause());
     } finally {
       verify(exceptionMock);

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java

@@ -32,7 +32,7 @@
 import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
 import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
 import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.gax.core.Page;
+import com.google.api.gax.paging.Page;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.WriteChannel;
 import com.google.cloud.bigquery.InsertAllRequest.RowToInsert;

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryOptionsTest.java

@@ -16,7 +16,7 @@
 
 package com.google.cloud.bigquery;
 
-import com.google.cloud.GrpcTransportOptions;
+import com.google.cloud.TransportOptions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -28,7 +28,7 @@ public class BigQueryOptionsTest {
   @Test
   public void testInvalidTransport() {
     thrown.expect(IllegalArgumentException.class);
-    BigQueryOptions.newBuilder().setTransportOptions(GrpcTransportOptions.newBuilder().build());
+    BigQueryOptions.newBuilder().setTransportOptions(new TransportOptions() {});
   }
 
 }

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java

@@ -30,7 +30,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import com.google.api.gax.core.Page;
+import com.google.api.gax.paging.Page;
 import com.google.cloud.PageImpl;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java

@@ -28,7 +28,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import com.google.api.gax.core.Page;
+import com.google.api.gax.paging.Page;
 import com.google.cloud.PageImpl;
 import com.google.cloud.bigquery.InsertAllRequest.RowToInsert;
 import com.google.common.collect.ImmutableList;

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java

@@ -24,7 +24,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.api.gax.core.Page;
+import com.google.api.gax.paging.Page;
 import com.google.cloud.WaitForOption;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQuery.DatasetField;

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelperTest.java

@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import com.google.cloud.HttpTransportOptions;
+import com.google.cloud.http.HttpTransportOptions;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption;
 import com.google.cloud.bigquery.BigQueryOptions;

google-cloud-compute/pom.xml

@@ -24,6 +24,11 @@
       <artifactId>google-cloud-core</artifactId>
       <version>${core.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>google-cloud-core-http</artifactId>
+      <version>${core-http.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-compute</artifactId>

google-cloud-compute/src/main/java/com/google/cloud/compute/Compute.java

@@ -20,7 +20,7 @@
 
 import com.google.cloud.FieldSelector;
 import com.google.cloud.FieldSelector.Helper;
-import com.google.api.gax.core.Page;
+import com.google.api.gax.paging.Page;
 import com.google.cloud.Service;
 import com.google.cloud.compute.AttachedDisk.PersistentDiskConfiguration;
 import com.google.cloud.compute.NetworkInterface.AccessConfig;

google-cloud-compute/src/main/java/com/google/cloud/compute/ComputeException.java

@@ -18,34 +18,29 @@
 
 import com.google.cloud.BaseServiceException;
 import com.google.cloud.RetryHelper.RetryHelperException;
+import com.google.cloud.http.BaseHttpServiceException;
 import com.google.common.collect.ImmutableSet;
-
 import java.io.IOException;
 import java.util.Set;
 
 /**
  * Compute Engine service exception.
  */
-public class ComputeException extends BaseServiceException {
+public class ComputeException extends BaseHttpServiceException {
 
   private static final Set<Error> RETRYABLE_ERRORS = ImmutableSet.of(new Error(500, null));
   private static final long serialVersionUID = -8039359778707845810L;
 
   ComputeException(int code, String message) {
-    super(code, message, null, true, null);
+    super(code, message, null, true, RETRYABLE_ERRORS, null);
   }
 
   ComputeException(int code, String message, Throwable cause) {
-    super(code, message, null, true, cause);
+    super(code, message, null, true, RETRYABLE_ERRORS, cause);
   }
 
   public ComputeException(IOException exception) {
-    super(exception, true);
-  }
-
-  @Override
-  protected Set<Error> getRetryableErrors() {
-    return RETRYABLE_ERRORS;
+    super(exception, true, RETRYABLE_ERRORS);
   }
 
   /**

google-cloud-compute/src/main/java/com/google/cloud/compute/ComputeImpl.java

@@ -20,7 +20,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.cloud.BaseService;
-import com.google.api.gax.core.Page;
+import com.google.api.gax.paging.Page;
 import com.google.cloud.PageImpl;
 import com.google.cloud.PageImpl.NextPageFetcher;
 import com.google.cloud.RetryHelper;

google-cloud-compute/src/main/java/com/google/cloud/compute/ComputeOptions.java

@@ -16,7 +16,7 @@
 
 package com.google.cloud.compute;
 
-import com.google.cloud.HttpTransportOptions;
+import com.google.cloud.http.HttpTransportOptions;
 import com.google.cloud.ServiceDefaults;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.ServiceRpc;

google-cloud-compute/src/main/java/com/google/cloud/compute/spi/v1/HttpComputeRpc.java

@@ -68,7 +68,7 @@
 import com.google.api.services.compute.model.Tags;
 import com.google.api.services.compute.model.Zone;
 import com.google.api.services.compute.model.ZoneList;
-import com.google.cloud.HttpTransportOptions;
+import com.google.cloud.http.HttpTransportOptions;
 import com.google.cloud.compute.ComputeException;
 import com.google.cloud.compute.ComputeOptions;
 import com.google.common.collect.ImmutableList;

google-cloud-compute/src/main/java/com/google/cloud/compute/testing/RemoteComputeHelper.java

@@ -17,8 +17,8 @@
 package com.google.cloud.compute.testing;
 
 import com.google.auth.oauth2.ServiceAccountCredentials;
-import com.google.cloud.HttpTransportOptions;
-import com.google.api.gax.core.RetrySettings;
+import com.google.cloud.http.HttpTransportOptions;
+import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.compute.ComputeOptions;
 
 import java.io.IOException;