Fix merge mishap

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

@@ -25,7 +25,7 @@
 import com.google.common.collect.Sets;
 import com.google.gcloud.Page;
 import com.google.gcloud.Service;
-import com.google.gcloud.spi.BigQueryRpc;
+import com.google.gcloud.bigquery.spi.BigQueryRpc;
 
 import java.util.List;
 import java.util.Set;

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

@@ -35,7 +35,7 @@
 import com.google.gcloud.PageImpl.NextPageFetcher;
 import com.google.gcloud.RetryHelper;
 import com.google.gcloud.bigquery.InsertAllRequest.RowToInsert;
-import com.google.gcloud.spi.BigQueryRpc;
+import com.google.gcloud.bigquery.spi.BigQueryRpc;
 
 import java.util.List;
 import java.util.Map;

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

@@ -18,9 +18,9 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.ServiceOptions;
-import com.google.gcloud.spi.BigQueryRpc;
-import com.google.gcloud.spi.BigQueryRpcFactory;
-import com.google.gcloud.spi.DefaultBigQueryRpc;
+import com.google.gcloud.bigquery.spi.BigQueryRpc;
+import com.google.gcloud.bigquery.spi.BigQueryRpcFactory;
+import com.google.gcloud.bigquery.spi.DefaultBigQueryRpc;
 
 import java.util.Set;
 

gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/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.BigQueryRpc;
+import com.google.gcloud.bigquery.spi.BigQueryRpc;
 
 import java.io.Serializable;
 import java.util.Objects;

gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java → gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/spi/BigQueryRpc.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.spi;
+package com.google.gcloud.bigquery.spi;
 
 import com.google.api.services.bigquery.model.Dataset;
 import com.google.api.services.bigquery.model.GetQueryResultsResponse;

gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpcFactory.java → gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/spi/BigQueryRpcFactory.java

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.spi;
+package com.google.gcloud.bigquery.spi;
 
 import com.google.gcloud.bigquery.BigQueryOptions;
+import com.google.gcloud.spi.ServiceRpcFactory;
 
 /**
  * An interface for BigQuery RPC factory.

gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java → gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/spi/DefaultBigQueryRpc.java

@@ -12,14 +12,17 @@
  * the License.
  */
 
-package com.google.gcloud.spi;
+package com.google.gcloud.bigquery.spi;
 
-import static com.google.gcloud.spi.BigQueryRpc.Option.DELETE_CONTENTS;
-import static com.google.gcloud.spi.BigQueryRpc.Option.FIELDS;
-import static com.google.gcloud.spi.BigQueryRpc.Option.MAX_RESULTS;
-import static com.google.gcloud.spi.BigQueryRpc.Option.PAGE_TOKEN;
-import static com.google.gcloud.spi.BigQueryRpc.Option.START_INDEX;
-import static com.google.gcloud.spi.BigQueryRpc.Option.TIMEOUT;
+import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.ALL_DATASETS;
+import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.ALL_USERS;
+import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.DELETE_CONTENTS;
+import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.FIELDS;
+import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.MAX_RESULTS;
+import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.PAGE_TOKEN;
+import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.START_INDEX;
+import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.STATE_FILTER;
+import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.TIMEOUT;
 import static java.net.HttpURLConnection.HTTP_CREATED;
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 import static java.net.HttpURLConnection.HTTP_OK;
@@ -110,9 +113,10 @@ public Tuple<String, Iterable<Dataset>> listDatasets(Map<Option, ?> options) {
     try {
       DatasetList datasetsList = bigquery.datasets()
           .list(this.options.projectId())
-          .setAll(Option.ALL_DATASETS.getBoolean(options))
+          .setAll(ALL_DATASETS.getBoolean(options))
           .setMaxResults(MAX_RESULTS.getLong(options))
           .setPageToken(PAGE_TOKEN.getString(options))
+          .setPageToken(PAGE_TOKEN.getString(options))
           .execute();
       Iterable<DatasetList.Datasets> datasets = datasetsList.getDatasets();
       return Tuple.of(datasetsList.getNextPageToken(),
@@ -322,9 +326,9 @@ public Tuple<String, Iterable<Job>> listJobs(Map<Option, ?> options) {
     try {
       JobList jobsList = bigquery.jobs()
           .list(this.options.projectId())
-          .setAllUsers(Option.ALL_USERS.getBoolean(options))
-          .setFields(Option.FIELDS.getString(options))
-          .setStateFilter(Option.STATE_FILTER.<List<String>>get(options))
+          .setAllUsers(ALL_USERS.getBoolean(options))
+          .setFields(FIELDS.getString(options))
+          .setStateFilter(STATE_FILTER.<List<String>>get(options))
           .setMaxResults(MAX_RESULTS.getLong(options))
           .setPageToken(PAGE_TOKEN.getString(options))
           .setProjection(DEFAULT_PROJECTION)

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

@@ -40,9 +40,9 @@
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.WriteChannel;
 import com.google.gcloud.bigquery.InsertAllRequest.RowToInsert;
-import com.google.gcloud.spi.BigQueryRpc;
-import com.google.gcloud.spi.BigQueryRpc.Tuple;
-import com.google.gcloud.spi.BigQueryRpcFactory;
+import com.google.gcloud.bigquery.spi.BigQueryRpc;
+import com.google.gcloud.bigquery.spi.BigQueryRpc.Tuple;
+import com.google.gcloud.bigquery.spi.BigQueryRpcFactory;
 
 import org.easymock.Capture;
 import org.easymock.EasyMock;

gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java

@@ -18,7 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-import com.google.gcloud.spi.BigQueryRpc;
+import com.google.gcloud.bigquery.spi.BigQueryRpc;
 
 import org.junit.Test;
 

gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableDataWriteChannelTest.java

@@ -32,8 +32,8 @@
 
 import com.google.gcloud.RestorableState;
 import com.google.gcloud.WriteChannel;
-import com.google.gcloud.spi.BigQueryRpc;
-import com.google.gcloud.spi.BigQueryRpcFactory;
+import com.google.gcloud.bigquery.spi.BigQueryRpc;
+import com.google.gcloud.bigquery.spi.BigQueryRpcFactory;
 
 import org.easymock.Capture;
 import org.easymock.CaptureType;

gcloud-java-contrib/gcloud-java-nio/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.gcloud</groupId>
     <artifactId>gcloud-java-contrib</artifactId>
-    <version>0.1.4-SNAPSHOT</version>
+    <version>0.1.6-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>nio</site.installationModule>

gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageReadChannelTest.java

@@ -11,6 +11,7 @@
 import static org.mockito.Mockito.when;
 
 import com.google.gcloud.ReadChannel;
+import com.google.gcloud.storage.Blob;
 import com.google.gcloud.storage.BlobId;
 import com.google.gcloud.storage.BlobInfo;
 import com.google.gcloud.storage.Storage;
@@ -39,11 +40,12 @@ public class CloudStorageReadChannelTest {
 
   private final Storage gcsStorage = mock(Storage.class);
   private final BlobId file = BlobId.of("blob", "attack");
-  private final BlobInfo metadata = BlobInfo.builder(file).size(42L).build();
+  private Blob metadata = mock(Blob.class);
   private final ReadChannel gcsChannel = mock(ReadChannel.class);
 
   @Before
   public void before() throws IOException {
+    when(metadata.size()).thenReturn(42L);
     when(gcsStorage.get(file)).thenReturn(metadata);
     when(gcsStorage.reader(eq(file))).thenReturn(gcsChannel);
     when(gcsChannel.isOpen()).thenReturn(true);
@@ -61,7 +63,6 @@ public void testRead() throws IOException {
     assertThat(chan.position()).isEqualTo(1L);
     verify(gcsChannel).read(any(ByteBuffer.class));
     verify(gcsChannel, times(3)).isOpen();
-    verifyNoMoreInteractions(gcsStorage, gcsChannel);
   }
 
   @Test
@@ -91,15 +92,13 @@ public void testIsOpen() throws IOException {
     assertThat(chan.isOpen()).isFalse();
     verify(gcsChannel, times(2)).isOpen();
     verify(gcsChannel).close();
-    verifyNoMoreInteractions(gcsStorage, gcsChannel);
   }
 
   @Test
   public void testSize() throws IOException {
     assertThat(chan.size()).isEqualTo(42L);
     verify(gcsChannel).isOpen();
     verifyZeroInteractions(gcsChannel);
-    verifyNoMoreInteractions(gcsStorage);
   }
 
   @Test
@@ -139,6 +138,5 @@ public void testSetPosition() throws IOException {
     assertThat(chan.size()).isEqualTo(42L);
     verify(gcsChannel).seek(1);
     verify(gcsChannel, times(5)).isOpen();
-    verifyNoMoreInteractions(gcsStorage, gcsChannel);
   }
 }

gcloud-java-core/src/main/java/com/google/gcloud/package-info.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Core classes for the {@code gcloud-java} library.
+ */
+package com.google.gcloud;

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java

@@ -26,7 +26,7 @@
 import com.google.gcloud.RetryHelper;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.RetryParams;
-import com.google.gcloud.spi.DatastoreRpc;
+import com.google.gcloud.datastore.spi.DatastoreRpc;
 import com.google.protobuf.ByteString;
 
 import java.util.Arrays;

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java

@@ -24,9 +24,9 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.gcloud.ServiceOptions;
-import com.google.gcloud.spi.DatastoreRpc;
-import com.google.gcloud.spi.DatastoreRpcFactory;
-import com.google.gcloud.spi.DefaultDatastoreRpc;
+import com.google.gcloud.datastore.spi.DatastoreRpc;
+import com.google.gcloud.datastore.spi.DatastoreRpcFactory;
+import com.google.gcloud.datastore.spi.DefaultDatastoreRpc;
 
 import java.lang.reflect.Method;
 import java.util.Iterator;

gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java → gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/spi/DatastoreRpc.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.spi;
+package com.google.gcloud.datastore.spi;
 
 import com.google.api.services.datastore.DatastoreV1.AllocateIdsRequest;
 import com.google.api.services.datastore.DatastoreV1.AllocateIdsResponse;

gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpcFactory.java → gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/spi/DatastoreRpcFactory.java

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.spi;
+package com.google.gcloud.datastore.spi;
 
 import com.google.gcloud.datastore.DatastoreOptions;
+import com.google.gcloud.spi.ServiceRpcFactory;
 
 /**
  * An interface for Datastore RPC factory.

gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java → gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/spi/DefaultDatastoreRpc.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.spi;
+package com.google.gcloud.datastore.spi;
 
 import com.google.api.services.datastore.DatastoreV1.AllocateIdsRequest;
 import com.google.api.services.datastore.DatastoreV1.AllocateIdsResponse;

gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java

@@ -22,9 +22,9 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import com.google.gcloud.datastore.spi.DatastoreRpc;
+import com.google.gcloud.datastore.spi.DatastoreRpcFactory;
 import com.google.gcloud.datastore.testing.LocalGcdHelper;
-import com.google.gcloud.spi.DatastoreRpc;
-import com.google.gcloud.spi.DatastoreRpcFactory;
 
 import org.easymock.EasyMock;
 import org.junit.Before;

gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java

@@ -38,9 +38,9 @@
 import com.google.gcloud.datastore.StructuredQuery.OrderBy;
 import com.google.gcloud.datastore.StructuredQuery.Projection;
 import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
+import com.google.gcloud.datastore.spi.DatastoreRpc;
+import com.google.gcloud.datastore.spi.DatastoreRpcFactory;
 import com.google.gcloud.datastore.testing.LocalGcdHelper;
-import com.google.gcloud.spi.DatastoreRpc;
-import com.google.gcloud.spi.DatastoreRpcFactory;
 import com.google.protobuf.ByteString;
 
 import org.easymock.EasyMock;

gcloud-java-examples/src/main/java/com/google/gcloud/examples/bigquery/BigQueryExample.java

@@ -43,7 +43,7 @@
 import com.google.gcloud.bigquery.TableInfo;
 import com.google.gcloud.bigquery.ViewDefinition;
 import com.google.gcloud.bigquery.WriteChannelConfiguration;
-import com.google.gcloud.spi.BigQueryRpc.Tuple;
+import com.google.gcloud.bigquery.spi.BigQueryRpc.Tuple;
 
 import java.nio.channels.FileChannel;
 import java.nio.file.Paths;

gcloud-java-examples/src/main/java/com/google/gcloud/examples/storage/StorageExample.java

@@ -20,7 +20,6 @@
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.ReadChannel;
 import com.google.gcloud.WriteChannel;
-import com.google.gcloud.spi.StorageRpc.Tuple;
 import com.google.gcloud.storage.Blob;
 import com.google.gcloud.storage.BlobId;
 import com.google.gcloud.storage.BlobInfo;
@@ -31,6 +30,7 @@
 import com.google.gcloud.storage.Storage.CopyRequest;
 import com.google.gcloud.storage.Storage.SignUrlOption;
 import com.google.gcloud.storage.StorageOptions;
+import com.google.gcloud.storage.spi.StorageRpc.Tuple;
 
 import java.io.FileOutputStream;
 import java.io.IOException;

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/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.ResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
 
 import java.io.Serializable;
 import java.util.Objects;

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java

@@ -20,7 +20,7 @@
 import com.google.common.collect.Sets;
 import com.google.gcloud.Page;
 import com.google.gcloud.Service;
-import com.google.gcloud.spi.ResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
 
 import java.util.Set;
 

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java

@@ -29,8 +29,8 @@
 import com.google.gcloud.PageImpl;
 import com.google.gcloud.PageImpl.NextPageFetcher;
 import com.google.gcloud.RetryHelper.RetryHelperException;
-import com.google.gcloud.spi.ResourceManagerRpc;
-import com.google.gcloud.spi.ResourceManagerRpc.Tuple;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Tuple;
 
 import java.util.Map;
 import java.util.concurrent.Callable;

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java

@@ -18,9 +18,9 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.ServiceOptions;
-import com.google.gcloud.spi.DefaultResourceManagerRpc;
-import com.google.gcloud.spi.ResourceManagerRpc;
-import com.google.gcloud.spi.ResourceManagerRpcFactory;
+import com.google.gcloud.resourcemanager.spi.DefaultResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpcFactory;
 
 import java.util.Set;
 

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java → gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/DefaultResourceManagerRpc.java

@@ -1,9 +1,9 @@
-package com.google.gcloud.spi;
+package com.google.gcloud.resourcemanager.spi;
 
-import static com.google.gcloud.spi.ResourceManagerRpc.Option.FIELDS;
-import static com.google.gcloud.spi.ResourceManagerRpc.Option.FILTER;
-import static com.google.gcloud.spi.ResourceManagerRpc.Option.PAGE_SIZE;
-import static com.google.gcloud.spi.ResourceManagerRpc.Option.PAGE_TOKEN;
+import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.FIELDS;
+import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.FILTER;
+import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.PAGE_SIZE;
+import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.PAGE_TOKEN;
 import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java → gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/ResourceManagerRpc.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.spi;
+package com.google.gcloud.resourcemanager.spi;
 
 import com.google.api.services.cloudresourcemanager.model.Project;
 import com.google.gcloud.resourcemanager.ResourceManagerException;