Move Compute's spi package to compute.spi (googleapis#901)

mziccard · Apr 29, 2016 · 5bb3e9d · 5bb3e9d
1 parent f085a41
commit 5bb3e9d
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 19 deletions.
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Compute.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Compute.java
@@ -23,7 +23,7 @@
 import com.google.common.collect.Sets;
 import com.google.gcloud.Page;
 import com.google.gcloud.Service;
-import com.google.gcloud.spi.ComputeRpc;
+import com.google.gcloud.compute.spi.ComputeRpc;
 
 import java.io.Serializable;
 import java.util.Objects;

diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ComputeImpl.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ComputeImpl.java
@@ -28,7 +28,7 @@
 import com.google.gcloud.PageImpl;
 import com.google.gcloud.PageImpl.NextPageFetcher;
 import com.google.gcloud.RetryHelper;
-import com.google.gcloud.spi.ComputeRpc;
+import com.google.gcloud.compute.spi.ComputeRpc;
 
 import java.util.Map;
 import java.util.concurrent.Callable;

diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ComputeOptions.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ComputeOptions.java
@@ -18,9 +18,9 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.ServiceOptions;
-import com.google.gcloud.spi.ComputeRpc;
-import com.google.gcloud.spi.ComputeRpcFactory;
-import com.google.gcloud.spi.DefaultComputeRpc;
+import com.google.gcloud.compute.spi.ComputeRpc;
+import com.google.gcloud.compute.spi.ComputeRpcFactory;
+import com.google.gcloud.compute.spi.DefaultComputeRpc;
 
 import java.util.Set;
 

diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Option.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Option.java
@@ -19,7 +19,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.base.MoreObjects;
-import com.google.gcloud.spi.ComputeRpc;
+import com.google.gcloud.compute.spi.ComputeRpc;
 
 import java.io.Serializable;
 import java.util.Objects;

diff --git a/...ava/com/google/gcloud/spi/ComputeRpc.java → ...google/gcloud/compute/spi/ComputeRpc.java b/...ava/com/google/gcloud/spi/ComputeRpc.java → ...google/gcloud/compute/spi/ComputeRpc.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.spi;
+package com.google.gcloud.compute.spi;
 
 import com.google.api.services.compute.model.Address;
 import com.google.api.services.compute.model.DeprecationStatus;

diff --git a/.../google/gcloud/spi/ComputeRpcFactory.java → ...gcloud/compute/spi/ComputeRpcFactory.java b/.../google/gcloud/spi/ComputeRpcFactory.java → ...gcloud/compute/spi/ComputeRpcFactory.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.spi;
+package com.google.gcloud.compute.spi;
 
 import com.google.gcloud.compute.ComputeOptions;
+import com.google.gcloud.spi.ServiceRpcFactory;
 
 /**
  * An interface for Compute RPC factory.

diff --git a/.../google/gcloud/spi/DefaultComputeRpc.java → ...gcloud/compute/spi/DefaultComputeRpc.java b/.../google/gcloud/spi/DefaultComputeRpc.java → ...gcloud/compute/spi/DefaultComputeRpc.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.spi;
+package com.google.gcloud.compute.spi;
 
-import static com.google.gcloud.spi.ComputeRpc.Option.FIELDS;
-import static com.google.gcloud.spi.ComputeRpc.Option.FILTER;
-import static com.google.gcloud.spi.ComputeRpc.Option.MAX_RESULTS;
-import static com.google.gcloud.spi.ComputeRpc.Option.PAGE_TOKEN;
+import static com.google.gcloud.compute.spi.ComputeRpc.Option.FIELDS;
+import static com.google.gcloud.compute.spi.ComputeRpc.Option.FILTER;
+import static com.google.gcloud.compute.spi.ComputeRpc.Option.MAX_RESULTS;
+import static com.google.gcloud.compute.spi.ComputeRpc.Option.PAGE_TOKEN;
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 
 import com.google.api.client.http.HttpRequestInitializer;

diff --git a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/ComputeImplTest.java b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/ComputeImplTest.java
@@ -16,9 +16,9 @@
 
 package com.google.gcloud.compute;
 
-import static com.google.gcloud.spi.ComputeRpc.Option.FILTER;
-import static com.google.gcloud.spi.ComputeRpc.Option.MAX_RESULTS;
-import static com.google.gcloud.spi.ComputeRpc.Option.PAGE_TOKEN;
+import static com.google.gcloud.compute.spi.ComputeRpc.Option.FILTER;
+import static com.google.gcloud.compute.spi.ComputeRpc.Option.MAX_RESULTS;
+import static com.google.gcloud.compute.spi.ComputeRpc.Option.PAGE_TOKEN;
 import static org.easymock.EasyMock.capture;
 import static org.easymock.EasyMock.eq;
 import static org.junit.Assert.assertArrayEquals;
@@ -71,9 +71,9 @@
 import com.google.gcloud.compute.Operation.OperationError;
 import com.google.gcloud.compute.Operation.OperationWarning;
 import com.google.gcloud.compute.Operation.Status;
-import com.google.gcloud.spi.ComputeRpc;
-import com.google.gcloud.spi.ComputeRpc.Tuple;
-import com.google.gcloud.spi.ComputeRpcFactory;
+import com.google.gcloud.compute.spi.ComputeRpc;
+import com.google.gcloud.compute.spi.ComputeRpc.Tuple;
+import com.google.gcloud.compute.spi.ComputeRpcFactory;
 
 import org.easymock.Capture;
 import org.easymock.EasyMock;