Skip to content

Commit 6cd817e

Browse files
committed
Move Compute's spi package to compute.spi
1 parent 5486d53 commit 6cd817e

File tree

8 files changed

+20
-19
lines changed

8 files changed

+20
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.google.common.collect.Sets;
2424
import com.google.gcloud.Page;
2525
import com.google.gcloud.Service;
26-
import com.google.gcloud.spi.ComputeRpc;
26+
import com.google.gcloud.compute.spi.ComputeRpc;
2727

2828
import java.io.Serializable;
2929
import java.util.Objects;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.google.gcloud.PageImpl;
2929
import com.google.gcloud.PageImpl.NextPageFetcher;
3030
import com.google.gcloud.RetryHelper;
31-
import com.google.gcloud.spi.ComputeRpc;
31+
import com.google.gcloud.compute.spi.ComputeRpc;
3232

3333
import java.util.Map;
3434
import java.util.concurrent.Callable;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import com.google.common.collect.ImmutableSet;
2020
import com.google.gcloud.ServiceOptions;
21-
import com.google.gcloud.spi.ComputeRpc;
22-
import com.google.gcloud.spi.ComputeRpcFactory;
23-
import com.google.gcloud.spi.DefaultComputeRpc;
21+
import com.google.gcloud.compute.spi.ComputeRpc;
22+
import com.google.gcloud.compute.spi.ComputeRpcFactory;
23+
import com.google.gcloud.compute.spi.DefaultComputeRpc;
2424

2525
import java.util.Set;
2626

gcloud-java-compute/src/main/java/com/google/gcloud/compute/Option.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

2121
import com.google.common.base.MoreObjects;
22-
import com.google.gcloud.spi.ComputeRpc;
22+
import com.google.gcloud.compute.spi.ComputeRpc;
2323

2424
import java.io.Serializable;
2525
import java.util.Objects;

gcloud-java-compute/src/main/java/com/google/gcloud/spi/ComputeRpc.java renamed to gcloud-java-compute/src/main/java/com/google/gcloud/compute/spi/ComputeRpc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.gcloud.spi;
17+
package com.google.gcloud.compute.spi;
1818

1919
import com.google.api.services.compute.model.Address;
2020
import com.google.api.services.compute.model.DeprecationStatus;

gcloud-java-compute/src/main/java/com/google/gcloud/spi/ComputeRpcFactory.java renamed to gcloud-java-compute/src/main/java/com/google/gcloud/compute/spi/ComputeRpcFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.gcloud.spi;
17+
package com.google.gcloud.compute.spi;
1818

1919
import com.google.gcloud.compute.ComputeOptions;
20+
import com.google.gcloud.spi.ServiceRpcFactory;
2021

2122
/**
2223
* An interface for Compute RPC factory.

gcloud-java-compute/src/main/java/com/google/gcloud/spi/DefaultComputeRpc.java renamed to gcloud-java-compute/src/main/java/com/google/gcloud/compute/spi/DefaultComputeRpc.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.gcloud.spi;
17+
package com.google.gcloud.compute.spi;
1818

19-
import static com.google.gcloud.spi.ComputeRpc.Option.FIELDS;
20-
import static com.google.gcloud.spi.ComputeRpc.Option.FILTER;
21-
import static com.google.gcloud.spi.ComputeRpc.Option.MAX_RESULTS;
22-
import static com.google.gcloud.spi.ComputeRpc.Option.PAGE_TOKEN;
19+
import static com.google.gcloud.compute.spi.ComputeRpc.Option.FIELDS;
20+
import static com.google.gcloud.compute.spi.ComputeRpc.Option.FILTER;
21+
import static com.google.gcloud.compute.spi.ComputeRpc.Option.MAX_RESULTS;
22+
import static com.google.gcloud.compute.spi.ComputeRpc.Option.PAGE_TOKEN;
2323
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
2424

2525
import com.google.api.client.http.HttpRequestInitializer;

gcloud-java-compute/src/test/java/com/google/gcloud/compute/ComputeImplTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.google.gcloud.compute;
1818

19-
import static com.google.gcloud.spi.ComputeRpc.Option.FILTER;
20-
import static com.google.gcloud.spi.ComputeRpc.Option.MAX_RESULTS;
21-
import static com.google.gcloud.spi.ComputeRpc.Option.PAGE_TOKEN;
19+
import static com.google.gcloud.compute.spi.ComputeRpc.Option.FILTER;
20+
import static com.google.gcloud.compute.spi.ComputeRpc.Option.MAX_RESULTS;
21+
import static com.google.gcloud.compute.spi.ComputeRpc.Option.PAGE_TOKEN;
2222
import static org.easymock.EasyMock.capture;
2323
import static org.easymock.EasyMock.eq;
2424
import static org.junit.Assert.assertArrayEquals;
@@ -71,9 +71,9 @@
7171
import com.google.gcloud.compute.Operation.OperationError;
7272
import com.google.gcloud.compute.Operation.OperationWarning;
7373
import com.google.gcloud.compute.Operation.Status;
74-
import com.google.gcloud.spi.ComputeRpc;
75-
import com.google.gcloud.spi.ComputeRpc.Tuple;
76-
import com.google.gcloud.spi.ComputeRpcFactory;
74+
import com.google.gcloud.compute.spi.ComputeRpc;
75+
import com.google.gcloud.compute.spi.ComputeRpc.Tuple;
76+
import com.google.gcloud.compute.spi.ComputeRpcFactory;
7777

7878
import org.easymock.Capture;
7979
import org.easymock.EasyMock;

0 commit comments

Comments
 (0)