From 333a3bb13bdf1714e43aea78085fcb29d8488dd9 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Thu, 22 Oct 2015 13:14:42 +0200 Subject: [PATCH 001/322] Add null value (empty map) for blob metadata --- .../com/google/gcloud/storage/BlobInfo.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java index 8e6921bbc20d..841bcc5d3b95 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java @@ -28,13 +28,16 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import java.io.Serializable; import java.math.BigInteger; +import java.util.AbstractMap; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; /** * Google Storage object metadata. @@ -81,6 +84,14 @@ public StorageObject apply(BlobInfo blobInfo) { private final String contentLanguage; private final Integer componentCount; + public static final class ImmutableEmptyMap extends AbstractMap { + + @Override + public Set> entrySet() { + return ImmutableSet.of(); + } + } + public static final class Builder { private BlobId blobId; @@ -99,7 +110,7 @@ public static final class Builder { private String md5; private String crc32c; private String mediaLink; - private ImmutableMap metadata; + private Map metadata; private Long generation; private Long metageneration; private Long deleteTime; @@ -188,7 +199,8 @@ Builder mediaLink(String mediaLink) { } public Builder metadata(Map metadata) { - this.metadata = metadata != null ? ImmutableMap.copyOf(metadata) : null; + this.metadata = metadata != null ? + ImmutableMap.copyOf(metadata) : Data.nullOf(ImmutableEmptyMap.class); return this; } @@ -315,7 +327,7 @@ public String mediaLink() { } public Map metadata() { - return metadata; + return Data.isNull(metadata) ? null : metadata; } public Long generation() { From 3b917417d6ca9b0cee5a162955755d8a35d1aaa0 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Thu, 22 Oct 2015 13:15:32 +0200 Subject: [PATCH 002/322] Document patch behaviour in Blob and Storage javadoc --- .../java/com/google/gcloud/storage/Blob.java | 24 ++++++++++++++----- .../com/google/gcloud/storage/Storage.java | 24 ++++++++++++++++--- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java index a4a817ead2df..bc75408997f4 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java @@ -190,6 +190,16 @@ public Blob reload(BlobSourceOption... options) { * made on the metadata generation of the current blob. If you want to update the information only * if the current blob metadata are at their latest version use the {@code metagenerationMatch} * option: {@code blob.update(newInfo, BlobTargetOption.metagenerationMatch())}. + *

+ * Original metadata are merged with metadata in the provided {@code blobInfo}. To replace + * metadata instead you first have to unset them. Unsetting metadata can be done by setting the + * provided {@code blobInfo}'s metadata to {@code null}. + *

+ *

+ * Example usage of replacing blob's metadata: + * 

    {@code blob.update(blob.info().toBuilder().metadata(null).build());}
+   *    {@code blob.update(blob.info().toBuilder().metadata(newMetadata).build());}
+   *
* * @param blobInfo new blob's information. Bucket and blob names must match the current ones * @param options update options @@ -306,8 +316,7 @@ public Storage storage() { } /** - * Gets the requested blobs. If {@code infos.length == 0} an empty list is returned. If - * {@code infos.length > 1} a batch request is used to fetch blobs. + * Gets the requested blobs. A batch request is used to fetch blobs. * * @param storage the storage service used to issue the request * @param blobs the blobs to get @@ -331,8 +340,12 @@ public Blob apply(BlobInfo f) { } /** - * Updates the requested blobs. If {@code infos.length == 0} an empty list is returned. If - * {@code infos.length > 1} a batch request is used to update blobs. + * Updates the requested blobs. A batch request is used to update blobs. Original metadata are + * merged with metadata in the provided {@code BlobInfo} objects. To replace metadata instead + * you first have to unset them. Unsetting metadata can be done by setting the provided + * {@code BlobInfo} objects metadata to {@code null}. See + * {@link #update(com.google.gcloud.storage.BlobInfo, + * com.google.gcloud.storage.Storage.BlobTargetOption...) } for a code example. * * @param storage the storage service used to issue the request * @param infos the blobs to update @@ -356,8 +369,7 @@ public Blob apply(BlobInfo f) { } /** - * Deletes the requested blobs. If {@code infos.length == 0} an empty list is returned. If - * {@code infos.length > 1} a batch request is used to delete blobs. + * Deletes the requested blobs. A batch request is used to delete blobs. * * @param storage the storage service used to issue the request * @param blobs the blobs to delete diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java index f9a1c00d4bec..267bcdf5b24c 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java @@ -683,7 +683,14 @@ public static Builder builder() { BucketInfo update(BucketInfo bucketInfo, BucketTargetOption... options); /** - * Update blob information. + * Update blob information. Original metadata are merged with metadata in the provided + * {@code blobInfo}. To replace metadata instead you first have to unset them. Unsetting metadata + * can be done by setting the provided {@code blobInfo}'s metadata to {@code null}. + *

+ * Example usage of replacing blob's metadata: + * 

    {@code service.update(BlobInfo.builder("bucket", "name").metadata(null).build());}
+   *    {@code service.update(BlobInfo.builder("bucket", "name").metadata(newMetadata).build());}
+   *
* * @return the updated blob * @throws StorageException upon failure @@ -691,7 +698,14 @@ public static Builder builder() { BlobInfo update(BlobInfo blobInfo, BlobTargetOption... options); /** - * Update blob information. + * Update blob information. Original metadata are merged with metadata in the provided + * {@code blobInfo}. To replace metadata instead you first have to unset them. Unsetting metadata + * can be done by setting the provided {@code blobInfo}'s metadata to {@code null}. + *

+ * Example usage of replacing blob's metadata: + * 

    {@code service.update(BlobInfo.builder("bucket", "name").metadata(null).build());}
+   *    {@code service.update(BlobInfo.builder("bucket", "name").metadata(newMetadata).build());}
+   *
* * @return the updated blob * @throws StorageException upon failure @@ -826,7 +840,11 @@ public static Builder builder() { List get(BlobId... blobIds); /** - * Updates the requested blobs. A batch request is used to perform this call. + * Updates the requested blobs. A batch request is used to perform this call. Original metadata + * are merged with metadata in the provided {@code BlobInfo} objects. To replace metadata instead + * you first have to unset them. Unsetting metadata can be done by setting the provided + * {@code BlobInfo} objects metadata to {@code null}. See + * {@link #update(com.google.gcloud.storage.BlobInfo)} for a code example. * * @param blobInfos blobs to update * @return an immutable list of {@code BlobInfo} objects. If a blob does not exist or access to it From 99178a3d0758a2ad7e1577c7e3adc99b8ef542bb Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Thu, 22 Oct 2015 13:20:47 +0200 Subject: [PATCH 003/322] Add integration test for replacing metadata --- .../google/gcloud/storage/ITStorageTest.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java index 2747444d1f27..36ea2041683a 100644 --- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java +++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.gcloud.RestorableState; import com.google.gcloud.storage.testing.RemoteGcsHelper; @@ -174,6 +175,23 @@ public void testUpdateBlob() { assertTrue(storage.delete(bucket, blobName)); } + @Test + public void testUpdateBlobReplaceMetadata() { + String blobName = "test-update-blob-replace-metadata"; + BlobInfo blob = BlobInfo.builder(bucket, blobName) + .contentType(CONTENT_TYPE) + .metadata(ImmutableMap.of("k1", "a")) + .build(); + assertNotNull(storage.create(blob)); + BlobInfo updatedBlob = storage.update(blob.toBuilder().metadata(null).build()); + assertNotNull(updatedBlob); + assertNull(updatedBlob.metadata()); + updatedBlob = storage.update(blob.toBuilder().metadata(ImmutableMap.of("k2", "b")).build()); + assertEquals(blob.blobId(), updatedBlob.blobId()); + assertEquals(ImmutableMap.of("k2", "b"), updatedBlob.metadata()); + assertTrue(storage.delete(bucket, blobName)); + } + @Test public void testUpdateBlobFail() { String blobName = "test-update-blob-fail"; From 04cf0a7c708cbf8c0e53fb971490b0e2cc6c5ab5 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Thu, 22 Oct 2015 13:22:00 +0200 Subject: [PATCH 004/322] Minor refactoring of ITStorageTest --- .../google/gcloud/storage/ITStorageTest.java | 47 +++++++------------ 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java index 36ea2041683a..20fdc84ff8a7 100644 --- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java +++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java @@ -96,8 +96,7 @@ public void testCreateBlob() { BlobInfo blob = BlobInfo.builder(bucket, blobName).build(); BlobInfo remoteBlob = storage.create(blob, BLOB_BYTE_CONTENT); assertNotNull(remoteBlob); - assertEquals(blob.bucket(), remoteBlob.bucket()); - assertEquals(blob.name(), remoteBlob.name()); + assertEquals(blob.blobId(), remoteBlob.blobId()); byte[] readBytes = storage.readAllBytes(bucket, blobName); assertArrayEquals(BLOB_BYTE_CONTENT, readBytes); assertTrue(storage.delete(bucket, blobName)); @@ -109,8 +108,7 @@ public void testCreateEmptyBlob() { BlobInfo blob = BlobInfo.builder(bucket, blobName).build(); BlobInfo remoteBlob = storage.create(blob); assertNotNull(remoteBlob); - assertEquals(blob.bucket(), remoteBlob.bucket()); - assertEquals(blob.name(), remoteBlob.name()); + assertEquals(blob.blobId(), remoteBlob.blobId()); byte[] readBytes = storage.readAllBytes(bucket, blobName); assertArrayEquals(new byte[0], readBytes); assertTrue(storage.delete(bucket, blobName)); @@ -123,8 +121,7 @@ public void testCreateBlobStream() throws UnsupportedEncodingException { ByteArrayInputStream stream = new ByteArrayInputStream(BLOB_STRING_CONTENT.getBytes(UTF_8)); BlobInfo remoteBlob = storage.create(blob, stream); assertNotNull(remoteBlob); - assertEquals(blob.bucket(), remoteBlob.bucket()); - assertEquals(blob.name(), remoteBlob.name()); + assertEquals(blob.blobId(), remoteBlob.blobId()); assertEquals(blob.contentType(), remoteBlob.contentType()); byte[] readBytes = storage.readAllBytes(bucket, blobName); assertEquals(BLOB_STRING_CONTENT, new String(readBytes, UTF_8)); @@ -169,8 +166,7 @@ public void testUpdateBlob() { assertNotNull(storage.create(blob)); BlobInfo updatedBlob = storage.update(blob.toBuilder().contentType(CONTENT_TYPE).build()); assertNotNull(updatedBlob); - assertEquals(blob.bucket(), updatedBlob.bucket()); - assertEquals(blob.name(), updatedBlob.name()); + assertEquals(blob.blobId(), updatedBlob.blobId()); assertEquals(CONTENT_TYPE, updatedBlob.contentType()); assertTrue(storage.delete(bucket, blobName)); } @@ -241,8 +237,7 @@ public void testComposeBlob() { Storage.ComposeRequest.of(ImmutableList.of(sourceBlobName1, sourceBlobName2), targetBlob); BlobInfo remoteBlob = storage.compose(req); assertNotNull(remoteBlob); - assertEquals(bucket, remoteBlob.bucket()); - assertEquals(targetBlobName, remoteBlob.name()); + assertEquals(targetBlob.blobId(), remoteBlob.blobId()); byte[] readBytes = storage.readAllBytes(bucket, targetBlobName); byte[] composedBytes = Arrays.copyOf(BLOB_BYTE_CONTENT, BLOB_BYTE_CONTENT.length * 2); System.arraycopy(BLOB_BYTE_CONTENT, 0, composedBytes, BLOB_BYTE_CONTENT.length, @@ -306,8 +301,7 @@ public void testCopyBlobUpdateMetadata() { Storage.CopyRequest req = Storage.CopyRequest.of(bucket, sourceBlobName, targetBlob); BlobInfo remoteBlob = storage.copy(req); assertNotNull(remoteBlob); - assertEquals(bucket, remoteBlob.bucket()); - assertEquals(targetBlobName, remoteBlob.name()); + assertEquals(targetBlob.blobId(), remoteBlob.blobId()); assertEquals(CONTENT_TYPE, remoteBlob.contentType()); assertTrue(storage.delete(bucket, sourceBlobName)); assertTrue(storage.delete(bucket, targetBlobName)); @@ -355,10 +349,8 @@ public void testBatchRequest() { assertEquals(0, updateResponse.gets().size()); BlobInfo remoteUpdatedBlob1 = updateResponse.updates().get(0).get(); BlobInfo remoteUpdatedBlob2 = updateResponse.updates().get(1).get(); - assertEquals(bucket, remoteUpdatedBlob1.bucket()); - assertEquals(bucket, remoteUpdatedBlob2.bucket()); - assertEquals(updatedBlob1.name(), remoteUpdatedBlob1.name()); - assertEquals(updatedBlob2.name(), remoteUpdatedBlob2.name()); + assertEquals(sourceBlob1.blobId(), remoteUpdatedBlob1.blobId()); + assertEquals(sourceBlob2.blobId(), remoteUpdatedBlob2.blobId()); assertEquals(updatedBlob1.contentType(), remoteUpdatedBlob1.contentType()); assertEquals(updatedBlob2.contentType(), remoteUpdatedBlob2.contentType()); @@ -533,8 +525,7 @@ public void testPostSignedUrl() throws IOException { connection.connect(); BlobInfo remoteBlob = storage.get(bucket, blobName); assertNotNull(remoteBlob); - assertEquals(bucket, remoteBlob.bucket()); - assertEquals(blob.name(), remoteBlob.name()); + assertEquals(blob.blobId(), remoteBlob.blobId()); assertTrue(storage.delete(bucket, blobName)); } @@ -546,11 +537,9 @@ public void testGetBlobs() { BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build(); assertNotNull(storage.create(sourceBlob1)); assertNotNull(storage.create(sourceBlob2)); - List remoteInfos = storage.get(sourceBlob1.blobId(), sourceBlob2.blobId()); - assertEquals(sourceBlob1.bucket(), remoteInfos.get(0).bucket()); - assertEquals(sourceBlob1.name(), remoteInfos.get(0).name()); - assertEquals(sourceBlob2.bucket(), remoteInfos.get(1).bucket()); - assertEquals(sourceBlob2.name(), remoteInfos.get(1).name()); + List remoteBlobs = storage.get(sourceBlob1.blobId(), sourceBlob2.blobId()); + assertEquals(sourceBlob1.blobId(), remoteBlobs.get(0).blobId()); + assertEquals(sourceBlob2.blobId(), remoteBlobs.get(1).blobId()); assertTrue(storage.delete(bucket, sourceBlobName1)); assertTrue(storage.delete(bucket, sourceBlobName2)); } @@ -563,8 +552,7 @@ public void testGetBlobsFail() { BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build(); assertNotNull(storage.create(sourceBlob1)); List remoteBlobs = storage.get(sourceBlob1.blobId(), sourceBlob2.blobId()); - assertEquals(sourceBlob1.bucket(), remoteBlobs.get(0).bucket()); - assertEquals(sourceBlob1.name(), remoteBlobs.get(0).name()); + assertEquals(sourceBlob1.blobId(), remoteBlobs.get(0).blobId()); assertNull(remoteBlobs.get(1)); assertTrue(storage.delete(bucket, sourceBlobName1)); } @@ -607,11 +595,9 @@ public void testUpdateBlobs() { List updatedBlobs = storage.update( remoteBlob1.toBuilder().contentType(CONTENT_TYPE).build(), remoteBlob2.toBuilder().contentType(CONTENT_TYPE).build()); - assertEquals(sourceBlob1.bucket(), updatedBlobs.get(0).bucket()); - assertEquals(sourceBlob1.name(), updatedBlobs.get(0).name()); + assertEquals(sourceBlob1.blobId(), updatedBlobs.get(0).blobId()); assertEquals(CONTENT_TYPE, updatedBlobs.get(0).contentType()); - assertEquals(sourceBlob2.bucket(), updatedBlobs.get(1).bucket()); - assertEquals(sourceBlob2.name(), updatedBlobs.get(1).name()); + assertEquals(sourceBlob2.blobId(), updatedBlobs.get(1).blobId()); assertEquals(CONTENT_TYPE, updatedBlobs.get(1).contentType()); assertTrue(storage.delete(bucket, sourceBlobName1)); assertTrue(storage.delete(bucket, sourceBlobName2)); @@ -628,8 +614,7 @@ public void testUpdateBlobsFail() { List updatedBlobs = storage.update( remoteBlob1.toBuilder().contentType(CONTENT_TYPE).build(), sourceBlob2.toBuilder().contentType(CONTENT_TYPE).build()); - assertEquals(sourceBlob1.bucket(), updatedBlobs.get(0).bucket()); - assertEquals(sourceBlob1.name(), updatedBlobs.get(0).name()); + assertEquals(sourceBlob1.blobId(), updatedBlobs.get(0).blobId()); assertEquals(CONTENT_TYPE, updatedBlobs.get(0).contentType()); assertNull(updatedBlobs.get(1)); assertTrue(storage.delete(bucket, sourceBlobName1)); From 75d90658261a380c1573ecf2a5f533dc3ed986ed Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Thu, 22 Oct 2015 16:17:12 +0200 Subject: [PATCH 005/322] Add contentType parameter to Blob.create --- .../java/com/google/gcloud/storage/Bucket.java | 16 ++++++++++++---- .../java/com/google/gcloud/storage/Storage.java | 2 ++ .../com/google/gcloud/storage/BucketTest.java | 15 +++++++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java index 3193259f68cb..3b99541a6410 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java @@ -19,10 +19,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.gcloud.storage.Storage.BlobSourceOption; import com.google.gcloud.storage.Storage.BlobTargetOption; +import com.google.gcloud.storage.Storage.BlobWriteOption; import com.google.gcloud.storage.Storage.BucketSourceOption; import com.google.gcloud.storage.Storage.BucketTargetOption; +import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; @@ -172,17 +175,22 @@ public List get(String blobName1, String blobName2, String... blobNames) { } /** - * Creates a new blob in this bucket. + * Creates a new blob in this bucket. Direct upload is used to upload {@code content}. + * For large content, {@link Blob#writer(com.google.gcloud.storage.Storage.BlobWriteOption...)} + * is recommended as it uses resumable upload. MD5 and CRC32C hashes of {@code content} are + * computed and used for validating transferred data. * * @param blob a blob name * @param content the blob content + * @param contentType the blob content type * @param options options for blob creation * @return a complete blob information. * @throws StorageException upon failure */ - Blob create(String blob, byte[] content, BlobTargetOption... options) { - BlobId blobId = BlobId.of(info.name(), blob); - return new Blob(storage, storage.create(BlobInfo.builder(blobId).build(), content, options)); + public Blob create(String blob, byte[] content, String contentType, BlobTargetOption... options) { + BlobInfo blobInfo = BlobInfo.builder(BlobId.of(info.name(), blob)) + .contentType(MoreObjects.firstNonNull(contentType, Storage.DEFAULT_CONTENT_TYPE)).build(); + return new Blob(storage, storage.create(blobInfo, content, options)); } /** diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java index f9a1c00d4bec..901a54b09bde 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java @@ -46,6 +46,8 @@ */ public interface Storage extends Service { + public static final String DEFAULT_CONTENT_TYPE = "application/octet-stream"; + enum PredefinedAcl { AUTHENTICATED_READ("authenticatedRead"), ALL_AUTHENTICATED_USERS("allAuthenticatedUsers"), diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java index af156cb932ee..045e12c28803 100644 --- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java +++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java @@ -45,6 +45,7 @@ public class BucketTest { BlobInfo.builder("b", "n1").build(), BlobInfo.builder("b", "n2").build(), BlobInfo.builder("b", "n3").build()); + private static final String CONTENT_TYPE = "text/plain"; private Storage storage; private Bucket bucket; @@ -161,11 +162,21 @@ public void testGetAll() throws Exception { @Test public void testCreate() throws Exception { - BlobInfo info = BlobInfo.builder("b", "n").build(); + BlobInfo info = BlobInfo.builder("b", "n").contentType(CONTENT_TYPE).build(); + byte[] content = {0xD, 0xE, 0xA, 0xD}; + expect(storage.create(info, content)).andReturn(info); + replay(storage); + Blob blob = bucket.create("n", content, CONTENT_TYPE); + assertEquals(info, blob.info()); + } + + @Test + public void testCreateNullContentType() throws Exception { + BlobInfo info = BlobInfo.builder("b", "n").contentType(Storage.DEFAULT_CONTENT_TYPE).build(); byte[] content = {0xD, 0xE, 0xA, 0xD}; expect(storage.create(info, content)).andReturn(info); replay(storage); - Blob blob = bucket.create("n", content); + Blob blob = bucket.create("n", content, null); assertEquals(info, blob.info()); } From cd1c8cf05dd0446be2b3b059ffd5367e9a49fdc4 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Thu, 22 Oct 2015 16:41:51 +0200 Subject: [PATCH 006/322] Add Bucket.create from input stream --- .../com/google/gcloud/storage/Bucket.java | 19 +++++++++++++++ .../com/google/gcloud/storage/BucketTest.java | 24 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java index 3b99541a6410..7a33c62ec2f5 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java @@ -193,6 +193,25 @@ public Blob create(String blob, byte[] content, String contentType, BlobTargetOp return new Blob(storage, storage.create(blobInfo, content, options)); } + /** + * Creates a new blob in this bucket. Direct upload is used to upload {@code content}. + * For large content, {@link Blob#writer(com.google.gcloud.storage.Storage.BlobWriteOption...)} + * is recommended as it uses resumable upload. + * + * @param blob a blob name + * @param content the blob content as a stream + * @param contentType the blob content type + * @param options options for blob creation + * @return a complete blob information. + * @throws StorageException upon failure + */ + public Blob create(String blob, InputStream content, String contentType, + BlobWriteOption... options) { + BlobInfo blobInfo = BlobInfo.builder(BlobId.of(info.name(), blob)) + .contentType(MoreObjects.firstNonNull(contentType, Storage.DEFAULT_CONTENT_TYPE)).build(); + return new Blob(storage, storage.create(blobInfo, content, options)); + } + /** * Returns the bucket's {@code Storage} object used to issue requests. */ diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java index 045e12c28803..6526f0d2fe8f 100644 --- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java +++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java @@ -28,6 +28,8 @@ import com.google.common.collect.ImmutableList; import com.google.gcloud.storage.BatchResponse.Result; +import java.io.ByteArrayInputStream; +import java.io.InputStream; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; @@ -180,6 +182,28 @@ public void testCreateNullContentType() throws Exception { assertEquals(info, blob.info()); } + @Test + public void testCreateFromStream() throws Exception { + BlobInfo info = BlobInfo.builder("b", "n").contentType(CONTENT_TYPE).build(); + byte[] content = {0xD, 0xE, 0xA, 0xD}; + InputStream streamContent = new ByteArrayInputStream(content); + expect(storage.create(info, streamContent)).andReturn(info); + replay(storage); + Blob blob = bucket.create("n", streamContent, CONTENT_TYPE); + assertEquals(info, blob.info()); + } + + @Test + public void testCreateFromStreamNullContentType() throws Exception { + BlobInfo info = BlobInfo.builder("b", "n").contentType(Storage.DEFAULT_CONTENT_TYPE).build(); + byte[] content = {0xD, 0xE, 0xA, 0xD}; + InputStream streamContent = new ByteArrayInputStream(content); + expect(storage.create(info, streamContent)).andReturn(info); + replay(storage); + Blob blob = bucket.create("n", streamContent, null); + assertEquals(info, blob.info()); + } + @Test public void testLoad() throws Exception { expect(storage.get(BUCKET_INFO.name())).andReturn(BUCKET_INFO); From 53328f7191f36fe5018734348cc808b8da02fc69 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Thu, 22 Oct 2015 20:54:31 +0200 Subject: [PATCH 007/322] Document contentType default value in Bucket.create --- .../src/main/java/com/google/gcloud/storage/Bucket.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java index 7a33c62ec2f5..8d696dc2ab6b 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java @@ -182,7 +182,8 @@ public List get(String blobName1, String blobName2, String... blobNames) { * * @param blob a blob name * @param content the blob content - * @param contentType the blob content type + * @param contentType the blob content type. If {@code null} then + * {@value com.google.gcloud.storage.Storage#DEFAULT_CONTENT_TYPE} is used. * @param options options for blob creation * @return a complete blob information. * @throws StorageException upon failure @@ -200,7 +201,8 @@ public Blob create(String blob, byte[] content, String contentType, BlobTargetOp * * @param blob a blob name * @param content the blob content as a stream - * @param contentType the blob content type + * @param contentType the blob content type. If {@code null} then + * {@value com.google.gcloud.storage.Storage#DEFAULT_CONTENT_TYPE} is used. * @param options options for blob creation * @return a complete blob information. * @throws StorageException upon failure From 9b3e6896c48ff1146a36d4c4ee4bcf941b641442 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Thu, 22 Oct 2015 14:21:00 -0700 Subject: [PATCH 008/322] Add unit tests for public methods in LocalGcdHelper --- .../datastore/testing/LocalGcdHelper.java | 9 ++- .../gcloud/datastore/LocalGcdHelperTest.java | 66 +++++++++++++++++++ 2 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelperTest.java diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java index c3afe025756b..24c0fbf9faab 100644 --- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java +++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java @@ -524,7 +524,8 @@ private static void extractFile(ZipInputStream zipIn, File filePath) throws IOEx } } - public static void sendQuitRequest(int port) { + public static String sendQuitRequest(int port) { + StringBuilder result = new StringBuilder(); try { URL url = new URL("http", "localhost", port, "/_ah/admin/quit"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); @@ -535,12 +536,14 @@ public static void sendQuitRequest(int port) { out.write("".getBytes()); out.flush(); InputStream in = con.getInputStream(); - while (in.read() != -1) { - // consume input + int currByte = 0; + while ((currByte = in.read()) != -1) { + result.append(((char) currByte)); } } catch (IOException ignore) { // ignore } + return result.toString(); } public void stop() throws IOException, InterruptedException { diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelperTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelperTest.java new file mode 100644 index 000000000000..bfc3ffdaccfe --- /dev/null +++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelperTest.java @@ -0,0 +1,66 @@ +/* + * Copyright 2015 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. + */ + +package com.google.gcloud.datastore; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import com.google.gcloud.datastore.testing.LocalGcdHelper; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import java.io.IOException; +import java.net.ServerSocket; + +@RunWith(JUnit4.class) +public class LocalGcdHelperTest { + + private static final String PROJECT_ID = LocalGcdHelper.DEFAULT_PROJECT_ID; + private static final int PORT = LocalGcdHelper.findAvailablePort(LocalGcdHelper.DEFAULT_PORT); + + @Test + public void testFindAvailablePort() { + int chosenPort = LocalGcdHelper.findAvailablePort(LocalGcdHelper.DEFAULT_PORT); + try (ServerSocket tempSocket = new ServerSocket(chosenPort)) { + // success + } catch (IOException e) { + if (chosenPort != LocalGcdHelper.DEFAULT_PORT) { + fail("Chosen port not free, even though LocalGcdHelper claimed it was."); + } + } + } + + @Test + public void testSendQuitRequest() throws IOException, InterruptedException { + LocalGcdHelper gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT); + assertTrue(LocalGcdHelper.sendQuitRequest(PORT).startsWith("Shutting down local server")); + gcdHelper.stop(); + assertTrue(LocalGcdHelper.sendQuitRequest(PORT).isEmpty()); // shouldn't error + } + + @Test + public void testStartStop() throws IOException, InterruptedException { + LocalGcdHelper gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT); + assertFalse(LocalGcdHelper.isActive("wrong-project-id", PORT)); + assertTrue(LocalGcdHelper.isActive(PROJECT_ID, PORT)); + gcdHelper.stop(); + assertFalse(LocalGcdHelper.isActive(PROJECT_ID, PORT)); + } +} From de1ce7fe771306435c5cc9c63376fbbdad538ee7 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Thu, 22 Oct 2015 15:18:54 -0700 Subject: [PATCH 009/322] Add test for deferred results in datastore get --- .../gcloud/datastore/DatastoreTest.java | 66 ++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java index 0bef237ee48a..2ac8f951f1a6 100644 --- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java @@ -35,6 +35,7 @@ import com.google.gcloud.datastore.StructuredQuery.PropertyFilter; import com.google.gcloud.datastore.testing.LocalGcdHelper; import com.google.gcloud.spi.DatastoreRpc; +import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException; import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason; import com.google.gcloud.spi.DatastoreRpcFactory; @@ -49,9 +50,12 @@ import org.junit.runners.JUnit4; import java.io.IOException; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Set; @RunWith(JUnit4.class) public class DatastoreTest { @@ -520,7 +524,7 @@ public void testGet() { } @Test - public void testGetArray() { + public void testGetArrayNoDeferredResults() { datastore.put(ENTITY3); Iterator result = datastore.fetch(KEY1, Key.builder(KEY1).name("bla").build(), KEY2, KEY3).iterator(); @@ -546,7 +550,65 @@ public void testGetArray() { // expected - no such property } assertFalse(result.hasNext()); - // TODO(ozarov): construct a test to verify more results + } + + public void testGetArrayDeferredResults() throws DatastoreRpcException { + List keysPb = new ArrayList<>(); + keysPb.add(KEY1.toPb()); + keysPb.add(KEY2.toPb()); + keysPb.add(KEY3.toPb()); + keysPb.add(KEY4.toPb()); + keysPb.add(KEY5.toPb()); + List lookupRequests = new ArrayList<>(); + lookupRequests.add(DatastoreV1.LookupRequest.newBuilder().addAllKey(keysPb).build()); + lookupRequests.add( + DatastoreV1.LookupRequest.newBuilder() + .addKey(keysPb.get(2)) + .addKey(keysPb.get(3)) + .addKey(keysPb.get(5)) + .build()); + lookupRequests.add(DatastoreV1.LookupRequest.newBuilder().addKey(keysPb.get(5)).build()); + Entity entity4 = Entity.builder(KEY4).set("value", StringValue.of("value")).build(); + Entity entity5 = Entity.builder(KEY5).set("value", "value").build(); + List lookupResponses = new ArrayList<>(); + lookupResponses.add( + DatastoreV1.LookupResponse.newBuilder() + .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb())) + .addFound(EntityResult.newBuilder().setEntity(entity4.toPb())) + .addDeferred(KEY2.toPb()) + .addDeferred(KEY3.toPb()) + .addDeferred(KEY5.toPb()) + .build()); + lookupResponses.add( + DatastoreV1.LookupResponse.newBuilder() + .addFound(EntityResult.newBuilder().setEntity(ENTITY3.toPb())) + .addFound(EntityResult.newBuilder().setEntity(entity4.toPb())) + .addDeferred(KEY5.toPb()) + .build()); + lookupResponses.add( + DatastoreV1.LookupResponse.newBuilder() + .addFound(EntityResult.newBuilder().setEntity(entity5.toPb())) + .build()); + DatastoreRpcFactory rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class); + DatastoreRpc rpcMock = EasyMock.createStrictMock(DatastoreRpc.class); + EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class))) + .andReturn(rpcMock); + for (int i = 0; i < lookupRequests.size(); i++) { + EasyMock.expect(rpcMock.lookup(lookupRequests.get(i))).andReturn(lookupResponses.get(i)); + } + EasyMock.replay(rpcFactoryMock, rpcMock); + DatastoreOptions options = + this.options.toBuilder() + .retryParams(RetryParams.getDefaultInstance()) + .serviceRpcFactory(rpcFactoryMock) + .build(); + Datastore datastore = DatastoreFactory.instance().get(options); + Iterator iter = datastore.get(KEY1, KEY2, KEY3, KEY4, KEY5); + Set foundEntities = new HashSet<>(); + while (iter.hasNext()) { + foundEntities.add(iter.next()); + } + assertEquals(foundEntities.size(), 5); } @Test From 87bc1a112eacee8f475f0ebe2734aa35522f4fac Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Fri, 23 Oct 2015 13:30:43 +0200 Subject: [PATCH 010/322] Provide a way to unset values in blob metadata - Use HashMap instead of ImmutableMap in builder.metadata - Use Collections.unmodifiableMap in blobInfo.metadata getter - Convert null values in metadata to Data.nullOf in blobInfo.toPb - Add integration tests - Add javadoc to mark BlobInfo.ImmutableEmptyMap as internal --- .../com/google/gcloud/storage/BlobInfo.java | 19 ++++++-- .../google/gcloud/storage/ITStorageTest.java | 48 +++++++++++++++++-- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java index 841bcc5d3b95..eb490db0f9fb 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java @@ -27,13 +27,14 @@ import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import java.io.Serializable; import java.math.BigInteger; import java.util.AbstractMap; +import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -84,6 +85,9 @@ public StorageObject apply(BlobInfo blobInfo) { private final String contentLanguage; private final Integer componentCount; + /** + * This class is meant for internal use only. Users are discouraged from using this class. + */ public static final class ImmutableEmptyMap extends AbstractMap { @Override @@ -200,7 +204,7 @@ Builder mediaLink(String mediaLink) { public Builder metadata(Map metadata) { this.metadata = metadata != null ? - ImmutableMap.copyOf(metadata) : Data.nullOf(ImmutableEmptyMap.class); + new HashMap(metadata) : Data.nullOf(ImmutableEmptyMap.class); return this; } @@ -327,7 +331,7 @@ public String mediaLink() { } public Map metadata() { - return Data.isNull(metadata) ? null : metadata; + return metadata == null || Data.isNull(metadata) ? null : Collections.unmodifiableMap(metadata); } public Long generation() { @@ -414,6 +418,14 @@ public ObjectAccessControl apply(Acl acl) { if (owner != null) { storageObject.setOwner(new Owner().setEntity(owner.toPb())); } + Map pbMetadata = metadata; + if (metadata != null && !Data.isNull(metadata)) { + pbMetadata = new HashMap<>(); + for (String key : metadata.keySet()) { + pbMetadata.put(key, firstNonNull(metadata.get(key), Data.nullOf(String.class))); + } + } + storageObject.setMetadata(pbMetadata); storageObject.setCacheControl(cacheControl); storageObject.setContentEncoding(contentEncoding); storageObject.setCrc32c(crc32c); @@ -421,7 +433,6 @@ public ObjectAccessControl apply(Acl acl) { storageObject.setGeneration(generation); storageObject.setMd5Hash(md5); storageObject.setMediaLink(mediaLink); - storageObject.setMetadata(metadata); storageObject.setMetageneration(metageneration); storageObject.setContentDisposition(contentDisposition); storageObject.setComponentCount(componentCount); diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java index 20fdc84ff8a7..3acb09a18080 100644 --- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java +++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java @@ -37,8 +37,10 @@ import java.net.URLConnection; import java.nio.ByteBuffer; import java.util.Arrays; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -174,17 +176,57 @@ public void testUpdateBlob() { @Test public void testUpdateBlobReplaceMetadata() { String blobName = "test-update-blob-replace-metadata"; + ImmutableMap metadata = ImmutableMap.of("k1", "a"); + ImmutableMap newMetadata = ImmutableMap.of("k2", "b"); BlobInfo blob = BlobInfo.builder(bucket, blobName) .contentType(CONTENT_TYPE) - .metadata(ImmutableMap.of("k1", "a")) + .metadata(metadata) .build(); assertNotNull(storage.create(blob)); BlobInfo updatedBlob = storage.update(blob.toBuilder().metadata(null).build()); assertNotNull(updatedBlob); assertNull(updatedBlob.metadata()); - updatedBlob = storage.update(blob.toBuilder().metadata(ImmutableMap.of("k2", "b")).build()); + updatedBlob = storage.update(blob.toBuilder().metadata(newMetadata).build()); assertEquals(blob.blobId(), updatedBlob.blobId()); - assertEquals(ImmutableMap.of("k2", "b"), updatedBlob.metadata()); + assertEquals(newMetadata, updatedBlob.metadata()); + assertTrue(storage.delete(bucket, blobName)); + } + + @Test + public void testUpdateBlobMergeMetadata() { + String blobName = "test-update-blob-merge-metadata"; + ImmutableMap metadata = ImmutableMap.of("k1", "a"); + ImmutableMap newMetadata = ImmutableMap.of("k2", "b"); + ImmutableMap expectedMetadata = ImmutableMap.of("k1", "a", "k2", "b"); + BlobInfo blob = BlobInfo.builder(bucket, blobName) + .contentType(CONTENT_TYPE) + .metadata(metadata) + .build(); + assertNotNull(storage.create(blob)); + BlobInfo updatedBlob = storage.update(blob.toBuilder().metadata(newMetadata).build()); + assertNotNull(updatedBlob); + assertEquals(blob.blobId(), updatedBlob.blobId()); + assertEquals(expectedMetadata, updatedBlob.metadata()); + assertTrue(storage.delete(bucket, blobName)); + } + + @Test + public void testUpdateBlobUnsetMetadata() { + String blobName = "test-update-blob-unset-metadata"; + ImmutableMap metadata = ImmutableMap.of("k1", "a", "k2", "b"); + Map newMetadata = new HashMap<>(); + newMetadata.put("k1", "a"); + newMetadata.put("k2", null); + ImmutableMap expectedMetadata = ImmutableMap.of("k1", "a"); + BlobInfo blob = BlobInfo.builder(bucket, blobName) + .contentType(CONTENT_TYPE) + .metadata(metadata) + .build(); + assertNotNull(storage.create(blob)); + BlobInfo updatedBlob = storage.update(blob.toBuilder().metadata(newMetadata).build()); + assertNotNull(updatedBlob); + assertEquals(blob.blobId(), updatedBlob.blobId()); + assertEquals(expectedMetadata, updatedBlob.metadata()); assertTrue(storage.delete(bucket, blobName)); } From 4db34b7d4e4e3949ffb9d5647a67a8c06497e301 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Fri, 23 Oct 2015 14:33:57 +0200 Subject: [PATCH 011/322] Add getResult comparison to BatchResponse.equals --- .../google/gcloud/storage/BatchResponse.java | 2 +- .../gcloud/storage/BatchRequestTest.java | 53 +++++++++++++++++++ .../gcloud/storage/BatchResponseTest.java | 31 ++++++++++- 3 files changed, 83 insertions(+), 3 deletions(-) diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchResponse.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchResponse.java index 02b1ca966622..9ac799e74a15 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchResponse.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchResponse.java @@ -133,7 +133,7 @@ public boolean equals(Object obj) { BatchResponse other = (BatchResponse) obj; return Objects.equals(deleteResult, other.deleteResult) && Objects.equals(updateResult, other.updateResult) - && Objects.equals(updateResult, other.updateResult); + && Objects.equals(getResult, other.getResult); } /** diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java index 96b73c871468..06b1105d7b9b 100644 --- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java +++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java @@ -19,6 +19,7 @@ import static com.google.gcloud.storage.Storage.PredefinedAcl.PUBLIC_READ; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import com.google.common.collect.Iterables; @@ -82,4 +83,56 @@ public void testBatchRequest() { assertTrue(Iterables.isEmpty(get.getValue())); assertFalse(gets.hasNext()); } + + @Test + public void testEquals() { + BatchRequest request = BatchRequest.builder() + .delete("b1", "o1") + .delete("b1", "o2") + .update(BlobInfo.builder("b2", "o1").build()) + .update(BlobInfo.builder("b2", "o2").build()) + .get("b3", "o1") + .get("b3", "o2") + .build(); + BatchRequest requestEquals = BatchRequest.builder() + .delete("b1", "o1") + .delete("b1", "o2") + .update(BlobInfo.builder("b2", "o1").build()) + .update(BlobInfo.builder("b2", "o2").build()) + .get("b3", "o1") + .get("b3", "o2") + .build(); + BatchRequest requestNotEquals1 = BatchRequest.builder() + .delete("b1", "o1") + .delete("b1", "o3") + .update(BlobInfo.builder("b2", "o1").build()) + .update(BlobInfo.builder("b2", "o2").build()) + .get("b3", "o1") + .get("b3", "o2") + .build(); + BatchRequest requestNotEquals2 = BatchRequest.builder() + .delete("b1", "o1") + .delete("b1", "o2") + .update(BlobInfo.builder("b2", "o1").build()) + .update(BlobInfo.builder("b2", "o3").build()) + .get("b3", "o1") + .get("b3", "o2") + .build(); + BatchRequest requestNotEquals3 = BatchRequest.builder() + .delete("b1", "o1") + .delete("b1", "o2") + .update(BlobInfo.builder("b2", "o1").build()) + .update(BlobInfo.builder("b2", "o2").build()) + .get("b3", "o1") + .get("b3", "o3") + .build(); + assertEquals(request, requestEquals); + assertEquals(request.hashCode(), requestEquals.hashCode()); + assertNotEquals(request, requestNotEquals1); + assertNotEquals(request.hashCode(), requestNotEquals1.hashCode()); + assertNotEquals(request, requestNotEquals2); + assertNotEquals(request.hashCode(), requestNotEquals2.hashCode()); + assertNotEquals(request, requestNotEquals3); + assertNotEquals(request.hashCode(), requestNotEquals3.hashCode()); + } } diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchResponseTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchResponseTest.java index 59c1da91b3fd..5985329e0183 100644 --- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchResponseTest.java +++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchResponseTest.java @@ -17,6 +17,7 @@ package com.google.gcloud.storage; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import com.google.common.collect.ImmutableList; import com.google.gcloud.storage.BatchResponse.Result; @@ -34,12 +35,38 @@ public class BatchResponseTest { @Test public void testBatchResponse() { List> deletes = ImmutableList.of(Result.of(true), Result.of(false)); - List> updates = ImmutableList.of(Result.of(BLOB_INFO_1), Result.of(BLOB_INFO_2)); + List> updates = + ImmutableList.of(Result.of(BLOB_INFO_1), Result.of(BLOB_INFO_2)); List> gets = ImmutableList.of(Result.of(BLOB_INFO_2), Result.of(BLOB_INFO_3)); BatchResponse response = new BatchResponse(deletes, updates, gets); - assertEquals(deletes, response.deletes()); assertEquals(updates, response.updates()); assertEquals(gets, response.gets()); } + + @Test + public void testEquals() { + List> deletes = ImmutableList.of(Result.of(true), Result.of(false)); + List> updates = + ImmutableList.of(Result.of(BLOB_INFO_1), Result.of(BLOB_INFO_2)); + List> gets = ImmutableList.of(Result.of(BLOB_INFO_2), Result.of(BLOB_INFO_3)); + List> otherDeletes = ImmutableList.of(Result.of(false), Result.of(true)); + List> otherUpdates = + ImmutableList.of(Result.of(BLOB_INFO_2), Result.of(BLOB_INFO_3)); + List> otherGets = + ImmutableList.of(Result.of(BLOB_INFO_1), Result.of(BLOB_INFO_2)); + BatchResponse response = new BatchResponse(deletes, updates, gets); + BatchResponse responseEquals = new BatchResponse(deletes, updates, gets); + BatchResponse responseNotEquals1 = new BatchResponse(otherDeletes, updates, gets); + BatchResponse responseNotEquals2 = new BatchResponse(deletes, otherUpdates, gets); + BatchResponse responseNotEquals3 = new BatchResponse(deletes, updates, otherGets); + assertEquals(response, responseEquals); + assertEquals(response.hashCode(), responseEquals.hashCode()); + assertNotEquals(response, responseNotEquals1); + assertNotEquals(response.hashCode(), responseNotEquals1.hashCode()); + assertNotEquals(response, responseNotEquals2); + assertNotEquals(response.hashCode(), responseNotEquals2.hashCode()); + assertNotEquals(response, responseNotEquals3); + assertNotEquals(response.hashCode(), responseNotEquals3.hashCode()); + } } From a30b948a2acfbece1aa6fd9924265564d0d910b0 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Fri, 23 Oct 2015 10:23:01 -0700 Subject: [PATCH 012/322] Add test for fetch with deferred results --- .../gcloud/datastore/DatastoreTest.java | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java index 2ac8f951f1a6..722457ea8039 100644 --- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java @@ -553,6 +553,33 @@ public void testGetArrayNoDeferredResults() { } public void testGetArrayDeferredResults() throws DatastoreRpcException { + Set requestedKeys = new HashSet(); + requestedKeys.add(KEY1); + requestedKeys.add(KEY2); + requestedKeys.add(KEY3); + requestedKeys.add(KEY4); + requestedKeys.add(KEY5); + Iterator iter = + createMockDatastoreForDeferredLookup().get(KEY1, KEY2, KEY3, KEY4, KEY5); + Set keysOfFoundEntities = new HashSet(); + while (iter.hasNext()) { + keysOfFoundEntities.add(iter.next().key()); + } + assertEquals(requestedKeys, keysOfFoundEntities); + } + + public void testFetchArrayDeferredResults() throws DatastoreRpcException { + List foundEntities = + createMockDatastoreForDeferredLookup().fetch(KEY1, KEY2, KEY3, KEY4, KEY5); + assertEquals(foundEntities.get(0).key(), KEY1); + assertEquals(foundEntities.get(1).key(), KEY2); + assertEquals(foundEntities.get(2).key(), KEY3); + assertEquals(foundEntities.get(3).key(), KEY4); + assertEquals(foundEntities.get(4).key(), KEY5); + assertEquals(foundEntities.size(), 5); + } + + private Datastore createMockDatastoreForDeferredLookup() throws DatastoreRpcException { List keysPb = new ArrayList<>(); keysPb.add(KEY1.toPb()); keysPb.add(KEY2.toPb()); @@ -575,15 +602,15 @@ public void testGetArrayDeferredResults() throws DatastoreRpcException { DatastoreV1.LookupResponse.newBuilder() .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb())) .addFound(EntityResult.newBuilder().setEntity(entity4.toPb())) - .addDeferred(KEY2.toPb()) - .addDeferred(KEY3.toPb()) - .addDeferred(KEY5.toPb()) + .addDeferred(keysPb.get(2)) + .addDeferred(keysPb.get(3)) + .addDeferred(keysPb.get(5)) .build()); lookupResponses.add( DatastoreV1.LookupResponse.newBuilder() .addFound(EntityResult.newBuilder().setEntity(ENTITY3.toPb())) .addFound(EntityResult.newBuilder().setEntity(entity4.toPb())) - .addDeferred(KEY5.toPb()) + .addDeferred(keysPb.get(5)) .build()); lookupResponses.add( DatastoreV1.LookupResponse.newBuilder() @@ -602,13 +629,7 @@ public void testGetArrayDeferredResults() throws DatastoreRpcException { .retryParams(RetryParams.getDefaultInstance()) .serviceRpcFactory(rpcFactoryMock) .build(); - Datastore datastore = DatastoreFactory.instance().get(options); - Iterator iter = datastore.get(KEY1, KEY2, KEY3, KEY4, KEY5); - Set foundEntities = new HashSet<>(); - while (iter.hasNext()) { - foundEntities.add(iter.next()); - } - assertEquals(foundEntities.size(), 5); + return DatastoreFactory.instance().get(options); } @Test From 494511c54dfd9ff09e4748c2847d32fda8483880 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Fri, 23 Oct 2015 10:41:39 -0700 Subject: [PATCH 013/322] Add timeout to testSendQuitRequest and boolean return value to sendQuitRequest --- .../gcloud/datastore/testing/LocalGcdHelper.java | 4 ++-- .../google/gcloud/datastore/LocalGcdHelperTest.java | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java index 24c0fbf9faab..7c60da50b0b0 100644 --- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java +++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/LocalGcdHelper.java @@ -524,7 +524,7 @@ private static void extractFile(ZipInputStream zipIn, File filePath) throws IOEx } } - public static String sendQuitRequest(int port) { + public static boolean sendQuitRequest(int port) { StringBuilder result = new StringBuilder(); try { URL url = new URL("http", "localhost", port, "/_ah/admin/quit"); @@ -543,7 +543,7 @@ public static String sendQuitRequest(int port) { } catch (IOException ignore) { // ignore } - return result.toString(); + return result.toString().startsWith("Shutting down local server"); } public void stop() throws IOException, InterruptedException { diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelperTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelperTest.java index bfc3ffdaccfe..40ea62c5a7e0 100644 --- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelperTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelperTest.java @@ -50,9 +50,16 @@ public void testFindAvailablePort() { @Test public void testSendQuitRequest() throws IOException, InterruptedException { LocalGcdHelper gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT); - assertTrue(LocalGcdHelper.sendQuitRequest(PORT).startsWith("Shutting down local server")); + assertTrue(LocalGcdHelper.sendQuitRequest(PORT)); + long timeoutMillis = 30000; + long startTime = System.currentTimeMillis(); + boolean datastoreActive = LocalGcdHelper.isActive(PROJECT_ID, PORT); + while (datastoreActive && System.currentTimeMillis() - startTime < timeoutMillis) { + datastoreActive = LocalGcdHelper.isActive(PROJECT_ID, PORT); + } + assertFalse(datastoreActive); + assertFalse(LocalGcdHelper.sendQuitRequest(PORT)); gcdHelper.stop(); - assertTrue(LocalGcdHelper.sendQuitRequest(PORT).isEmpty()); // shouldn't error } @Test From d4530f604125c52522b729cd6bd1142f5eacd54a Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Fri, 23 Oct 2015 10:46:21 -0700 Subject: [PATCH 014/322] rename helper method in DatastoreTests and other minor style fixes --- .../com/google/gcloud/datastore/DatastoreTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java index 722457ea8039..c55820b324fb 100644 --- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java @@ -553,15 +553,14 @@ public void testGetArrayNoDeferredResults() { } public void testGetArrayDeferredResults() throws DatastoreRpcException { - Set requestedKeys = new HashSet(); + Set requestedKeys = new HashSet<>(); requestedKeys.add(KEY1); requestedKeys.add(KEY2); requestedKeys.add(KEY3); requestedKeys.add(KEY4); requestedKeys.add(KEY5); - Iterator iter = - createMockDatastoreForDeferredLookup().get(KEY1, KEY2, KEY3, KEY4, KEY5); - Set keysOfFoundEntities = new HashSet(); + Iterator iter = createDatastoreForDeferredLookup().get(KEY1, KEY2, KEY3, KEY4, KEY5); + Set keysOfFoundEntities = new HashSet<>(); while (iter.hasNext()) { keysOfFoundEntities.add(iter.next().key()); } @@ -570,7 +569,7 @@ public void testGetArrayDeferredResults() throws DatastoreRpcException { public void testFetchArrayDeferredResults() throws DatastoreRpcException { List foundEntities = - createMockDatastoreForDeferredLookup().fetch(KEY1, KEY2, KEY3, KEY4, KEY5); + createDatastoreForDeferredLookup().fetch(KEY1, KEY2, KEY3, KEY4, KEY5); assertEquals(foundEntities.get(0).key(), KEY1); assertEquals(foundEntities.get(1).key(), KEY2); assertEquals(foundEntities.get(2).key(), KEY3); @@ -579,7 +578,7 @@ public void testFetchArrayDeferredResults() throws DatastoreRpcException { assertEquals(foundEntities.size(), 5); } - private Datastore createMockDatastoreForDeferredLookup() throws DatastoreRpcException { + private Datastore createDatastoreForDeferredLookup() throws DatastoreRpcException { List keysPb = new ArrayList<>(); keysPb.add(KEY1.toPb()); keysPb.add(KEY2.toPb()); From 682848a60389769e66c7a0e4e6f3ec4ac7dad572 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Fri, 23 Oct 2015 19:50:53 +0200 Subject: [PATCH 015/322] Use newHashMapWithExpectedSize instead of new HashMap --- .../src/main/java/com/google/gcloud/storage/BlobInfo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java index eb490db0f9fb..ec3ef36708cb 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java @@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import java.io.Serializable; import java.math.BigInteger; @@ -420,7 +421,7 @@ public ObjectAccessControl apply(Acl acl) { } Map pbMetadata = metadata; if (metadata != null && !Data.isNull(metadata)) { - pbMetadata = new HashMap<>(); + pbMetadata = Maps.newHashMapWithExpectedSize(metadata.size()); for (String key : metadata.keySet()) { pbMetadata.put(key, firstNonNull(metadata.get(key), Data.nullOf(String.class))); } From fe98cb412dfbcf9c87dbf120cf5dc25f11781ae1 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Mon, 26 Oct 2015 09:45:56 +0100 Subject: [PATCH 016/322] Remove storage todos (replaced with issues: #288 #289 #290 #291 #292) --- .../src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java | 3 --- .../src/main/java/com/google/gcloud/storage/StorageImpl.java | 2 -- 2 files changed, 5 deletions(-) diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java index 52820171cf29..90f2c98ad4b8 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java @@ -293,7 +293,6 @@ public StorageObject compose(Iterable sources, StorageObject targ Map targetOptions) throws StorageException { ComposeRequest request = new ComposeRequest(); if (target.getContentType() == null) { - // todo: remove once this is no longer requirement (b/20681287). target.setContentType("application/octet-stream"); } request.setDestination(target); @@ -311,7 +310,6 @@ public StorageObject compose(Iterable sources, StorageObject targ } request.setSourceObjects(sourceObjects); try { - // todo: missing setProjection (b/20659000) return storage.objects() .compose(target.getBucket(), target.getName(), request) .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(targetOptions)) @@ -435,7 +433,6 @@ public byte[] read(StorageObject from, Map options, long position, in .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(options)) .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(options)); MediaHttpDownloader downloader = req.getMediaHttpDownloader(); - // todo: Fix int casting (https://github.com/google/google-api-java-client/issues/937) downloader.setContentRange(position, (int) position + bytes); downloader.setDirectDownloadEnabled(true); ByteArrayOutputStream output = new ByteArrayOutputStream(); diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java index 6edd2713fded..b6292e1cdf87 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java @@ -102,8 +102,6 @@ public RetryResult beforeEval(Exception exception) { StorageImpl(StorageOptions options) { super(options); storageRpc = options.storageRpc(); - // todo: provide rewrite - https://cloud.google.com/storage/docs/json_api/v1/objects/rewrite - // todo: check if we need to expose https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls/insert vs using bucket update/patch } @Override From 8f5dee2caaf1643cedecc6f70a86fa91bb13070a Mon Sep 17 00:00:00 2001 From: aozarov Date: Mon, 26 Oct 2015 10:41:38 -0700 Subject: [PATCH 017/322] Remove Serializable from AuthCredentials, ServiceFactory and ServiceRpcFactory and set factories on ServiceOptions --- README.md | 6 +- TESTING.md | 6 +- .../com/google/gcloud/AuthCredentials.java | 172 +++++++--- .../java/com/google/gcloud/BaseService.java | 2 +- .../java/com/google/gcloud/Restorable.java | 15 + .../com/google/gcloud/RestorableState.java | 2 +- .../main/java/com/google/gcloud/Service.java | 2 +- .../com/google/gcloud/ServiceFactory.java | 28 ++ .../com/google/gcloud/ServiceOptions.java | 152 ++++++--- .../google/gcloud/spi/ServiceRpcFactory.java | 9 +- gcloud-java-datastore/README.md | 3 +- .../gcloud/datastore/DatastoreFactory.java | 25 +- .../gcloud/datastore/DatastoreImpl.java | 2 +- .../gcloud/datastore/DatastoreOptions.java | 56 ++-- .../google/gcloud/datastore/package-info.java | 2 +- .../datastore/testing/package-info.java | 4 +- .../gcloud/spi/DefaultDatastoreRpc.java | 2 +- .../datastore/DatastoreOptionsTest.java | 3 +- .../gcloud/datastore/DatastoreTest.java | 10 +- .../gcloud/examples/DatastoreExample.java | 3 +- .../gcloud/examples/StorageExample.java | 4 +- gcloud-java-storage/README.md | 5 +- .../gcloud/storage/BlobReadChannel.java | 11 +- .../gcloud/storage/BlobReadChannelImpl.java | 4 +- .../gcloud/storage/BlobWriteChannel.java | 11 +- .../gcloud/storage/BlobWriteChannelImpl.java | 6 +- .../google/gcloud/storage/StorageFactory.java | 25 +- .../google/gcloud/storage/StorageImpl.java | 6 +- .../google/gcloud/storage/StorageOptions.java | 53 +-- .../google/gcloud/storage/package-info.java | 2 +- .../gcloud/storage/testing/package-info.java | 2 +- .../storage/BlobReadChannelImplTest.java | 69 ++-- .../storage/BlobWriteChannelImplTest.java | 79 ++--- .../google/gcloud/storage/ITStorageTest.java | 16 +- .../gcloud/storage/SerializationTest.java | 4 +- .../gcloud/storage/StorageImplTest.java | 306 +++++++----------- src/site/resources/index.html | 10 +- 37 files changed, 582 insertions(+), 535 deletions(-) create mode 100644 gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java create mode 100644 gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java diff --git a/README.md b/README.md index 2887f5a1a9a1..1b9867fd198f 100644 --- a/README.md +++ b/README.md @@ -61,14 +61,13 @@ Here is a code snippet showing a simple usage example from within Compute/App En ```java import com.google.gcloud.datastore.Datastore; -import com.google.gcloud.datastore.DatastoreFactory; import com.google.gcloud.datastore.DatastoreOptions; import com.google.gcloud.datastore.DateTime; import com.google.gcloud.datastore.Entity; import com.google.gcloud.datastore.Key; import com.google.gcloud.datastore.KeyFactory; -Datastore datastore = DatastoreFactory.instance().get(DatastoreOptions.getDefaultInstance()); +Datastore datastore = DatastoreOptions.getDefaultInstance().service(); KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND); Key key = keyFactory.newKey(keyName); Entity entity = datastore.get(key); @@ -106,14 +105,13 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.gcloud.storage.Blob; import com.google.gcloud.storage.BlobId; import com.google.gcloud.storage.Storage; -import com.google.gcloud.storage.StorageFactory; import com.google.gcloud.storage.StorageOptions; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; StorageOptions options = StorageOptions.builder().projectId("project").build(); -Storage storage = StorageFactory.instance().get(options); +Storage storage = options.service(); BlobId blobId = BlobId.of("bucket", "blob_name"); Blob blob = Blob.load(storage, blobId); if (blob == null) { diff --git a/TESTING.md b/TESTING.md index 158d71be2e91..02a3d14ab0bf 100644 --- a/TESTING.md +++ b/TESTING.md @@ -18,7 +18,7 @@ You can test against a temporary local datastore by following these steps: .projectId(PROJECT_ID) .host("http://localhost:8080") .build(); - Datastore localDatastore = DatastoreFactory.instance().get(options); + Datastore localDatastore = options.service(); ``` 3. Run your tests. @@ -35,7 +35,7 @@ You can test against a remote datastore emulator as well. To do this, set the ` .projectId(PROJECT_ID) .host("http://:") .build(); - Datastore localDatastore = DatastoreFactory.instance().get(options); + Datastore localDatastore = options.service(); ``` Note that the remote datastore must be running before your tests are run. @@ -52,7 +52,7 @@ Currently, there isn't an emulator for Google Cloud Storage, so an alternative i Here is an example that uses the `RemoteGcsHelper` to create a bucket. ```java RemoteGcsHelper gcsHelper = RemoteGcsHelper.create(PROJECT_ID, "/path/to/my/JSON/key.json"); - Storage storage = StorageFactory.instance().get(gcsHelper.options()); + Storage storage = gcsHelper.options().service(); String bucket = RemoteGcsHelper.generateBucketName(); storage.create(BucketInfo.of(bucket)); ``` diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java index ffc54df77a90..73c66279ea53 100644 --- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java +++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java @@ -31,8 +31,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectStreamException; import java.io.Serializable; import java.security.GeneralSecurityException; import java.security.PrivateKey; @@ -42,15 +40,34 @@ /** * Credentials for accessing Google Cloud services. */ -public abstract class AuthCredentials implements Serializable { - - private static final long serialVersionUID = 236297804453464604L; +public abstract class AuthCredentials implements Restorable { private static class AppEngineAuthCredentials extends AuthCredentials { - private static final long serialVersionUID = 7931300552744202954L; - private static final AuthCredentials INSTANCE = new AppEngineAuthCredentials(); + private static final AppEngineAuthCredentialsState STATE = + new AppEngineAuthCredentialsState(); + + private static class AppEngineAuthCredentialsState + implements RestorableState, Serializable { + + private static final long serialVersionUID = 3558563960848658928L; + + @Override + public AuthCredentials restore() { + return INSTANCE; + } + + @Override + public int hashCode() { + return getClass().getName().hashCode(); + } + + @Override + public boolean equals(Object obj) { + return obj instanceof AppEngineAuthCredentialsState; + } + } @Override protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport, @@ -58,19 +75,56 @@ protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport, return new AppIdentityCredential(scopes); } - private Object readResolve() throws ObjectStreamException { - return INSTANCE; + @Override + public RestorableState capture() { + return STATE; } } public static class ServiceAccountAuthCredentials extends AuthCredentials { - private static final long serialVersionUID = 8007708734318445901L; private final String account; private final PrivateKey privateKey; private static final AuthCredentials NO_CREDENTIALS = new ServiceAccountAuthCredentials(); + private static class ServiceAccountAuthCredentialsState + implements RestorableState, Serializable { + + private static final long serialVersionUID = -7302180782414633639L; + + private final String account; + private final PrivateKey privateKey; + + private ServiceAccountAuthCredentialsState(String account, PrivateKey privateKey) { + this.account = account; + this.privateKey = privateKey; + } + + @Override + public AuthCredentials restore() { + if (account == null && privateKey == null) { + return NO_CREDENTIALS; + } + return new ServiceAccountAuthCredentials(account, privateKey); + } + + @Override + public int hashCode() { + return Objects.hash(account, privateKey); + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ServiceAccountAuthCredentialsState)) { + return false; + } + ServiceAccountAuthCredentialsState other = (ServiceAccountAuthCredentialsState) obj; + return Objects.equals(account, other.account) + && Objects.equals(privateKey, other.privateKey); + } + } + ServiceAccountAuthCredentials(String account, PrivateKey privateKey) { this.account = checkNotNull(account); this.privateKey = checkNotNull(privateKey); @@ -104,59 +158,94 @@ public PrivateKey privateKey() { } @Override - public int hashCode() { - return Objects.hash(account, privateKey); - } - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof ServiceAccountAuthCredentials)) { - return false; - } - ServiceAccountAuthCredentials other = (ServiceAccountAuthCredentials) obj; - return Objects.equals(account, other.account) - && Objects.equals(privateKey, other.privateKey); + public RestorableState capture() { + return new ServiceAccountAuthCredentialsState(account, privateKey); } } private static class ComputeEngineAuthCredentials extends AuthCredentials { - private static final long serialVersionUID = -5217355402127260144L; + private ComputeCredential computeCredential; - private transient ComputeCredential computeCredential; + private static final ComputeEngineAuthCredentialsState STATE = + new ComputeEngineAuthCredentialsState(); - ComputeEngineAuthCredentials() throws IOException, GeneralSecurityException { - computeCredential = getComputeCredential(); - } + private static class ComputeEngineAuthCredentialsState + implements RestorableState, Serializable { + + private static final long serialVersionUID = -6168594072854417404L; + + @Override + public AuthCredentials restore() { + try { + return new ComputeEngineAuthCredentials(); + } catch (IOException | GeneralSecurityException e) { + throw new IllegalStateException( + "Could not restore " + ComputeEngineAuthCredentials.class.getSimpleName(), e); + } + } + + @Override + public int hashCode() { + return getClass().getName().hashCode(); + } - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - in.defaultReadObject(); - try { - computeCredential = getComputeCredential(); - } catch (GeneralSecurityException e) { - throw new IOException(e); + @Override + public boolean equals(Object obj) { + return obj instanceof ComputeEngineAuthCredentialsState; } } + ComputeEngineAuthCredentials() throws IOException, GeneralSecurityException { + computeCredential = getComputeCredential(); + } + @Override protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport, Set scopes) { return computeCredential; } + + @Override + public RestorableState capture() { + return STATE; + } } private static class ApplicationDefaultAuthCredentials extends AuthCredentials { - private static final long serialVersionUID = -8306873864136099893L; + private GoogleCredentials googleCredentials; - private transient GoogleCredentials googleCredentials; + private static final ApplicationDefaultAuthCredentialsState STATE = + new ApplicationDefaultAuthCredentialsState(); - ApplicationDefaultAuthCredentials() throws IOException { - googleCredentials = GoogleCredentials.getApplicationDefault(); + private static class ApplicationDefaultAuthCredentialsState + implements RestorableState, Serializable { + + private static final long serialVersionUID = -8839085552021212257L; + + @Override + public AuthCredentials restore() { + try { + return new ApplicationDefaultAuthCredentials(); + } catch (IOException e) { + throw new IllegalStateException( + "Could not restore " + ApplicationDefaultAuthCredentials.class.getSimpleName(), e); + } + } + + @Override + public int hashCode() { + return getClass().getName().hashCode(); + } + + @Override + public boolean equals(Object obj) { + return obj instanceof ApplicationDefaultAuthCredentialsState; + } } - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - in.defaultReadObject(); + ApplicationDefaultAuthCredentials() throws IOException { googleCredentials = GoogleCredentials.getApplicationDefault(); } @@ -165,6 +254,11 @@ protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport, Set scopes) { return new HttpCredentialsAdapter(googleCredentials); } + + @Override + public RestorableState capture() { + return STATE; + } } protected abstract HttpRequestInitializer httpRequestInitializer(HttpTransport transport, diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java index 982d3058295c..7600d25411fd 100644 --- a/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java +++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java @@ -16,7 +16,7 @@ package com.google.gcloud; -public abstract class BaseService> +public abstract class BaseService> implements Service { private final OptionsT options; diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java new file mode 100644 index 000000000000..aba973590965 --- /dev/null +++ b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java @@ -0,0 +1,15 @@ +package com.google.gcloud; + +/** + * Implementation of this interface can persist their state and restore from it. + */ +public interface Restorable> { + + /** + * Capture the state of this object. + * + * @return a {@link RestorableState} instance that contains the state for this object and can + * restore it afterwards. + */ + RestorableState capture(); +} diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java b/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java index 9cd3ee5c3c4c..0c60411cb285 100644 --- a/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java +++ b/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java @@ -23,7 +23,7 @@ * Implementations of this class must implement {@link java.io.Serializable} to ensure that the * state of a the object can be correctly serialized. */ -public interface RestorableState { +public interface RestorableState> { /** * Returns an object whose internal state reflects the one saved in the invocation object. diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Service.java b/gcloud-java-core/src/main/java/com/google/gcloud/Service.java index 19759fb20e21..2748c55058b4 100644 --- a/gcloud-java-core/src/main/java/com/google/gcloud/Service.java +++ b/gcloud-java-core/src/main/java/com/google/gcloud/Service.java @@ -16,6 +16,6 @@ package com.google.gcloud; -public interface Service> { +public interface Service> { OptionsT options(); } diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java new file mode 100644 index 000000000000..b59fc1e9a10e --- /dev/null +++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java @@ -0,0 +1,28 @@ +/* + * Copyright 2015 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. + */ + +package com.google.gcloud; + +/** + * A base interface for all service factories. + * + * Implementation must provide a public no-arg constructor. + * Loading of a factory implementation is done via {@link java.util.ServiceLoader}. + */ +public interface ServiceFactory { + + ServiceT create(ServiceOptionsT serviceOptions); +} diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java index b1510ae6a9fd..70da7831c1db 100644 --- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java +++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java @@ -28,14 +28,7 @@ import com.google.common.collect.Iterables; import com.google.gcloud.spi.ServiceRpcFactory; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.ObjectStreamException; -import java.io.Serializable; +import java.io.*; import java.lang.reflect.Method; import java.net.HttpURLConnection; import java.net.URL; @@ -47,8 +40,9 @@ import java.util.regex.Pattern; public abstract class ServiceOptions< + ServiceT extends Service, ServiceRpcT, - OptionsT extends ServiceOptions> + OptionsT extends ServiceOptions> implements Serializable { private static final String DEFAULT_HOST = "https://www.googleapis.com"; @@ -57,21 +51,35 @@ public abstract class ServiceOptions< private final String projectId; private final String host; - private final HttpTransportFactory httpTransportFactory; - private final AuthCredentials authCredentials; + private final String httpTransportFactoryClassName; + private final RestorableState authCredentialsState; private final RetryParams retryParams; - private final ServiceRpcFactory serviceRpcFactory; + private final String serviceRpcFactoryClassName; + private final String serviceFactoryClassName; private final int connectTimeout; private final int readTimeout; private final Clock clock; - public interface HttpTransportFactory extends Serializable { + private transient HttpTransportFactory httpTransportFactory; + private transient AuthCredentials authCredentials; + private transient ServiceRpcFactory serviceRpcFactory; + private transient ServiceFactory serviceFactory; + private transient ServiceT service; + private transient ServiceRpcT rpc; + + /** + * A base interface for all {@link HttpTransport} factories. + * + * Implementation must provide a public no-arg constructor. + * Loading of a factory implementation is done via {@link java.util.ServiceLoader}. + */ + public interface HttpTransportFactory { HttpTransport create(); } - private enum DefaultHttpTransportFactory implements HttpTransportFactory { + public static class DefaultHttpTransportFactory implements HttpTransportFactory { - INSTANCE; + private static final HttpTransportFactory INSTANCE = new DefaultHttpTransportFactory(); @Override public HttpTransport create() { @@ -133,15 +141,17 @@ private Object readResolve() throws ObjectStreamException { } protected abstract static class Builder< + ServiceT extends Service, ServiceRpcT, - OptionsT extends ServiceOptions, - B extends Builder> { + OptionsT extends ServiceOptions, + B extends Builder> { private String projectId; private String host; private HttpTransportFactory httpTransportFactory; private AuthCredentials authCredentials; private RetryParams retryParams; + private ServiceFactory serviceFactory; private ServiceRpcFactory serviceRpcFactory; private int connectTimeout = -1; private int readTimeout = -1; @@ -149,22 +159,34 @@ protected abstract static class Builder< protected Builder() {} - protected Builder(ServiceOptions options) { + protected Builder(ServiceOptions options) { projectId = options.projectId; host = options.host; httpTransportFactory = options.httpTransportFactory; authCredentials = options.authCredentials; retryParams = options.retryParams; + serviceFactory = options.serviceFactory; serviceRpcFactory = options.serviceRpcFactory; + connectTimeout = options.connectTimeout; + readTimeout = options.readTimeout; + clock = options.clock; } - protected abstract ServiceOptions build(); + protected abstract ServiceOptions build(); @SuppressWarnings("unchecked") protected B self() { return (B) this; } + /** + * Sets the service factory. + */ + public B serviceFactory(ServiceFactory serviceFactory) { + this.serviceFactory = serviceFactory; + return self(); + } + /** * Sets the service's clock. The clock is mainly used for testing purpose. {@link Clock} will be * replaced by Java8's {@code java.time.Clock}. @@ -263,14 +285,23 @@ public B readTimeout(int readTimeout) { } } - protected ServiceOptions(Builder builder) { + protected ServiceOptions(Class> serviceFactoryClass, + Class> rpcFactoryClass, + Builder builder) { projectId = checkNotNull(builder.projectId != null ? builder.projectId : defaultProject()); host = firstNonNull(builder.host, defaultHost()); - httpTransportFactory = - firstNonNull(builder.httpTransportFactory, DefaultHttpTransportFactory.INSTANCE); + httpTransportFactory = firstNonNull(builder.httpTransportFactory, + getFromServiceLoader(HttpTransportFactory.class, DefaultHttpTransportFactory.INSTANCE)); + httpTransportFactoryClassName = httpTransportFactory.getClass().getName(); authCredentials = firstNonNull(builder.authCredentials, defaultAuthCredentials()); + authCredentialsState = authCredentials.capture(); retryParams = builder.retryParams; - serviceRpcFactory = builder.serviceRpcFactory; + serviceFactory = firstNonNull(builder.serviceFactory, + getFromServiceLoader(serviceFactoryClass, defaultServiceFactory())); + serviceFactoryClassName = serviceFactory.getClass().getName(); + serviceRpcFactory = firstNonNull(builder.serviceRpcFactory, + getFromServiceLoader(rpcFactoryClass, defaultRpcFactory())); + serviceRpcFactoryClassName = serviceRpcFactory.getClass().getName(); connectTimeout = builder.connectTimeout; readTimeout = builder.readTimeout; clock = firstNonNull(builder.clock, Clock.defaultClock()); @@ -389,10 +420,22 @@ protected static String getAppEngineProjectId() { } } - protected abstract Set scopes(); + public ServiceT service() { + if (service == null) { + service = serviceFactory.create((OptionsT) this); + } + return service; + } + + public ServiceRpcT rpc() { + if (rpc == null) { + rpc = serviceRpcFactory.create((OptionsT) this); + } + return rpc; + } /** - * Returns the project id. + * Returns the project id. */ public String projectId() { return projectId; @@ -427,13 +470,6 @@ public RetryParams retryParams() { return retryParams != null ? retryParams : RetryParams.noRetries(); } - /** - * Returns the factory for rpc services. - */ - public ServiceRpcFactory serviceRpcFactory() { - return serviceRpcFactory; - } - /** * Returns a request initializer responsible for initializing requests according to service * options. @@ -474,40 +510,56 @@ public int readTimeout() { /** * Returns the service's clock. Default time source uses {@link System#currentTimeMillis()} to - * get current time. + * get current time. */ public Clock clock() { return clock; } protected int baseHashCode() { - return Objects.hash(projectId, host, httpTransportFactory, authCredentials, retryParams, - serviceRpcFactory, connectTimeout, readTimeout, clock); + return Objects.hash(projectId, host, httpTransportFactoryClassName, authCredentialsState, + retryParams, serviceFactoryClassName, serviceRpcFactoryClassName, connectTimeout, + readTimeout, clock); } - protected boolean baseEquals(ServiceOptions other) { + protected boolean baseEquals(ServiceOptions other) { return Objects.equals(projectId, other.projectId) && Objects.equals(host, other.host) - && Objects.equals(httpTransportFactory, other.httpTransportFactory) - && Objects.equals(authCredentials, other.authCredentials) + && Objects.equals(httpTransportFactoryClassName, other.httpTransportFactoryClassName) + && Objects.equals(authCredentialsState, other.authCredentialsState) && Objects.equals(retryParams, other.retryParams) - && Objects.equals(serviceRpcFactory, other.serviceRpcFactory) + && Objects.equals(serviceFactoryClassName, other.serviceFactoryClassName) + && Objects.equals(serviceRpcFactoryClassName, other.serviceRpcFactoryClassName) && Objects.equals(connectTimeout, other.connectTimeout) && Objects.equals(readTimeout, other.readTimeout) && Objects.equals(clock, clock); } - public abstract Builder toBuilder(); + private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException { + input.defaultReadObject(); + httpTransportFactory = newInstance(httpTransportFactoryClassName); + serviceFactory = newInstance(serviceFactoryClassName); + serviceRpcFactory = newInstance(serviceRpcFactoryClassName); + authCredentials = authCredentialsState.restore(); + } - /** - * Creates a service RPC using a factory loaded by {@link ServiceLoader}. - */ - protected static - > - ServiceRpcT createRpc(OptionsT options, - Class> factoryClass) { - ServiceRpcFactory factory = - Iterables.getFirst(ServiceLoader.load(factoryClass), null); - return factory == null ? null : factory.create(options); + private static T newInstance(String className) throws IOException, ClassNotFoundException { + try { + return (T) Class.forName(className).newInstance(); + } catch (InstantiationException | IllegalAccessException e) { + throw new IOException(e); + } + } + + protected abstract > T defaultServiceFactory(); + + protected abstract > T defaultRpcFactory(); + + protected abstract Set scopes(); + + public abstract > B toBuilder(); + + private static T getFromServiceLoader(Class clazz, T defaultInstance) { + return Iterables.getFirst(ServiceLoader.load(clazz), defaultInstance); } } diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/spi/ServiceRpcFactory.java b/gcloud-java-core/src/main/java/com/google/gcloud/spi/ServiceRpcFactory.java index 89e08cda9eda..d20b690167a1 100644 --- a/gcloud-java-core/src/main/java/com/google/gcloud/spi/ServiceRpcFactory.java +++ b/gcloud-java-core/src/main/java/com/google/gcloud/spi/ServiceRpcFactory.java @@ -18,16 +18,13 @@ import com.google.gcloud.ServiceOptions; -import java.io.Serializable; - /** * A base interface for all service RPC factories. + * + * Implementation must provide a public no-arg constructor. * Loading of a factory implementation is done via {@link java.util.ServiceLoader}. */ -public interface ServiceRpcFactory< - ServiceRpcT, - OptionsT extends ServiceOptions> - extends Serializable { +public interface ServiceRpcFactory { ServiceRpcT create(OptionsT options); } diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md index f0dca1777fe8..bbcdd9d8857c 100644 --- a/gcloud-java-datastore/README.md +++ b/gcloud-java-datastore/README.md @@ -52,14 +52,13 @@ Here is a code snippet showing a simple usage example from within Compute/App En ```java import com.google.gcloud.datastore.Datastore; -import com.google.gcloud.datastore.DatastoreFactory; import com.google.gcloud.datastore.DatastoreOptions; import com.google.gcloud.datastore.DateTime; import com.google.gcloud.datastore.Entity; import com.google.gcloud.datastore.Key; import com.google.gcloud.datastore.KeyFactory; -Datastore datastore = DatastoreFactory.instance().get(DatastoreOptions.getDefaultInstance()); +Datastore datastore = DatastoreOptions.getDefaultInstance().service(); KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND); Key key = keyFactory.newKey(keyName); Entity entity = datastore.get(key); diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreFactory.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreFactory.java index a64fab3715f1..b1f5a026a3e5 100644 --- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreFactory.java +++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreFactory.java @@ -17,27 +17,10 @@ package com.google.gcloud.datastore; +import com.google.gcloud.ServiceFactory; + /** - * A base class for Datastore factories. + * An interface for Datastore factories. */ -public abstract class DatastoreFactory { - - private static final DatastoreFactory INSTANCE = new DatastoreFactory() { - @Override - public Datastore get(DatastoreOptions options) { - return new DatastoreImpl(options); - } - }; - - /** - * Returns the default factory instance. - */ - public static DatastoreFactory instance() { - return INSTANCE; - } - - /** - * Returns a {@code Datastore} service for the given options. - */ - public abstract Datastore get(DatastoreOptions options); +public interface DatastoreFactory extends ServiceFactory { } diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java index c12ffc8a032d..43fd75396538 100644 --- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java +++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java @@ -74,7 +74,7 @@ public RetryResult beforeEval(Exception exception) { DatastoreImpl(DatastoreOptions options) { super(options); - this.datastoreRpc = options.datastoreRpc(); + this.datastoreRpc = options.rpc(); retryParams = MoreObjects.firstNonNull(options.retryParams(), RetryParams.noRetries()); } diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java index 7b0dd3a2a606..46ff1b5b847b 100644 --- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java +++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java @@ -34,9 +34,9 @@ import java.util.Objects; import java.util.Set; -public class DatastoreOptions extends ServiceOptions { +public class DatastoreOptions extends ServiceOptions { - private static final long serialVersionUID = -8636602944160689193L; + private static final long serialVersionUID = 5056049000758143852L; private static final String DATASET_ENV_NAME = "DATASTORE_DATASET"; private static final String HOST_ENV_NAME = "DATASTORE_HOST"; private static final String DATASTORE_SCOPE = "https://www.googleapis.com/auth/datastore"; @@ -46,10 +46,25 @@ public class DatastoreOptions extends ServiceOptions { + ServiceOptions.Builder { private String namespace; private boolean force; @@ -88,7 +103,7 @@ Builder normalizeDataset(boolean normalizeDataset) { } private DatastoreOptions(Builder builder) { - super(builder); + super(DatastoreFactory.class, DatastoreRpcFactory.class, builder); normalizeDataset = builder.normalizeDataset; namespace = builder.namespace != null ? builder.namespace : defaultNamespace(); force = builder.force; @@ -108,7 +123,7 @@ private DatastoreOptions normalize() { .build(); requestPb.addKey(key); try { - LookupResponse responsePb = datastoreRpc().lookup(requestPb.build()); + LookupResponse responsePb = rpc().lookup(requestPb.build()); if (responsePb.getDeferredCount() > 0) { key = responsePb.getDeferred(0); } else { @@ -138,6 +153,16 @@ protected String defaultProject() { return projectId != null ? projectId : super.defaultProject(); } + @Override + protected DatastoreFactory defaultServiceFactory() { + return new DefaultDatastoreFactory(); + } + + @Override + protected DatastoreRpcFactory defaultRpcFactory() { + return new DefaultDatastoreRpcFactory(); + } + public String namespace() { return namespace; } @@ -186,25 +211,6 @@ public boolean equals(Object obj) { && Objects.equals(normalizeDataset, other.normalizeDataset); } - DatastoreRpc datastoreRpc() { - if (datastoreRpc != null) { - return datastoreRpc; - } - if (serviceRpcFactory() != null) { - datastoreRpc = serviceRpcFactory().create(this); - } else { - datastoreRpc = createRpc(this, DatastoreRpcFactory.class); - if (datastoreRpc == null) { - datastoreRpc = new DefaultDatastoreRpc(this); - } - } - return datastoreRpc; - } - - public static DatastoreOptions defaultInstance() { - return builder().build(); - } - public static Builder builder() { return new Builder(); } diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java index 3b402820e663..2135267d9ac4 100644 --- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java +++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java @@ -20,7 +20,7 @@ *

A simple usage example: * 

 {@code
  * DatastoreOptions options = DatastoreOptions.builder().projectId(PROJECT_ID).build();
- * Datastore datastore = DatastoreFactory.instance().get(options);
+ * Datastore datastore = options.service();
  * KeyFactory keyFactory = datastore.newKeyFactory().kind(kind);
  * Key key = keyFactory.newKey(keyName);
  * Entity entity = datastore.get(key);
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/package-info.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/package-info.java
index 9d20b3c7ffd8..d03c9d85cd09 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/package-info.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/package-info.java
@@ -25,9 +25,9 @@
  *     .projectId(PROJECT_ID)
  *     .host("localhost:8080")
  *     .build();
- * Datastore localDatastore = DatastoreFactory.instance().get(options);
+ * Datastore localDatastore = options.service();
  * }
- * + * *

After the test: * 

 {@code
  * gcdHelper.stop();
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
index e20bd9a3f9d6..ccb89267a29e 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -79,7 +79,7 @@ public DefaultDatastoreRpc(DatastoreOptions options) {
   private static String normalizeHost(String host) {
     host = host.toLowerCase();
     if (includesScheme(host)) {
-      Preconditions.checkArgument(!(host.startsWith("https://") && isLocalHost(host)), 
+      Preconditions.checkArgument(!(host.startsWith("https://") && isLocalHost(host)),
           "\"https\" is not supported for localhost.  Use \"http\" instead.");
       return host;
     }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java
index f9200b3327e1..78536e3f45cb 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java
@@ -79,8 +79,7 @@ public void testForce() throws Exception {
 
   @Test
   public void testDatastore() throws Exception {
-    assertSame(datastoreRpcFactory, options.build().serviceRpcFactory());
-    assertSame(datastoreRpc, options.build().datastoreRpc());
+    assertSame(datastoreRpc, options.build().rpc());
   }
 
   @Test
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index c55820b324fb..c0d21456d28f 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -126,7 +126,7 @@ public void setUp() throws IOException, InterruptedException {
         .projectId(PROJECT_ID)
         .host("http://localhost:" + PORT)
         .build();
-    datastore = DatastoreFactory.instance().get(options);
+    datastore = options.service();
     StructuredQuery query = Query.keyQueryBuilder().build();
     QueryResults result = datastore.run(query);
     datastore.delete(Iterators.toArray(result, Key.class));
@@ -628,7 +628,7 @@ private Datastore createDatastoreForDeferredLookup() throws DatastoreRpcExceptio
             .retryParams(RetryParams.getDefaultInstance())
             .serviceRpcFactory(rpcFactoryMock)
             .build();
-    return DatastoreFactory.instance().get(options);
+    return options.service();
   }
 
   @Test
@@ -741,7 +741,7 @@ public void testRetryableException() throws Exception {
         .retryParams(RetryParams.getDefaultInstance())
         .serviceRpcFactory(rpcFactoryMock)
         .build();
-    Datastore datastore = DatastoreFactory.instance().get(options);
+    Datastore datastore = options.service();
     Entity entity = datastore.get(KEY1);
     assertEquals(ENTITY1, entity);
     EasyMock.verify(rpcFactoryMock, rpcMock);
@@ -764,7 +764,7 @@ public void testNonRetryableException() throws Exception {
         .retryParams(retryParams)
         .serviceRpcFactory(rpcFactoryMock)
         .build();
-    Datastore datastore = DatastoreFactory.instance().get(options);
+    Datastore datastore = options.service();
     thrown.expect(DatastoreException.class);
     thrown.expectMessage(Reason.PERMISSION_DENIED.description());
     datastore.get(KEY1);
@@ -787,7 +787,7 @@ public void testRuntimeException() throws Exception {
         .retryParams(RetryParams.getDefaultInstance())
         .serviceRpcFactory(rpcFactoryMock)
         .build();
-    Datastore datastore = DatastoreFactory.instance().get(options);
+    Datastore datastore = options.service();
     thrown.expect(DatastoreException.class);
     thrown.expectMessage(exceptionMessage);
     datastore.get(KEY1);
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
index c707e6686707..a3b1257f943a 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
@@ -17,7 +17,6 @@
 package com.google.gcloud.examples;
 
 import com.google.gcloud.datastore.Datastore;
-import com.google.gcloud.datastore.DatastoreFactory;
 import com.google.gcloud.datastore.DatastoreOptions;
 import com.google.gcloud.datastore.DateTime;
 import com.google.gcloud.datastore.Entity;
@@ -183,7 +182,7 @@ public static void main(String... args) {
         .namespace(NAMESPACE)
         .build();
     String name = args.length > 1 ? args[1] : System.getProperty("user.name");
-    Datastore datastore = DatastoreFactory.instance().get(options);
+    Datastore datastore = options.service();
     KeyFactory keyFactory = datastore.newKeyFactory().kind(USER_KIND);
     Key key = keyFactory.newKey(name);
     String actionName = args.length > 2 ? args[2].toLowerCase() : DEFAULT_ACTION;
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index d47494b953fc..46fb94297ec7 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -31,7 +31,6 @@
 import com.google.gcloud.storage.Storage.ComposeRequest;
 import com.google.gcloud.storage.Storage.CopyRequest;
 import com.google.gcloud.storage.Storage.SignUrlOption;
-import com.google.gcloud.storage.StorageFactory;
 import com.google.gcloud.storage.StorageOptions;
 
 import java.io.FileOutputStream;
@@ -41,7 +40,6 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
-import static java.nio.charset.StandardCharsets.UTF_8;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -558,7 +556,7 @@ public static void main(String... args) throws Exception {
       printUsage();
       return;
     }
-    Storage storage = StorageFactory.instance().get(optionsBuilder.build());
+    Storage storage = optionsBuilder.build().service();
     Object request;
     try {
       request = action.parse(args);
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index bd3a9ea0da88..717fd1f1f3e4 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -1,7 +1,7 @@
 Google Cloud Java Client for Storage
 ====================================
 
-Java idiomatic client for [Google Cloud Storage] (https://cloud.google.com/storage/). 
+Java idiomatic client for [Google Cloud Storage] (https://cloud.google.com/storage/).
 
 [![Build Status](https://travis-ci.org/GoogleCloudPlatform/gcloud-java.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/gcloud-java)
 [![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/gcloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/gcloud-java?branch=master)
@@ -55,13 +55,12 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.gcloud.storage.Blob;
 import com.google.gcloud.storage.Storage;
-import com.google.gcloud.storage.StorageFactory;
 import com.google.gcloud.storage.StorageOptions;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-Storage storage = StorageFactory.instance().get(StorageOptions.getDefaultInstance());
+Storage storage = StorageOptions.getDefaultInstance().service();
 Blob blob = new Blob(storage, "bucket", "blob_name");
 if (!blob.exists()) {
   storage2.create(blob.info(), "Hello, Cloud Storage!".getBytes(UTF_8));
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
index b004e3d61634..0ca5b290aef9 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
@@ -16,6 +16,7 @@
 
 package com.google.gcloud.storage;
 
+import com.google.gcloud.Restorable;
 import com.google.gcloud.RestorableState;
 
 import java.io.Closeable;
@@ -29,7 +30,8 @@
  *
  * This class is @{link Serializable}, which allows incremental reads.
  */
-public interface BlobReadChannel extends ReadableByteChannel, Closeable {
+public interface BlobReadChannel extends ReadableByteChannel, Closeable,
+    Restorable {
 
   /**
    * Overridden to remove IOException.
@@ -48,10 +50,11 @@ public interface BlobReadChannel extends ReadableByteChannel, Closeable {
   void chunkSize(int chunkSize);
 
   /**
-   * Saves the read channel state.
+   * Capture the read channel state so that it can be saved and restored afterwards.
    *
    * @return a {@link RestorableState} object that contains the read channel state and can restore
-   *     it afterwards. State object must implement {@link java.io.Serializable}.
+   *     it afterwards.
    */
-  public RestorableState save();
+  @Override
+  RestorableState capture();
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java
index 7731d04837a6..09047a642218 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java
@@ -57,12 +57,12 @@ class BlobReadChannelImpl implements BlobReadChannel {
     this.blob = blob;
     this.requestOptions = requestOptions;
     isOpen = true;
-    storageRpc = serviceOptions.storageRpc();
+    storageRpc = serviceOptions.rpc();
     storageObject = blob.toPb();
   }
 
   @Override
-  public RestorableState save() {
+  public RestorableState capture() {
     StateImpl.Builder builder = StateImpl.builder(serviceOptions, blob, requestOptions)
         .position(position)
         .isOpen(isOpen)
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java
index be3ef2293ec3..17cf93422bd7 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java
@@ -16,6 +16,7 @@
 
 package com.google.gcloud.storage;
 
+import com.google.gcloud.Restorable;
 import com.google.gcloud.RestorableState;
 
 import java.io.Closeable;
@@ -28,7 +29,8 @@
  * data will only be visible after calling {@link #close()}. This class is serializable, to allow
  * incremental writes.
  */
-public interface BlobWriteChannel extends WritableByteChannel, Closeable {
+public interface BlobWriteChannel extends WritableByteChannel, Closeable,
+    Restorable {
 
   /**
    * Sets the minimum size that will be written by a single RPC.
@@ -37,12 +39,13 @@ public interface BlobWriteChannel extends WritableByteChannel, Closeable {
   void chunkSize(int chunkSize);
 
   /**
-   * Saves the write channel state so that it can be restored afterwards. The original
+   * Capture the write channel state so that it can be saved and restored afterwards. The original
    * {@code BlobWriteChannel} and the restored one should not both be used. Closing one channel
    * causes the other channel to close, subsequent writes will fail.
    *
    * @return a {@link RestorableState} object that contains the write channel state and can restore
-   *     it afterwards. State object must implement {@link java.io.Serializable}.
+   *     it afterwards.
    */
-  public RestorableState save();
+  @Override
+  RestorableState capture();
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java
index 1c841d1dfc6a..8c3254a28d44 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java
@@ -57,7 +57,7 @@ class BlobWriteChannelImpl implements BlobWriteChannel {
       Map optionsMap) {
     this.options = options;
     this.blobInfo = blobInfo;
-    storageRpc = options.storageRpc();
+    storageRpc = options.rpc();
     storageObject = blobInfo.toPb();
     uploadId = storageRpc.open(storageObject, optionsMap);
   }
@@ -66,12 +66,12 @@ class BlobWriteChannelImpl implements BlobWriteChannel {
     this.options = options;
     this.blobInfo = blobInfo;
     this.uploadId = uploadId;
-    storageRpc = options.storageRpc();
+    storageRpc = options.rpc();
     storageObject = blobInfo.toPb();
   }
 
   @Override
-  public RestorableState save() {
+  public RestorableState capture() {
     byte[] bufferToSave = null;
     if (isOpen) {
       flush();
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageFactory.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageFactory.java
index e269f0c9d92b..fbce5559464c 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageFactory.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageFactory.java
@@ -17,27 +17,10 @@
 package com.google.gcloud.storage;
 
 
+import com.google.gcloud.ServiceFactory;
+
 /**
- * A base class for Storage factories.
+ * An interface for Storage factories.
  */
-public abstract class StorageFactory {
-
-  private static final StorageFactory INSTANCE = new StorageFactory() {
-    @Override
-    public Storage get(StorageOptions options) {
-      return new StorageImpl(options);
-    }
-  };
-
-  /**
-   * Returns the default factory instance.
-   */
-  public static StorageFactory instance() {
-    return INSTANCE;
-  }
-
-  /**
-   * Returns a {@code Storage} service for the given options.
-   */
-  public abstract Storage get(StorageOptions options);
+public interface StorageFactory extends ServiceFactory {
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index b6292e1cdf87..6856ee27eec7 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -101,7 +101,7 @@ public RetryResult beforeEval(Exception exception) {
 
   StorageImpl(StorageOptions options) {
     super(options);
-    storageRpc = options.storageRpc();
+    storageRpc = options.rpc();
   }
 
   @Override
@@ -289,7 +289,7 @@ private static ListResult listBuckets(final StorageOptions serviceOp
           new Callable>>() {
             @Override
             public Tuple> call() {
-              return serviceOptions.storageRpc().list(optionsMap);
+              return serviceOptions.rpc().list(optionsMap);
             }
           }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
       String cursor = result.x();
@@ -320,7 +320,7 @@ private static ListResult listBlobs(final String bucket,
           new Callable>>() {
             @Override
             public Tuple> call() {
-              return serviceOptions.storageRpc().list(bucket, optionsMap);
+              return serviceOptions.rpc().list(bucket, optionsMap);
             }
           }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
       String cursor = result.x();
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
index a439e3c8ae49..02379838888a 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
@@ -26,7 +26,7 @@
 import java.util.Objects;
 import java.util.Set;
 
-public class StorageOptions extends ServiceOptions {
+public class StorageOptions extends ServiceOptions {
 
   private static final long serialVersionUID = -7804860602287801084L;
   private static final String GCS_SCOPE = "https://www.googleapis.com/auth/devstorage.full_control";
@@ -34,10 +34,25 @@ public class StorageOptions extends ServiceOptions {
   private static final String DEFAULT_PATH_DELIMITER = "/";
 
   private final String pathDelimiter;
-  private transient StorageRpc storageRpc;
+
+  public static class DefaultStorageFactory implements StorageFactory {
+
+    @Override
+    public Storage create(StorageOptions options) {
+      return new StorageImpl(options);
+    }
+  }
+
+  public static class DefaultStorageRpcFactory implements StorageRpcFactory {
+
+    @Override
+    public StorageRpc create(StorageOptions options) {
+      return new DefaultStorageRpc(options);
+    }
+  }
 
   public static class Builder extends
-      ServiceOptions.Builder {
+      ServiceOptions.Builder {
 
     private String pathDelimiter;
 
@@ -45,6 +60,7 @@ private Builder() {}
 
     private Builder(StorageOptions options) {
       super(options);
+      pathDelimiter = options.pathDelimiter;
     }
 
     /**
@@ -65,28 +81,23 @@ public StorageOptions build() {
   }
 
   private StorageOptions(Builder builder) {
-    super(builder);
+    super(StorageFactory.class, StorageRpcFactory.class, builder);
     pathDelimiter = MoreObjects.firstNonNull(builder.pathDelimiter, DEFAULT_PATH_DELIMITER);
   }
 
   @Override
-  protected Set scopes() {
-    return SCOPES;
+  protected StorageFactory defaultServiceFactory() {
+    return new DefaultStorageFactory();
   }
 
-  StorageRpc storageRpc() {
-    if (storageRpc != null) {
-      return storageRpc;
-    }
-    if (serviceRpcFactory() != null) {
-      storageRpc = serviceRpcFactory().create(this);
-    } else {
-      storageRpc = createRpc(this, StorageRpcFactory.class);
-      if (storageRpc == null) {
-        storageRpc = new DefaultStorageRpc(this);
-      }
-    }
-    return storageRpc;
+  @Override
+  protected StorageRpcFactory defaultRpcFactory() {
+    return new DefaultStorageRpcFactory();
+  }
+
+  @Override
+  protected Set scopes() {
+    return SCOPES;
   }
 
   /**
@@ -115,10 +126,6 @@ public boolean equals(Object obj) {
     return baseEquals(other) && Objects.equals(pathDelimiter, other.pathDelimiter);
   }
 
-  public static StorageOptions defaultInstance() {
-    return builder().build();
-  }
-
   public static Builder builder() {
     return new Builder();
   }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
index b4a701fde840..2a09631be40a 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
@@ -20,7 +20,7 @@
  * 
A simple usage example:
  * 
{@code
  * StorageOptions options = StorageOptions.builder().projectId("project").build();
- * Storage storage = StorageFactory.instance().get(options);
+ * Storage storage = options.service();
  * BlobId blobId = BlobId.of("bucket", "blob_name");
  * Blob blob = Blob.load(storage, blobId);
  * if (blob == null) {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/package-info.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/package-info.java
index eca45b4b6306..82b3578284dc 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/package-info.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/package-info.java
@@ -21,7 +21,7 @@
  * 
Before the test:
  * 
 {@code
  * RemoteGcsHelper gcsHelper = RemoteGcsHelper.create(PROJECT_ID, "/path/to/JSON/key.json");
- * Storage storage = StorageFactory.instance().get(gcsHelper.options());
+ * Storage storage = gcsHelper.options().service();
  * String bucket = RemoteGcsHelper.generateBucketName();
  * storage.create(BucketInfo.of(bucket));
  * } 

diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
index e8ed915581b8..108edef0e7d4 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
@@ -18,25 +18,25 @@
 
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.RestorableState;
-import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc;
+import com.google.gcloud.spi.StorageRpcFactory;
 
 import org.easymock.EasyMock;
-import org.junit.Test;
+import org.junit.After;
 import org.junit.Before;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Random;
-import org.junit.After;
 
 public class BlobReadChannelImplTest {
 
@@ -48,37 +48,38 @@ public class BlobReadChannelImplTest {
   private static final int CUSTOM_CHUNK_SIZE = 2 * 1024 * 1024;
   private static final Random RANDOM = new Random();
 
-  private StorageOptions optionsMock;
+  private StorageOptions options;
   private StorageRpc storageRpcMock;
   private BlobReadChannelImpl reader;
 
   @Before
   public void setUp() throws IOException, InterruptedException {
-    optionsMock = EasyMock.createMock(StorageOptions.class);
+    StorageRpcFactory rpcFactoryMock = EasyMock.createNiceMock(StorageRpcFactory.class);
     storageRpcMock = EasyMock.createMock(StorageRpc.class);
+    EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(StorageOptions.class)))
+        .andReturn(storageRpcMock);
+    EasyMock.replay(rpcFactoryMock);
+    options = StorageOptions.builder()
+        .projectId("projectId")
+        .serviceRpcFactory(rpcFactoryMock)
+        .build();
   }
 
   @After
   public void tearDown() throws Exception {
-    verify(optionsMock);
     verify(storageRpcMock);
   }
 
   @Test
   public void testCreate() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.replay(optionsMock);
     EasyMock.replay(storageRpcMock);
-    reader = new BlobReadChannelImpl(optionsMock, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     assertTrue(reader.isOpen());
   }
 
   @Test
   public void testReadBuffered() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.replay(optionsMock);
-    reader = new BlobReadChannelImpl(optionsMock, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     byte[] result = randomByteArray(DEFAULT_CHUNK_SIZE);
     ByteBuffer firstReadBuffer = ByteBuffer.allocate(42);
     ByteBuffer secondReadBuffer = ByteBuffer.allocate(42);
@@ -97,10 +98,7 @@ public void testReadBuffered() throws IOException {
 
   @Test
   public void testReadBig() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries()).times(2);
-    EasyMock.replay(optionsMock);
-    reader = new BlobReadChannelImpl(optionsMock, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     reader.chunkSize(CUSTOM_CHUNK_SIZE);
     byte[] firstResult = randomByteArray(DEFAULT_CHUNK_SIZE);
     byte[] secondResult = randomByteArray(DEFAULT_CHUNK_SIZE);
@@ -124,10 +122,7 @@ public void testReadBig() throws IOException {
 
   @Test
   public void testReadFinish() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.replay(optionsMock);
-    reader = new BlobReadChannelImpl(optionsMock, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     byte[] result = {};
     ByteBuffer readBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
     EasyMock
@@ -139,10 +134,7 @@ public void testReadFinish() throws IOException {
 
   @Test
   public void testSeek() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.replay(optionsMock);
-    reader = new BlobReadChannelImpl(optionsMock, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     reader.seek(42);
     byte[] result = randomByteArray(DEFAULT_CHUNK_SIZE);
     ByteBuffer readBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
@@ -156,10 +148,8 @@ public void testSeek() throws IOException {
 
   @Test
   public void testClose() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.replay(optionsMock);
     EasyMock.replay(storageRpcMock);
-    reader = new BlobReadChannelImpl(optionsMock, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     assertTrue(reader.isOpen());
     reader.close();
     assertTrue(!reader.isOpen());
@@ -167,10 +157,8 @@ public void testClose() throws IOException {
 
   @Test
   public void testReadClosed() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.replay(optionsMock);
     EasyMock.replay(storageRpcMock);
-    reader = new BlobReadChannelImpl(optionsMock, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     reader.close();
     try {
       ByteBuffer readBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
@@ -183,9 +171,6 @@ public void testReadClosed() {
 
   @Test
   public void testSaveAndRestore() throws IOException, ClassNotFoundException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries()).times(2);
-    EasyMock.replay(optionsMock);
     byte[] firstResult = randomByteArray(DEFAULT_CHUNK_SIZE);
     byte[] secondResult = randomByteArray(DEFAULT_CHUNK_SIZE);
     ByteBuffer firstReadBuffer = ByteBuffer.allocate(42);
@@ -197,9 +182,9 @@ public void testSaveAndRestore() throws IOException, ClassNotFoundException {
         .expect(storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, 42, DEFAULT_CHUNK_SIZE))
         .andReturn(secondResult);
     EasyMock.replay(storageRpcMock);
-    reader = new BlobReadChannelImpl(optionsMock, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     reader.read(firstReadBuffer);
-    RestorableState readerState = reader.save();
+    RestorableState readerState = reader.capture();
     BlobReadChannel restoredReader = readerState.restore();
     restoredReader.read(secondReadBuffer);
     assertArrayEquals(Arrays.copyOf(firstResult, firstReadBuffer.capacity()),
@@ -209,13 +194,11 @@ public void testSaveAndRestore() throws IOException, ClassNotFoundException {
 
   @Test
   public void testStateEquals() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.replay(optionsMock);
     EasyMock.replay(storageRpcMock);
-    reader = new BlobReadChannelImpl(optionsMock, BLOB_ID, EMPTY_RPC_OPTIONS);
-    BlobReadChannel secondReader = new BlobReadChannelImpl(optionsMock, BLOB_ID, EMPTY_RPC_OPTIONS);
-    RestorableState state = reader.save();
-    RestorableState secondState = secondReader.save();
+    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    BlobReadChannel secondReader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    RestorableState state = reader.capture();
+    RestorableState secondState = secondReader.capture();
     assertEquals(state, secondState);
     assertEquals(state.hashCode(), secondState.hashCode());
     assertEquals(state.toString(), secondState.toString());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
index ab3f7a000d90..fdb75fe8cad4 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
@@ -17,22 +17,22 @@
 package com.google.gcloud.storage;
 
 import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.RestorableState;
-import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc;
+import com.google.gcloud.spi.StorageRpcFactory;
 
 import org.easymock.Capture;
 import org.easymock.CaptureType;
 import org.easymock.EasyMock;
 import org.junit.After;
-import org.junit.Test;
 import org.junit.Before;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -52,47 +52,46 @@ public class BlobWriteChannelImplTest {
   private static final int CUSTOM_CHUNK_SIZE = 4 * MIN_CHUNK_SIZE;
   private static final Random RANDOM = new Random();
 
-  private StorageOptions optionsMock;
+  private StorageOptions options;
   private StorageRpc storageRpcMock;
   private BlobWriteChannelImpl writer;
 
   @Before
   public void setUp() throws IOException, InterruptedException {
-    optionsMock = EasyMock.createMock(StorageOptions.class);
+    StorageRpcFactory rpcFactoryMock = EasyMock.createNiceMock(StorageRpcFactory.class);
     storageRpcMock = EasyMock.createMock(StorageRpc.class);
+    EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(StorageOptions.class)))
+        .andReturn(storageRpcMock);
+    EasyMock.replay(rpcFactoryMock);
+    options = StorageOptions.builder()
+        .projectId("projectid")
+        .serviceRpcFactory(rpcFactoryMock)
+        .build();
   }
 
   @After
   public void tearDown() throws Exception {
-    verify(optionsMock);
     verify(storageRpcMock);
   }
 
   @Test
   public void testCreate() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.replay(optionsMock);
     EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     EasyMock.replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertTrue(writer.isOpen());
   }
 
   @Test
   public void testWriteWithoutFlush() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.replay(optionsMock);
     EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     EasyMock.replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertEquals(MIN_CHUNK_SIZE, writer.write(ByteBuffer.allocate(MIN_CHUNK_SIZE)));
   }
 
   @Test
   public void testWriteWithFlush() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.replay(optionsMock);
     EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
     storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
@@ -100,7 +99,7 @@ public void testWriteWithFlush() throws IOException {
         EasyMock.eq(false));
     EasyMock.expectLastCall();
     EasyMock.replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     writer.chunkSize(CUSTOM_CHUNK_SIZE);
     ByteBuffer buffer = randomBuffer(CUSTOM_CHUNK_SIZE);
     assertEquals(CUSTOM_CHUNK_SIZE, writer.write(buffer));
@@ -109,9 +108,6 @@ public void testWriteWithFlush() throws IOException {
 
   @Test
   public void testWritesAndFlush() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.replay(optionsMock);
     EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
     storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
@@ -119,7 +115,7 @@ public void testWritesAndFlush() throws IOException {
         EasyMock.eq(false));
     EasyMock.expectLastCall();
     EasyMock.replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     ByteBuffer[] buffers = new ByteBuffer[DEFAULT_CHUNK_SIZE / MIN_CHUNK_SIZE];
     for (int i = 0; i < buffers.length; i++) {
       buffers[i] = randomBuffer(MIN_CHUNK_SIZE);
@@ -135,16 +131,13 @@ public void testWritesAndFlush() throws IOException {
 
   @Test
   public void testCloseWithoutFlush() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.replay(optionsMock);
     EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
     storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
         EasyMock.eq(BLOB_INFO.toPb()), EasyMock.eq(0L), EasyMock.eq(0), EasyMock.eq(true));
     EasyMock.expectLastCall();
     EasyMock.replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertTrue(writer.isOpen());
     writer.close();
     assertArrayEquals(new byte[0], capturedBuffer.getValue());
@@ -153,9 +146,6 @@ public void testCloseWithoutFlush() throws IOException {
 
   @Test
   public void testCloseWithFlush() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.replay(optionsMock);
     EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
     ByteBuffer buffer = randomBuffer(MIN_CHUNK_SIZE);
@@ -164,7 +154,7 @@ public void testCloseWithFlush() throws IOException {
         EasyMock.eq(true));
     EasyMock.expectLastCall();
     EasyMock.replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertTrue(writer.isOpen());
     writer.write(buffer);
     writer.close();
@@ -175,16 +165,13 @@ public void testCloseWithFlush() throws IOException {
 
   @Test
   public void testWriteClosed() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.replay(optionsMock);
     EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
     storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
         EasyMock.eq(BLOB_INFO.toPb()), EasyMock.eq(0L), EasyMock.eq(0), EasyMock.eq(true));
     EasyMock.expectLastCall();
     EasyMock.replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     writer.close();
     try {
       writer.write(ByteBuffer.allocate(MIN_CHUNK_SIZE));
@@ -196,9 +183,6 @@ public void testWriteClosed() throws IOException {
 
   @Test
   public void testSaveAndRestore() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries()).times(2);
-    EasyMock.replay(optionsMock);
     EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance(CaptureType.ALL);
     Capture capturedPosition = Capture.newInstance(CaptureType.ALL);
@@ -209,11 +193,11 @@ public void testSaveAndRestore() throws IOException {
     EasyMock.replay(storageRpcMock);
     ByteBuffer buffer1 = randomBuffer(DEFAULT_CHUNK_SIZE);
     ByteBuffer buffer2 = randomBuffer(DEFAULT_CHUNK_SIZE);
-    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertEquals(DEFAULT_CHUNK_SIZE, writer.write(buffer1));
     assertArrayEquals(buffer1.array(), capturedBuffer.getValues().get(0));
     assertEquals(new Long(0L), capturedPosition.getValues().get(0));
-    RestorableState writerState = writer.save();
+    RestorableState writerState = writer.capture();
     BlobWriteChannel restoredWriter = writerState.restore();
     assertEquals(DEFAULT_CHUNK_SIZE, restoredWriter.write(buffer2));
     assertArrayEquals(buffer2.array(), capturedBuffer.getValues().get(1));
@@ -222,20 +206,17 @@ public void testSaveAndRestore() throws IOException {
 
   @Test
   public void testSaveAndRestoreClosed() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.replay(optionsMock);
     EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
     storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
         EasyMock.eq(BLOB_INFO.toPb()), EasyMock.eq(0L), EasyMock.eq(0), EasyMock.eq(true));
     EasyMock.expectLastCall();
     EasyMock.replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     writer.close();
-    RestorableState writerState = writer.save();
+    RestorableState writerState = writer.capture();
     RestorableState expectedWriterState =
-        BlobWriteChannelImpl.StateImpl.builder(optionsMock, BLOB_INFO, UPLOAD_ID)
+        BlobWriteChannelImpl.StateImpl.builder(options, BLOB_INFO, UPLOAD_ID)
             .buffer(null)
             .chunkSize(DEFAULT_CHUNK_SIZE)
             .isOpen(false)
@@ -243,20 +224,18 @@ public void testSaveAndRestoreClosed() throws IOException {
             .build();
     BlobWriteChannel restoredWriter = writerState.restore();
     assertArrayEquals(new byte[0], capturedBuffer.getValue());
-    assertEquals(expectedWriterState, restoredWriter.save());
+    assertEquals(expectedWriterState, restoredWriter.capture());
   }
 
   @Test
   public void testStateEquals() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.replay(optionsMock);
     EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID)
         .times(2);
     EasyMock.replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
-    BlobWriteChannel writer2 = new BlobWriteChannelImpl(optionsMock, BLOB_INFO, EMPTY_RPC_OPTIONS);
-    RestorableState state = writer.save();
-    RestorableState state2 = writer2.save();
+    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    BlobWriteChannel writer2 = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    RestorableState state = writer.capture();
+    RestorableState state2 = writer2.capture();
     assertEquals(state, state2);
     assertEquals(state.hashCode(), state2.hashCode());
     assertEquals(state.toString(), state2.toString());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 3acb09a18080..1dd310cdc8b5 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -29,6 +29,10 @@
 import com.google.gcloud.RestorableState;
 import com.google.gcloud.storage.testing.RemoteGcsHelper;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -47,10 +51,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 public class ITStorageTest {
 
   private static Storage storage;
@@ -65,7 +65,7 @@ public class ITStorageTest {
   @BeforeClass
   public static void beforeClass() {
     gcsHelper = RemoteGcsHelper.create();
-    storage = StorageFactory.instance().get(gcsHelper.options());
+    storage = gcsHelper.options().service();
     storage.create(BucketInfo.of(bucket));
   }
 
@@ -469,13 +469,13 @@ public void testReadAndWriteChannels() throws UnsupportedEncodingException, IOEx
 
   @Test
   public void testReadAndWriteSaveChannels() throws UnsupportedEncodingException, IOException {
-    String blobName = "test-read-and-write-save-channels-blob";
+    String blobName = "test-read-and-write-capture-channels-blob";
     BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
     byte[] stringBytes;
     BlobWriteChannel writer = storage.writer(blob);
     stringBytes = BLOB_STRING_CONTENT.getBytes(UTF_8);
     writer.write(ByteBuffer.wrap(BLOB_BYTE_CONTENT));
-    RestorableState writerState = writer.save();
+    RestorableState writerState = writer.capture();
     BlobWriteChannel secondWriter = writerState.restore();
     secondWriter.write(ByteBuffer.wrap(stringBytes));
     secondWriter.close();
@@ -485,7 +485,7 @@ public void testReadAndWriteSaveChannels() throws UnsupportedEncodingException,
     reader.chunkSize(BLOB_BYTE_CONTENT.length);
     readBytes = ByteBuffer.allocate(BLOB_BYTE_CONTENT.length);
     reader.read(readBytes);
-    RestorableState readerState = reader.save();
+    RestorableState readerState = reader.capture();
     BlobReadChannel secondReader = readerState.restore();
     readStringBytes = ByteBuffer.allocate(stringBytes.length);
     secondReader.read(readStringBytes);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index edda4ed17e25..50cbdbf9abd5 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -114,7 +114,7 @@ public void testReadChannelState() throws IOException, ClassNotFoundException {
         .build();
     BlobReadChannel reader =
         new BlobReadChannelImpl(options, BlobId.of("b", "n"), EMPTY_RPC_OPTIONS);
-    RestorableState state = reader.save();
+    RestorableState state = reader.capture();
     RestorableState deserializedState = serializeAndDeserialize(state);
     assertEquals(state, deserializedState);
     assertEquals(state.hashCode(), deserializedState.hashCode());
@@ -130,7 +130,7 @@ public void testWriteChannelState() throws IOException, ClassNotFoundException {
         .build();
     BlobWriteChannelImpl writer = new BlobWriteChannelImpl(
         options, BlobInfo.builder(BlobId.of("b", "n")).build(), "upload-id");
-    RestorableState state = writer.save();
+    RestorableState state = writer.capture();
     RestorableState deserializedState = serializeAndDeserialize(state);
     assertEquals(state, deserializedState);
     assertEquals(state.hashCode(), deserializedState.hashCode());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index b3a6fe36859e..4aa4a84a7975 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -17,8 +17,8 @@
 package com.google.gcloud.storage;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -31,21 +31,22 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.google.common.io.BaseEncoding;
+import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.ServiceOptions;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.Tuple;
+import com.google.gcloud.spi.StorageRpcFactory;
 
 import org.easymock.Capture;
 import org.easymock.EasyMock;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
-import org.junit.rules.ExpectedException;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -194,10 +195,11 @@ public long millis() {
     }
   };
 
+  private static final String ACCOUNT = "account";
   private static PrivateKey privateKey;
   private static PublicKey publicKey;
 
-  private StorageOptions optionsMock;
+  private StorageOptions options;
   private StorageRpc storageRpcMock;
   private Storage storage;
 
@@ -217,43 +219,47 @@ public static void beforeClass() throws NoSuchAlgorithmException, InvalidKeySpec
 
   @Before
   public void setUp() throws IOException, InterruptedException {
-    optionsMock = EasyMock.createMock(StorageOptions.class);
+    StorageRpcFactory rpcFactoryMock = EasyMock.createNiceMock(StorageRpcFactory.class);
     storageRpcMock = EasyMock.createMock(StorageRpc.class);
+    EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(StorageOptions.class)))
+        .andReturn(storageRpcMock);
+    EasyMock.replay(rpcFactoryMock);
+    options = StorageOptions.builder()
+        .projectId("projectId")
+        .authCredentials(AuthCredentials.noCredentials())
+        .clock(TIME_SOURCE)
+        .serviceRpcFactory(rpcFactoryMock)
+        .build();
   }
 
   @After
   public void tearDown() throws Exception {
-    EasyMock.verify(optionsMock, storageRpcMock);
+    EasyMock.verify(storageRpcMock);
   }
 
   @Test
   public void testGetOptions() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
-    assertSame(optionsMock, storage.options());
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    assertSame(options, storage.options());
   }
 
   @Test
   public void testCreateBucket() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.create(BUCKET_INFO1.toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(BUCKET_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BucketInfo bucket = storage.create(BUCKET_INFO1);
     assertEquals(BUCKET_INFO1.toPb(), bucket.toPb());
   }
 
   @Test
   public void testCreateBucketWithOptions() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.create(BUCKET_INFO1.toPb(), BUCKET_TARGET_OPTIONS))
         .andReturn(BUCKET_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BucketInfo bucket =
         storage.create(BUCKET_INFO1, BUCKET_TARGET_METAGENERATION, BUCKET_TARGET_PREDEFINED_ACL);
     assertEquals(BUCKET_INFO1, bucket);
@@ -261,16 +267,14 @@ public void testCreateBucketWithOptions() {
 
   @Test
   public void testCreateBlob() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     Capture capturedStream = Capture.newInstance();
     EasyMock.expect(storageRpcMock.create(
         EasyMock.eq(BLOB_INFO1.toBuilder().md5(CONTENT_MD5).crc32c(CONTENT_CRC32C).build().toPb()),
         EasyMock.capture(capturedStream),
         EasyMock.eq(EMPTY_RPC_OPTIONS)))
         .andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob = storage.create(BLOB_INFO1, BLOB_CONTENT);
     assertEquals(BLOB_INFO1, blob);
     ByteArrayInputStream byteStream = capturedStream.getValue();
@@ -282,8 +286,6 @@ public void testCreateBlob() throws IOException {
 
   @Test
   public void testCreateEmptyBlob() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     Capture capturedStream = Capture.newInstance();
     EasyMock.expect(storageRpcMock.create(
         EasyMock.eq(BLOB_INFO1.toBuilder()
@@ -294,8 +296,8 @@ public void testCreateEmptyBlob() throws IOException {
         EasyMock.capture(capturedStream),
         EasyMock.eq(EMPTY_RPC_OPTIONS)))
         .andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob = storage.create(BLOB_INFO1);
     assertEquals(BLOB_INFO1, blob);
     ByteArrayInputStream byteStream = capturedStream.getValue();
@@ -305,8 +307,6 @@ public void testCreateEmptyBlob() throws IOException {
 
   @Test
   public void testCreateBlobWithOptions() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     Capture capturedStream = Capture.newInstance();
     EasyMock.expect(storageRpcMock.create(
         EasyMock.eq(BLOB_INFO1.toBuilder()
@@ -317,8 +317,8 @@ public void testCreateBlobWithOptions() throws IOException {
         EasyMock.capture(capturedStream),
         EasyMock.eq(BLOB_TARGET_OPTIONS_CREATE)))
         .andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob =
         storage.create(BLOB_INFO1, BLOB_CONTENT, BLOB_TARGET_METAGENERATION, BLOB_TARGET_NOT_EXIST,
             BLOB_TARGET_PREDEFINED_ACL);
@@ -332,40 +332,34 @@ public void testCreateBlobWithOptions() throws IOException {
 
   @Test
   public void testCreateBlobFromStream() throws IOException {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     ByteArrayInputStream fileStream = new ByteArrayInputStream(BLOB_CONTENT);
     BlobInfo.Builder infoBuilder = BLOB_INFO1.toBuilder();
     BlobInfo infoWithHashes = infoBuilder.md5(CONTENT_MD5).crc32c(CONTENT_CRC32C).build();
     BlobInfo infoWithoutHashes = infoBuilder.md5(null).crc32c(null).build();
     EasyMock.expect(storageRpcMock.create(infoWithoutHashes.toPb(), fileStream, EMPTY_RPC_OPTIONS))
         .andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob = storage.create(infoWithHashes, fileStream);
     assertEquals(BLOB_INFO1, blob);
   }
 
   @Test
   public void testGetBucket() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.get(BucketInfo.of(BUCKET_NAME1).toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(BUCKET_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BucketInfo bucket = storage.get(BUCKET_NAME1);
     assertEquals(BUCKET_INFO1, bucket);
   }
 
   @Test
   public void testGetBucketWithOptions() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.get(BucketInfo.of(BUCKET_NAME1).toPb(), BUCKET_SOURCE_OPTIONS))
         .andReturn(BUCKET_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BucketInfo bucket =
         storage.get(BUCKET_NAME1,
             Storage.BucketSourceOption.metagenerationMatch(BUCKET_INFO1.metageneration()));
@@ -374,26 +368,22 @@ public void testGetBucketWithOptions() {
 
   @Test
   public void testGetBlob() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(
         storageRpcMock.get(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob = storage.get(BUCKET_NAME1, BLOB_NAME1);
     assertEquals(BLOB_INFO1, blob);
   }
 
   @Test
   public void testGetBlobWithOptions() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(
         storageRpcMock.get(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb(), BLOB_SOURCE_OPTIONS))
         .andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob =
         storage.get(BUCKET_NAME1, BLOB_NAME1, BLOB_SOURCE_METAGENERATION, BLOB_SOURCE_GENERATION);
     assertEquals(BLOB_INFO1, blob);
@@ -401,15 +391,13 @@ public void testGetBlobWithOptions() {
 
   @Test
   public void testListBuckets() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     String cursor = "cursor";
     ImmutableList bucketList = ImmutableList.of(BUCKET_INFO1, BUCKET_INFO2);
     Tuple> result =
         Tuple.of(cursor, Iterables.transform(bucketList, BucketInfo.TO_PB_FUNCTION));
     EasyMock.expect(storageRpcMock.list(EMPTY_RPC_OPTIONS)).andReturn(result);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     ListResult listResult = storage.list();
     assertEquals(cursor, listResult.nextPageCursor());
     assertArrayEquals(bucketList.toArray(), Iterables.toArray(listResult, BucketInfo.class));
@@ -417,12 +405,10 @@ public void testListBuckets() {
 
   @Test
   public void testListBucketsEmpty() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.list(EMPTY_RPC_OPTIONS)).andReturn(
         Tuple.>of(null, null));
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     ListResult listResult = storage.list();
     assertNull(listResult.nextPageCursor());
     assertArrayEquals(ImmutableList.of().toArray(),
@@ -431,15 +417,13 @@ public void testListBucketsEmpty() {
 
   @Test
   public void testListBucketsWithOptions() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     String cursor = "cursor";
     ImmutableList bucketList = ImmutableList.of(BUCKET_INFO1, BUCKET_INFO2);
     Tuple> result =
         Tuple.of(cursor, Iterables.transform(bucketList, BucketInfo.TO_PB_FUNCTION));
     EasyMock.expect(storageRpcMock.list(BUCKET_LIST_OPTIONS)).andReturn(result);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     ListResult listResult = storage.list(BUCKET_LIST_MAX_RESULT, BUCKET_LIST_PREFIX);
     assertEquals(cursor, listResult.nextPageCursor());
     assertArrayEquals(bucketList.toArray(), Iterables.toArray(listResult, BucketInfo.class));
@@ -447,15 +431,13 @@ public void testListBucketsWithOptions() {
 
   @Test
   public void testListBlobs() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     String cursor = "cursor";
     ImmutableList blobList = ImmutableList.of(BLOB_INFO1, BLOB_INFO2);
     Tuple> result =
         Tuple.of(cursor, Iterables.transform(blobList, BlobInfo.TO_PB_FUNCTION));
     EasyMock.expect(storageRpcMock.list(BUCKET_NAME1, EMPTY_RPC_OPTIONS)).andReturn(result);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     ListResult listResult = storage.list(BUCKET_NAME1);
     assertEquals(cursor, listResult.nextPageCursor());
     assertArrayEquals(blobList.toArray(), Iterables.toArray(listResult, BlobInfo.class));
@@ -463,14 +445,12 @@ public void testListBlobs() {
 
   @Test
   public void testListBlobsEmpty() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.list(BUCKET_NAME1, EMPTY_RPC_OPTIONS))
         .andReturn(
             Tuple.>of(null,
                 null));
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     ListResult listResult = storage.list(BUCKET_NAME1);
     assertNull(listResult.nextPageCursor());
     assertArrayEquals(ImmutableList.of().toArray(), Iterables.toArray(listResult, BlobInfo.class));
@@ -478,15 +458,13 @@ public void testListBlobsEmpty() {
 
   @Test
   public void testListBlobsWithOptions() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     String cursor = "cursor";
     ImmutableList blobList = ImmutableList.of(BLOB_INFO1, BLOB_INFO2);
     Tuple> result =
         Tuple.of(cursor, Iterables.transform(blobList, BlobInfo.TO_PB_FUNCTION));
     EasyMock.expect(storageRpcMock.list(BUCKET_NAME1, BLOB_LIST_OPTIONS)).andReturn(result);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     ListResult listResult =
         storage.list(BUCKET_NAME1, BLOB_LIST_MAX_RESULT, BLOB_LIST_PREFIX);
     assertEquals(cursor, listResult.nextPageCursor());
@@ -496,12 +474,10 @@ public void testListBlobsWithOptions() {
   @Test
   public void testUpdateBucket() {
     BucketInfo updatedBucketInfo = BUCKET_INFO1.toBuilder().indexPage("some-page").build();
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.patch(updatedBucketInfo.toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(updatedBucketInfo.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BucketInfo bucket = storage.update(updatedBucketInfo);
     assertEquals(updatedBucketInfo, bucket);
   }
@@ -509,12 +485,10 @@ public void testUpdateBucket() {
   @Test
   public void testUpdateBucketWithOptions() {
     BucketInfo updatedBucketInfo = BUCKET_INFO1.toBuilder().indexPage("some-page").build();
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.patch(updatedBucketInfo.toPb(), BUCKET_TARGET_OPTIONS))
         .andReturn(updatedBucketInfo.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BucketInfo bucket =
         storage.update(updatedBucketInfo, BUCKET_TARGET_METAGENERATION,
             BUCKET_TARGET_PREDEFINED_ACL);
@@ -524,12 +498,10 @@ public void testUpdateBucketWithOptions() {
   @Test
   public void testUpdateBlob() {
     BlobInfo updatedBlobInfo = BLOB_INFO1.toBuilder().contentType("some-content-type").build();
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.patch(updatedBlobInfo.toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(updatedBlobInfo.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob = storage.update(updatedBlobInfo);
     assertEquals(updatedBlobInfo, blob);
   }
@@ -537,12 +509,10 @@ public void testUpdateBlob() {
   @Test
   public void testUpdateBlobWithOptions() {
     BlobInfo updatedBlobInfo = BLOB_INFO1.toBuilder().contentType("some-content-type").build();
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.patch(updatedBlobInfo.toPb(), BLOB_TARGET_OPTIONS_UPDATE))
         .andReturn(updatedBlobInfo.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob =
         storage.update(updatedBlobInfo, BLOB_TARGET_METAGENERATION, BLOB_TARGET_PREDEFINED_ACL);
     assertEquals(updatedBlobInfo, blob);
@@ -550,48 +520,40 @@ public void testUpdateBlobWithOptions() {
 
   @Test
   public void testDeleteBucket() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.delete(BucketInfo.of(BUCKET_NAME1).toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(true);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     assertTrue(storage.delete(BUCKET_NAME1));
   }
 
   @Test
   public void testDeleteBucketWithOptions() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock
         .expect(storageRpcMock.delete(BucketInfo.of(BUCKET_NAME1).toPb(), BUCKET_SOURCE_OPTIONS))
         .andReturn(true);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     assertTrue(storage.delete(BUCKET_NAME1, BUCKET_SOURCE_METAGENERATION));
   }
 
   @Test
   public void testDeleteBlob() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(
         storageRpcMock.delete(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(true);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     assertTrue(storage.delete(BUCKET_NAME1, BLOB_NAME1));
   }
 
   @Test
   public void testDeleteBlobWithOptions() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(
         storageRpcMock.delete(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb(), BLOB_SOURCE_OPTIONS))
         .andReturn(true);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     assertTrue(storage.delete(BUCKET_NAME1, BLOB_NAME1, BLOB_SOURCE_GENERATION,
         BLOB_SOURCE_METAGENERATION));
   }
@@ -602,12 +564,10 @@ public void testCompose() {
         .addSource(BLOB_NAME2, BLOB_NAME3)
         .target(BLOB_INFO1)
         .build();
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.compose(ImmutableList.of(BLOB_INFO2.toPb(), BLOB_INFO3.toPb()),
         BLOB_INFO1.toPb(), EMPTY_RPC_OPTIONS)).andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob = storage.compose(req);
     assertEquals(BLOB_INFO1, blob);
   }
@@ -619,12 +579,10 @@ public void testComposeWithOptions() {
         .target(BLOB_INFO1)
         .targetOptions(BLOB_TARGET_GENERATION, BLOB_TARGET_METAGENERATION)
         .build();
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.compose(ImmutableList.of(BLOB_INFO2.toPb(), BLOB_INFO3.toPb()),
         BLOB_INFO1.toPb(), BLOB_TARGET_OPTIONS_COMPOSE)).andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob = storage.compose(req);
     assertEquals(BLOB_INFO1, blob);
   }
@@ -635,12 +593,10 @@ public void testCopy() {
         .source(BUCKET_NAME1, BLOB_NAME2)
         .target(BLOB_INFO1)
         .build();
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(storageRpcMock.copy(BLOB_INFO2.toPb(), EMPTY_RPC_OPTIONS, BLOB_INFO1.toPb(),
         EMPTY_RPC_OPTIONS)).andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob = storage.copy(req);
     assertEquals(BLOB_INFO1, blob);
   }
@@ -653,39 +609,33 @@ public void testCopyWithOptions() {
         .target(BLOB_INFO1)
         .targetOptions(BLOB_TARGET_GENERATION, BLOB_TARGET_METAGENERATION)
         .build();
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(
         storageRpcMock.copy(BLOB_INFO2.toPb(), BLOB_SOURCE_OPTIONS_COPY, BLOB_INFO1.toPb(),
             BLOB_TARGET_OPTIONS_COMPOSE)).andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobInfo blob = storage.copy(req);
     assertEquals(BLOB_INFO1, blob);
   }
 
   @Test
   public void testReadAllBytes() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(
         storageRpcMock.load(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(BLOB_CONTENT);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     byte[] readBytes = storage.readAllBytes(BUCKET_NAME1, BLOB_NAME1);
     assertArrayEquals(BLOB_CONTENT, readBytes);
   }
 
   @Test
   public void testReadAllBytesWithOptions() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
     EasyMock.expect(
         storageRpcMock.load(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb(), BLOB_SOURCE_OPTIONS))
         .andReturn(BLOB_CONTENT);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     byte[] readBytes = storage.readAllBytes(BUCKET_NAME1, BLOB_NAME1, BLOB_SOURCE_GENERATION,
         BLOB_SOURCE_METAGENERATION);
     assertArrayEquals(BLOB_CONTENT, readBytes);
@@ -732,11 +682,11 @@ public Tuple apply(StorageObject f) {
     StorageRpc.BatchResponse res =
         new StorageRpc.BatchResponse(deleteResult, updateResult, getResult);
 
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
+
     Capture capturedBatchRequest = Capture.newInstance();
     EasyMock.expect(storageRpcMock.batch(EasyMock.capture(capturedBatchRequest))).andReturn(res);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BatchResponse batchResponse = storage.apply(req);
 
     // Verify captured StorageRpc.BatchRequest
@@ -773,9 +723,8 @@ public Tuple apply(StorageObject f) {
 
   @Test
   public void testReader() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobReadChannel channel = storage.reader(BUCKET_NAME1, BLOB_NAME1);
     assertNotNull(channel);
     assertTrue(channel.isOpen());
@@ -784,13 +733,11 @@ public void testReader() {
   @Test
   public void testReaderWithOptions() throws IOException {
     byte[] result = new byte[DEFAULT_CHUNK_SIZE];
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
     EasyMock.expect(
         storageRpcMock.read(BLOB_INFO2.toPb(), BLOB_SOURCE_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
         .andReturn(result);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobReadChannel channel = storage.reader(BUCKET_NAME1, BLOB_NAME2, BLOB_SOURCE_GENERATION,
         BLOB_SOURCE_METAGENERATION);
     assertNotNull(channel);
@@ -800,14 +747,13 @@ public void testReaderWithOptions() throws IOException {
 
   @Test
   public void testWriter() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
     BlobInfo.Builder infoBuilder = BLOB_INFO1.toBuilder();
     BlobInfo infoWithHashes = infoBuilder.md5(CONTENT_MD5).crc32c(CONTENT_CRC32C).build();
     BlobInfo infoWithoutHashes = infoBuilder.md5(null).crc32c(null).build();
     EasyMock.expect(storageRpcMock.open(infoWithoutHashes.toPb(), EMPTY_RPC_OPTIONS))
         .andReturn("upload-id");
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobWriteChannel channel = storage.writer(infoWithHashes);
     assertNotNull(channel);
     assertTrue(channel.isOpen());
@@ -815,12 +761,11 @@ public void testWriter() {
 
   @Test
   public void testWriterWithOptions() {
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock).times(2);
     BlobInfo info = BLOB_INFO1.toBuilder().md5(CONTENT_MD5).crc32c(CONTENT_CRC32C).build();
     EasyMock.expect(storageRpcMock.open(info.toPb(), BLOB_TARGET_OPTIONS_CREATE))
         .andReturn("upload-id");
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     BlobWriteChannel channel = storage.writer(info, BLOB_WRITE_METAGENERATION, BLOB_WRITE_NOT_EXIST,
         BLOB_WRITE_PREDEFINED_ACL, BLOB_WRITE_CRC2C, BLOB_WRITE_MD5_HASH);
     assertNotNull(channel);
@@ -830,21 +775,15 @@ public void testWriterWithOptions() {
   @Test
   public void testSignUrl() throws NoSuchAlgorithmException, InvalidKeyException,
       SignatureException, UnsupportedEncodingException {
-    String account = "account";
-    ServiceAccountAuthCredentials credentialsMock =
-        EasyMock.createMock(ServiceAccountAuthCredentials.class);
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.authCredentials()).andReturn(credentialsMock).times(2);
-    EasyMock.expect(optionsMock.clock()).andReturn(TIME_SOURCE);
-    EasyMock.expect(credentialsMock.privateKey()).andReturn(privateKey);
-    EasyMock.expect(credentialsMock.account()).andReturn(account);
-    EasyMock.replay(optionsMock, storageRpcMock, credentialsMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    ServiceAccountAuthCredentials authCredentials =
+        ServiceAccountAuthCredentials.createFor(ACCOUNT, privateKey);
+    storage = options.toBuilder().authCredentials(authCredentials).build().service();
     URL url = storage.signUrl(BLOB_INFO1, 14, TimeUnit.DAYS);
     String stringUrl = url.toString();
     String expectedUrl =
         new StringBuilder("https://storage.googleapis.com/").append(BUCKET_NAME1).append("/")
-            .append(BLOB_NAME1).append("?GoogleAccessId=").append(account).append("&Expires=")
+            .append(BLOB_NAME1).append("?GoogleAccessId=").append(ACCOUNT).append("&Expires=")
             .append(42L + 1209600).append("&Signature=").toString();
     assertTrue(stringUrl.startsWith(expectedUrl));
     String signature = stringUrl.substring(expectedUrl.length());
@@ -859,22 +798,15 @@ public void testSignUrl() throws NoSuchAlgorithmException, InvalidKeyException,
     signer.update(signedMessageBuilder.toString().getBytes(UTF_8));
     assertTrue(signer.verify(BaseEncoding.base64().decode(
         URLDecoder.decode(signature, UTF_8.name()))));
-    EasyMock.verify(credentialsMock);
   }
 
   @Test
   public void testSignUrlWithOptions() throws NoSuchAlgorithmException, InvalidKeyException,
       SignatureException, UnsupportedEncodingException {
-    String account = "account";
-    ServiceAccountAuthCredentials credentialsMock =
-        EasyMock.createMock(ServiceAccountAuthCredentials.class);
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.authCredentials()).andReturn(credentialsMock).times(2);
-    EasyMock.expect(optionsMock.clock()).andReturn(TIME_SOURCE);
-    EasyMock.expect(credentialsMock.privateKey()).andReturn(privateKey);
-    EasyMock.expect(credentialsMock.account()).andReturn(account);
-    EasyMock.replay(optionsMock, storageRpcMock, credentialsMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    ServiceAccountAuthCredentials authCredentials =
+        ServiceAccountAuthCredentials.createFor(ACCOUNT, privateKey);
+    storage = options.toBuilder().authCredentials(authCredentials).build().service();
     URL url =
         storage.signUrl(BLOB_INFO1, 14, TimeUnit.DAYS,
             Storage.SignUrlOption.httpMethod(HttpMethod.POST),
@@ -882,7 +814,7 @@ public void testSignUrlWithOptions() throws NoSuchAlgorithmException, InvalidKey
     String stringUrl = url.toString();
     String expectedUrl =
         new StringBuilder("https://storage.googleapis.com/").append(BUCKET_NAME1).append("/")
-            .append(BLOB_NAME1).append("?GoogleAccessId=").append(account).append("&Expires=")
+            .append(BLOB_NAME1).append("?GoogleAccessId=").append(ACCOUNT).append("&Expires=")
             .append(42L + 1209600).append("&Signature=").toString();
     assertTrue(stringUrl.startsWith(expectedUrl));
     String signature = stringUrl.substring(expectedUrl.length());
@@ -897,7 +829,6 @@ public void testSignUrlWithOptions() throws NoSuchAlgorithmException, InvalidKey
     signer.update(signedMessageBuilder.toString().getBytes(UTF_8));
     assertTrue(signer.verify(BaseEncoding.base64().decode(
         URLDecoder.decode(signature, UTF_8.name()))));
-    EasyMock.verify(credentialsMock);
   }
 
   @Test
@@ -920,11 +851,11 @@ public Tuple apply(StorageObject f) {
     StorageRpc.BatchResponse res =
         new StorageRpc.BatchResponse(deleteResult, updateResult, getResult);
 
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
+
     Capture capturedBatchRequest = Capture.newInstance();
     EasyMock.expect(storageRpcMock.batch(EasyMock.capture(capturedBatchRequest))).andReturn(res);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     List resultBlobs = storage.get(blobId1, blobId2);
 
     // Verify captured StorageRpc.BatchRequest
@@ -963,11 +894,11 @@ public Tuple apply(StorageObject f) {
     StorageRpc.BatchResponse res =
         new StorageRpc.BatchResponse(deleteResult, updateResult, getResult);
 
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
+
     Capture capturedBatchRequest = Capture.newInstance();
     EasyMock.expect(storageRpcMock.batch(EasyMock.capture(capturedBatchRequest))).andReturn(res);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     List resultBlobs = storage.update(blobInfo1, blobInfo2);
 
     // Verify captured StorageRpc.BatchRequest
@@ -1006,11 +937,10 @@ public Tuple apply(StorageObject f) {
     StorageRpc.BatchResponse res =
         new StorageRpc.BatchResponse(deleteResult, updateResult, getResult);
 
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
     Capture capturedBatchRequest = Capture.newInstance();
     EasyMock.expect(storageRpcMock.batch(EasyMock.capture(capturedBatchRequest))).andReturn(res);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
     List deleteResults = storage.delete(blobInfo1.blobId(), blobInfo2.blobId());
 
     // Verify captured StorageRpc.BatchRequest
@@ -1032,13 +962,11 @@ public Tuple apply(StorageObject f) {
   @Test
   public void testRetryableException() {
     BlobId blob = BlobId.of(BUCKET_NAME1, BLOB_NAME1);
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.getDefaultInstance());
     EasyMock.expect(storageRpcMock.get(blob.toPb(), EMPTY_RPC_OPTIONS))
         .andThrow(new StorageException(500, "InternalError", true))
         .andReturn(BLOB_INFO1.toPb());
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
     BlobInfo readBlob = storage.get(blob);
     assertEquals(BLOB_INFO1, readBlob);
   }
@@ -1047,12 +975,10 @@ public void testRetryableException() {
   public void testNonRetryableException() {
     BlobId blob = BlobId.of(BUCKET_NAME1, BLOB_NAME1);
     String exceptionMessage = "Not Implemented";
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.getDefaultInstance());
     EasyMock.expect(storageRpcMock.get(blob.toPb(), EMPTY_RPC_OPTIONS))
         .andThrow(new StorageException(501, exceptionMessage, false));
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
     thrown.expect(StorageException.class);
     thrown.expectMessage(exceptionMessage);
     storage.get(blob);
@@ -1062,12 +988,10 @@ public void testNonRetryableException() {
   public void testRuntimeException() {
     BlobId blob = BlobId.of(BUCKET_NAME1, BLOB_NAME1);
     String exceptionMessage = "Artificial runtime exception";
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.getDefaultInstance());
     EasyMock.expect(storageRpcMock.get(blob.toPb(), EMPTY_RPC_OPTIONS))
         .andThrow(new RuntimeException(exceptionMessage));
-    EasyMock.replay(optionsMock, storageRpcMock);
-    storage = StorageFactory.instance().get(optionsMock);
+    EasyMock.replay(storageRpcMock);
+    storage = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
     thrown.expect(StorageException.class);
     thrown.expectMessage(exceptionMessage);
     storage.get(blob);
diff --git a/src/site/resources/index.html b/src/site/resources/index.html
index 4daf4fa596f4..25c769db2fbf 100644
--- a/src/site/resources/index.html
+++ b/src/site/resources/index.html
@@ -118,7 +118,7 @@ 
What is it?

 		    integrates better with your codebase.
 		    All this means you spend more time creating code that matters
 		    to you.

-		  
+
 		  
gcloud is configured to access Google Cloud Platform
 		    services and authorize (OAuth 2.0) automatically on your behalf.
 		    Add the gcloud dependency to your project and get a private key to be
@@ -126,7 +126,7 @@ 
What is it?

 		    Compute Engine instance, the private key is automatically detected.
                 
 
-                
		  
+                

                   
Example: Retrieve Datastore Entries

 
                     

@@ -136,7 +136,6 @@ 
Example: Retrieve Datastore Entries

 
                     
 import com.google.gcloud.datastore.Datastore;
-import com.google.gcloud.datastore.DatastoreFactory;
 import com.google.gcloud.datastore.DatastoreOptions;
 import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
@@ -145,7 +144,7 @@ 
Example: Retrieve Datastore Entries

 // Authentication is automatic inside Google Compute Engine
 // and Google App Engine.
 DatastoreOptions options = DatastoreOptions.builder().build();
-Datastore datastore = DatastoreFactory.instance().get(options);
+Datastore datastore = options.service();
 KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
 Key key = keyFactory.newKey(keyName);
 Entity entity = datastore.get(key);
@@ -156,7 +155,6 @@ 
Example: Retrieve Datastore Entries

                     
 import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.datastore.Datastore;
-import com.google.gcloud.datastore.DatastoreFactory;
 import com.google.gcloud.datastore.DatastoreOptions;
 import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
@@ -166,7 +164,7 @@ 
Example: Retrieve Datastore Entries

   .projectId(PROJECT_ID)
   .authCredentials(AuthCredentials.createForJson(
     new FileInputStream(PATH_TO_JSON_KEY))).build();
-Datastore datastore = DatastoreFactory.instance().get(options);
+Datastore datastore = options.service();
 KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
 Key key = keyFactory.newKey(keyName);
 Entity entity = datastore.get(key);

From 855a9d1290ab2fe726ad6847cedde5dd02eefd47 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 26 Oct 2015 21:57:41 +0100
Subject: [PATCH 018/322] Force dependency information page to show
 instructions for gcloud-java

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9672c02a8ca7..91f88db02c0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -332,6 +332,8 @@
                 true
                 true
                 true
+                gcloud-java
+                jar
               
             
             

From 7afcc34c56b19556ef2b2cc8bcbc7459604910ad Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 27 Oct 2015 11:18:15 +0100
Subject: [PATCH 019/322] Override artifact id for Dependency Information
 report

---
 gcloud-java-core/pom.xml      | 21 +++++++++++++++++++++
 gcloud-java-datastore/pom.xml | 21 +++++++++++++++++++++
 gcloud-java-examples/pom.xml  | 17 +++++++++++++++++
 gcloud-java-storage/pom.xml   | 21 +++++++++++++++++++++
 gcloud-java/pom.xml           | 21 +++++++++++++++++++++
 5 files changed, 101 insertions(+)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index 2275c7f0765b..1062f4d3110c 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -90,4 +90,25 @@
       test
     
   
+  
+    
+      
+        org.apache.maven.plugins
+        maven-site-plugin
+        3.4
+        
+          
+            
+              org.apache.maven.plugins
+              maven-project-info-reports-plugin
+              2.8
+              
+                gcloud-java-core
+              
+            
+          
+        
+      
+    
+  
 
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index ba70d805a86c..700f14c03a51 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -38,4 +38,25 @@
       test
     
   
+  
+    
+      
+        org.apache.maven.plugins
+        maven-site-plugin
+        3.4
+        
+          
+            
+              org.apache.maven.plugins
+              maven-project-info-reports-plugin
+              2.8
+              
+                gcloud-java-datastore
+              
+            
+          
+        
+      
+    
+  
 
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index d6a990ed8b7c..4f5649797f78 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -29,6 +29,23 @@
           false
         
       
+      
+        org.apache.maven.plugins
+        maven-site-plugin
+        3.4
+        
+          
+            
+              org.apache.maven.plugins
+              maven-project-info-reports-plugin
+              2.8
+              
+                gcloud-java-examples
+              
+            
+          
+        
+      
     
   
 
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 2d4d9f8df55b..439fa540e479 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -44,4 +44,25 @@
       test
     
   
+  
+    
+      
+        org.apache.maven.plugins
+        maven-site-plugin
+        3.4
+        
+          
+            
+              org.apache.maven.plugins
+              maven-project-info-reports-plugin
+              2.8
+              
+                gcloud-java-storage
+              
+            
+          
+        
+      
+    
+  
 
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 6ad0fce8f1b1..9b8614c20431 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -30,4 +30,25 @@
       ${project.version}
     
   
+  
+    
+      
+        org.apache.maven.plugins
+        maven-site-plugin
+        3.4
+        
+          
+            
+              org.apache.maven.plugins
+              maven-project-info-reports-plugin
+              2.8
+              
+                gcloud-java
+              
+            
+          
+        
+      
+    
+  
 

From e0363357c295c561b755619126a10a8ac9db2809 Mon Sep 17 00:00:00 2001
From: aozarov 
Date: Tue, 27 Oct 2015 12:15:39 -0700
Subject: [PATCH 020/322] use static constant for default factories, add
 example to Restorable and use mock instead of niceMock

---
 .../java/com/google/gcloud/Restorable.java    |  17 ++-
 .../com/google/gcloud/ServiceOptions.java     |  44 ++++----
 .../gcloud/datastore/DatastoreOptions.java    |   8 +-
 .../gcloud/storage/BlobReadChannel.java       |   2 +-
 .../gcloud/storage/BlobWriteChannel.java      |   2 +-
 .../google/gcloud/storage/StorageOptions.java |   8 +-
 .../storage/BlobReadChannelImplTest.java      |  63 +++++------
 .../storage/BlobWriteChannelImplTest.java     | 103 +++++++++---------
 .../google/gcloud/storage/ITStorageTest.java  |  13 +--
 .../gcloud/storage/StorageImplTest.java       |   5 +-
 10 files changed, 145 insertions(+), 120 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
index aba973590965..83ef39a4dd73 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
@@ -2,11 +2,26 @@
 
 /**
  * Implementation of this interface can persist their state and restore from it.
+ *
+ * 

+ * A typical capture usage:
+ * 
  {@code
+ * X restorableObj; // X instanceof Restorable
+ * RestorableState state = restorableObj.capture();
+ * .. persist state
+ * }

+ *
+ * A typical restore usage:
+ * 
  {@code
+ * RestorableState state = ... // read from persistence
+ * X restorableObj = state.restore();
+ * ...
+ * }

  */
 public interface Restorable> {
 
   /**
-   * Capture the state of this object.
+   * Captures the state of this object.
    *
    * @return a {@link RestorableState} instance that contains the state for this object and can
    *     restore it afterwards.
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 70da7831c1db..4a68aa7894f7 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -1,17 +1,15 @@
 /*
  * Copyright 2015 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
+ * 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
+ * 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.
+ * 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.
  */
 
 package com.google.gcloud;
@@ -28,7 +26,15 @@
 import com.google.common.collect.Iterables;
 import com.google.gcloud.spi.ServiceRpcFactory;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -70,8 +76,8 @@ public abstract class ServiceOptions<
   /**
    * A base interface for all {@link HttpTransport} factories.
    *
-   * Implementation must provide a public no-arg constructor.
-   * Loading of a factory implementation is done via {@link java.util.ServiceLoader}.
+   * Implementation must provide a public no-arg constructor. Loading of a factory implementation is
+   * done via {@link java.util.ServiceLoader}.
    */
   public interface HttpTransportFactory {
     HttpTransport create();
@@ -264,7 +270,7 @@ public B serviceRpcFactory(ServiceRpcFactory serviceRpcFa
      * Sets the timeout in milliseconds to establish a connection.
      *
      * @param connectTimeout connection timeout in milliseconds. 0 for an infinite timeout, a
-     * negative number for the default value (20000).
+     *        negative number for the default value (20000).
      * @return the builder.
      */
     public B connectTimeout(int connectTimeout) {
@@ -275,8 +281,8 @@ public B connectTimeout(int connectTimeout) {
     /**
      * Sets the timeout in milliseconds to read data from an established connection.
      *
-     * @param readTimeout read timeout in milliseconds. 0 for an infinite timeout, a
-     * negative number for the default value (20000).
+     * @param readTimeout read timeout in milliseconds. 0 for an infinite timeout, a negative number
+     *        for the default value (20000).
      * @return the builder.
      */
     public B readTimeout(int readTimeout) {
@@ -362,10 +368,10 @@ protected static String googleCloudProjectId() {
     } catch (IOException ignore) {
       // ignore
     }
-   File configDir;
+    File configDir;
     if (System.getenv().containsKey("CLOUDSDK_CONFIG")) {
       configDir = new File(System.getenv("CLOUDSDK_CONFIG"));
-    } else if (isWindows() &&  System.getenv().containsKey("APPDATA")) {
+    } else if (isWindows() && System.getenv().containsKey("APPDATA")) {
       configDir = new File(System.getenv("APPDATA"), "gcloud");
     } else {
       configDir = new File(System.getProperty("user.home"), ".config/gcloud");
@@ -509,8 +515,8 @@ public int readTimeout() {
   }
 
   /**
-   * Returns the service's clock. Default time source uses {@link System#currentTimeMillis()} to
-   * get current time.
+   * Returns the service's clock. Default time source uses {@link System#currentTimeMillis()} to get
+   * current time.
    */
   public Clock clock() {
     return clock;
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
index 46ff1b5b847b..328573ac7164 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -49,6 +49,8 @@ public class DatastoreOptions extends ServiceOptions readerState = reader.capture();
@@ -194,7 +189,7 @@ public void testSaveAndRestore() throws IOException, ClassNotFoundException {
 
   @Test
   public void testStateEquals() {
-    EasyMock.replay(storageRpcMock);
+    replay(storageRpcMock);
     reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     BlobReadChannel secondReader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     RestorableState state = reader.capture();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
index fdb75fe8cad4..6faa36173ab9 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
@@ -16,6 +16,14 @@
 
 package com.google.gcloud.storage;
 
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.captureLong;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -29,7 +37,6 @@
 
 import org.easymock.Capture;
 import org.easymock.CaptureType;
-import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,16 +60,17 @@ public class BlobWriteChannelImplTest {
   private static final Random RANDOM = new Random();
 
   private StorageOptions options;
+  private StorageRpcFactory rpcFactoryMock;
   private StorageRpc storageRpcMock;
   private BlobWriteChannelImpl writer;
 
   @Before
   public void setUp() throws IOException, InterruptedException {
-    StorageRpcFactory rpcFactoryMock = EasyMock.createNiceMock(StorageRpcFactory.class);
-    storageRpcMock = EasyMock.createMock(StorageRpc.class);
-    EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(StorageOptions.class)))
+    rpcFactoryMock = createMock(StorageRpcFactory.class);
+    storageRpcMock = createMock(StorageRpc.class);
+    expect(rpcFactoryMock.create(anyObject(StorageOptions.class)))
         .andReturn(storageRpcMock);
-    EasyMock.replay(rpcFactoryMock);
+    replay(rpcFactoryMock);
     options = StorageOptions.builder()
         .projectId("projectid")
         .serviceRpcFactory(rpcFactoryMock)
@@ -71,34 +79,32 @@ public void setUp() throws IOException, InterruptedException {
 
   @After
   public void tearDown() throws Exception {
-    verify(storageRpcMock);
+    verify(rpcFactoryMock, storageRpcMock);
   }
 
   @Test
   public void testCreate() {
-    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
-    EasyMock.replay(storageRpcMock);
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
+    replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertTrue(writer.isOpen());
   }
 
   @Test
   public void testWriteWithoutFlush() throws IOException {
-    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
-    EasyMock.replay(storageRpcMock);
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
+    replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertEquals(MIN_CHUNK_SIZE, writer.write(ByteBuffer.allocate(MIN_CHUNK_SIZE)));
   }
 
   @Test
   public void testWriteWithFlush() throws IOException {
-    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
-    storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
-        EasyMock.eq(BLOB_INFO.toPb()), EasyMock.eq(0L), EasyMock.eq(CUSTOM_CHUNK_SIZE),
-        EasyMock.eq(false));
-    EasyMock.expectLastCall();
-    EasyMock.replay(storageRpcMock);
+    storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0),
+        eq(BLOB_INFO.toPb()), eq(0L), eq(CUSTOM_CHUNK_SIZE), eq(false));
+    replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     writer.chunkSize(CUSTOM_CHUNK_SIZE);
     ByteBuffer buffer = randomBuffer(CUSTOM_CHUNK_SIZE);
@@ -108,13 +114,12 @@ public void testWriteWithFlush() throws IOException {
 
   @Test
   public void testWritesAndFlush() throws IOException {
-    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
-    storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
-        EasyMock.eq(BLOB_INFO.toPb()), EasyMock.eq(0L), EasyMock.eq(DEFAULT_CHUNK_SIZE),
-        EasyMock.eq(false));
-    EasyMock.expectLastCall();
-    EasyMock.replay(storageRpcMock);
+    storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0),
+        eq(BLOB_INFO.toPb()), eq(0L), eq(DEFAULT_CHUNK_SIZE),
+        eq(false));
+    replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     ByteBuffer[] buffers = new ByteBuffer[DEFAULT_CHUNK_SIZE / MIN_CHUNK_SIZE];
     for (int i = 0; i < buffers.length; i++) {
@@ -131,12 +136,11 @@ public void testWritesAndFlush() throws IOException {
 
   @Test
   public void testCloseWithoutFlush() throws IOException {
-    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
-    storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
-        EasyMock.eq(BLOB_INFO.toPb()), EasyMock.eq(0L), EasyMock.eq(0), EasyMock.eq(true));
-    EasyMock.expectLastCall();
-    EasyMock.replay(storageRpcMock);
+    storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0),
+        eq(BLOB_INFO.toPb()), eq(0L), eq(0), eq(true));
+    replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertTrue(writer.isOpen());
     writer.close();
@@ -146,14 +150,13 @@ public void testCloseWithoutFlush() throws IOException {
 
   @Test
   public void testCloseWithFlush() throws IOException {
-    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
     ByteBuffer buffer = randomBuffer(MIN_CHUNK_SIZE);
-    storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
-        EasyMock.eq(BLOB_INFO.toPb()), EasyMock.eq(0L), EasyMock.eq(MIN_CHUNK_SIZE),
-        EasyMock.eq(true));
-    EasyMock.expectLastCall();
-    EasyMock.replay(storageRpcMock);
+    storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0),
+        eq(BLOB_INFO.toPb()), eq(0L), eq(MIN_CHUNK_SIZE),
+        eq(true));
+    replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertTrue(writer.isOpen());
     writer.write(buffer);
@@ -165,12 +168,11 @@ public void testCloseWithFlush() throws IOException {
 
   @Test
   public void testWriteClosed() throws IOException {
-    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
-    storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
-        EasyMock.eq(BLOB_INFO.toPb()), EasyMock.eq(0L), EasyMock.eq(0), EasyMock.eq(true));
-    EasyMock.expectLastCall();
-    EasyMock.replay(storageRpcMock);
+    storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0),
+        eq(BLOB_INFO.toPb()), eq(0L), eq(0), eq(true));
+    replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     writer.close();
     try {
@@ -183,14 +185,14 @@ public void testWriteClosed() throws IOException {
 
   @Test
   public void testSaveAndRestore() throws IOException {
-    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance(CaptureType.ALL);
     Capture capturedPosition = Capture.newInstance(CaptureType.ALL);
-    storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
-        EasyMock.eq(BLOB_INFO.toPb()), EasyMock.captureLong(capturedPosition),
-        EasyMock.eq(DEFAULT_CHUNK_SIZE), EasyMock.eq(false));
-    EasyMock.expectLastCall().times(2);
-    EasyMock.replay(storageRpcMock);
+    storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0),
+        eq(BLOB_INFO.toPb()), captureLong(capturedPosition),
+        eq(DEFAULT_CHUNK_SIZE), eq(false));
+    expectLastCall().times(2);
+    replay(storageRpcMock);
     ByteBuffer buffer1 = randomBuffer(DEFAULT_CHUNK_SIZE);
     ByteBuffer buffer2 = randomBuffer(DEFAULT_CHUNK_SIZE);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
@@ -206,12 +208,11 @@ public void testSaveAndRestore() throws IOException {
 
   @Test
   public void testSaveAndRestoreClosed() throws IOException {
-    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     Capture capturedBuffer = Capture.newInstance();
-    storageRpcMock.write(EasyMock.eq(UPLOAD_ID), EasyMock.capture(capturedBuffer), EasyMock.eq(0),
-        EasyMock.eq(BLOB_INFO.toPb()), EasyMock.eq(0L), EasyMock.eq(0), EasyMock.eq(true));
-    EasyMock.expectLastCall();
-    EasyMock.replay(storageRpcMock);
+    storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0),
+        eq(BLOB_INFO.toPb()), eq(0L), eq(0), eq(true));
+    replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     writer.close();
     RestorableState writerState = writer.capture();
@@ -229,9 +230,9 @@ public void testSaveAndRestoreClosed() throws IOException {
 
   @Test
   public void testStateEquals() {
-    EasyMock.expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID)
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID)
         .times(2);
-    EasyMock.replay(storageRpcMock);
+    replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     BlobWriteChannel writer2 = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     RestorableState state = writer.capture();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 1dd310cdc8b5..a0bae0e0e29e 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -54,7 +54,6 @@
 public class ITStorageTest {
 
   private static Storage storage;
-  private static RemoteGcsHelper gcsHelper;
 
   private static final Logger log = Logger.getLogger(ITStorageTest.class.getName());
   private static final String bucket = RemoteGcsHelper.generateBucketName();
@@ -64,7 +63,7 @@ public class ITStorageTest {
 
   @BeforeClass
   public static void beforeClass() {
-    gcsHelper = RemoteGcsHelper.create();
+    RemoteGcsHelper gcsHelper = RemoteGcsHelper.create();
     storage = gcsHelper.options().service();
     storage.create(BucketInfo.of(bucket));
   }
@@ -445,7 +444,7 @@ public void testBatchRequestFail() {
   }
 
   @Test
-  public void testReadAndWriteChannels() throws UnsupportedEncodingException, IOException {
+  public void testReadAndWriteChannels() throws IOException {
     String blobName = "test-read-and-write-channels-blob";
     BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
     byte[] stringBytes;
@@ -468,7 +467,7 @@ public void testReadAndWriteChannels() throws UnsupportedEncodingException, IOEx
   }
 
   @Test
-  public void testReadAndWriteSaveChannels() throws UnsupportedEncodingException, IOException {
+  public void testReadAndWriteCaptureChannels() throws IOException {
     String blobName = "test-read-and-write-capture-channels-blob";
     BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
     byte[] stringBytes;
@@ -497,7 +496,7 @@ public void testReadAndWriteSaveChannels() throws UnsupportedEncodingException,
   }
 
   @Test
-  public void testReadChannelFail() throws UnsupportedEncodingException, IOException {
+  public void testReadChannelFail() throws IOException {
     String blobName = "test-read-channel-blob-fail";
     BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
     assertNotNull(storage.create(blob));
@@ -512,7 +511,7 @@ public void testReadChannelFail() throws UnsupportedEncodingException, IOExcepti
   }
 
   @Test
-  public void testWriteChannelFail() throws UnsupportedEncodingException, IOException {
+  public void testWriteChannelFail() throws IOException {
     String blobName = "test-write-channel-blob-fail";
     BlobInfo blob = BlobInfo.builder(bucket, blobName).generation(-1L).build();
     try {
@@ -527,7 +526,7 @@ public void testWriteChannelFail() throws UnsupportedEncodingException, IOExcept
   }
 
   @Test
-  public void testWriteChannelExistingBlob() throws UnsupportedEncodingException, IOException {
+  public void testWriteChannelExistingBlob() throws IOException {
     String blobName = "test-write-channel-existing-blob";
     BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
     BlobInfo remoteBlob = storage.create(blob);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 4aa4a84a7975..9c80d43396c0 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -200,6 +200,7 @@ public long millis() {
   private static PublicKey publicKey;
 
   private StorageOptions options;
+  private StorageRpcFactory rpcFactoryMock;
   private StorageRpc storageRpcMock;
   private Storage storage;
 
@@ -219,7 +220,7 @@ public static void beforeClass() throws NoSuchAlgorithmException, InvalidKeySpec
 
   @Before
   public void setUp() throws IOException, InterruptedException {
-    StorageRpcFactory rpcFactoryMock = EasyMock.createNiceMock(StorageRpcFactory.class);
+    rpcFactoryMock = EasyMock.createMock(StorageRpcFactory.class);
     storageRpcMock = EasyMock.createMock(StorageRpc.class);
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(StorageOptions.class)))
         .andReturn(storageRpcMock);
@@ -234,7 +235,7 @@ public void setUp() throws IOException, InterruptedException {
 
   @After
   public void tearDown() throws Exception {
-    EasyMock.verify(storageRpcMock);
+    EasyMock.verify(rpcFactoryMock, storageRpcMock);
   }
 
   @Test

From fd556b8035122a8a18bad54ef8188bc13ae2cec1 Mon Sep 17 00:00:00 2001
From: aozarov 
Date: Tue, 27 Oct 2015 12:24:53 -0700
Subject: [PATCH 021/322] add and fix copyright headers

---
 .../main/java/com/google/gcloud/Restorable.java  | 16 ++++++++++++++++
 .../java/com/google/gcloud/ServiceOptions.java   | 16 +++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
index 83ef39a4dd73..51391e33bd7d 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 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.
+ */
+
 package com.google.gcloud;
 
 /**
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 4a68aa7894f7..f22c4d51e371 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -1,15 +1,17 @@
 /*
  * Copyright 2015 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
+ * 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
+ *       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.
+ * 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.
  */
 
 package com.google.gcloud;

From 207c00a3554efbc70041466ee9a4a6d982cb62d2 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 27 Oct 2015 22:39:50 +0100
Subject: [PATCH 022/322] Copy report configuration to submodules poms

---
 gcloud-java-core/pom.xml      | 77 +++++++++++++++++++++++++++++++++++
 gcloud-java-datastore/pom.xml | 77 +++++++++++++++++++++++++++++++++++
 gcloud-java-examples/pom.xml  | 77 +++++++++++++++++++++++++++++++++++
 gcloud-java-storage/pom.xml   | 77 +++++++++++++++++++++++++++++++++++
 gcloud-java/pom.xml           | 77 +++++++++++++++++++++++++++++++++++
 5 files changed, 385 insertions(+)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index 1062f4d3110c..6d25aa42ce95 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -97,13 +97,90 @@
         maven-site-plugin
         3.4
         
+          true
           
+            
+              org.apache.maven.plugins
+              maven-changelog-plugin
+              2.3
+            
             
               org.apache.maven.plugins
               maven-project-info-reports-plugin
               2.8
+              
+                
+                  
+                    index
+                    dependency-info
+                    dependencies
+                    dependency-convergence
+                    project-team
+                    mailing-list
+                    cim
+                    issue-tracking
+                    license
+                    scm
+                    dependency-management
+                    distribution-management
+                    summary
+                    modules
+                  
+                
+              
               
+                true
+                true
+                true
+                true
                 gcloud-java-core
+                jar
+              
+            
+            
+              org.apache.maven.plugins
+              maven-dependency-plugin
+              2.10
+            
+            
+              org.apache.maven.plugins
+              maven-javadoc-plugin
+              2.10.3
+              
+                
+                  html
+                  
+                    javadoc
+                  
+                
+              
+              
+                true
+                protected
+                true
+                ${project.build.directory}/javadoc
+              
+            
+            
+              org.apache.maven.plugins
+              maven-surefire-report-plugin
+              2.18.1
+            
+            
+              org.apache.maven.plugins
+              maven-checkstyle-plugin
+              2.16
+              
+                checkstyle.xml
+                false
+              
+            
+            
+              org.codehaus.mojo
+              cobertura-maven-plugin
+              2.7
+              
+                true
               
             
           
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index 700f14c03a51..6cd56e2c2211 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -45,13 +45,90 @@
         maven-site-plugin
         3.4
         
+          true
           
+            
+              org.apache.maven.plugins
+              maven-changelog-plugin
+              2.3
+            
             
               org.apache.maven.plugins
               maven-project-info-reports-plugin
               2.8
+              
+                
+                  
+                    index
+                    dependency-info
+                    dependencies
+                    dependency-convergence
+                    project-team
+                    mailing-list
+                    cim
+                    issue-tracking
+                    license
+                    scm
+                    dependency-management
+                    distribution-management
+                    summary
+                    modules
+                  
+                
+              
               
+                true
+                true
+                true
+                true
                 gcloud-java-datastore
+                jar
+              
+            
+            
+              org.apache.maven.plugins
+              maven-dependency-plugin
+              2.10
+            
+            
+              org.apache.maven.plugins
+              maven-javadoc-plugin
+              2.10.3
+              
+                
+                  html
+                  
+                    javadoc
+                  
+                
+              
+              
+                true
+                protected
+                true
+                ${project.build.directory}/javadoc
+              
+            
+            
+              org.apache.maven.plugins
+              maven-surefire-report-plugin
+              2.18.1
+            
+            
+              org.apache.maven.plugins
+              maven-checkstyle-plugin
+              2.16
+              
+                checkstyle.xml
+                false
+              
+            
+            
+              org.codehaus.mojo
+              cobertura-maven-plugin
+              2.7
+              
+                true
               
             
           
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index 4f5649797f78..c795571a0ff1 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -34,13 +34,90 @@
         maven-site-plugin
         3.4
         
+          true
           
+            
+              org.apache.maven.plugins
+              maven-changelog-plugin
+              2.3
+            
             
               org.apache.maven.plugins
               maven-project-info-reports-plugin
               2.8
+              
+                
+                  
+                    index
+                    dependency-info
+                    dependencies
+                    dependency-convergence
+                    project-team
+                    mailing-list
+                    cim
+                    issue-tracking
+                    license
+                    scm
+                    dependency-management
+                    distribution-management
+                    summary
+                    modules
+                  
+                
+              
               
+                true
+                true
+                true
+                true
                 gcloud-java-examples
+                jar
+              
+            
+            
+              org.apache.maven.plugins
+              maven-dependency-plugin
+              2.10
+            
+            
+              org.apache.maven.plugins
+              maven-javadoc-plugin
+              2.10.3
+              
+                
+                  html
+                  
+                    javadoc
+                  
+                
+              
+              
+                true
+                protected
+                true
+                ${project.build.directory}/javadoc
+              
+            
+            
+              org.apache.maven.plugins
+              maven-surefire-report-plugin
+              2.18.1
+            
+            
+              org.apache.maven.plugins
+              maven-checkstyle-plugin
+              2.16
+              
+                checkstyle.xml
+                false
+              
+            
+            
+              org.codehaus.mojo
+              cobertura-maven-plugin
+              2.7
+              
+                true
               
             
           
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 439fa540e479..f682f498da6c 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -51,13 +51,90 @@
         maven-site-plugin
         3.4
         
+          true
           
+            
+              org.apache.maven.plugins
+              maven-changelog-plugin
+              2.3
+            
             
               org.apache.maven.plugins
               maven-project-info-reports-plugin
               2.8
+              
+                
+                  
+                    index
+                    dependency-info
+                    dependencies
+                    dependency-convergence
+                    project-team
+                    mailing-list
+                    cim
+                    issue-tracking
+                    license
+                    scm
+                    dependency-management
+                    distribution-management
+                    summary
+                    modules
+                  
+                
+              
               
+                true
+                true
+                true
+                true
                 gcloud-java-storage
+                jar
+              
+            
+            
+              org.apache.maven.plugins
+              maven-dependency-plugin
+              2.10
+            
+            
+              org.apache.maven.plugins
+              maven-javadoc-plugin
+              2.10.3
+              
+                
+                  html
+                  
+                    javadoc
+                  
+                
+              
+              
+                true
+                protected
+                true
+                ${project.build.directory}/javadoc
+              
+            
+            
+              org.apache.maven.plugins
+              maven-surefire-report-plugin
+              2.18.1
+            
+            
+              org.apache.maven.plugins
+              maven-checkstyle-plugin
+              2.16
+              
+                checkstyle.xml
+                false
+              
+            
+            
+              org.codehaus.mojo
+              cobertura-maven-plugin
+              2.7
+              
+                true
               
             
           
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 9b8614c20431..df5f1352881e 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -37,13 +37,90 @@
         maven-site-plugin
         3.4
         
+          true
           
+            
+              org.apache.maven.plugins
+              maven-changelog-plugin
+              2.3
+            
             
               org.apache.maven.plugins
               maven-project-info-reports-plugin
               2.8
+              
+                
+                  
+                    index
+                    dependency-info
+                    dependencies
+                    dependency-convergence
+                    project-team
+                    mailing-list
+                    cim
+                    issue-tracking
+                    license
+                    scm
+                    dependency-management
+                    distribution-management
+                    summary
+                    modules
+                  
+                
+              
               
+                true
+                true
+                true
+                true
                 gcloud-java
+                jar
+              
+            
+            
+              org.apache.maven.plugins
+              maven-dependency-plugin
+              2.10
+            
+            
+              org.apache.maven.plugins
+              maven-javadoc-plugin
+              2.10.3
+              
+                
+                  html
+                  
+                    javadoc
+                  
+                
+              
+              
+                true
+                protected
+                true
+                ${project.build.directory}/javadoc
+              
+            
+            
+              org.apache.maven.plugins
+              maven-surefire-report-plugin
+              2.18.1
+            
+            
+              org.apache.maven.plugins
+              maven-checkstyle-plugin
+              2.16
+              
+                checkstyle.xml
+                false
+              
+            
+            
+              org.codehaus.mojo
+              cobertura-maven-plugin
+              2.7
+              
+                true
               
             
           

From 736a0f573ebbd6b2b656d93f0c8ac254fc3c24c8 Mon Sep 17 00:00:00 2001
From: aozarov 
Date: Tue, 27 Oct 2015 17:28:50 -0700
Subject: [PATCH 023/322] fix checkstyle issues

---
 .../java/com/google/gcloud/RetryParams.java   |   3 +-
 .../com/google/gcloud/ServiceOptions.java     |  10 +-
 .../google/gcloud/ExceptionHandlerTest.java   |   2 +-
 .../com/google/gcloud/datastore/Blob.java     |   3 +-
 .../google/gcloud/datastore/Transaction.java  |   3 +-
 .../google/gcloud/datastore/BaseKeyTest.java  |   4 +-
 .../gcloud/datastore/DatastoreTest.java       |   3 +-
 .../gcloud/datastore/ListValueTest.java       |   3 +-
 .../gcloud/datastore/SerializationTest.java   |   4 +-
 .../google/gcloud/datastore/ValueTest.java    |   7 +-
 .../gcloud/examples/DatastoreExample.java     |   2 +-
 .../gcloud/examples/StorageExample.java       |   8 +-
 .../java/com/google/gcloud/storage/Acl.java   |   5 +-
 .../com/google/gcloud/storage/BlobId.java     |   2 +-
 .../com/google/gcloud/storage/BlobInfo.java   |   4 +-
 .../com/google/gcloud/storage/BucketInfo.java |   4 +-
 .../java/com/google/gcloud/storage/Cors.java  |   2 +-
 .../google/gcloud/storage/StorageImpl.java    |   7 +-
 .../storage/testing/RemoteGcsHelper.java      |   4 +-
 .../gcloud/storage/BlobListResultTest.java    |   3 +-
 .../com/google/gcloud/storage/BucketTest.java |  10 +-
 .../google/gcloud/storage/ITStorageTest.java  | 202 +++++++++---------
 .../com/google/gcloud/storage/OptionTest.java |   2 +-
 .../gcloud/storage/RemoteGcsHelperTest.java   |  20 +-
 .../gcloud/storage/SerializationTest.java     |   4 +-
 25 files changed, 165 insertions(+), 156 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/RetryParams.java b/gcloud-java-core/src/main/java/com/google/gcloud/RetryParams.java
index 24983326ccae..461dbac77ff2 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/RetryParams.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/RetryParams.java
@@ -251,7 +251,8 @@ public double getRetryDelayBackoffFactor() {
   }
 
   /**
-   * Returns the totalRetryPeriodMillis. Default value is {@value #DEFAULT_TOTAL_RETRY_PERIOD_MILLIS}.
+   * Returns the totalRetryPeriodMillis. Default value is
+   * {@value #DEFAULT_TOTAL_RETRY_PERIOD_MILLIS}.
    */
   public long getTotalRetryPeriodMillis() {
     return totalRetryPeriodMillis;
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index f22c4d51e371..8555b8d61ed4 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -48,9 +48,9 @@
 import java.util.regex.Pattern;
 
 public abstract class ServiceOptions<
-        ServiceT extends Service,
-        ServiceRpcT,
-        OptionsT extends ServiceOptions>
+    ServiceT extends Service,
+    ServiceRpcT,
+    OptionsT extends ServiceOptions>
     implements Serializable {
 
   private static final String DEFAULT_HOST = "https://www.googleapis.com";
@@ -116,9 +116,9 @@ public HttpTransport create() {
    * Implementations should implement {@code Serializable} wherever possible and must document
    * whether or not they do support serialization.
    */
-  public static abstract class Clock {
+  public abstract static class Clock {
 
-    private static ServiceOptions.Clock DEFAULT_TIME_SOURCE = new DefaultClock();
+    private static final ServiceOptions.Clock DEFAULT_TIME_SOURCE = new DefaultClock();
 
     /**
      * Returns current time in milliseconds according to this clock.
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/ExceptionHandlerTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/ExceptionHandlerTest.java
index 5ce05ad900a8..c182515dbb16 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/ExceptionHandlerTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/ExceptionHandlerTest.java
@@ -23,9 +23,9 @@
 import com.google.gcloud.ExceptionHandler.Interceptor;
 import com.google.gcloud.ExceptionHandler.Interceptor.RetryResult;
 
-import org.junit.rules.ExpectedException;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java
index 5a759240be38..0c4d6c26d9fa 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java
@@ -35,7 +35,8 @@
  * A Google Cloud Datastore Blob.
  * This class is immutable.
  *
- * @see Google Cloud Datastore Entities, Properties, and Keys
+ * @see 
+ *   Google Cloud Datastore Entities, Properties, and Keys
  */
 public final class Blob extends Serializable {
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Transaction.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Transaction.java
index 9d676bc68a8c..8089c0130f5d 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Transaction.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Transaction.java
@@ -47,7 +47,8 @@
  *   }
  * } 

  *
- * @see Google Cloud Datastore transactions
+ * @see 
+ *   Google Cloud Datastore transactions
  *
  */
 public interface Transaction extends DatastoreBatchWriter, DatastoreReaderWriter {
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/BaseKeyTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/BaseKeyTest.java
index e99e7a60fd0b..8615ee025bd1 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/BaseKeyTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/BaseKeyTest.java
@@ -115,10 +115,10 @@ public void testAncestors() throws Exception {
     BaseKey key = builder.build();
     assertTrue(key.ancestors().isEmpty());
     List path = new ArrayList<>();
-    path.add(PathElement.of("p1","v1"));
+    path.add(PathElement.of("p1", "v1"));
     key = builder.ancestors(path.get(0)).build();
     assertEquals(path, key.ancestors());
-    path.add(PathElement.of("p2","v2"));
+    path.add(PathElement.of("p2", "v2"));
     key = builder.ancestors(path.get(1)).build();
     assertEquals(path, key.ancestors());
   }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index c0d21456d28f..1d2bb4889658 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -346,7 +346,8 @@ public void testNewBatch() {
 
   @Test
   public void testRunGqlQueryNoCasting() {
-    Query query1 = Query.gqlQueryBuilder(ResultType.ENTITY, "select * from " + KIND1).build();
+    Query query1 =
+        Query.gqlQueryBuilder(ResultType.ENTITY, "select * from " + KIND1).build();
     QueryResults results1 = datastore.run(query1);
     assertTrue(results1.hasNext());
     assertEquals(ENTITY1, results1.next());
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ListValueTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ListValueTest.java
index 36e3571d49ac..7af82c29901d 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ListValueTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ListValueTest.java
@@ -28,7 +28,8 @@
 
 public class ListValueTest {
 
-  private static final List> CONTENT = ImmutableList.of(NullValue.of(), StringValue.of("foo"));
+  private static final List> CONTENT =
+      ImmutableList.of(NullValue.of(), StringValue.of("foo"));
 
   @Test
   public void testToBuilder() throws Exception {
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
index 5f3bfc036fa2..1ad690938ef5 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
@@ -48,8 +48,8 @@ public class SerializationTest {
   private static final Key KEY2 = Key.builder(KEY1, "v", 2).build();
   private static final DateTime DATE_TIME1 = DateTime.now();
   private static final Blob BLOB1 = Blob.copyFrom(UTF_8.encode("hello world"));
-  private static final Cursor CURSOR1 = Cursor.copyFrom(new byte[] {1,2});
-  private static final Cursor CURSOR2 = Cursor.copyFrom(new byte[]{10});
+  private static final Cursor CURSOR1 = Cursor.copyFrom(new byte[] {1, 2});
+  private static final Cursor CURSOR2 = Cursor.copyFrom(new byte[] {10});
   private static final Query GQL1 =
       Query.gqlQueryBuilder("select * from kind1 where name = @name and age > @1")
       .setBinding("name", "name1")
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java
index 973a3c3c0da4..199b3f90f442 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java
@@ -42,7 +42,8 @@ public class ValueTest {
   private static final NullValue NULL_VALUE = NullValue.of();
   private static final StringValue STRING_VALUE = StringValue.of("hello");
   private static final RawValue RAW_VALUE = RawValue.of(STRING_VALUE.toPb());
-  private static final ImmutableMap TYPES = ImmutableMap.builder()
+  private static final ImmutableMap TYPES =
+      ImmutableMap.builder()
       .put(ValueType.NULL, new Object[] {NullValue.class, NULL_VALUE.get()})
       .put(ValueType.KEY, new Object[] {KeyValue.class, KEY})
       .put(ValueType.BLOB, new Object[] {BlobValue.class, BLOB})
@@ -160,7 +161,7 @@ public void testIndexed() throws Exception {
   @SuppressWarnings("deprecation")
   @Test
   public void testHasMeaning() throws Exception {
-    for (Value value: typeToValue.values()) {
+    for (Value value : typeToValue.values()) {
       assertFalse(value.hasMeaning());
     }
 
@@ -171,7 +172,7 @@ public void testHasMeaning() throws Exception {
   @SuppressWarnings("deprecation")
   @Test
   public void testMeaning() throws Exception {
-    for (Value value: typeToValue.values()) {
+    for (Value value : typeToValue.values()) {
       assertNull(value.meaning());
     }
 
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
index a3b1257f943a..93bb1b5b93b4 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
@@ -202,7 +202,7 @@ public static void main(String... args) {
           DatastoreExample.class.getSimpleName(), actionAndParams);
       return;
     }
-    args = args.length > 3 ? Arrays.copyOfRange(args, 3, args.length): new String []{};
+    args = args.length > 3 ? Arrays.copyOfRange(args, 3, args.length) : new String []{};
     Transaction tx = datastore.newTransaction();
     try {
       action.run(tx, key, args);
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index 46fb94297ec7..274710f10e93 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -83,7 +83,7 @@ public class StorageExample {
 
   private static final Map ACTIONS = new HashMap<>();
 
-  private static abstract class StorageAction {
+  private abstract static class StorageAction {
 
     abstract void run(Storage storage, T request) throws Exception;
 
@@ -94,7 +94,7 @@ protected String params() {
     }
   }
 
-  private static abstract class BlobsAction extends StorageAction {
+  private abstract static class BlobsAction extends StorageAction {
 
     @Override
     BlobId[] parse(String... args) {
@@ -483,8 +483,8 @@ public void run(Storage storage, Tuple
     private void run(Storage storage, ServiceAccountAuthCredentials cred, BlobInfo blobInfo)
         throws IOException {
       Blob blob = new Blob(storage, blobInfo);
-      System.out.println("Signed URL: " +
-          blob.signUrl(1, TimeUnit.DAYS, SignUrlOption.serviceAccount(cred)));
+      System.out.println("Signed URL: "
+          + blob.signUrl(1, TimeUnit.DAYS, SignUrlOption.serviceAccount(cred)));
     }
 
     @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java
index e5e319b39164..3d9731352400 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java
@@ -36,7 +36,7 @@ public enum Role {
     OWNER, READER, WRITER
   }
 
-  public static abstract class Entity implements Serializable {
+  public abstract static class Entity implements Serializable {
 
     private static final long serialVersionUID = -2707407252771255840L;
 
@@ -69,8 +69,7 @@ public boolean equals(Object o) {
         return false;
       }
       Entity entity = (Entity) o;
-      return Objects.equals(type, entity.type) &&
-          Objects.equals(value, entity.value);
+      return Objects.equals(type, entity.type) && Objects.equals(value, entity.value);
     }
 
     @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
index ea98e65d244d..eafebe09a4cb 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
@@ -16,9 +16,9 @@
 
 package com.google.gcloud.storage;
 
-import com.google.api.services.storage.model.StorageObject;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.services.storage.model.StorageObject;
 import com.google.common.base.MoreObjects;
 
 import java.io.Serializable;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
index ec3ef36708cb..01711a53613e 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
@@ -204,8 +204,8 @@ Builder mediaLink(String mediaLink) {
     }
 
     public Builder metadata(Map metadata) {
-      this.metadata = metadata != null ?
-          new HashMap(metadata) : Data.nullOf(ImmutableEmptyMap.class);
+      this.metadata = metadata != null
+          ? new HashMap(metadata) : Data.nullOf(ImmutableEmptyMap.class);
       return this;
     }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
index ddd4665ca129..5d69c54e0d96 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
@@ -83,7 +83,7 @@ public com.google.api.services.storage.model.Bucket apply(BucketInfo bucketInfo)
   private final Location location;
   private final StorageClass storageClass;
 
-  public static abstract class DeleteRule implements Serializable {
+  public abstract static class DeleteRule implements Serializable {
 
     private static final long serialVersionUID = 3137971668395933033L;
     private static final String SUPPORTED_ACTION = "Delete";
@@ -393,7 +393,7 @@ public static Location of(String value) {
     }
   }
 
-  public final static class Builder {
+  public static final class Builder {
 
     private String id;
     private String name;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Cors.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Cors.java
index ce8cfb95b6e9..a94359f17a79 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Cors.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Cors.java
@@ -98,7 +98,7 @@ public boolean equals(Object obj) {
       if (!(obj instanceof Origin)) {
         return false;
       }
-      return value.equals(((Origin)obj).value);
+      return value.equals(((Origin) obj).value);
     }
 
     @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 6856ee27eec7..21cd8b726753 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -222,7 +222,7 @@ public BlobInfo get(BlobId blob) {
     return get(blob, new BlobSourceOption[0]);
   }
 
-  private static abstract class BasePageFetcher
+  private abstract static class BasePageFetcher
       implements BaseListResult.NextPageFetcher {
 
     private static final long serialVersionUID = 8236329004030295223L;
@@ -497,7 +497,8 @@ public BatchResponse apply(BatchRequest batchRequest) {
     }
     List>> toUpdate =
         Lists.newArrayListWithCapacity(batchRequest.toUpdate().size());
-    for (Map.Entry> entry : batchRequest.toUpdate().entrySet()) {
+    for (Map.Entry> entry :
+        batchRequest.toUpdate().entrySet()) {
       BlobInfo blobInfo = entry.getKey();
       Map optionsMap =
           optionMap(blobInfo.generation(), blobInfo.metageneration(), entry.getValue());
@@ -582,7 +583,7 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
           "Signing key was not provided and could not be derived");
       cred = (ServiceAccountAuthCredentials) this.options().authCredentials();
     }
-    // construct signature data - see https://cloud.google.com/storage/docs/access-control#Signed-URLs
+    // construct signature - see https://cloud.google.com/storage/docs/access-control#Signed-URLs
     StringBuilder stBuilder = new StringBuilder();
     if (optionMap.containsKey(SignUrlOption.Option.HTTP_METHOD)) {
       stBuilder.append(optionMap.get(SignUrlOption.Option.HTTP_METHOD));
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
index 1e154e3f8eea..6ad655db8670 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
@@ -17,16 +17,16 @@
 package com.google.gcloud.storage.testing;
 
 import com.google.gcloud.AuthCredentials;
-import com.google.gcloud.storage.BlobInfo;
 import com.google.gcloud.RetryParams;
+import com.google.gcloud.storage.BlobInfo;
 import com.google.gcloud.storage.Storage;
 import com.google.gcloud.storage.StorageException;
 import com.google.gcloud.storage.StorageOptions;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobListResultTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobListResultTest.java
index 117e2b692c6b..615213ab1516 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobListResultTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobListResultTest.java
@@ -24,11 +24,12 @@
 import static org.junit.Assert.assertFalse;
 
 import com.google.common.collect.ImmutableList;
-import java.util.Iterator;
 
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.Iterator;
+
 public class BlobListResultTest {
 
   private static final Iterable FIRST_PAGE_RESULTS = ImmutableList.of(
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
index 6526f0d2fe8f..370850a5b6d4 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -28,6 +28,12 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.gcloud.storage.BatchResponse.Result;
+
+import org.easymock.Capture;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Collections;
@@ -35,10 +41,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-import org.easymock.Capture;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 public class BucketTest {
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index a0bae0e0e29e..7b29086ecbe5 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -56,7 +56,7 @@ public class ITStorageTest {
   private static Storage storage;
 
   private static final Logger log = Logger.getLogger(ITStorageTest.class.getName());
-  private static final String bucket = RemoteGcsHelper.generateBucketName();
+  private static final String BUCKET = RemoteGcsHelper.generateBucketName();
   private static final String CONTENT_TYPE = "text/plain";
   private static final byte[] BLOB_BYTE_CONTENT = {0xD, 0xE, 0xA, 0xD};
   private static final String BLOB_STRING_CONTENT = "Hello Google Cloud Storage!";
@@ -65,15 +65,15 @@ public class ITStorageTest {
   public static void beforeClass() {
     RemoteGcsHelper gcsHelper = RemoteGcsHelper.create();
     storage = gcsHelper.options().service();
-    storage.create(BucketInfo.of(bucket));
+    storage.create(BucketInfo.of(BUCKET));
   }
 
   @AfterClass
   public static void afterClass()
       throws ExecutionException, TimeoutException, InterruptedException {
-    if (storage != null && !RemoteGcsHelper.forceDelete(storage, bucket, 5, TimeUnit.SECONDS)) {
+    if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS)) {
       if (log.isLoggable(Level.WARNING)) {
-        log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", bucket);
+        log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);
       }
     }
   }
@@ -81,58 +81,58 @@ public static void afterClass()
   @Test(timeout = 5000)
   public void testListBuckets() throws InterruptedException {
     Iterator bucketIterator =
-        storage.list(Storage.BucketListOption.prefix(bucket)).iterator();
+        storage.list(Storage.BucketListOption.prefix(BUCKET)).iterator();
     while (!bucketIterator.hasNext()) {
       Thread.sleep(500);
-      bucketIterator = storage.list(Storage.BucketListOption.prefix(bucket)).iterator();
+      bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET)).iterator();
     }
     while (bucketIterator.hasNext()) {
-      assertTrue(bucketIterator.next().name().startsWith(bucket));
+      assertTrue(bucketIterator.next().name().startsWith(BUCKET));
     }
   }
 
   @Test
   public void testCreateBlob() {
     String blobName = "test-create-blob";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     BlobInfo remoteBlob = storage.create(blob, BLOB_BYTE_CONTENT);
     assertNotNull(remoteBlob);
     assertEquals(blob.blobId(), remoteBlob.blobId());
-    byte[] readBytes = storage.readAllBytes(bucket, blobName);
+    byte[] readBytes = storage.readAllBytes(BUCKET, blobName);
     assertArrayEquals(BLOB_BYTE_CONTENT, readBytes);
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testCreateEmptyBlob() {
     String blobName = "test-create-empty-blob";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     BlobInfo remoteBlob = storage.create(blob);
     assertNotNull(remoteBlob);
     assertEquals(blob.blobId(), remoteBlob.blobId());
-    byte[] readBytes = storage.readAllBytes(bucket, blobName);
+    byte[] readBytes = storage.readAllBytes(BUCKET, blobName);
     assertArrayEquals(new byte[0], readBytes);
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testCreateBlobStream() throws UnsupportedEncodingException {
     String blobName = "test-create-blob-stream";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).contentType(CONTENT_TYPE).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).contentType(CONTENT_TYPE).build();
     ByteArrayInputStream stream = new ByteArrayInputStream(BLOB_STRING_CONTENT.getBytes(UTF_8));
     BlobInfo remoteBlob = storage.create(blob, stream);
     assertNotNull(remoteBlob);
     assertEquals(blob.blobId(), remoteBlob.blobId());
     assertEquals(blob.contentType(), remoteBlob.contentType());
-    byte[] readBytes = storage.readAllBytes(bucket, blobName);
+    byte[] readBytes = storage.readAllBytes(BUCKET, blobName);
     assertEquals(BLOB_STRING_CONTENT, new String(readBytes, UTF_8));
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testCreateBlobFail() {
     String blobName = "test-create-blob-fail";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
     try {
       storage.create(blob.toBuilder().generation(-1L).build(), BLOB_BYTE_CONTENT,
@@ -141,13 +141,13 @@ public void testCreateBlobFail() {
     } catch (StorageException ex) {
       // expected
     }
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testCreateBlobMd5Fail() throws UnsupportedEncodingException {
     String blobName = "test-create-blob-md5-fail";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName)
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName)
         .contentType(CONTENT_TYPE)
         .md5("O1R4G1HJSDUISJjoIYmVhQ==")
         .build();
@@ -163,13 +163,13 @@ public void testCreateBlobMd5Fail() throws UnsupportedEncodingException {
   @Test
   public void testUpdateBlob() {
     String blobName = "test-update-blob";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
     BlobInfo updatedBlob = storage.update(blob.toBuilder().contentType(CONTENT_TYPE).build());
     assertNotNull(updatedBlob);
     assertEquals(blob.blobId(), updatedBlob.blobId());
     assertEquals(CONTENT_TYPE, updatedBlob.contentType());
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
@@ -177,7 +177,7 @@ public void testUpdateBlobReplaceMetadata() {
     String blobName = "test-update-blob-replace-metadata";
     ImmutableMap metadata = ImmutableMap.of("k1", "a");
     ImmutableMap newMetadata = ImmutableMap.of("k2", "b");
-    BlobInfo blob = BlobInfo.builder(bucket, blobName)
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName)
         .contentType(CONTENT_TYPE)
         .metadata(metadata)
         .build();
@@ -188,7 +188,7 @@ public void testUpdateBlobReplaceMetadata() {
     updatedBlob = storage.update(blob.toBuilder().metadata(newMetadata).build());
     assertEquals(blob.blobId(), updatedBlob.blobId());
     assertEquals(newMetadata, updatedBlob.metadata());
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
@@ -197,7 +197,7 @@ public void testUpdateBlobMergeMetadata() {
     ImmutableMap metadata = ImmutableMap.of("k1", "a");
     ImmutableMap newMetadata = ImmutableMap.of("k2", "b");
     ImmutableMap expectedMetadata = ImmutableMap.of("k1", "a", "k2", "b");
-    BlobInfo blob = BlobInfo.builder(bucket, blobName)
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName)
         .contentType(CONTENT_TYPE)
         .metadata(metadata)
         .build();
@@ -206,7 +206,7 @@ public void testUpdateBlobMergeMetadata() {
     assertNotNull(updatedBlob);
     assertEquals(blob.blobId(), updatedBlob.blobId());
     assertEquals(expectedMetadata, updatedBlob.metadata());
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
@@ -217,7 +217,7 @@ public void testUpdateBlobUnsetMetadata() {
     newMetadata.put("k1", "a");
     newMetadata.put("k2", null);
     ImmutableMap expectedMetadata = ImmutableMap.of("k1", "a");
-    BlobInfo blob = BlobInfo.builder(bucket, blobName)
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName)
         .contentType(CONTENT_TYPE)
         .metadata(metadata)
         .build();
@@ -226,13 +226,13 @@ public void testUpdateBlobUnsetMetadata() {
     assertNotNull(updatedBlob);
     assertEquals(blob.blobId(), updatedBlob.blobId());
     assertEquals(expectedMetadata, updatedBlob.metadata());
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testUpdateBlobFail() {
     String blobName = "test-update-blob-fail";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
     try {
       storage.update(blob.toBuilder().contentType(CONTENT_TYPE).generation(-1L).build(),
@@ -241,64 +241,64 @@ public void testUpdateBlobFail() {
     } catch (StorageException ex) {
       // expected
     }
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testDeleteNonExistingBlob() {
     String blobName = "test-delete-non-existing-blob";
-    assertTrue(!storage.delete(bucket, blobName));
+    assertTrue(!storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testDeleteBlobFail() {
     String blobName = "test-delete-blob-fail";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
     try {
-      storage.delete(bucket, blob.name(), Storage.BlobSourceOption.generationMatch(-1L));
+      storage.delete(BUCKET, blob.name(), Storage.BlobSourceOption.generationMatch(-1L));
       fail("StorageException was expected");
     } catch (StorageException ex) {
       // expected
     }
-    assertTrue(storage.delete(bucket, blob.name()));
+    assertTrue(storage.delete(BUCKET, blob.name()));
   }
 
   @Test
   public void testComposeBlob() {
     String sourceBlobName1 = "test-compose-blob-source-1";
     String sourceBlobName2 = "test-compose-blob-source-2";
-    BlobInfo sourceBlob1 = BlobInfo.builder(bucket, sourceBlobName1).build();
-    BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build();
+    BlobInfo sourceBlob1 = BlobInfo.builder(BUCKET, sourceBlobName1).build();
+    BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
     assertNotNull(storage.create(sourceBlob1, BLOB_BYTE_CONTENT));
     assertNotNull(storage.create(sourceBlob2, BLOB_BYTE_CONTENT));
     String targetBlobName = "test-compose-blob-target";
-    BlobInfo targetBlob = BlobInfo.builder(bucket, targetBlobName).build();
+    BlobInfo targetBlob = BlobInfo.builder(BUCKET, targetBlobName).build();
     Storage.ComposeRequest req =
         Storage.ComposeRequest.of(ImmutableList.of(sourceBlobName1, sourceBlobName2), targetBlob);
     BlobInfo remoteBlob = storage.compose(req);
     assertNotNull(remoteBlob);
     assertEquals(targetBlob.blobId(), remoteBlob.blobId());
-    byte[] readBytes = storage.readAllBytes(bucket, targetBlobName);
+    byte[] readBytes = storage.readAllBytes(BUCKET, targetBlobName);
     byte[] composedBytes = Arrays.copyOf(BLOB_BYTE_CONTENT, BLOB_BYTE_CONTENT.length * 2);
     System.arraycopy(BLOB_BYTE_CONTENT, 0, composedBytes, BLOB_BYTE_CONTENT.length,
         BLOB_BYTE_CONTENT.length);
     assertArrayEquals(composedBytes, readBytes);
-    assertTrue(storage.delete(bucket, sourceBlobName1));
-    assertTrue(storage.delete(bucket, sourceBlobName2));
-    assertTrue(storage.delete(bucket, targetBlobName));
+    assertTrue(storage.delete(BUCKET, sourceBlobName1));
+    assertTrue(storage.delete(BUCKET, sourceBlobName2));
+    assertTrue(storage.delete(BUCKET, targetBlobName));
   }
 
   @Test
   public void testComposeBlobFail() {
     String sourceBlobName1 = "test-compose-blob-fail-source-1";
     String sourceBlobName2 = "test-compose-blob-fail-source-2";
-    BlobInfo sourceBlob1 = BlobInfo.builder(bucket, sourceBlobName1).build();
-    BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build();
+    BlobInfo sourceBlob1 = BlobInfo.builder(BUCKET, sourceBlobName1).build();
+    BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
     assertNotNull(storage.create(sourceBlob1));
     assertNotNull(storage.create(sourceBlob2));
     String targetBlobName = "test-compose-blob-fail-target";
-    BlobInfo targetBlob = BlobInfo.builder(bucket, targetBlobName).build();
+    BlobInfo targetBlob = BlobInfo.builder(BUCKET, targetBlobName).build();
     Storage.ComposeRequest req = Storage.ComposeRequest.builder()
         .addSource(sourceBlobName1, -1L)
         .addSource(sourceBlobName2, -1L)
@@ -310,53 +310,53 @@ public void testComposeBlobFail() {
     } catch (StorageException ex) {
       // expected
     }
-    assertTrue(storage.delete(bucket, sourceBlobName1));
-    assertTrue(storage.delete(bucket, sourceBlobName2));
+    assertTrue(storage.delete(BUCKET, sourceBlobName1));
+    assertTrue(storage.delete(BUCKET, sourceBlobName2));
   }
 
   @Test
   public void testCopyBlob() {
     String sourceBlobName = "test-copy-blob-source";
-    BlobInfo blob = BlobInfo.builder(bucket, sourceBlobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, sourceBlobName).build();
     assertNotNull(storage.create(blob, BLOB_BYTE_CONTENT));
     String targetBlobName = "test-copy-blob-target";
     Storage.CopyRequest req = Storage.CopyRequest.of(blob.blobId(), targetBlobName);
     BlobInfo remoteBlob = storage.copy(req);
     assertNotNull(remoteBlob);
-    assertEquals(bucket, remoteBlob.bucket());
+    assertEquals(BUCKET, remoteBlob.bucket());
     assertEquals(targetBlobName, remoteBlob.name());
-    byte[] readBytes = storage.readAllBytes(bucket, targetBlobName);
+    byte[] readBytes = storage.readAllBytes(BUCKET, targetBlobName);
     assertArrayEquals(BLOB_BYTE_CONTENT, readBytes);
-    assertTrue(storage.delete(bucket, sourceBlobName));
-    assertTrue(storage.delete(bucket, targetBlobName));
+    assertTrue(storage.delete(BUCKET, sourceBlobName));
+    assertTrue(storage.delete(BUCKET, targetBlobName));
   }
 
   @Test
   public void testCopyBlobUpdateMetadata() {
     String sourceBlobName = "test-copy-blob-update-metadata-source";
-    BlobInfo sourceBlob = BlobInfo.builder(bucket, sourceBlobName).build();
+    BlobInfo sourceBlob = BlobInfo.builder(BUCKET, sourceBlobName).build();
     assertNotNull(storage.create(sourceBlob));
     String targetBlobName = "test-copy-blob-update-metadata-target";
     BlobInfo targetBlob =
-        BlobInfo.builder(bucket, targetBlobName).contentType(CONTENT_TYPE).build();
-    Storage.CopyRequest req = Storage.CopyRequest.of(bucket, sourceBlobName, targetBlob);
+        BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
+    Storage.CopyRequest req = Storage.CopyRequest.of(BUCKET, sourceBlobName, targetBlob);
     BlobInfo remoteBlob = storage.copy(req);
     assertNotNull(remoteBlob);
     assertEquals(targetBlob.blobId(), remoteBlob.blobId());
     assertEquals(CONTENT_TYPE, remoteBlob.contentType());
-    assertTrue(storage.delete(bucket, sourceBlobName));
-    assertTrue(storage.delete(bucket, targetBlobName));
+    assertTrue(storage.delete(BUCKET, sourceBlobName));
+    assertTrue(storage.delete(BUCKET, targetBlobName));
   }
 
   @Test
   public void testCopyBlobFail() {
     String sourceBlobName = "test-copy-blob-fail-source";
-    BlobInfo blob = BlobInfo.builder(bucket, sourceBlobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, sourceBlobName).build();
     assertNotNull(storage.create(blob));
     String targetBlobName = "test-copy-blob-fail-target";
     Storage.CopyRequest req = new Storage.CopyRequest.Builder()
-        .source(bucket, sourceBlobName)
-        .target(BlobInfo.builder(bucket, targetBlobName).build())
+        .source(BUCKET, sourceBlobName)
+        .target(BlobInfo.builder(BUCKET, targetBlobName).build())
         .sourceOptions(Storage.BlobSourceOption.metagenerationMatch(-1L))
         .build();
     try {
@@ -365,15 +365,15 @@ public void testCopyBlobFail() {
     } catch (StorageException ex) {
       // expected
     }
-    assertTrue(storage.delete(bucket, sourceBlobName));
+    assertTrue(storage.delete(BUCKET, sourceBlobName));
   }
 
   @Test
   public void testBatchRequest() {
     String sourceBlobName1 = "test-batch-request-blob-1";
     String sourceBlobName2 = "test-batch-request-blob-2";
-    BlobInfo sourceBlob1 = BlobInfo.builder(bucket, sourceBlobName1).build();
-    BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build();
+    BlobInfo sourceBlob1 = BlobInfo.builder(BUCKET, sourceBlobName1).build();
+    BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
     assertNotNull(storage.create(sourceBlob1));
     assertNotNull(storage.create(sourceBlob2));
 
@@ -397,8 +397,8 @@ public void testBatchRequest() {
 
     // Batch get request
     BatchRequest getRequest = BatchRequest.builder()
-        .get(bucket, sourceBlobName1)
-        .get(bucket, sourceBlobName2)
+        .get(BUCKET, sourceBlobName1)
+        .get(BUCKET, sourceBlobName2)
         .build();
     BatchResponse getResponse = storage.apply(getRequest);
     assertEquals(2, getResponse.gets().size());
@@ -411,8 +411,8 @@ public void testBatchRequest() {
 
     // Batch delete request
     BatchRequest deleteRequest = BatchRequest.builder()
-        .delete(bucket, sourceBlobName1)
-        .delete(bucket, sourceBlobName2)
+        .delete(BUCKET, sourceBlobName1)
+        .delete(BUCKET, sourceBlobName2)
         .build();
     BatchResponse deleteResponse = storage.apply(deleteRequest);
     assertEquals(2, deleteResponse.deletes().size());
@@ -425,13 +425,13 @@ public void testBatchRequest() {
   @Test
   public void testBatchRequestFail() {
     String blobName = "test-batch-request-blob-fail";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
     BlobInfo updatedBlob = blob.toBuilder().generation(-1L).build();
     BatchRequest batchRequest = BatchRequest.builder()
         .update(updatedBlob, Storage.BlobTargetOption.generationMatch())
-        .delete(bucket, blobName, Storage.BlobSourceOption.generationMatch(-1L))
-        .get(bucket, blobName, Storage.BlobSourceOption.generationMatch(-1L))
+        .delete(BUCKET, blobName, Storage.BlobSourceOption.generationMatch(-1L))
+        .get(BUCKET, blobName, Storage.BlobSourceOption.generationMatch(-1L))
         .build();
     BatchResponse updateResponse = storage.apply(batchRequest);
     assertEquals(1, updateResponse.updates().size());
@@ -440,13 +440,13 @@ public void testBatchRequestFail() {
     assertTrue(updateResponse.updates().get(0).failed());
     assertTrue(updateResponse.gets().get(0).failed());
     assertTrue(updateResponse.deletes().get(0).failed());
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testReadAndWriteChannels() throws IOException {
     String blobName = "test-read-and-write-channels-blob";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     byte[] stringBytes;
     try (BlobWriteChannel writer = storage.writer(blob)) {
       stringBytes = BLOB_STRING_CONTENT.getBytes(UTF_8);
@@ -463,13 +463,13 @@ public void testReadAndWriteChannels() throws IOException {
     }
     assertArrayEquals(BLOB_BYTE_CONTENT, readBytes.array());
     assertEquals(BLOB_STRING_CONTENT, new String(readStringBytes.array(), UTF_8));
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testReadAndWriteCaptureChannels() throws IOException {
     String blobName = "test-read-and-write-capture-channels-blob";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     byte[] stringBytes;
     BlobWriteChannel writer = storage.writer(blob);
     stringBytes = BLOB_STRING_CONTENT.getBytes(UTF_8);
@@ -492,13 +492,13 @@ public void testReadAndWriteCaptureChannels() throws IOException {
     secondReader.close();
     assertArrayEquals(BLOB_BYTE_CONTENT, readBytes.array());
     assertEquals(BLOB_STRING_CONTENT, new String(readStringBytes.array(), UTF_8));
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testReadChannelFail() throws IOException {
     String blobName = "test-read-channel-blob-fail";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
     try (BlobReadChannel reader =
         storage.reader(blob.blobId(), Storage.BlobSourceOption.metagenerationMatch(-1L))) {
@@ -507,13 +507,13 @@ public void testReadChannelFail() throws IOException {
     } catch (StorageException ex) {
       // expected
     }
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testWriteChannelFail() throws IOException {
     String blobName = "test-write-channel-blob-fail";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).generation(-1L).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).generation(-1L).build();
     try {
       try (BlobWriteChannel writer =
           storage.writer(blob, Storage.BlobWriteOption.generationMatch())) {
@@ -528,7 +528,7 @@ public void testWriteChannelFail() throws IOException {
   @Test
   public void testWriteChannelExistingBlob() throws IOException {
     String blobName = "test-write-channel-existing-blob";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     BlobInfo remoteBlob = storage.create(blob);
     byte[] stringBytes;
     try (BlobWriteChannel writer = storage.writer(remoteBlob)) {
@@ -536,13 +536,13 @@ public void testWriteChannelExistingBlob() throws IOException {
       writer.write(ByteBuffer.wrap(stringBytes));
     }
     assertArrayEquals(stringBytes, storage.readAllBytes(blob.blobId()));
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testGetSignedUrl() throws IOException {
     String blobName = "test-get-signed-url-blob";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob, BLOB_BYTE_CONTENT));
     URL url = storage.signUrl(blob, 1, TimeUnit.HOURS);
     URLConnection connection = url.openConnection();
@@ -550,60 +550,60 @@ public void testGetSignedUrl() throws IOException {
     try (InputStream responseStream = connection.getInputStream()) {
       assertEquals(BLOB_BYTE_CONTENT.length, responseStream.read(readBytes));
       assertArrayEquals(BLOB_BYTE_CONTENT, readBytes);
-      assertTrue(storage.delete(bucket, blobName));
+      assertTrue(storage.delete(BUCKET, blobName));
     }
   }
 
   @Test
   public void testPostSignedUrl() throws IOException {
     String blobName = "test-post-signed-url-blob";
-    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
     URL url =
         storage.signUrl(blob, 1, TimeUnit.HOURS, Storage.SignUrlOption.httpMethod(HttpMethod.POST));
     URLConnection connection = url.openConnection();
     connection.setDoOutput(true);
     connection.connect();
-    BlobInfo remoteBlob = storage.get(bucket, blobName);
+    BlobInfo remoteBlob = storage.get(BUCKET, blobName);
     assertNotNull(remoteBlob);
     assertEquals(blob.blobId(), remoteBlob.blobId());
-    assertTrue(storage.delete(bucket, blobName));
+    assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testGetBlobs() {
     String sourceBlobName1 = "test-get-blobs-1";
     String sourceBlobName2 = "test-get-blobs-2";
-    BlobInfo sourceBlob1 = BlobInfo.builder(bucket, sourceBlobName1).build();
-    BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build();
+    BlobInfo sourceBlob1 = BlobInfo.builder(BUCKET, sourceBlobName1).build();
+    BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
     assertNotNull(storage.create(sourceBlob1));
     assertNotNull(storage.create(sourceBlob2));
     List remoteBlobs = storage.get(sourceBlob1.blobId(), sourceBlob2.blobId());
     assertEquals(sourceBlob1.blobId(), remoteBlobs.get(0).blobId());
     assertEquals(sourceBlob2.blobId(), remoteBlobs.get(1).blobId());
-    assertTrue(storage.delete(bucket, sourceBlobName1));
-    assertTrue(storage.delete(bucket, sourceBlobName2));
+    assertTrue(storage.delete(BUCKET, sourceBlobName1));
+    assertTrue(storage.delete(BUCKET, sourceBlobName2));
   }
 
   @Test
   public void testGetBlobsFail() {
     String sourceBlobName1 = "test-get-blobs-fail-1";
     String sourceBlobName2 = "test-get-blobs-fail-2";
-    BlobInfo sourceBlob1 = BlobInfo.builder(bucket, sourceBlobName1).build();
-    BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build();
+    BlobInfo sourceBlob1 = BlobInfo.builder(BUCKET, sourceBlobName1).build();
+    BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
     assertNotNull(storage.create(sourceBlob1));
     List remoteBlobs = storage.get(sourceBlob1.blobId(), sourceBlob2.blobId());
     assertEquals(sourceBlob1.blobId(), remoteBlobs.get(0).blobId());
     assertNull(remoteBlobs.get(1));
-    assertTrue(storage.delete(bucket, sourceBlobName1));
+    assertTrue(storage.delete(BUCKET, sourceBlobName1));
   }
 
   @Test
   public void testDeleteBlobs() {
     String sourceBlobName1 = "test-delete-blobs-1";
     String sourceBlobName2 = "test-delete-blobs-2";
-    BlobInfo sourceBlob1 = BlobInfo.builder(bucket, sourceBlobName1).build();
-    BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build();
+    BlobInfo sourceBlob1 = BlobInfo.builder(BUCKET, sourceBlobName1).build();
+    BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
     assertNotNull(storage.create(sourceBlob1));
     assertNotNull(storage.create(sourceBlob2));
     List deleteStatus = storage.delete(sourceBlob1.blobId(), sourceBlob2.blobId());
@@ -615,8 +615,8 @@ public void testDeleteBlobs() {
   public void testDeleteBlobsFail() {
     String sourceBlobName1 = "test-delete-blobs-fail-1";
     String sourceBlobName2 = "test-delete-blobs-fail-2";
-    BlobInfo sourceBlob1 = BlobInfo.builder(bucket, sourceBlobName1).build();
-    BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build();
+    BlobInfo sourceBlob1 = BlobInfo.builder(BUCKET, sourceBlobName1).build();
+    BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
     assertNotNull(storage.create(sourceBlob1));
     List deleteStatus = storage.delete(sourceBlob1.blobId(), sourceBlob2.blobId());
     assertTrue(deleteStatus.get(0));
@@ -627,8 +627,8 @@ public void testDeleteBlobsFail() {
   public void testUpdateBlobs() {
     String sourceBlobName1 = "test-update-blobs-1";
     String sourceBlobName2 = "test-update-blobs-2";
-    BlobInfo sourceBlob1 = BlobInfo.builder(bucket, sourceBlobName1).build();
-    BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build();
+    BlobInfo sourceBlob1 = BlobInfo.builder(BUCKET, sourceBlobName1).build();
+    BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
     BlobInfo remoteBlob1 = storage.create(sourceBlob1);
     BlobInfo remoteBlob2 = storage.create(sourceBlob2);
     assertNotNull(remoteBlob1);
@@ -640,16 +640,16 @@ public void testUpdateBlobs() {
     assertEquals(CONTENT_TYPE, updatedBlobs.get(0).contentType());
     assertEquals(sourceBlob2.blobId(), updatedBlobs.get(1).blobId());
     assertEquals(CONTENT_TYPE, updatedBlobs.get(1).contentType());
-    assertTrue(storage.delete(bucket, sourceBlobName1));
-    assertTrue(storage.delete(bucket, sourceBlobName2));
+    assertTrue(storage.delete(BUCKET, sourceBlobName1));
+    assertTrue(storage.delete(BUCKET, sourceBlobName2));
   }
 
   @Test
   public void testUpdateBlobsFail() {
     String sourceBlobName1 = "test-update-blobs-fail-1";
     String sourceBlobName2 = "test-update-blobs-fail-2";
-    BlobInfo sourceBlob1 = BlobInfo.builder(bucket, sourceBlobName1).build();
-    BlobInfo sourceBlob2 = BlobInfo.builder(bucket, sourceBlobName2).build();
+    BlobInfo sourceBlob1 = BlobInfo.builder(BUCKET, sourceBlobName1).build();
+    BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
     BlobInfo remoteBlob1 = storage.create(sourceBlob1);
     assertNotNull(remoteBlob1);
     List updatedBlobs = storage.update(
@@ -658,6 +658,6 @@ public void testUpdateBlobsFail() {
     assertEquals(sourceBlob1.blobId(), updatedBlobs.get(0).blobId());
     assertEquals(CONTENT_TYPE, updatedBlobs.get(0).contentType());
     assertNull(updatedBlobs.get(1));
-    assertTrue(storage.delete(bucket, sourceBlobName1));
+    assertTrue(storage.delete(BUCKET, sourceBlobName1));
   }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/OptionTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/OptionTest.java
index 4665d04b2d82..2703ddb401c5 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/OptionTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/OptionTest.java
@@ -31,7 +31,7 @@ public void testOption() {
     assertEquals("/", option.value());
   }
 
-  @Test(expected=NullPointerException.class)
+  @Test(expected = NullPointerException.class)
   public void testIndexOutOfBoundsException() {
     new Option(null, "/");
   }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
index 3cd67701e92b..329767e85d4a 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
@@ -22,6 +22,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.gcloud.storage.testing.RemoteGcsHelper;
 
+import org.easymock.EasyMock;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -32,12 +38,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import org.easymock.EasyMock;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
 public class RemoteGcsHelperTest {
 
   private static final String BUCKET_NAME = "bucket-name";
@@ -91,7 +91,7 @@ public Iterator iterator() {
       return BLOB_LIST.iterator();
     }
   };
-  private static String KEY_PATH = "/does/not/exist/key." + UUID.randomUUID().toString() + ".json";
+  private static String keyPath = "/does/not/exist/key." + UUID.randomUUID().toString() + ".json";
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
@@ -99,7 +99,7 @@ public Iterator iterator() {
   @BeforeClass
   public static void beforeClass() {
     while (Files.exists(Paths.get(JSON_KEY))) {
-      KEY_PATH = "/does/not/exist/key." + UUID.randomUUID().toString() + ".json";
+      keyPath = "/does/not/exist/key." + UUID.randomUUID().toString() + ".json";
     }
   }
 
@@ -163,7 +163,7 @@ public void testCreateFromStream() {
   @Test
   public void testCreateNoKey() {
     thrown.expect(RemoteGcsHelper.GcsHelperException.class);
-    thrown.expectMessage(KEY_PATH + " (No such file or directory)");
-    RemoteGcsHelper.create(PROJECT_ID, KEY_PATH);
+    thrown.expectMessage(keyPath + " (No such file or directory)");
+    RemoteGcsHelper.create(PROJECT_ID, keyPath);
   }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index 50cbdbf9abd5..4c22170bba80 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -54,8 +54,8 @@ public class SerializationTest {
       Collections.singletonList(BatchResponse.Result.of(true)),
       Collections.>emptyList(),
       Collections.>emptyList());
-  private static final BaseListResult LIST_RESULT =
-      new BaseListResult<>(null, "c", Collections.singletonList(BlobInfo.builder("b", "n").build()));
+  private static final BaseListResult LIST_RESULT = new BaseListResult<>(
+      null, "c", Collections.singletonList(BlobInfo.builder("b", "n").build()));
   private static final Storage.BlobListOption BLOB_LIST_OPTIONS =
       Storage.BlobListOption.maxResults(100);
   private static final Storage.BlobSourceOption BLOB_SOURCE_OPTIONS =

From fdb2402b1ea90fc1cfc4631005563c08887fdfd3 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 26 Oct 2015 17:45:29 +0100
Subject: [PATCH 024/322] Add support for blob rewrite - Add rewrite method to
 StorageRpc and DefaultStorageRpc - Add rewriter method to Storage and
 StorageImpl - Add unit and integration tests

---
 .../google/gcloud/spi/DefaultStorageRpc.java  |  28 +++
 .../com/google/gcloud/spi/StorageRpc.java     |   5 +
 .../google/gcloud/storage/BlobRewriter.java   | 203 ++++++++++++++++++
 .../com/google/gcloud/storage/Storage.java    | 170 +++++++++++++++
 .../google/gcloud/storage/StorageImpl.java    |  11 +
 .../gcloud/storage/BlobRewriterTest.java      | 149 +++++++++++++
 .../google/gcloud/storage/ITStorageTest.java  |  38 ++++
 7 files changed, 604 insertions(+)
 create mode 100644 gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java
 create mode 100644 gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 90f2c98ad4b8..f28e3dba8a65 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -55,6 +55,7 @@
 import com.google.api.services.storage.model.ComposeRequest;
 import com.google.api.services.storage.model.ComposeRequest.SourceObjects.ObjectPreconditions;
 import com.google.api.services.storage.model.Objects;
+import com.google.api.services.storage.model.RewriteResponse;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
@@ -521,4 +522,31 @@ public String open(StorageObject object, Map options)
       throw translate(ex);
     }
   }
+
+  @Override
+  public RewriteResponse rewrite(StorageObject source, Map sourceOptions,
+      StorageObject target, Map targetOptions, String token, Long maxByteRewrittenPerCall)
+      throws StorageException {
+    try {
+      return storage
+          .objects()
+          .rewrite(source.getBucket(), source.getName(), target.getBucket(), target.getName(),
+              target)
+          .setRewriteToken(token)
+          .setMaxBytesRewrittenPerCall(maxByteRewrittenPerCall)
+          .setProjection(DEFAULT_PROJECTION)
+          .setIfSourceMetagenerationMatch(IF_SOURCE_METAGENERATION_MATCH.getLong(sourceOptions))
+          .setIfSourceMetagenerationNotMatch(
+              IF_SOURCE_METAGENERATION_NOT_MATCH.getLong(sourceOptions))
+          .setIfSourceGenerationMatch(IF_SOURCE_GENERATION_MATCH.getLong(sourceOptions))
+          .setIfSourceGenerationNotMatch(IF_SOURCE_GENERATION_NOT_MATCH.getLong(sourceOptions))
+          .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(targetOptions))
+          .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(targetOptions))
+          .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(targetOptions))
+          .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(targetOptions))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
index b7ac99bf909e..a463583a563c 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
@@ -19,6 +19,7 @@
 import static com.google.common.base.MoreObjects.firstNonNull;
 
 import com.google.api.services.storage.model.Bucket;
+import com.google.api.services.storage.model.RewriteResponse;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -174,4 +175,8 @@ byte[] read(StorageObject from, Map options, long position, int bytes
 
   void write(String uploadId, byte[] toWrite, int toWriteOffset, StorageObject dest,
       long destOffset, int length, boolean last) throws StorageException;
+
+  RewriteResponse rewrite(StorageObject source, Map sourceOptions,
+      StorageObject target, Map targetOptions, String token, Long maxByteRewrittenPerCall)
+      throws StorageException;
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java
new file mode 100644
index 000000000000..e144fe013261
--- /dev/null
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.storage;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.gcloud.RetryHelper.runWithRetries;
+
+import com.google.api.services.storage.model.RewriteResponse;
+import com.google.gcloud.RetryHelper;
+import com.google.gcloud.spi.StorageRpc;
+
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+/**
+ * Google Storage blob rewriter.
+ */
+public final class BlobRewriter {
+
+  private final StorageOptions serviceOptions;
+  private final BlobId source;
+  private final Map sourceOptions;
+  private final Map targetOptions;
+  private final Long maxBytesRewrittenPerCall;
+  private BigInteger blobSize;
+  private BlobInfo target;
+  private Boolean isDone;
+  private String rewriteToken;
+  private BigInteger totalBytesRewritten;
+
+  private final StorageRpc storageRpc;
+
+  private BlobRewriter(Builder builder) {
+    this.serviceOptions = builder.serviceOptions;
+    this.source = builder.source;
+    this.sourceOptions = builder.sourceOptions;
+    this.target = builder.target;
+    this.targetOptions = builder.targetOptions;
+    this.blobSize = builder.blobSize;
+    this.isDone = builder.isDone;
+    this.rewriteToken = builder.rewriteToken;
+    this.totalBytesRewritten = firstNonNull(builder.totalBytesRewritten, BigInteger.ZERO);
+    this.maxBytesRewrittenPerCall = builder.maxBytesRewrittenPerCall;
+    this.storageRpc = serviceOptions.storageRpc();
+  }
+
+  static class Builder {
+
+    private final StorageOptions serviceOptions;
+    private final BlobId source;
+    private final Map sourceOptions;
+    private final BlobInfo target;
+    private final Map targetOptions;
+    private BigInteger blobSize;
+    private Boolean isDone;
+    private String rewriteToken;
+    private BigInteger totalBytesRewritten;
+    private Long maxBytesRewrittenPerCall;
+
+    Builder(StorageOptions serviceOptions, BlobId source, Map sourceOptions,
+        BlobInfo target, Map targetOptions) {
+      this.serviceOptions = serviceOptions;
+      this.source = source;
+      this.sourceOptions = sourceOptions;
+      this.target = target;
+      this.targetOptions = targetOptions;
+    }
+
+    Builder blobSize(BigInteger blobSize) {
+      this.blobSize = blobSize;
+      return this;
+    }
+
+    Builder isDone(Boolean isDone) {
+      this.isDone = isDone;
+      return this;
+    }
+
+    Builder rewriteToken(String rewriteToken) {
+      this.rewriteToken = rewriteToken;
+      return this;
+    }
+
+    Builder totalBytesRewritten(BigInteger totalBytesRewritten) {
+      this.totalBytesRewritten = totalBytesRewritten;
+      return this;
+    }
+
+    Builder maxBytesRewrittenPerCall(Long maxBytesRewrittenPerCall) {
+      this.maxBytesRewrittenPerCall = maxBytesRewrittenPerCall;
+      return this;
+    }
+
+    BlobRewriter build() {
+      return new BlobRewriter(this);
+    }
+  }
+
+  static Builder builder(StorageOptions options, BlobId source,
+      Map sourceOpt,
+      BlobInfo target, Map targetOpt) {
+    return new Builder(options, source, sourceOpt, target, targetOpt);
+  }
+
+  /**
+   * Returns the id of the source blob.
+   */
+  public BlobId source() {
+    return source;
+  }
+
+  /**
+   * Returns the info for the target blob. When {@link #isDone} is {@code true} this method returns
+   * the updated information for the just written blob.
+   */
+  public BlobInfo target() {
+    return target;
+  }
+
+  /**
+   * Size of the blob being copied. Returns {@code null} until the first copy request returns.
+   */
+  public BigInteger blobSize() {
+    return blobSize;
+  }
+
+  /**
+   * Returns {@code true} of blob rewrite finished, {@code false} otherwise.
+   */
+  public Boolean isDone() {
+    return isDone;
+  }
+
+  /**
+   * Returns the token to be used to rewrite the next chunk of the blob.
+   */
+  public String rewriteToken() {
+    return rewriteToken;
+  }
+
+  /**
+   * Returns the number of bytes written. 
+   */
+  public BigInteger totalBytesRewritten() {
+    return totalBytesRewritten;
+  }
+
+  /**
+   * Returns the maximum number of bytes to be copied with each {@link #copyChunk()} call. This
+   * parameter is ignored if source and target blob share the same location and storage class as
+   * rewrite is made with one single RPC.
+   */
+  public Long maxBytesRewrittenPerCall() {
+    return maxBytesRewrittenPerCall;
+  }
+
+  /**
+   * Rewrite the next chunk of the blob. An RPC is issued only if rewrite has not finished yet
+   * ({@link #isDone} returns {@code false}).
+   *
+   * @throws StorageException upon failure
+   */
+  public void copyChunk() {
+    if (!isDone) {
+      try {
+        RewriteResponse response = runWithRetries(new Callable() {
+          @Override
+          public RewriteResponse call() {
+            return storageRpc.rewrite(
+                source.toPb(),
+                sourceOptions,
+                target.toPb(),
+                targetOptions,
+                rewriteToken,
+                maxBytesRewrittenPerCall);
+          }
+        }, serviceOptions.retryParams(), StorageImpl.EXCEPTION_HANDLER);
+        rewriteToken = response.getRewriteToken();
+        isDone = response.getDone();
+        blobSize = response.getObjectSize();
+        totalBytesRewritten = response.getTotalBytesRewritten();
+        target = response.getResource() != null ? BlobInfo.fromPb(response.getResource()) : target;
+      } catch (RetryHelper.RetryHelperException e) {
+        throw StorageException.translateAndThrow(e);
+      }
+    }
+  }
+}
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 7f96ba90fc1f..f5dfee6f2f70 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -596,6 +596,157 @@ public static Builder builder() {
     }
   }
 
+  class RewriteRequest implements Serializable {
+
+    private static final long serialVersionUID = -4498650529476219937L;
+
+    private final BlobId source;
+    private final List sourceOptions;
+    private final BlobInfo target;
+    private final List targetOptions;
+    private final Long maxBytesRewrittenPerCall;
+
+    public static class Builder {
+
+      private final Set sourceOptions = new LinkedHashSet<>();
+      private final Set targetOptions = new LinkedHashSet<>();
+      private BlobId source;
+      private BlobInfo target;
+      private Long maxBytesRewrittenPerCall;
+
+      /**
+       * Sets the blob to rewrite given bucket and blob name.
+       *
+       * @return the builder.
+       */
+      public Builder source(String bucket, String blob) {
+        this.source = BlobId.of(bucket, blob);
+        return this;
+      }
+
+      /**
+       * Sets the blob to rewrite given a {@link BlobId}.
+       *
+       * @return the builder.
+       */
+      public Builder source(BlobId source) {
+        this.source = source;
+        return this;
+      }
+
+      /**
+       * Sets blob's source options.
+       *
+       * @return the builder.
+       */
+      public Builder sourceOptions(BlobSourceOption... options) {
+        Collections.addAll(sourceOptions, options);
+        return this;
+      }
+
+      /**
+       * Sets blob's source options.
+       *
+       * @return the builder.
+       */
+      public Builder sourceOptions(Iterable options) {
+        Iterables.addAll(sourceOptions, options);
+        return this;
+      }
+
+      /**
+       * Sets the rewrite target.
+       *
+       * @return the builder.
+       */
+      public Builder target(BlobInfo target) {
+        this.target = target;
+        return this;
+      }
+
+      /**
+       * Sets blob's target options.
+       *
+       * @return the builder.
+       */
+      public Builder targetOptions(BlobTargetOption... options) {
+        Collections.addAll(targetOptions, options);
+        return this;
+      }
+
+      /**
+       * Sets blob's target options.
+       *
+       * @return the builder.
+       */
+      public Builder targetOptions(Iterable options) {
+        Iterables.addAll(targetOptions, options);
+        return this;
+      }
+
+      /**
+       * Sets the maximum number of bytes to copy for each RPC call. This parameter is ignored if
+       * source and target blob share the same location and storage class as rewrite is made with
+       * one single RPC.
+       *
+       * @return the builder.
+       */
+      public Builder maxBytesRewrittenPerCall(Long maxBytesRewrittenPerCall) {
+        this.maxBytesRewrittenPerCall = maxBytesRewrittenPerCall;
+        return this;
+      }
+
+      /**
+       * Creates a {@code RewriteRequest}.
+       */
+      public RewriteRequest build() {
+        checkNotNull(source);
+        checkNotNull(target);
+        return new RewriteRequest(this);
+      }
+    }
+
+    private RewriteRequest(Builder builder) {
+      source = checkNotNull(builder.source);
+      sourceOptions = ImmutableList.copyOf(builder.sourceOptions);
+      target = checkNotNull(builder.target);
+      targetOptions = ImmutableList.copyOf(builder.targetOptions);
+      maxBytesRewrittenPerCall = builder.maxBytesRewrittenPerCall;
+    }
+
+    public BlobId source() {
+      return source;
+    }
+
+    public List sourceOptions() {
+      return sourceOptions;
+    }
+
+    public BlobInfo target() {
+      return target;
+    }
+
+    public List targetOptions() {
+      return targetOptions;
+    }
+
+    public Long maxBytesRewrittenPerCall() {
+      return maxBytesRewrittenPerCall;
+    }
+
+    public static RewriteRequest of(String sourceBucket, String sourceBlob, BlobInfo target) {
+      return builder().source(sourceBucket, sourceBlob).target(target).build();
+    }
+
+    public static RewriteRequest of(BlobId sourceBlobId, BlobInfo target) {
+      return builder().source(sourceBlobId).target(target).build();
+    }
+
+    public static Builder builder() {
+      return new Builder();
+    }
+  }
+
   /**
    * Create a new bucket.
    *
@@ -865,4 +1016,23 @@ public static Builder builder() {
    * @throws StorageException upon failure
    */
   List delete(BlobId... blobIds);
+
+  /**
+   * Returns a {@link BlobRewriter} object for the provided {@code rewriteRequest}. If source and
+   * destination objects share the same location and storage class the source blob is copied with a
+   * single call of {@link BlobRewriter#copyChunk()}, regardless of the {@link
+   * RewriteRequest#maxBytesRewrittenPerCall} parameter. If source and destination have different
+   * location or storage class multiple RPC calls might be needed depending on blob's size.
+   * 

+   * Example usage of blob rewriter:
+   * 
    {@code BlobRewriter rewriter = service.rewriter(rewriteRequest);}
+   *    {@code while(!rewriter.isDone()) {
+   *       rewriter.copyChunk();
+   *   }}
+   * 

+   *
+   * @throws StorageException upon failure
+   * @see Rewrite
+   */
+  BlobRewriter rewriter(RewriteRequest rewriteRequest);
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 21cd8b726753..bfa760288d6f 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -663,6 +663,17 @@ public List delete(BlobId... blobIds) {
     return Collections.unmodifiableList(transformResultList(response.deletes(), Boolean.FALSE));
   }
 
+  @Override
+  public BlobRewriter rewriter(final RewriteRequest req) {
+    final Map sourceOpts = optionMap(null, null, req.sourceOptions(), true);
+    final Map targetOpts = optionMap(req.target().generation(),
+        req.target().metageneration(), req.targetOptions());
+    return BlobRewriter.builder(options(), req.source(), sourceOpts, req.target(), targetOpts)
+        .isDone(false)
+        .maxBytesRewrittenPerCall(req.maxBytesRewrittenPerCall())
+        .build();
+  }
+
   private static  List transformResultList(
       List> results, final T errorValue) {
     return Lists.transform(results, new Function, T>() {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java
new file mode 100644
index 000000000000..0f5e009fd95e
--- /dev/null
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.storage;
+
+import com.google.api.services.storage.model.RewriteResponse;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.RetryParams;
+import com.google.gcloud.spi.StorageRpc;
+
+import org.easymock.EasyMock;
+import org.junit.Test;
+import org.junit.Before;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Map;
+import org.junit.After;
+
+public class BlobRewriterTest {
+
+  private static final String SOURCE_BUCKET_NAME = "b";
+  private static final String SOURCE_BLOB_NAME = "n";
+  private static final String DESTINATION_BUCKET_NAME = "b1";
+  private static final String DESTINATION_BLOB_NAME = "n1";
+  private static final BlobId BLOB_ID = BlobId.of(SOURCE_BUCKET_NAME, SOURCE_BLOB_NAME);
+  private static final BlobInfo BLOB_INFO =
+      BlobInfo.builder(DESTINATION_BUCKET_NAME, DESTINATION_BLOB_NAME).build();
+  private static final Map EMPTY_OPTIONS = ImmutableMap.of();
+
+  private StorageOptions optionsMock;
+  private StorageRpc storageRpcMock;
+  private BlobRewriter rewriter;
+
+  @Before
+  public void setUp() throws IOException, InterruptedException {
+    optionsMock = EasyMock.createMock(StorageOptions.class);
+    storageRpcMock = EasyMock.createMock(StorageRpc.class);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    verify(optionsMock, storageRpcMock);
+  }
+
+  @Test
+  public void testRewrite() {
+    RewriteResponse response = new RewriteResponse()
+        .setDone(true)
+        .setResource(BLOB_INFO.toPb())
+        .setObjectSize(BigInteger.valueOf(42L))
+        .setTotalBytesRewritten(BigInteger.valueOf(42L));
+    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
+    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
+    EasyMock.expect(storageRpcMock.rewrite(
+        BLOB_ID.toPb(), EMPTY_OPTIONS, BLOB_INFO.toPb(), EMPTY_OPTIONS, null, null))
+        .andReturn(response);
+    EasyMock.replay(optionsMock, storageRpcMock);
+    rewriter = BlobRewriter.builder(optionsMock, BLOB_ID, EMPTY_OPTIONS, BLOB_INFO, EMPTY_OPTIONS)
+        .isDone(false)
+        .build();
+    rewriter.copyChunk();
+    assertTrue(rewriter.isDone());
+    assertEquals(BLOB_INFO, rewriter.target());
+    assertEquals(BLOB_ID, rewriter.source());
+    assertEquals(BigInteger.valueOf(42L), rewriter.totalBytesRewritten());
+    assertEquals(BigInteger.valueOf(42L), rewriter.blobSize());
+  }
+
+  @Test
+  public void testRewriteCustumSize() {
+    RewriteResponse response = new RewriteResponse()
+        .setDone(true)
+        .setResource(BLOB_INFO.toPb())
+        .setObjectSize(BigInteger.valueOf(42L))
+        .setTotalBytesRewritten(BigInteger.valueOf(42L));
+    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
+    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
+    EasyMock.expect(storageRpcMock.rewrite(
+        BLOB_ID.toPb(), EMPTY_OPTIONS, BLOB_INFO.toPb(), EMPTY_OPTIONS, null, 1048576L))
+        .andReturn(response);
+    EasyMock.replay(optionsMock, storageRpcMock);
+    rewriter = BlobRewriter.builder(optionsMock, BLOB_ID, EMPTY_OPTIONS, BLOB_INFO, EMPTY_OPTIONS)
+        .isDone(false)
+        .maxBytesRewrittenPerCall(1048576L)
+        .build();
+    rewriter.copyChunk();
+    assertTrue(rewriter.isDone());
+    assertEquals(BLOB_INFO, rewriter.target());
+    assertEquals(BLOB_ID, rewriter.source());
+    assertEquals(BigInteger.valueOf(42L), rewriter.totalBytesRewritten());
+    assertEquals(BigInteger.valueOf(42L), rewriter.blobSize());
+  }
+
+  @Test
+  public void testRewriteMultipleRequests() {
+    RewriteResponse firstResponse = new RewriteResponse()
+        .setDone(false)
+        .setResource(BLOB_INFO.toPb())
+        .setObjectSize(BigInteger.valueOf(42L))
+        .setRewriteToken("token")
+        .setTotalBytesRewritten(BigInteger.valueOf(21L));
+    RewriteResponse secondResponse = new RewriteResponse()
+        .setDone(true)
+        .setResource(BLOB_INFO.toPb())
+        .setObjectSize(BigInteger.valueOf(42L))
+        .setTotalBytesRewritten(BigInteger.valueOf(42L));
+    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
+    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries()).times(2);
+    EasyMock.expect(storageRpcMock.rewrite(
+        BLOB_ID.toPb(), EMPTY_OPTIONS, BLOB_INFO.toPb(), EMPTY_OPTIONS, null, null))
+        .andReturn(firstResponse);
+    EasyMock.expect(storageRpcMock.rewrite(
+        BLOB_ID.toPb(), EMPTY_OPTIONS, BLOB_INFO.toPb(), EMPTY_OPTIONS, "token", null))
+        .andReturn(secondResponse);
+    EasyMock.replay(optionsMock, storageRpcMock);
+    rewriter = BlobRewriter.builder(optionsMock, BLOB_ID, EMPTY_OPTIONS, BLOB_INFO, EMPTY_OPTIONS)
+        .isDone(false)
+        .build();
+    int loopCount = 0;
+    while (!rewriter.isDone()) {
+      rewriter.copyChunk();
+      loopCount++;
+    }
+    assertTrue(rewriter.isDone());
+    assertEquals(BLOB_INFO, rewriter.target());
+    assertEquals(BLOB_ID, rewriter.source());
+    assertEquals(BigInteger.valueOf(42L), rewriter.totalBytesRewritten());
+    assertEquals(BigInteger.valueOf(42L), rewriter.blobSize());
+    assertEquals(2, loopCount);
+  }
+}
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 7b29086ecbe5..b7e7d4b415d0 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -660,4 +660,42 @@ public void testUpdateBlobsFail() {
     assertNull(updatedBlobs.get(1));
     assertTrue(storage.delete(BUCKET, sourceBlobName1));
   }
+
+  @Test
+  public void testRewriteBlob() {
+    String sourceBlobName = "test-rewrite-blob-source";
+    BlobId source = BlobId.of(bucket, sourceBlobName);
+    assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
+    String targetBlobName = "test-rewrite-blob-target";
+    BlobInfo target = BlobInfo.builder(bucket, targetBlobName).contentType(CONTENT_TYPE).build();
+    Storage.RewriteRequest req = Storage.RewriteRequest.of(source, target);
+    BlobRewriter rewriter = storage.rewriter(req);
+    rewriter.copyChunk();
+    assertTrue(rewriter.isDone());
+    assertEquals(rewriter.target(), storage.get(bucket, targetBlobName));
+    assertTrue(storage.delete(bucket, sourceBlobName));
+    assertTrue(storage.delete(bucket, targetBlobName));
+  }
+
+  @Test
+  public void testRewriteBlobFail() {
+    String sourceBlobName = "test-rewrite-blob-source-fail";
+    BlobId source = BlobId.of(bucket, sourceBlobName);
+    assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
+    String targetBlobName = "test-rewrite-blob-target-fail";
+    BlobInfo target = BlobInfo.builder(bucket, targetBlobName).contentType(CONTENT_TYPE).build();
+    Storage.RewriteRequest req = Storage.RewriteRequest.builder()
+        .source(source)
+        .sourceOptions(Storage.BlobSourceOption.generationMatch(-1L))
+        .target(target)
+        .build();
+    BlobRewriter rewriter = storage.rewriter(req);
+    try {
+      rewriter.copyChunk();
+      fail("StorageException was expected");
+    } catch (StorageException ex) {
+      // expected
+    }
+    assertTrue(storage.delete(bucket, sourceBlobName));
+  }
 }

From 15372f1920ef32ba0f161ff293f35e0e37664637 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 27 Oct 2015 16:41:49 +0100
Subject: [PATCH 025/322] Refactor StorageRpc and Storage rewrite - Split
 StorageRpc.rewrite into openRewrite and continueRewrite - Add
 StorageRpc.RewriteResponse and RewriteRequest classe - Move first rewrite
 request from BlobRewriter to StorageImpl - Change maxBytesRewrittenPerCall to
 megabytesRewrittenPerCall - Change BlobWriter.blobSize for BigInteger to Long
 - BlobRewriter extends Restorable - Refactor tests and add StorageImpl unit
 tests

---
 .../google/gcloud/spi/DefaultStorageRpc.java  |  49 ++-
 .../com/google/gcloud/spi/StorageRpc.java     |  91 ++++-
 .../google/gcloud/storage/BlobRewriter.java   | 318 ++++++++++--------
 .../com/google/gcloud/storage/Storage.java    |  37 +-
 .../google/gcloud/storage/StorageImpl.java    |  28 +-
 .../gcloud/storage/BlobRewriterTest.java      | 140 ++++----
 .../google/gcloud/storage/ITStorageTest.java  |  19 +-
 .../gcloud/storage/StorageImplTest.java       |  65 ++++
 8 files changed, 489 insertions(+), 258 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index f28e3dba8a65..1098ca4c538d 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -55,7 +55,6 @@
 import com.google.api.services.storage.model.ComposeRequest;
 import com.google.api.services.storage.model.ComposeRequest.SourceObjects.ObjectPreconditions;
 import com.google.api.services.storage.model.Objects;
-import com.google.api.services.storage.model.RewriteResponse;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
@@ -79,6 +78,7 @@ public class DefaultStorageRpc implements StorageRpc {
 
   // see: https://cloud.google.com/storage/docs/concepts-techniques#practices
   private static final Set RETRYABLE_CODES = ImmutableSet.of(504, 503, 502, 500, 429, 408);
+  private static final long MEGABYTE = 1024L * 1024L;
 
   public DefaultStorageRpc(StorageOptions options) {
     HttpTransport transport = options.httpTransportFactory().create();
@@ -524,27 +524,42 @@ public String open(StorageObject object, Map options)
   }
 
   @Override
-  public RewriteResponse rewrite(StorageObject source, Map sourceOptions,
-      StorageObject target, Map targetOptions, String token, Long maxByteRewrittenPerCall)
-      throws StorageException {
+  public RewriteResponse openRewrite(RewriteRequest rewriteRequest) throws StorageException {
+    return rewrite(rewriteRequest, null);
+  }
+
+  @Override
+  public RewriteResponse continueRewrite(RewriteResponse previousResponse) throws StorageException {
+    return rewrite(previousResponse.rewriteRequest, previousResponse.rewriteToken);
+  }
+
+  private RewriteResponse rewrite(RewriteRequest req, String token) throws StorageException {
     try {
-      return storage
-          .objects()
-          .rewrite(source.getBucket(), source.getName(), target.getBucket(), target.getName(),
-              target)
+      Long maxBytesRewrittenPerCall = req.megabytesRewrittenPerCall != null
+          ? req.megabytesRewrittenPerCall * MEGABYTE : null;
+      com.google.api.services.storage.model.RewriteResponse rewriteReponse = storage.objects()
+          .rewrite(req.source.getBucket(), req.source.getName(), req.target.getBucket(),
+              req.target.getName(), req.target)
           .setRewriteToken(token)
-          .setMaxBytesRewrittenPerCall(maxByteRewrittenPerCall)
+          .setMaxBytesRewrittenPerCall(maxBytesRewrittenPerCall)
           .setProjection(DEFAULT_PROJECTION)
-          .setIfSourceMetagenerationMatch(IF_SOURCE_METAGENERATION_MATCH.getLong(sourceOptions))
+          .setIfSourceMetagenerationMatch(IF_SOURCE_METAGENERATION_MATCH.getLong(req.sourceOptions))
           .setIfSourceMetagenerationNotMatch(
-              IF_SOURCE_METAGENERATION_NOT_MATCH.getLong(sourceOptions))
-          .setIfSourceGenerationMatch(IF_SOURCE_GENERATION_MATCH.getLong(sourceOptions))
-          .setIfSourceGenerationNotMatch(IF_SOURCE_GENERATION_NOT_MATCH.getLong(sourceOptions))
-          .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(targetOptions))
-          .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(targetOptions))
-          .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(targetOptions))
-          .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(targetOptions))
+              IF_SOURCE_METAGENERATION_NOT_MATCH.getLong(req.sourceOptions))
+          .setIfSourceGenerationMatch(IF_SOURCE_GENERATION_MATCH.getLong(req.sourceOptions))
+          .setIfSourceGenerationNotMatch(IF_SOURCE_GENERATION_NOT_MATCH.getLong(req.sourceOptions))
+          .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(req.targetOptions))
+          .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(req.targetOptions))
+          .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(req.targetOptions))
+          .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(req.targetOptions))
           .execute();
+      return new RewriteResponse(
+          req,
+          rewriteReponse.getResource(),
+          rewriteReponse.getObjectSize().longValue(),
+          rewriteReponse.getDone(),
+          rewriteReponse.getRewriteToken(),
+          rewriteReponse.getTotalBytesRewritten().longValue());
     } catch (IOException ex) {
       throw translate(ex);
     }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
index a463583a563c..1a4afa0524e0 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
@@ -19,7 +19,6 @@
 import static com.google.common.base.MoreObjects.firstNonNull;
 
 import com.google.api.services.storage.model.Bucket;
-import com.google.api.services.storage.model.RewriteResponse;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -28,6 +27,7 @@
 import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public interface StorageRpc {
 
@@ -133,6 +133,89 @@ public BatchResponse(Map> delete
     }
   }
 
+  class RewriteRequest {
+
+    public final StorageObject source;
+    public final Map sourceOptions;
+    public final StorageObject target;
+    public final Map targetOptions;
+    public final Long megabytesRewrittenPerCall;
+
+    public RewriteRequest(StorageObject source, Map sourceOptions,
+        StorageObject target, Map targetOptions,
+        Long megabytesRewrittenPerCall) {
+      this.source = source;
+      this.sourceOptions = sourceOptions;
+      this.target = target;
+      this.targetOptions = targetOptions;
+      this.megabytesRewrittenPerCall = megabytesRewrittenPerCall;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (obj == null) {
+        return false;
+      }
+      if (!(obj instanceof RewriteRequest)) {
+        return false;
+      }
+      final RewriteRequest other = (RewriteRequest) obj;
+      return Objects.equals(this.source, other.source)
+          && Objects.equals(this.sourceOptions, other.sourceOptions)
+          && Objects.equals(this.target, other.target)
+          && Objects.equals(this.targetOptions, other.targetOptions)
+          && Objects.equals(this.megabytesRewrittenPerCall, other.megabytesRewrittenPerCall);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(source, sourceOptions, target, targetOptions, megabytesRewrittenPerCall);
+    }
+  }
+
+  class RewriteResponse {
+
+    public final RewriteRequest rewriteRequest;
+    public final StorageObject result;
+    public final Long blobSize;
+    public final Boolean isDone;
+    public final String rewriteToken;
+    public final Long totalBytesRewritten;
+
+    public RewriteResponse(RewriteRequest rewriteRequest, StorageObject result, Long blobSize,
+        Boolean isDone, String rewriteToken, Long totalBytesRewritten) {
+      this.rewriteRequest = rewriteRequest;
+      this.result = result;
+      this.blobSize = blobSize;
+      this.isDone = isDone;
+      this.rewriteToken = rewriteToken;
+      this.totalBytesRewritten = totalBytesRewritten;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (obj == null) {
+        return false;
+      }
+      if (!(obj instanceof RewriteResponse)) {
+        return false;
+      }
+      final RewriteResponse other = (RewriteResponse) obj;
+      return Objects.equals(this.rewriteRequest, other.rewriteRequest)
+          && Objects.equals(this.result, other.result)
+          && Objects.equals(this.rewriteToken, other.rewriteToken)
+          && Objects.equals(this.blobSize, other.blobSize)
+          && Objects.equals(this.isDone, other.isDone)
+          && Objects.equals(this.totalBytesRewritten, other.totalBytesRewritten);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(rewriteRequest, result, blobSize, isDone, rewriteToken,
+          totalBytesRewritten);
+    }
+  }
+
   Bucket create(Bucket bucket, Map options) throws StorageException;
 
   StorageObject create(StorageObject object, InputStream content, Map options)
@@ -176,7 +259,7 @@ byte[] read(StorageObject from, Map options, long position, int bytes
   void write(String uploadId, byte[] toWrite, int toWriteOffset, StorageObject dest,
       long destOffset, int length, boolean last) throws StorageException;
 
-  RewriteResponse rewrite(StorageObject source, Map sourceOptions,
-      StorageObject target, Map targetOptions, String token, Long maxByteRewrittenPerCall)
-      throws StorageException;
+  RewriteResponse openRewrite(RewriteRequest rewriteRequest) throws StorageException;
+
+  RewriteResponse continueRewrite(RewriteResponse previousResponse) throws StorageException;
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java
index e144fe013261..75b0516f0acf 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java
@@ -16,157 +16,63 @@
 
 package com.google.gcloud.storage;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.gcloud.RetryHelper.runWithRetries;
 
-import com.google.api.services.storage.model.RewriteResponse;
+import com.google.common.base.MoreObjects;
+import com.google.gcloud.Restorable;
+import com.google.gcloud.RestorableState;
 import com.google.gcloud.RetryHelper;
 import com.google.gcloud.spi.StorageRpc;
+import com.google.gcloud.spi.StorageRpc.RewriteRequest;
+import com.google.gcloud.spi.StorageRpc.RewriteResponse;
 
-import java.math.BigInteger;
+import java.io.Serializable;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.Callable;
 
 /**
  * Google Storage blob rewriter.
  */
-public final class BlobRewriter {
+public final class BlobRewriter implements Restorable {
 
   private final StorageOptions serviceOptions;
-  private final BlobId source;
-  private final Map sourceOptions;
-  private final Map targetOptions;
-  private final Long maxBytesRewrittenPerCall;
-  private BigInteger blobSize;
-  private BlobInfo target;
-  private Boolean isDone;
-  private String rewriteToken;
-  private BigInteger totalBytesRewritten;
-
   private final StorageRpc storageRpc;
+  private RewriteResponse rewriteResponse;
 
-  private BlobRewriter(Builder builder) {
-    this.serviceOptions = builder.serviceOptions;
-    this.source = builder.source;
-    this.sourceOptions = builder.sourceOptions;
-    this.target = builder.target;
-    this.targetOptions = builder.targetOptions;
-    this.blobSize = builder.blobSize;
-    this.isDone = builder.isDone;
-    this.rewriteToken = builder.rewriteToken;
-    this.totalBytesRewritten = firstNonNull(builder.totalBytesRewritten, BigInteger.ZERO);
-    this.maxBytesRewrittenPerCall = builder.maxBytesRewrittenPerCall;
-    this.storageRpc = serviceOptions.storageRpc();
-  }
-
-  static class Builder {
-
-    private final StorageOptions serviceOptions;
-    private final BlobId source;
-    private final Map sourceOptions;
-    private final BlobInfo target;
-    private final Map targetOptions;
-    private BigInteger blobSize;
-    private Boolean isDone;
-    private String rewriteToken;
-    private BigInteger totalBytesRewritten;
-    private Long maxBytesRewrittenPerCall;
-
-    Builder(StorageOptions serviceOptions, BlobId source, Map sourceOptions,
-        BlobInfo target, Map targetOptions) {
-      this.serviceOptions = serviceOptions;
-      this.source = source;
-      this.sourceOptions = sourceOptions;
-      this.target = target;
-      this.targetOptions = targetOptions;
-    }
-
-    Builder blobSize(BigInteger blobSize) {
-      this.blobSize = blobSize;
-      return this;
-    }
-
-    Builder isDone(Boolean isDone) {
-      this.isDone = isDone;
-      return this;
-    }
-
-    Builder rewriteToken(String rewriteToken) {
-      this.rewriteToken = rewriteToken;
-      return this;
-    }
-
-    Builder totalBytesRewritten(BigInteger totalBytesRewritten) {
-      this.totalBytesRewritten = totalBytesRewritten;
-      return this;
-    }
-
-    Builder maxBytesRewrittenPerCall(Long maxBytesRewrittenPerCall) {
-      this.maxBytesRewrittenPerCall = maxBytesRewrittenPerCall;
-      return this;
-    }
-
-    BlobRewriter build() {
-      return new BlobRewriter(this);
-    }
-  }
-
-  static Builder builder(StorageOptions options, BlobId source,
-      Map sourceOpt,
-      BlobInfo target, Map targetOpt) {
-    return new Builder(options, source, sourceOpt, target, targetOpt);
-  }
-
-  /**
-   * Returns the id of the source blob.
-   */
-  public BlobId source() {
-    return source;
+  BlobRewriter(StorageOptions serviceOptions, RewriteResponse rewriteResponse) {
+    this.serviceOptions = serviceOptions;
+    this.rewriteResponse = rewriteResponse;
+    this.storageRpc = serviceOptions.rpc();
   }
 
   /**
-   * Returns the info for the target blob. When {@link #isDone} is {@code true} this method returns
-   * the updated information for the just written blob.
+   * Returns the updated information for the just written blob when {@link #isDone} is {@code true}.
+   * Returns {@code null} otherwise.
    */
-  public BlobInfo target() {
-    return target;
+  public BlobInfo result() {
+    return rewriteResponse.result != null ? BlobInfo.fromPb(rewriteResponse.result) : null;
   }
 
   /**
-   * Size of the blob being copied. Returns {@code null} until the first copy request returns.
+   * Size of the blob being copied.
    */
-  public BigInteger blobSize() {
-    return blobSize;
+  public Long blobSize() {
+    return rewriteResponse.blobSize;
   }
 
   /**
    * Returns {@code true} of blob rewrite finished, {@code false} otherwise.
    */
   public Boolean isDone() {
-    return isDone;
-  }
-
-  /**
-   * Returns the token to be used to rewrite the next chunk of the blob.
-   */
-  public String rewriteToken() {
-    return rewriteToken;
+    return rewriteResponse.isDone;
   }
 
   /**
    * Returns the number of bytes written. 
    */
-  public BigInteger totalBytesRewritten() {
-    return totalBytesRewritten;
-  }
-
-  /**
-   * Returns the maximum number of bytes to be copied with each {@link #copyChunk()} call. This
-   * parameter is ignored if source and target blob share the same location and storage class as
-   * rewrite is made with one single RPC.
-   */
-  public Long maxBytesRewrittenPerCall() {
-    return maxBytesRewrittenPerCall;
+  public Long totalBytesRewritten() {
+    return rewriteResponse.totalBytesRewritten;
   }
 
   /**
@@ -176,28 +82,178 @@ public Long maxBytesRewrittenPerCall() {
    * @throws StorageException upon failure
    */
   public void copyChunk() {
-    if (!isDone) {
+    if (!isDone()) {
       try {
-        RewriteResponse response = runWithRetries(new Callable() {
+        this.rewriteResponse = runWithRetries(new Callable() {
           @Override
           public RewriteResponse call() {
-            return storageRpc.rewrite(
-                source.toPb(),
-                sourceOptions,
-                target.toPb(),
-                targetOptions,
-                rewriteToken,
-                maxBytesRewrittenPerCall);
+            return storageRpc.continueRewrite(rewriteResponse);
           }
         }, serviceOptions.retryParams(), StorageImpl.EXCEPTION_HANDLER);
-        rewriteToken = response.getRewriteToken();
-        isDone = response.getDone();
-        blobSize = response.getObjectSize();
-        totalBytesRewritten = response.getTotalBytesRewritten();
-        target = response.getResource() != null ? BlobInfo.fromPb(response.getResource()) : target;
       } catch (RetryHelper.RetryHelperException e) {
         throw StorageException.translateAndThrow(e);
       }
     }
   }
+
+  @Override
+  public RestorableState capture() {
+    return StateImpl.builder(
+        serviceOptions,
+        BlobId.fromPb(rewriteResponse.rewriteRequest.source),
+        rewriteResponse.rewriteRequest.sourceOptions,
+        BlobInfo.fromPb(rewriteResponse.rewriteRequest.target),
+        rewriteResponse.rewriteRequest.targetOptions)
+        .blobSize(blobSize())
+        .isDone(isDone())
+        .megabytesRewrittenPerCall(rewriteResponse.rewriteRequest.megabytesRewrittenPerCall)
+        .rewriteToken(rewriteResponse.rewriteToken)
+        .totalBytesRewritten(totalBytesRewritten())
+        .build();
+  }
+
+  static class StateImpl implements RestorableState, Serializable {
+
+    private static final long serialVersionUID = 8279287678903181701L;
+
+    private final StorageOptions serviceOptions;
+    private final BlobId source;
+    private final Map sourceOptions;
+    private final BlobInfo target;
+    private final Map targetOptions;
+    private final BlobInfo result;
+    private final Long blobSize;
+    private final Boolean isDone;
+    private final String rewriteToken;
+    private final Long totalBytesRewritten;
+    private final Long megabytesRewrittenPerCall;
+
+    StateImpl(Builder builder) {
+      this.serviceOptions = builder.serviceOptions;
+      this.source = builder.source;
+      this.sourceOptions = builder.sourceOptions;
+      this.target = builder.target;
+      this.targetOptions = builder.targetOptions;
+      this.result = builder.result;
+      this.blobSize = builder.blobSize;
+      this.isDone = builder.isDone;
+      this.rewriteToken = builder.rewriteToken;
+      this.totalBytesRewritten = builder.totalBytesRewritten;
+      this.megabytesRewrittenPerCall = builder.megabytesRewrittenPerCall;
+    }
+
+    static class Builder {
+
+      private final StorageOptions serviceOptions;
+      private final BlobId source;
+      private final Map sourceOptions;
+      private final BlobInfo target;
+      private final Map targetOptions;
+      private BlobInfo result;
+      private Long blobSize;
+      private Boolean isDone;
+      private String rewriteToken;
+      private Long totalBytesRewritten;
+      private Long megabytesRewrittenPerCall;
+
+      private Builder(StorageOptions options, BlobId source,
+          Map sourceOptions,
+          BlobInfo target, Map targetOptions) {
+        this.serviceOptions = options;
+        this.source = source;
+        this.sourceOptions = sourceOptions;
+        this.target = target;
+        this.targetOptions = targetOptions;
+      }
+
+      Builder result(BlobInfo result) {
+        this.result = result;
+        return this;
+      }
+
+      Builder blobSize(Long blobSize) {
+        this.blobSize = blobSize;
+        return this;
+      }
+
+      Builder isDone(Boolean isDone) {
+        this.isDone = isDone;
+        return this;
+      }
+
+      Builder rewriteToken(String rewriteToken) {
+        this.rewriteToken = rewriteToken;
+        return this;
+      }
+
+      Builder totalBytesRewritten(Long totalBytesRewritten) {
+        this.totalBytesRewritten = totalBytesRewritten;
+        return this;
+      }
+
+      Builder megabytesRewrittenPerCall(Long megabytesRewrittenPerCall) {
+        this.megabytesRewrittenPerCall = megabytesRewrittenPerCall;
+        return this;
+      }
+
+      RestorableState build() {
+        return new StateImpl(this);
+      }
+    }
+
+    static Builder builder(StorageOptions options, BlobId source,
+        Map sourceOptions, BlobInfo target,
+        Map targetOptions) {
+      return new Builder(options, source, sourceOptions, target, targetOptions);
+    }
+
+    @Override
+    public BlobRewriter restore() {
+      RewriteRequest rewriteRequest = new RewriteRequest(
+          source.toPb(), sourceOptions, target.toPb(), targetOptions, megabytesRewrittenPerCall);
+      RewriteResponse rewriteResponse = new RewriteResponse(rewriteRequest,
+          result != null ? result.toPb() : null, blobSize, isDone, rewriteToken,
+          totalBytesRewritten);
+      return new BlobRewriter(serviceOptions, rewriteResponse);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(serviceOptions, source, sourceOptions, target, targetOptions, result,
+          blobSize, isDone, megabytesRewrittenPerCall, rewriteToken, totalBytesRewritten);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (obj == null) {
+        return false;
+      }
+      if (!(obj instanceof StateImpl)) {
+        return false;
+      }
+      final StateImpl other = (StateImpl) obj;
+      return Objects.equals(this.serviceOptions, other.serviceOptions)
+          && Objects.equals(this.source, other.source)
+          && Objects.equals(this.sourceOptions, other.sourceOptions)
+          && Objects.equals(this.target, other.target)
+          && Objects.equals(this.targetOptions, other.targetOptions)
+          && Objects.equals(this.result, other.result)
+          && Objects.equals(this.rewriteToken, other.rewriteToken)
+          && Objects.equals(this.blobSize, other.blobSize)
+          && Objects.equals(this.isDone, other.isDone)
+          && Objects.equals(this.megabytesRewrittenPerCall, other.megabytesRewrittenPerCall)
+          && Objects.equals(this.totalBytesRewritten, other.totalBytesRewritten);
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("source", source)
+          .add("target", target)
+          .add("isDone", isDone)
+          .add("totalBytesRewritten", totalBytesRewritten)
+          .add("blobSize", blobSize)
+          .toString();
+    }
+  }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index f5dfee6f2f70..88f2a80f8b9b 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -604,7 +604,7 @@ class RewriteRequest implements Serializable {
     private final List sourceOptions;
     private final BlobInfo target;
     private final List targetOptions;
-    private final Long maxBytesRewrittenPerCall;
+    private final Long megabytesRewrittenPerCall;
 
     public static class Builder {
 
@@ -612,7 +612,7 @@ public static class Builder {
       private final Set targetOptions = new LinkedHashSet<>();
       private BlobId source;
       private BlobInfo target;
-      private Long maxBytesRewrittenPerCall;
+      private Long megabytesRewrittenPerCall;
 
       /**
        * Sets the blob to rewrite given bucket and blob name.
@@ -685,14 +685,14 @@ public Builder targetOptions(Iterable options) {
       }
 
       /**
-       * Sets the maximum number of bytes to copy for each RPC call. This parameter is ignored if
-       * source and target blob share the same location and storage class as rewrite is made with
+       * Sets the maximum number of megabytes to copy for each RPC call. This parameter is ignored
+       * if source and target blob share the same location and storage class as rewrite is made with
        * one single RPC.
        *
        * @return the builder.
        */
-      public Builder maxBytesRewrittenPerCall(Long maxBytesRewrittenPerCall) {
-        this.maxBytesRewrittenPerCall = maxBytesRewrittenPerCall;
+      public Builder megabytesRewrittenPerCall(Long megabytesRewrittenPerCall) {
+        this.megabytesRewrittenPerCall = megabytesRewrittenPerCall;
         return this;
       }
 
@@ -711,27 +711,44 @@ private RewriteRequest(Builder builder) {
       sourceOptions = ImmutableList.copyOf(builder.sourceOptions);
       target = checkNotNull(builder.target);
       targetOptions = ImmutableList.copyOf(builder.targetOptions);
-      maxBytesRewrittenPerCall = builder.maxBytesRewrittenPerCall;
+      megabytesRewrittenPerCall = builder.megabytesRewrittenPerCall;
     }
 
+    /**
+     * Returns the blob to rewrite, as a {@link BlobId}.
+     */
     public BlobId source() {
       return source;
     }
 
+    /**
+     * Returns blob's source options.
+     */
     public List sourceOptions() {
       return sourceOptions;
     }
 
+    /**
+     * Returns the rewrite target.
+     */
     public BlobInfo target() {
       return target;
     }
 
+    /**
+     * Returns blob's target options.
+     */
     public List targetOptions() {
       return targetOptions;
     }
 
-    public Long maxBytesRewrittenPerCall() {
-      return maxBytesRewrittenPerCall;
+    /**
+     * Returns the maximum number of megabytes to copy for each RPC call. This parameter is ignored
+     * if source and target blob share the same location and storage class as rewrite is made with
+     * one single RPC.
+     */
+    public Long megabytesRewrittenPerCall() {
+      return megabytesRewrittenPerCall;
     }
 
     public static RewriteRequest of(String sourceBucket, String sourceBlob, BlobInfo target) {
@@ -1018,7 +1035,7 @@ public static Builder builder() {
   List delete(BlobId... blobIds);
 
   /**
-   * Returns a {@link BlobRewriter} object for the provided {@code rewriteRequest}. If source and
+   * Returns a {@link BlobRewriter} object for the provided {@code RewriteRequest}. If source and
    * destination objects share the same location and storage class the source blob is copied with a
    * single call of {@link BlobRewriter#copyChunk()}, regardless of the {@link
    * RewriteRequest#maxBytesRewrittenPerCall} parameter. If source and destination have different
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index bfa760288d6f..7bc39481b8a0 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -49,6 +49,7 @@
 import com.google.gcloud.ExceptionHandler.Interceptor;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.spi.StorageRpc;
+import com.google.gcloud.spi.StorageRpc.RewriteResponse;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 
 import java.io.ByteArrayInputStream;
@@ -664,14 +665,25 @@ public List delete(BlobId... blobIds) {
   }
 
   @Override
-  public BlobRewriter rewriter(final RewriteRequest req) {
-    final Map sourceOpts = optionMap(null, null, req.sourceOptions(), true);
-    final Map targetOpts = optionMap(req.target().generation(),
-        req.target().metageneration(), req.targetOptions());
-    return BlobRewriter.builder(options(), req.source(), sourceOpts, req.target(), targetOpts)
-        .isDone(false)
-        .maxBytesRewrittenPerCall(req.maxBytesRewrittenPerCall())
-        .build();
+  public BlobRewriter rewriter(final RewriteRequest rewriteRequest) {
+    final StorageObject source = rewriteRequest.source().toPb();
+    final Map sourceOptions =
+        optionMap(null, null, rewriteRequest.sourceOptions(), true);
+    final StorageObject target = rewriteRequest.target().toPb();
+    final Map targetOptions = optionMap(rewriteRequest.target().generation(),
+        rewriteRequest.target().metageneration(), rewriteRequest.targetOptions());
+    try {
+      RewriteResponse rewriteResponse = runWithRetries(new Callable() {
+        @Override
+        public RewriteResponse call() {
+          return storageRpc.openRewrite(new StorageRpc.RewriteRequest(source, sourceOptions, target,
+              targetOptions, rewriteRequest.megabytesRewrittenPerCall()));
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER);
+      return new BlobRewriter(options(), rewriteResponse);
+    } catch (RetryHelperException e) {
+      throw StorageException.translateAndThrow(e);
+    }
   }
 
   private static  List transformResultList(
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java
index 0f5e009fd95e..83cda633fd6a 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java
@@ -16,23 +16,28 @@
 
 package com.google.gcloud.storage;
 
-import com.google.api.services.storage.model.RewriteResponse;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.gcloud.RetryParams;
+import com.google.gcloud.RestorableState;
 import com.google.gcloud.spi.StorageRpc;
+import com.google.gcloud.spi.StorageRpc.RewriteRequest;
+import com.google.gcloud.spi.StorageRpc.RewriteResponse;
+import com.google.gcloud.spi.StorageRpcFactory;
 
 import org.easymock.EasyMock;
+import org.junit.After;
 import org.junit.Test;
 import org.junit.Before;
 
 import java.io.IOException;
-import java.math.BigInteger;
 import java.util.Map;
-import org.junit.After;
 
 public class BlobRewriterTest {
 
@@ -43,107 +48,86 @@ public class BlobRewriterTest {
   private static final BlobId BLOB_ID = BlobId.of(SOURCE_BUCKET_NAME, SOURCE_BLOB_NAME);
   private static final BlobInfo BLOB_INFO =
       BlobInfo.builder(DESTINATION_BUCKET_NAME, DESTINATION_BLOB_NAME).build();
+  private static final BlobInfo RESULT =
+      BlobInfo.builder(DESTINATION_BUCKET_NAME, DESTINATION_BLOB_NAME).contentType("type").build();
   private static final Map EMPTY_OPTIONS = ImmutableMap.of();
+  private static final RewriteRequest REQUEST = new StorageRpc.RewriteRequest(BLOB_ID.toPb(),
+      EMPTY_OPTIONS, BLOB_INFO.toPb(), EMPTY_OPTIONS, null);
+  private static final RewriteResponse RESPONSE = new StorageRpc.RewriteResponse(REQUEST,
+      null, 42L, false, "token", 21L);
+  private static final RewriteResponse RESPONSE_DONE = new StorageRpc.RewriteResponse(REQUEST,
+      RESULT.toPb(), 42L, true, "token", 42L);
 
-  private StorageOptions optionsMock;
+  private StorageOptions options;
+  private StorageRpcFactory rpcFactoryMock;
   private StorageRpc storageRpcMock;
   private BlobRewriter rewriter;
 
   @Before
   public void setUp() throws IOException, InterruptedException {
-    optionsMock = EasyMock.createMock(StorageOptions.class);
-    storageRpcMock = EasyMock.createMock(StorageRpc.class);
+    rpcFactoryMock = createMock(StorageRpcFactory.class);
+    storageRpcMock = createMock(StorageRpc.class);
+    expect(rpcFactoryMock.create(anyObject(StorageOptions.class)))
+        .andReturn(storageRpcMock);
+    replay(rpcFactoryMock);
+    options = StorageOptions.builder()
+        .projectId("projectid")
+        .serviceRpcFactory(rpcFactoryMock)
+        .build();
   }
 
   @After
   public void tearDown() throws Exception {
-    verify(optionsMock, storageRpcMock);
+    verify(rpcFactoryMock, storageRpcMock);
   }
 
   @Test
   public void testRewrite() {
-    RewriteResponse response = new RewriteResponse()
-        .setDone(true)
-        .setResource(BLOB_INFO.toPb())
-        .setObjectSize(BigInteger.valueOf(42L))
-        .setTotalBytesRewritten(BigInteger.valueOf(42L));
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.expect(storageRpcMock.rewrite(
-        BLOB_ID.toPb(), EMPTY_OPTIONS, BLOB_INFO.toPb(), EMPTY_OPTIONS, null, null))
-        .andReturn(response);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    rewriter = BlobRewriter.builder(optionsMock, BLOB_ID, EMPTY_OPTIONS, BLOB_INFO, EMPTY_OPTIONS)
-        .isDone(false)
-        .build();
+    EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE_DONE);
+    EasyMock.replay(storageRpcMock);
+    rewriter = new BlobRewriter(options, RESPONSE);
     rewriter.copyChunk();
     assertTrue(rewriter.isDone());
-    assertEquals(BLOB_INFO, rewriter.target());
-    assertEquals(BLOB_ID, rewriter.source());
-    assertEquals(BigInteger.valueOf(42L), rewriter.totalBytesRewritten());
-    assertEquals(BigInteger.valueOf(42L), rewriter.blobSize());
-  }
-
-  @Test
-  public void testRewriteCustumSize() {
-    RewriteResponse response = new RewriteResponse()
-        .setDone(true)
-        .setResource(BLOB_INFO.toPb())
-        .setObjectSize(BigInteger.valueOf(42L))
-        .setTotalBytesRewritten(BigInteger.valueOf(42L));
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries());
-    EasyMock.expect(storageRpcMock.rewrite(
-        BLOB_ID.toPb(), EMPTY_OPTIONS, BLOB_INFO.toPb(), EMPTY_OPTIONS, null, 1048576L))
-        .andReturn(response);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    rewriter = BlobRewriter.builder(optionsMock, BLOB_ID, EMPTY_OPTIONS, BLOB_INFO, EMPTY_OPTIONS)
-        .isDone(false)
-        .maxBytesRewrittenPerCall(1048576L)
-        .build();
-    rewriter.copyChunk();
-    assertTrue(rewriter.isDone());
-    assertEquals(BLOB_INFO, rewriter.target());
-    assertEquals(BLOB_ID, rewriter.source());
-    assertEquals(BigInteger.valueOf(42L), rewriter.totalBytesRewritten());
-    assertEquals(BigInteger.valueOf(42L), rewriter.blobSize());
+    assertEquals(RESULT, rewriter.result());
+    assertEquals(new Long(42L), rewriter.totalBytesRewritten());
+    assertEquals(new Long(42L), rewriter.blobSize());
   }
 
   @Test
   public void testRewriteMultipleRequests() {
-    RewriteResponse firstResponse = new RewriteResponse()
-        .setDone(false)
-        .setResource(BLOB_INFO.toPb())
-        .setObjectSize(BigInteger.valueOf(42L))
-        .setRewriteToken("token")
-        .setTotalBytesRewritten(BigInteger.valueOf(21L));
-    RewriteResponse secondResponse = new RewriteResponse()
-        .setDone(true)
-        .setResource(BLOB_INFO.toPb())
-        .setObjectSize(BigInteger.valueOf(42L))
-        .setTotalBytesRewritten(BigInteger.valueOf(42L));
-    EasyMock.expect(optionsMock.storageRpc()).andReturn(storageRpcMock);
-    EasyMock.expect(optionsMock.retryParams()).andReturn(RetryParams.noRetries()).times(2);
-    EasyMock.expect(storageRpcMock.rewrite(
-        BLOB_ID.toPb(), EMPTY_OPTIONS, BLOB_INFO.toPb(), EMPTY_OPTIONS, null, null))
-        .andReturn(firstResponse);
-    EasyMock.expect(storageRpcMock.rewrite(
-        BLOB_ID.toPb(), EMPTY_OPTIONS, BLOB_INFO.toPb(), EMPTY_OPTIONS, "token", null))
-        .andReturn(secondResponse);
-    EasyMock.replay(optionsMock, storageRpcMock);
-    rewriter = BlobRewriter.builder(optionsMock, BLOB_ID, EMPTY_OPTIONS, BLOB_INFO, EMPTY_OPTIONS)
-        .isDone(false)
-        .build();
+    EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE);
+    EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE_DONE);
+    EasyMock.replay(storageRpcMock);
+    rewriter = new BlobRewriter(options, RESPONSE);
     int loopCount = 0;
     while (!rewriter.isDone()) {
       rewriter.copyChunk();
       loopCount++;
     }
     assertTrue(rewriter.isDone());
-    assertEquals(BLOB_INFO, rewriter.target());
-    assertEquals(BLOB_ID, rewriter.source());
-    assertEquals(BigInteger.valueOf(42L), rewriter.totalBytesRewritten());
-    assertEquals(BigInteger.valueOf(42L), rewriter.blobSize());
+    assertEquals(RESULT, rewriter.result());
+    assertEquals(new Long(42L), rewriter.totalBytesRewritten());
+    assertEquals(new Long(42L), rewriter.blobSize());
     assertEquals(2, loopCount);
   }
+
+  @Test
+  public void testSaveAndRestore() throws IOException {
+    EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE);
+    EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE_DONE);
+    EasyMock.replay(storageRpcMock);
+    rewriter = new BlobRewriter(options, RESPONSE);
+    rewriter.copyChunk();
+    assertTrue(!rewriter.isDone());
+    assertEquals(null, rewriter.result());
+    assertEquals(new Long(21L), rewriter.totalBytesRewritten());
+    assertEquals(new Long(42L), rewriter.blobSize());
+    RestorableState rewriterState = rewriter.capture();
+    BlobRewriter restoredRewriter = rewriterState.restore();
+    restoredRewriter.copyChunk();
+    assertTrue(restoredRewriter.isDone());
+    assertEquals(RESULT, restoredRewriter.result());
+    assertEquals(new Long(42L), restoredRewriter.totalBytesRewritten());
+    assertEquals(new Long(42L), restoredRewriter.blobSize());
+  }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index b7e7d4b415d0..7025227a27f3 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -664,38 +664,37 @@ public void testUpdateBlobsFail() {
   @Test
   public void testRewriteBlob() {
     String sourceBlobName = "test-rewrite-blob-source";
-    BlobId source = BlobId.of(bucket, sourceBlobName);
+    BlobId source = BlobId.of(BUCKET, sourceBlobName);
     assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
     String targetBlobName = "test-rewrite-blob-target";
-    BlobInfo target = BlobInfo.builder(bucket, targetBlobName).contentType(CONTENT_TYPE).build();
+    BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
     Storage.RewriteRequest req = Storage.RewriteRequest.of(source, target);
     BlobRewriter rewriter = storage.rewriter(req);
     rewriter.copyChunk();
     assertTrue(rewriter.isDone());
-    assertEquals(rewriter.target(), storage.get(bucket, targetBlobName));
-    assertTrue(storage.delete(bucket, sourceBlobName));
-    assertTrue(storage.delete(bucket, targetBlobName));
+    assertEquals(rewriter.result(), storage.get(BUCKET, targetBlobName));
+    assertTrue(storage.delete(BUCKET, sourceBlobName));
+    assertTrue(storage.delete(BUCKET, targetBlobName));
   }
 
   @Test
   public void testRewriteBlobFail() {
     String sourceBlobName = "test-rewrite-blob-source-fail";
-    BlobId source = BlobId.of(bucket, sourceBlobName);
+    BlobId source = BlobId.of(BUCKET, sourceBlobName);
     assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
     String targetBlobName = "test-rewrite-blob-target-fail";
-    BlobInfo target = BlobInfo.builder(bucket, targetBlobName).contentType(CONTENT_TYPE).build();
+    BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
     Storage.RewriteRequest req = Storage.RewriteRequest.builder()
         .source(source)
         .sourceOptions(Storage.BlobSourceOption.generationMatch(-1L))
         .target(target)
         .build();
-    BlobRewriter rewriter = storage.rewriter(req);
     try {
-      rewriter.copyChunk();
+      storage.rewriter(req);
       fail("StorageException was expected");
     } catch (StorageException ex) {
       // expected
     }
-    assertTrue(storage.delete(bucket, sourceBlobName));
+    assertTrue(storage.delete(BUCKET, sourceBlobName));
   }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 9c80d43396c0..6248c9720511 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -38,6 +38,7 @@
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 import com.google.gcloud.spi.StorageRpcFactory;
+import com.google.gcloud.storage.Storage.RewriteRequest;
 
 import org.easymock.Capture;
 import org.easymock.EasyMock;
@@ -960,6 +961,70 @@ public Tuple apply(StorageObject f) {
     }
   }
 
+  @Test
+  public void testRewriter() {
+    RewriteRequest request = Storage.RewriteRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2);
+    StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
+        EMPTY_RPC_OPTIONS, request.target().toPb(), EMPTY_RPC_OPTIONS, null);
+    StorageRpc.RewriteResponse rpcResponse = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
+        false, "token", 21L);
+    EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    BlobRewriter writer = storage.rewriter(request);
+    assertNull(writer.result());
+    assertEquals(new Long(42L), writer.blobSize());
+    assertEquals(new Long(21L), writer.totalBytesRewritten());
+    assertTrue(!writer.isDone());
+  }
+
+  @Test
+  public void testRewriterWithOptions() {
+    RewriteRequest request = Storage.RewriteRequest.builder()
+        .source(BLOB_INFO2.blobId())
+        .sourceOptions(BLOB_SOURCE_GENERATION, BLOB_SOURCE_METAGENERATION)
+        .target(BLOB_INFO1)
+        .targetOptions(BLOB_TARGET_GENERATION, BLOB_TARGET_METAGENERATION)
+        .build();
+    StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
+        BLOB_SOURCE_OPTIONS_COPY, request.target().toPb(), BLOB_TARGET_OPTIONS_COMPOSE, null);
+    StorageRpc.RewriteResponse rpcResponse = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
+        false, "token", 21L);
+    EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    BlobRewriter writer = storage.rewriter(request);
+    assertNull(writer.result());
+    assertEquals(new Long(42L), writer.blobSize());
+    assertEquals(new Long(21L), writer.totalBytesRewritten());
+    assertTrue(!writer.isDone());
+  }
+
+  @Test
+  public void testRewriterMultipleRequests() {
+    RewriteRequest request = Storage.RewriteRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2);
+    StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
+        EMPTY_RPC_OPTIONS, request.target().toPb(), EMPTY_RPC_OPTIONS, null);
+    StorageRpc.RewriteResponse rpcResponse1 = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
+        false, "token", 21L);
+    StorageRpc.RewriteResponse rpcResponse2 = new StorageRpc.RewriteResponse(rpcRequest,
+        BLOB_INFO1.toPb(), 42L, true, "token", 42L);
+    EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse1);
+    EasyMock.expect(storageRpcMock.continueRewrite(rpcResponse1)).andReturn(rpcResponse2);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    BlobRewriter writer = storage.rewriter(request);
+    assertNull(writer.result());
+    assertEquals(new Long(42L), writer.blobSize());
+    assertEquals(new Long(21L), writer.totalBytesRewritten());
+    assertTrue(!writer.isDone());
+    writer.copyChunk();
+    assertTrue(writer.isDone());
+    assertEquals(BLOB_INFO1, writer.result());
+    assertEquals(new Long(42L), writer.totalBytesRewritten());
+    assertEquals(new Long(42L), writer.blobSize());
+  }
+
   @Test
   public void testRetryableException() {
     BlobId blob = BlobId.of(BUCKET_NAME1, BLOB_NAME1);

From 43460b9d9e01c52368d670119bf3a357e1d607aa Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 28 Oct 2015 15:31:54 +0100
Subject: [PATCH 026/322] Use StorageRpc.rewrite to implement Storage.copy -
 rename BlobRewriter to CopyWriter - update Storage.copy and Blob.copyTo
 methods to use StorageRpc.openRewrite - update Blob and Storage unit and
 intergration tests - update StorageExample

---
 .../gcloud/examples/StorageExample.java       |  15 +-
 .../java/com/google/gcloud/storage/Blob.java  |  31 ++--
 .../{BlobRewriter.java => CopyWriter.java}    |  45 +++---
 .../com/google/gcloud/storage/Storage.java    | 153 +++---------------
 .../google/gcloud/storage/StorageImpl.java    |  35 +---
 .../com/google/gcloud/storage/BlobTest.java   |  32 ++--
 ...bRewriterTest.java => CopyWriterTest.java} |  48 +++---
 .../google/gcloud/storage/ITStorageTest.java  |  95 ++++-------
 .../gcloud/storage/StorageImplTest.java       | 129 ++++++---------
 9 files changed, 204 insertions(+), 379 deletions(-)
 rename gcloud-java-storage/src/main/java/com/google/gcloud/storage/{BlobRewriter.java => CopyWriter.java} (84%)
 rename gcloud-java-storage/src/test/java/com/google/gcloud/storage/{BlobRewriterTest.java => CopyWriterTest.java} (78%)

diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index 274710f10e93..a13e057d2555 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -24,6 +24,7 @@
 import com.google.gcloud.storage.BlobId;
 import com.google.gcloud.storage.BlobInfo;
 import com.google.gcloud.storage.BlobReadChannel;
+import com.google.gcloud.storage.CopyWriter;
 import com.google.gcloud.storage.BlobWriteChannel;
 import com.google.gcloud.storage.Bucket;
 import com.google.gcloud.storage.BucketInfo;
@@ -366,21 +367,25 @@ public String params() {
   private static class CopyAction extends StorageAction {
     @Override
     public void run(Storage storage, CopyRequest request) {
-      BlobInfo copiedBlobInfo = storage.copy(request);
-      System.out.println("Copied " + copiedBlobInfo);
+      CopyWriter copyWriter = storage.copy(request);
+      while (!copyWriter.isDone()) {
+        copyWriter.copyChunk();
+      }
+      System.out.println("Copied " + copyWriter.result());
     }
 
     @Override
     CopyRequest parse(String... args) {
-      if (args.length != 4) {
+      if (args.length != 5) {
         throw new IllegalArgumentException();
       }
-      return CopyRequest.of(args[0], args[1], BlobInfo.builder(args[2], args[3]).build());
+      return CopyRequest.of(args[0], args[1],
+          BlobInfo.builder(args[2], args[3]).contentType(args[4]).build());
     }
 
     @Override
     public String params() {
-      return "   ";
+      return "    ";
     }
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index bc75408997f4..dfd112d39c55 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -213,19 +213,20 @@ public Blob update(BlobInfo blobInfo, BlobTargetOption... options) {
   }
 
   /**
-   * Copies this blob to the specified target. Possibly copying also some of the metadata
-   * (e.g. content-type).
+   * Sends a copy request for the current blob to the target blob. Possibly also some of the
+   * metadata are copied (e.g. content-type).
    *
    * @param targetBlob target blob's id
    * @param options source blob options
-   * @return the copied blob
+   * @return a {@link CopyWriter} object that can be used to get information on the newly created
+   *     blob or to complete the copy if more than one RPC request is needed
    * @throws StorageException upon failure
    */
-  public Blob copyTo(BlobId targetBlob, BlobSourceOption... options) {
+  public CopyWriter copyTo(BlobId targetBlob, BlobSourceOption... options) {
     BlobInfo updatedInfo = info.toBuilder().blobId(targetBlob).build();
     CopyRequest copyRequest = CopyRequest.builder().source(info.bucket(), info.name())
         .sourceOptions(convert(info, options)).target(updatedInfo).build();
-    return new Blob(storage, storage.copy(copyRequest));
+    return storage.copy(copyRequest);
   }
 
   /**
@@ -240,33 +241,35 @@ public boolean delete(BlobSourceOption... options) {
   }
 
   /**
-   * Copies this blob to the target bucket, preserving its name. Possibly copying also some of the
-   * metadata (e.g. content-type).
+   * Sends a copy request for the current blob to the target bucket, preserving its name. Possibly
+   * copying also some of the metadata (e.g. content-type).
    *
    * @param targetBucket target bucket's name
    * @param options source blob options
-   * @return the copied blob
+   * @return a {@link CopyWriter} object that can be used to get information on the newly created
+   *     blob or to complete the copy if more than one RPC request is needed
    * @throws StorageException upon failure
    */
-  public Blob copyTo(String targetBucket, BlobSourceOption... options) {
+  public CopyWriter copyTo(String targetBucket, BlobSourceOption... options) {
     return copyTo(targetBucket, info.name(), options);
   }
 
   /**
-   * Copies this blob to the target bucket with a new name. Possibly copying also some of the
-   * metadata (e.g. content-type).
+   * Sends a copy request for the current blob to the target blob. Possibly also some of the
+   * metadata are copied (e.g. content-type).
    *
    * @param targetBucket target bucket's name
    * @param targetBlob target blob's name
    * @param options source blob options
-   * @return the copied blob
+   * @return a {@link CopyWriter} object that can be used to get information on the newly created
+   *     blob or to complete the copy if more than one RPC request is needed
    * @throws StorageException upon failure
    */
-  public Blob copyTo(String targetBucket, String targetBlob, BlobSourceOption... options) {
+  public CopyWriter copyTo(String targetBucket, String targetBlob, BlobSourceOption... options) {
     BlobInfo updatedInfo = info.toBuilder().blobId(BlobId.of(targetBucket, targetBlob)).build();
     CopyRequest copyRequest = CopyRequest.builder().source(info.bucket(), info.name())
         .sourceOptions(convert(info, options)).target(updatedInfo).build();
-    return new Blob(storage, storage.copy(copyRequest));
+    return storage.copy(copyRequest);
   }
 
   /**
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
similarity index 84%
rename from gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java
rename to gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
index 75b0516f0acf..916d3c18865f 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobRewriter.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
@@ -32,15 +32,20 @@
 import java.util.concurrent.Callable;
 
 /**
- * Google Storage blob rewriter.
+ * Google Storage blob copy writer. This class holds the result of a copy request.
+ * If source and destination blobs do not share the same location or storage class more than one
+ * RPC request is needed to copy the blob. When this is the case {@link #copyChunk()} can be used
+ * to copy to destination other chunks of the source blob.
+ *
+ * @see Rewrite
  */
-public final class BlobRewriter implements Restorable {
+public class CopyWriter implements Restorable {
 
   private final StorageOptions serviceOptions;
   private final StorageRpc storageRpc;
   private RewriteResponse rewriteResponse;
 
-  BlobRewriter(StorageOptions serviceOptions, RewriteResponse rewriteResponse) {
+  CopyWriter(StorageOptions serviceOptions, RewriteResponse rewriteResponse) {
     this.serviceOptions = serviceOptions;
     this.rewriteResponse = rewriteResponse;
     this.storageRpc = serviceOptions.rpc();
@@ -69,14 +74,14 @@ public Boolean isDone() {
   }
 
   /**
-   * Returns the number of bytes written. 
+   * Returns the number of bytes copied. 
    */
-  public Long totalBytesRewritten() {
+  public Long totalBytesCopied() {
     return rewriteResponse.totalBytesRewritten;
   }
 
   /**
-   * Rewrite the next chunk of the blob. An RPC is issued only if rewrite has not finished yet
+   * Copies the next chunk of the blob. An RPC is issued only if copy has not finished yet
    * ({@link #isDone} returns {@code false}).
    *
    * @throws StorageException upon failure
@@ -97,7 +102,7 @@ public RewriteResponse call() {
   }
 
   @Override
-  public RestorableState capture() {
+  public RestorableState capture() {
     return StateImpl.builder(
         serviceOptions,
         BlobId.fromPb(rewriteResponse.rewriteRequest.source),
@@ -108,11 +113,11 @@ public RestorableState capture() {
         .isDone(isDone())
         .megabytesRewrittenPerCall(rewriteResponse.rewriteRequest.megabytesRewrittenPerCall)
         .rewriteToken(rewriteResponse.rewriteToken)
-        .totalBytesRewritten(totalBytesRewritten())
+        .totalBytesRewritten(totalBytesCopied())
         .build();
   }
 
-  static class StateImpl implements RestorableState, Serializable {
+  static class StateImpl implements RestorableState, Serializable {
 
     private static final long serialVersionUID = 8279287678903181701L;
 
@@ -125,7 +130,7 @@ static class StateImpl implements RestorableState, Serializable {
     private final Long blobSize;
     private final Boolean isDone;
     private final String rewriteToken;
-    private final Long totalBytesRewritten;
+    private final Long totalBytesCopied;
     private final Long megabytesRewrittenPerCall;
 
     StateImpl(Builder builder) {
@@ -138,7 +143,7 @@ static class StateImpl implements RestorableState, Serializable {
       this.blobSize = builder.blobSize;
       this.isDone = builder.isDone;
       this.rewriteToken = builder.rewriteToken;
-      this.totalBytesRewritten = builder.totalBytesRewritten;
+      this.totalBytesCopied = builder.totalBytesCopied;
       this.megabytesRewrittenPerCall = builder.megabytesRewrittenPerCall;
     }
 
@@ -153,7 +158,7 @@ static class Builder {
       private Long blobSize;
       private Boolean isDone;
       private String rewriteToken;
-      private Long totalBytesRewritten;
+      private Long totalBytesCopied;
       private Long megabytesRewrittenPerCall;
 
       private Builder(StorageOptions options, BlobId source,
@@ -187,7 +192,7 @@ Builder rewriteToken(String rewriteToken) {
       }
 
       Builder totalBytesRewritten(Long totalBytesRewritten) {
-        this.totalBytesRewritten = totalBytesRewritten;
+        this.totalBytesCopied = totalBytesRewritten;
         return this;
       }
 
@@ -196,7 +201,7 @@ Builder megabytesRewrittenPerCall(Long megabytesRewrittenPerCall) {
         return this;
       }
 
-      RestorableState build() {
+      RestorableState build() {
         return new StateImpl(this);
       }
     }
@@ -208,19 +213,19 @@ static Builder builder(StorageOptions options, BlobId source,
     }
 
     @Override
-    public BlobRewriter restore() {
+    public CopyWriter restore() {
       RewriteRequest rewriteRequest = new RewriteRequest(
           source.toPb(), sourceOptions, target.toPb(), targetOptions, megabytesRewrittenPerCall);
       RewriteResponse rewriteResponse = new RewriteResponse(rewriteRequest,
           result != null ? result.toPb() : null, blobSize, isDone, rewriteToken,
-          totalBytesRewritten);
-      return new BlobRewriter(serviceOptions, rewriteResponse);
+          totalBytesCopied);
+      return new CopyWriter(serviceOptions, rewriteResponse);
     }
 
     @Override
     public int hashCode() {
       return Objects.hash(serviceOptions, source, sourceOptions, target, targetOptions, result,
-          blobSize, isDone, megabytesRewrittenPerCall, rewriteToken, totalBytesRewritten);
+          blobSize, isDone, megabytesRewrittenPerCall, rewriteToken, totalBytesCopied);
     }
 
     @Override
@@ -242,7 +247,7 @@ public boolean equals(Object obj) {
           && Objects.equals(this.blobSize, other.blobSize)
           && Objects.equals(this.isDone, other.isDone)
           && Objects.equals(this.megabytesRewrittenPerCall, other.megabytesRewrittenPerCall)
-          && Objects.equals(this.totalBytesRewritten, other.totalBytesRewritten);
+          && Objects.equals(this.totalBytesCopied, other.totalBytesCopied);
     }
 
     @Override
@@ -251,7 +256,7 @@ public String toString() {
           .add("source", source)
           .add("target", target)
           .add("isDone", isDone)
-          .add("totalBytesRewritten", totalBytesRewritten)
+          .add("totalBytesRewritten", totalBytesCopied)
           .add("blobSize", blobSize)
           .toString();
     }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 88f2a80f8b9b..cc9c3770e790 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -494,110 +494,6 @@ public static Builder builder() {
 
   class CopyRequest implements Serializable {
 
-    private static final long serialVersionUID = -2606508373751748775L;
-
-    private final BlobId source;
-    private final List sourceOptions;
-    private final BlobInfo target;
-    private final List targetOptions;
-
-    public static class Builder {
-
-      private final Set sourceOptions = new LinkedHashSet<>();
-      private final Set targetOptions = new LinkedHashSet<>();
-      private BlobId source;
-      private BlobInfo target;
-
-      public Builder source(String bucket, String blob) {
-        this.source = BlobId.of(bucket, blob);
-        return this;
-      }
-
-      public Builder source(BlobId source) {
-        this.source = source;
-        return this;
-      }
-
-      public Builder sourceOptions(BlobSourceOption... options) {
-        Collections.addAll(sourceOptions, options);
-        return this;
-      }
-
-      public Builder sourceOptions(Iterable options) {
-        Iterables.addAll(sourceOptions, options);
-        return this;
-      }
-
-      public Builder target(BlobInfo target) {
-        this.target = target;
-        return this;
-      }
-
-      public Builder targetOptions(BlobTargetOption... options) {
-        Collections.addAll(targetOptions, options);
-        return this;
-      }
-
-      public Builder targetOptions(Iterable options) {
-        Iterables.addAll(targetOptions, options);
-        return this;
-      }
-
-      public CopyRequest build() {
-        checkNotNull(source);
-        checkNotNull(target);
-        return new CopyRequest(this);
-      }
-    }
-
-    private CopyRequest(Builder builder) {
-      source = checkNotNull(builder.source);
-      sourceOptions = ImmutableList.copyOf(builder.sourceOptions);
-      target = checkNotNull(builder.target);
-      targetOptions = ImmutableList.copyOf(builder.targetOptions);
-    }
-
-    public BlobId source() {
-      return source;
-    }
-
-    public List sourceOptions() {
-      return sourceOptions;
-    }
-
-    public BlobInfo target() {
-      return target;
-    }
-
-    public List targetOptions() {
-      return targetOptions;
-    }
-
-    public static CopyRequest of(String sourceBucket, String sourceBlob, BlobInfo target) {
-      return builder().source(sourceBucket, sourceBlob).target(target).build();
-    }
-
-    public static CopyRequest of(BlobId sourceBlobId, BlobInfo target) {
-      return builder().source(sourceBlobId).target(target).build();
-    }
-
-    public static CopyRequest of(String sourceBucket, String sourceBlob, String targetBlob) {
-      return of(sourceBucket, sourceBlob,
-          BlobInfo.builder(BlobId.of(sourceBucket, targetBlob)).build());
-    }
-
-    public static CopyRequest of(BlobId sourceBlobId, String targetBlob) {
-      return of(sourceBlobId,
-          BlobInfo.builder(BlobId.of(sourceBlobId.bucket(), targetBlob)).build());
-    }
-
-    public static Builder builder() {
-      return new Builder();
-    }
-  }
-
-  class RewriteRequest implements Serializable {
-
     private static final long serialVersionUID = -4498650529476219937L;
 
     private final BlobId source;
@@ -699,14 +595,14 @@ public Builder megabytesRewrittenPerCall(Long megabytesRewrittenPerCall) {
       /**
        * Creates a {@code RewriteRequest}.
        */
-      public RewriteRequest build() {
+      public CopyRequest build() {
         checkNotNull(source);
         checkNotNull(target);
-        return new RewriteRequest(this);
+        return new CopyRequest(this);
       }
     }
 
-    private RewriteRequest(Builder builder) {
+    private CopyRequest(Builder builder) {
       source = checkNotNull(builder.source);
       sourceOptions = ImmutableList.copyOf(builder.sourceOptions);
       target = checkNotNull(builder.target);
@@ -751,11 +647,11 @@ public Long megabytesRewrittenPerCall() {
       return megabytesRewrittenPerCall;
     }
 
-    public static RewriteRequest of(String sourceBucket, String sourceBlob, BlobInfo target) {
+    public static CopyRequest of(String sourceBucket, String sourceBlob, BlobInfo target) {
       return builder().source(sourceBucket, sourceBlob).target(target).build();
     }
 
-    public static RewriteRequest of(BlobId sourceBlobId, BlobInfo target) {
+    public static CopyRequest of(BlobId sourceBlobId, BlobInfo target) {
       return builder().source(sourceBlobId).target(target).build();
     }
 
@@ -923,12 +819,26 @@ public static Builder builder() {
   BlobInfo compose(ComposeRequest composeRequest);
 
   /**
-   * Send a copy request.
+   * Sends a copy request. Returns a {@link CopyWriter} object for the provided
+   * {@code CopyRequest}. If source and destination objects share the same location and storage
+   * class the source blob is copied and its information can be accessed with
+   * {@link CopyWriter#result()}, regardless of the {@link CopyRequest#megabytesRewrittenPerCall}
+   * parameter. If source and destination have different location or storage class multiple RPC
+   * calls might be needed depending on blob's size.
+   * 

+   * Example usage of copy:
+   * 
    {@code CopyWriter copyWriter = service.copy(copyRequest);}
+   *    {@code while(!copyWriter.isDone()) {
+   *       copyWriter.copyChunk();
+   *   }}
+   * 

    *
-   * @return the copied blob.
+   * @return a {@link CopyWriter} object that can be used to get information on the newly created
+   *     blob or to complete the copy if more than one RPC request is needed
    * @throws StorageException upon failure
+   * @see Rewrite
    */
-  BlobInfo copy(CopyRequest copyRequest);
+  CopyWriter copy(CopyRequest copyRequest);
 
   /**
    * Reads all the bytes from a blob.
@@ -1033,23 +943,4 @@ public static Builder builder() {
    * @throws StorageException upon failure
    */
   List delete(BlobId... blobIds);
-
-  /**
-   * Returns a {@link BlobRewriter} object for the provided {@code RewriteRequest}. If source and
-   * destination objects share the same location and storage class the source blob is copied with a
-   * single call of {@link BlobRewriter#copyChunk()}, regardless of the {@link
-   * RewriteRequest#maxBytesRewrittenPerCall} parameter. If source and destination have different
-   * location or storage class multiple RPC calls might be needed depending on blob's size.
-   * 

-   * Example usage of blob rewriter:
-   * 
    {@code BlobRewriter rewriter = service.rewriter(rewriteRequest);}
-   *    {@code while(!rewriter.isDone()) {
-   *       rewriter.copyChunk();
-   *   }}
-   * 

-   *
-   * @throws StorageException upon failure
-   * @see Rewrite
-   */
-  BlobRewriter rewriter(RewriteRequest rewriteRequest);
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 7bc39481b8a0..a9fdee6705a0 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -445,21 +445,22 @@ public StorageObject call() {
   }
 
   @Override
-  public BlobInfo copy(CopyRequest copyRequest) {
+  public CopyWriter copy(final CopyRequest copyRequest) {
     final StorageObject source = copyRequest.source().toPb();
-    copyRequest.sourceOptions();
     final Map sourceOptions =
         optionMap(null, null, copyRequest.sourceOptions(), true);
     final StorageObject target = copyRequest.target().toPb();
     final Map targetOptions = optionMap(copyRequest.target().generation(),
         copyRequest.target().metageneration(), copyRequest.targetOptions());
     try {
-      return BlobInfo.fromPb(runWithRetries(new Callable() {
+      RewriteResponse rewriteResponse = runWithRetries(new Callable() {
         @Override
-        public StorageObject call() {
-          return storageRpc.copy(source, sourceOptions, target, targetOptions);
+        public RewriteResponse call() {
+          return storageRpc.openRewrite(new StorageRpc.RewriteRequest(source, sourceOptions, target,
+              targetOptions, copyRequest.megabytesRewrittenPerCall()));
         }
-      }, options().retryParams(), EXCEPTION_HANDLER));
+      }, options().retryParams(), EXCEPTION_HANDLER);
+      return new CopyWriter(options(), rewriteResponse);
     } catch (RetryHelperException e) {
       throw StorageException.translateAndThrow(e);
     }
@@ -664,28 +665,6 @@ public List delete(BlobId... blobIds) {
     return Collections.unmodifiableList(transformResultList(response.deletes(), Boolean.FALSE));
   }
 
-  @Override
-  public BlobRewriter rewriter(final RewriteRequest rewriteRequest) {
-    final StorageObject source = rewriteRequest.source().toPb();
-    final Map sourceOptions =
-        optionMap(null, null, rewriteRequest.sourceOptions(), true);
-    final StorageObject target = rewriteRequest.target().toPb();
-    final Map targetOptions = optionMap(rewriteRequest.target().generation(),
-        rewriteRequest.target().metageneration(), rewriteRequest.targetOptions());
-    try {
-      RewriteResponse rewriteResponse = runWithRetries(new Callable() {
-        @Override
-        public RewriteResponse call() {
-          return storageRpc.openRewrite(new StorageRpc.RewriteRequest(source, sourceOptions, target,
-              targetOptions, rewriteRequest.megabytesRewrittenPerCall()));
-        }
-      }, options().retryParams(), EXCEPTION_HANDLER);
-      return new BlobRewriter(options(), rewriteResponse);
-    } catch (RetryHelperException e) {
-      throw StorageException.translateAndThrow(e);
-    }
-  }
-
   private static  List transformResultList(
       List> results, final T errorValue) {
     return Lists.transform(results, new Function, T>() {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
index dddbb763f04c..095937981b7f 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
@@ -31,10 +31,12 @@
 
 import com.google.api.client.util.Lists;
 import com.google.gcloud.storage.Storage.CopyRequest;
+
 import org.easymock.Capture;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
@@ -120,41 +122,47 @@ public void testDelete() throws Exception {
   @Test
   public void testCopyToBucket() throws Exception {
     BlobInfo target = BLOB_INFO.toBuilder().blobId(BlobId.of("bt", "n")).build();
+    CopyWriter copyWriter = createMock(CopyWriter.class);
     Capture capturedCopyRequest = Capture.newInstance();
-    expect(storage.copy(capture(capturedCopyRequest))).andReturn(target);
+    expect(storage.copy(capture(capturedCopyRequest))).andReturn(copyWriter);
     replay(storage);
-    Blob targetBlob = blob.copyTo("bt");
-    assertEquals(target, targetBlob.info());
+    CopyWriter returnedCopyWriter = blob.copyTo("bt");
+    assertEquals(copyWriter, returnedCopyWriter);
     assertEquals(capturedCopyRequest.getValue().source(), blob.id());
     assertEquals(capturedCopyRequest.getValue().target(), target);
-    assertSame(storage, targetBlob.storage());
+    assertTrue(capturedCopyRequest.getValue().sourceOptions().isEmpty());
+    assertTrue(capturedCopyRequest.getValue().targetOptions().isEmpty());
   }
 
   @Test
   public void testCopyTo() throws Exception {
     BlobInfo target = BLOB_INFO.toBuilder().blobId(BlobId.of("bt", "nt")).build();
+    CopyWriter copyWriter = createMock(CopyWriter.class);
     Capture capturedCopyRequest = Capture.newInstance();
-    expect(storage.copy(capture(capturedCopyRequest))).andReturn(target);
+    expect(storage.copy(capture(capturedCopyRequest))).andReturn(copyWriter);
     replay(storage);
-    Blob targetBlob = blob.copyTo("bt", "nt");
-    assertEquals(target, targetBlob.info());
+    CopyWriter returnedCopyWriter = blob.copyTo("bt", "nt");
+    assertEquals(copyWriter, returnedCopyWriter);
     assertEquals(capturedCopyRequest.getValue().source(), blob.id());
     assertEquals(capturedCopyRequest.getValue().target(), target);
-    assertSame(storage, targetBlob.storage());
+    assertTrue(capturedCopyRequest.getValue().sourceOptions().isEmpty());
+    assertTrue(capturedCopyRequest.getValue().targetOptions().isEmpty());
   }
 
   @Test
   public void testCopyToBlobId() throws Exception {
     BlobId targetId = BlobId.of("bt", "nt");
+    CopyWriter copyWriter = createMock(CopyWriter.class);
     BlobInfo target = BLOB_INFO.toBuilder().blobId(targetId).build();
     Capture capturedCopyRequest = Capture.newInstance();
-    expect(storage.copy(capture(capturedCopyRequest))).andReturn(target);
+    expect(storage.copy(capture(capturedCopyRequest))).andReturn(copyWriter);
     replay(storage);
-    Blob targetBlob = blob.copyTo(targetId);
-    assertEquals(target, targetBlob.info());
+    CopyWriter returnedCopyWriter = blob.copyTo(targetId);
+    assertEquals(copyWriter, returnedCopyWriter);
     assertEquals(capturedCopyRequest.getValue().source(), blob.id());
     assertEquals(capturedCopyRequest.getValue().target(), target);
-    assertSame(storage, targetBlob.storage());
+    assertTrue(capturedCopyRequest.getValue().sourceOptions().isEmpty());
+    assertTrue(capturedCopyRequest.getValue().targetOptions().isEmpty());
   }
 
   @Test
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
similarity index 78%
rename from gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java
rename to gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
index 83cda633fd6a..feba88d57118 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobRewriterTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
@@ -39,7 +39,7 @@
 import java.io.IOException;
 import java.util.Map;
 
-public class BlobRewriterTest {
+public class CopyWriterTest {
 
   private static final String SOURCE_BUCKET_NAME = "b";
   private static final String SOURCE_BLOB_NAME = "n";
@@ -61,7 +61,7 @@ public class BlobRewriterTest {
   private StorageOptions options;
   private StorageRpcFactory rpcFactoryMock;
   private StorageRpc storageRpcMock;
-  private BlobRewriter rewriter;
+  private CopyWriter copyWriter;
 
   @Before
   public void setUp() throws IOException, InterruptedException {
@@ -85,12 +85,12 @@ public void tearDown() throws Exception {
   public void testRewrite() {
     EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE_DONE);
     EasyMock.replay(storageRpcMock);
-    rewriter = new BlobRewriter(options, RESPONSE);
-    rewriter.copyChunk();
-    assertTrue(rewriter.isDone());
-    assertEquals(RESULT, rewriter.result());
-    assertEquals(new Long(42L), rewriter.totalBytesRewritten());
-    assertEquals(new Long(42L), rewriter.blobSize());
+    copyWriter = new CopyWriter(options, RESPONSE);
+    copyWriter.copyChunk();
+    assertTrue(copyWriter.isDone());
+    assertEquals(RESULT, copyWriter.result());
+    assertEquals(new Long(42L), copyWriter.totalBytesCopied());
+    assertEquals(new Long(42L), copyWriter.blobSize());
   }
 
   @Test
@@ -98,16 +98,16 @@ public void testRewriteMultipleRequests() {
     EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE);
     EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE_DONE);
     EasyMock.replay(storageRpcMock);
-    rewriter = new BlobRewriter(options, RESPONSE);
+    copyWriter = new CopyWriter(options, RESPONSE);
     int loopCount = 0;
-    while (!rewriter.isDone()) {
-      rewriter.copyChunk();
+    while (!copyWriter.isDone()) {
+      copyWriter.copyChunk();
       loopCount++;
     }
-    assertTrue(rewriter.isDone());
-    assertEquals(RESULT, rewriter.result());
-    assertEquals(new Long(42L), rewriter.totalBytesRewritten());
-    assertEquals(new Long(42L), rewriter.blobSize());
+    assertTrue(copyWriter.isDone());
+    assertEquals(RESULT, copyWriter.result());
+    assertEquals(new Long(42L), copyWriter.totalBytesCopied());
+    assertEquals(new Long(42L), copyWriter.blobSize());
     assertEquals(2, loopCount);
   }
 
@@ -116,18 +116,18 @@ public void testSaveAndRestore() throws IOException {
     EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE);
     EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE_DONE);
     EasyMock.replay(storageRpcMock);
-    rewriter = new BlobRewriter(options, RESPONSE);
-    rewriter.copyChunk();
-    assertTrue(!rewriter.isDone());
-    assertEquals(null, rewriter.result());
-    assertEquals(new Long(21L), rewriter.totalBytesRewritten());
-    assertEquals(new Long(42L), rewriter.blobSize());
-    RestorableState rewriterState = rewriter.capture();
-    BlobRewriter restoredRewriter = rewriterState.restore();
+    copyWriter = new CopyWriter(options, RESPONSE);
+    copyWriter.copyChunk();
+    assertTrue(!copyWriter.isDone());
+    assertEquals(null, copyWriter.result());
+    assertEquals(new Long(21L), copyWriter.totalBytesCopied());
+    assertEquals(new Long(42L), copyWriter.blobSize());
+    RestorableState rewriterState = copyWriter.capture();
+    CopyWriter restoredRewriter = rewriterState.restore();
     restoredRewriter.copyChunk();
     assertTrue(restoredRewriter.isDone());
     assertEquals(RESULT, restoredRewriter.result());
-    assertEquals(new Long(42L), restoredRewriter.totalBytesRewritten());
+    assertEquals(new Long(42L), restoredRewriter.totalBytesCopied());
     assertEquals(new Long(42L), restoredRewriter.blobSize());
   }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 7025227a27f3..612d4c37aa07 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -317,16 +317,15 @@ public void testComposeBlobFail() {
   @Test
   public void testCopyBlob() {
     String sourceBlobName = "test-copy-blob-source";
-    BlobInfo blob = BlobInfo.builder(BUCKET, sourceBlobName).build();
-    assertNotNull(storage.create(blob, BLOB_BYTE_CONTENT));
-    String targetBlobName = "test-copy-blob-target";
-    Storage.CopyRequest req = Storage.CopyRequest.of(blob.blobId(), targetBlobName);
-    BlobInfo remoteBlob = storage.copy(req);
-    assertNotNull(remoteBlob);
-    assertEquals(BUCKET, remoteBlob.bucket());
-    assertEquals(targetBlobName, remoteBlob.name());
-    byte[] readBytes = storage.readAllBytes(BUCKET, targetBlobName);
-    assertArrayEquals(BLOB_BYTE_CONTENT, readBytes);
+    BlobId source = BlobId.of(BUCKET, sourceBlobName);
+    assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
+    String targetBlobName = "test-rewrite-blob-target";
+    BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
+    Storage.CopyRequest req = Storage.CopyRequest.of(source, target);
+    CopyWriter rewriter = storage.copy(req);
+    rewriter.copyChunk();
+    assertTrue(rewriter.isDone());
+    assertEquals(rewriter.result(), storage.get(BUCKET, targetBlobName));
     assertTrue(storage.delete(BUCKET, sourceBlobName));
     assertTrue(storage.delete(BUCKET, targetBlobName));
   }
@@ -334,30 +333,33 @@ public void testCopyBlob() {
   @Test
   public void testCopyBlobUpdateMetadata() {
     String sourceBlobName = "test-copy-blob-update-metadata-source";
-    BlobInfo sourceBlob = BlobInfo.builder(BUCKET, sourceBlobName).build();
-    assertNotNull(storage.create(sourceBlob));
-    String targetBlobName = "test-copy-blob-update-metadata-target";
-    BlobInfo targetBlob =
-        BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
-    Storage.CopyRequest req = Storage.CopyRequest.of(BUCKET, sourceBlobName, targetBlob);
-    BlobInfo remoteBlob = storage.copy(req);
-    assertNotNull(remoteBlob);
-    assertEquals(targetBlob.blobId(), remoteBlob.blobId());
-    assertEquals(CONTENT_TYPE, remoteBlob.contentType());
+    BlobId source = BlobId.of(BUCKET, sourceBlobName);
+    assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
+    String targetBlobName = "test-rewrite-blob-target";
+    BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName)
+        .contentType(CONTENT_TYPE)
+        .metadata(ImmutableMap.of("k", "v"))
+        .build();
+    Storage.CopyRequest req = Storage.CopyRequest.of(source, target);
+    CopyWriter rewriter = storage.copy(req);
+    rewriter.copyChunk();
+    assertTrue(rewriter.isDone());
+    assertEquals(rewriter.result(), storage.get(BUCKET, targetBlobName));
     assertTrue(storage.delete(BUCKET, sourceBlobName));
     assertTrue(storage.delete(BUCKET, targetBlobName));
   }
 
   @Test
   public void testCopyBlobFail() {
-    String sourceBlobName = "test-copy-blob-fail-source";
-    BlobInfo blob = BlobInfo.builder(BUCKET, sourceBlobName).build();
-    assertNotNull(storage.create(blob));
-    String targetBlobName = "test-copy-blob-fail-target";
-    Storage.CopyRequest req = new Storage.CopyRequest.Builder()
-        .source(BUCKET, sourceBlobName)
-        .target(BlobInfo.builder(BUCKET, targetBlobName).build())
-        .sourceOptions(Storage.BlobSourceOption.metagenerationMatch(-1L))
+    String sourceBlobName = "test-copy-blob-source-fail";
+    BlobId source = BlobId.of(BUCKET, sourceBlobName);
+    assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
+    String targetBlobName = "test-rewrite-blob-target-fail";
+    BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
+    Storage.CopyRequest req = Storage.CopyRequest.builder()
+        .source(source)
+        .sourceOptions(Storage.BlobSourceOption.generationMatch(-1L))
+        .target(target)
         .build();
     try {
       storage.copy(req);
@@ -660,41 +662,4 @@ public void testUpdateBlobsFail() {
     assertNull(updatedBlobs.get(1));
     assertTrue(storage.delete(BUCKET, sourceBlobName1));
   }
-
-  @Test
-  public void testRewriteBlob() {
-    String sourceBlobName = "test-rewrite-blob-source";
-    BlobId source = BlobId.of(BUCKET, sourceBlobName);
-    assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
-    String targetBlobName = "test-rewrite-blob-target";
-    BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
-    Storage.RewriteRequest req = Storage.RewriteRequest.of(source, target);
-    BlobRewriter rewriter = storage.rewriter(req);
-    rewriter.copyChunk();
-    assertTrue(rewriter.isDone());
-    assertEquals(rewriter.result(), storage.get(BUCKET, targetBlobName));
-    assertTrue(storage.delete(BUCKET, sourceBlobName));
-    assertTrue(storage.delete(BUCKET, targetBlobName));
-  }
-
-  @Test
-  public void testRewriteBlobFail() {
-    String sourceBlobName = "test-rewrite-blob-source-fail";
-    BlobId source = BlobId.of(BUCKET, sourceBlobName);
-    assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
-    String targetBlobName = "test-rewrite-blob-target-fail";
-    BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
-    Storage.RewriteRequest req = Storage.RewriteRequest.builder()
-        .source(source)
-        .sourceOptions(Storage.BlobSourceOption.generationMatch(-1L))
-        .target(target)
-        .build();
-    try {
-      storage.rewriter(req);
-      fail("StorageException was expected");
-    } catch (StorageException ex) {
-      // expected
-    }
-    assertTrue(storage.delete(BUCKET, sourceBlobName));
-  }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 6248c9720511..1a99741fa4d0 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -38,7 +38,7 @@
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 import com.google.gcloud.spi.StorageRpcFactory;
-import com.google.gcloud.storage.Storage.RewriteRequest;
+import com.google.gcloud.storage.Storage.CopyRequest;
 
 import org.easymock.Capture;
 import org.easymock.EasyMock;
@@ -591,33 +591,66 @@ public void testComposeWithOptions() {
 
   @Test
   public void testCopy() {
-    Storage.CopyRequest req = Storage.CopyRequest.builder()
-        .source(BUCKET_NAME1, BLOB_NAME2)
-        .target(BLOB_INFO1)
-        .build();
-    EasyMock.expect(storageRpcMock.copy(BLOB_INFO2.toPb(), EMPTY_RPC_OPTIONS, BLOB_INFO1.toPb(),
-        EMPTY_RPC_OPTIONS)).andReturn(BLOB_INFO1.toPb());
+    CopyRequest request = Storage.CopyRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2);
+    StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
+        EMPTY_RPC_OPTIONS, request.target().toPb(), EMPTY_RPC_OPTIONS, null);
+    StorageRpc.RewriteResponse rpcResponse = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
+        false, "token", 21L);
+    EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    BlobInfo blob = storage.copy(req);
-    assertEquals(BLOB_INFO1, blob);
+    CopyWriter writer = storage.copy(request);
+    assertNull(writer.result());
+    assertEquals(new Long(42L), writer.blobSize());
+    assertEquals(new Long(21L), writer.totalBytesCopied());
+    assertTrue(!writer.isDone());
   }
 
   @Test
   public void testCopyWithOptions() {
-    Storage.CopyRequest req = Storage.CopyRequest.builder()
-        .source(BUCKET_NAME1, BLOB_NAME2)
+    CopyRequest request = Storage.CopyRequest.builder()
+        .source(BLOB_INFO2.blobId())
         .sourceOptions(BLOB_SOURCE_GENERATION, BLOB_SOURCE_METAGENERATION)
         .target(BLOB_INFO1)
         .targetOptions(BLOB_TARGET_GENERATION, BLOB_TARGET_METAGENERATION)
         .build();
-    EasyMock.expect(
-        storageRpcMock.copy(BLOB_INFO2.toPb(), BLOB_SOURCE_OPTIONS_COPY, BLOB_INFO1.toPb(),
-            BLOB_TARGET_OPTIONS_COMPOSE)).andReturn(BLOB_INFO1.toPb());
+    StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
+        BLOB_SOURCE_OPTIONS_COPY, request.target().toPb(), BLOB_TARGET_OPTIONS_COMPOSE, null);
+    StorageRpc.RewriteResponse rpcResponse = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
+        false, "token", 21L);
+    EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    BlobInfo blob = storage.copy(req);
-    assertEquals(BLOB_INFO1, blob);
+    CopyWriter writer = storage.copy(request);
+    assertNull(writer.result());
+    assertEquals(new Long(42L), writer.blobSize());
+    assertEquals(new Long(21L), writer.totalBytesCopied());
+    assertTrue(!writer.isDone());
+  }
+
+  @Test
+  public void testCopyMultipleRequests() {
+    CopyRequest request = Storage.CopyRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2);
+    StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
+        EMPTY_RPC_OPTIONS, request.target().toPb(), EMPTY_RPC_OPTIONS, null);
+    StorageRpc.RewriteResponse rpcResponse1 = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
+        false, "token", 21L);
+    StorageRpc.RewriteResponse rpcResponse2 = new StorageRpc.RewriteResponse(rpcRequest,
+        BLOB_INFO1.toPb(), 42L, true, "token", 42L);
+    EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse1);
+    EasyMock.expect(storageRpcMock.continueRewrite(rpcResponse1)).andReturn(rpcResponse2);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    CopyWriter writer = storage.copy(request);
+    assertNull(writer.result());
+    assertEquals(new Long(42L), writer.blobSize());
+    assertEquals(new Long(21L), writer.totalBytesCopied());
+    assertTrue(!writer.isDone());
+    writer.copyChunk();
+    assertTrue(writer.isDone());
+    assertEquals(BLOB_INFO1, writer.result());
+    assertEquals(new Long(42L), writer.totalBytesCopied());
+    assertEquals(new Long(42L), writer.blobSize());
   }
 
   @Test
@@ -961,70 +994,6 @@ public Tuple apply(StorageObject f) {
     }
   }
 
-  @Test
-  public void testRewriter() {
-    RewriteRequest request = Storage.RewriteRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2);
-    StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
-        EMPTY_RPC_OPTIONS, request.target().toPb(), EMPTY_RPC_OPTIONS, null);
-    StorageRpc.RewriteResponse rpcResponse = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
-        false, "token", 21L);
-    EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse);
-    EasyMock.replay(storageRpcMock);
-    storage = options.service();
-    BlobRewriter writer = storage.rewriter(request);
-    assertNull(writer.result());
-    assertEquals(new Long(42L), writer.blobSize());
-    assertEquals(new Long(21L), writer.totalBytesRewritten());
-    assertTrue(!writer.isDone());
-  }
-
-  @Test
-  public void testRewriterWithOptions() {
-    RewriteRequest request = Storage.RewriteRequest.builder()
-        .source(BLOB_INFO2.blobId())
-        .sourceOptions(BLOB_SOURCE_GENERATION, BLOB_SOURCE_METAGENERATION)
-        .target(BLOB_INFO1)
-        .targetOptions(BLOB_TARGET_GENERATION, BLOB_TARGET_METAGENERATION)
-        .build();
-    StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
-        BLOB_SOURCE_OPTIONS_COPY, request.target().toPb(), BLOB_TARGET_OPTIONS_COMPOSE, null);
-    StorageRpc.RewriteResponse rpcResponse = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
-        false, "token", 21L);
-    EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse);
-    EasyMock.replay(storageRpcMock);
-    storage = options.service();
-    BlobRewriter writer = storage.rewriter(request);
-    assertNull(writer.result());
-    assertEquals(new Long(42L), writer.blobSize());
-    assertEquals(new Long(21L), writer.totalBytesRewritten());
-    assertTrue(!writer.isDone());
-  }
-
-  @Test
-  public void testRewriterMultipleRequests() {
-    RewriteRequest request = Storage.RewriteRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2);
-    StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
-        EMPTY_RPC_OPTIONS, request.target().toPb(), EMPTY_RPC_OPTIONS, null);
-    StorageRpc.RewriteResponse rpcResponse1 = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
-        false, "token", 21L);
-    StorageRpc.RewriteResponse rpcResponse2 = new StorageRpc.RewriteResponse(rpcRequest,
-        BLOB_INFO1.toPb(), 42L, true, "token", 42L);
-    EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse1);
-    EasyMock.expect(storageRpcMock.continueRewrite(rpcResponse1)).andReturn(rpcResponse2);
-    EasyMock.replay(storageRpcMock);
-    storage = options.service();
-    BlobRewriter writer = storage.rewriter(request);
-    assertNull(writer.result());
-    assertEquals(new Long(42L), writer.blobSize());
-    assertEquals(new Long(21L), writer.totalBytesRewritten());
-    assertTrue(!writer.isDone());
-    writer.copyChunk();
-    assertTrue(writer.isDone());
-    assertEquals(BLOB_INFO1, writer.result());
-    assertEquals(new Long(42L), writer.totalBytesRewritten());
-    assertEquals(new Long(42L), writer.blobSize());
-  }
-
   @Test
   public void testRetryableException() {
     BlobId blob = BlobId.of(BUCKET_NAME1, BLOB_NAME1);

From f90e70c4e9784d1d99784d863a5ae2c5ec257985 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 28 Oct 2015 17:13:44 +0100
Subject: [PATCH 027/322] Check contentType != null before adding object to
 rewrite

---
 .../com/google/gcloud/examples/StorageExample.java     |  7 +++----
 .../java/com/google/gcloud/spi/DefaultStorageRpc.java  |  2 +-
 .../main/java/com/google/gcloud/storage/Storage.java   | 10 ++++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index a13e057d2555..184c4f3d5e0f 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -376,16 +376,15 @@ public void run(Storage storage, CopyRequest request) {
 
     @Override
     CopyRequest parse(String... args) {
-      if (args.length != 5) {
+      if (args.length != 4) {
         throw new IllegalArgumentException();
       }
-      return CopyRequest.of(args[0], args[1],
-          BlobInfo.builder(args[2], args[3]).contentType(args[4]).build());
+      return CopyRequest.of(args[0], args[1], BlobInfo.builder(args[2], args[3]).build());
     }
 
     @Override
     public String params() {
-      return "    ";
+      return "   ";
     }
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 1098ca4c538d..c627d65363f6 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -539,7 +539,7 @@ private RewriteResponse rewrite(RewriteRequest req, String token) throws Storage
           ? req.megabytesRewrittenPerCall * MEGABYTE : null;
       com.google.api.services.storage.model.RewriteResponse rewriteReponse = storage.objects()
           .rewrite(req.source.getBucket(), req.source.getName(), req.target.getBucket(),
-              req.target.getName(), req.target)
+              req.target.getName(), req.target.getContentType() != null ? req.target : null)
           .setRewriteToken(token)
           .setMaxBytesRewrittenPerCall(maxBytesRewrittenPerCall)
           .setProjection(DEFAULT_PROJECTION)
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index cc9c3770e790..8c505a7826aa 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -655,6 +655,16 @@ public static CopyRequest of(BlobId sourceBlobId, BlobInfo target) {
       return builder().source(sourceBlobId).target(target).build();
     }
 
+    public static CopyRequest of(String sourceBucket, String sourceBlob, String targetBlob) {
+      return of(sourceBucket, sourceBlob,
+          BlobInfo.builder(BlobId.of(sourceBucket, targetBlob)).build());
+    }
+
+    public static CopyRequest of(BlobId sourceBlobId, String targetBlob) {
+      return of(sourceBlobId,
+          BlobInfo.builder(BlobId.of(sourceBlobId.bucket(), targetBlob)).build());
+    }
+
     public static Builder builder() {
       return new Builder();
     }

From f2dc019ebc193c5af9e7ed3b7e2030bc97faf1ef Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 28 Oct 2015 10:31:48 -0700
Subject: [PATCH 028/322] Remove todos from core and datastore

---
 .../src/main/java/com/google/gcloud/ServiceOptions.java         | 2 --
 .../main/java/com/google/gcloud/datastore/DatastoreOptions.java | 2 --
 .../test/java/com/google/gcloud/datastore/DatastoreTest.java    | 1 -
 3 files changed, 5 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 8555b8d61ed4..c58a71c8b7ef 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -411,8 +411,6 @@ private static boolean isWindows() {
   }
 
   protected static String getAppEngineProjectId() {
-    // TODO(ozarov): An alternative to reflection would be to depend on AE api jar:
-    // http://mvnrepository.com/artifact/com.google.appengine/appengine-api-1.0-sdk/1.2.0
     try {
       Class factoryClass =
           Class.forName("com.google.appengine.api.appidentity.AppIdentityServiceFactory");
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
index 328573ac7164..5338c03a6d56 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -172,8 +172,6 @@ public String namespace() {
   }
 
   private static String defaultNamespace() {
-    // TODO(ozarov): An alternative to reflection would be to depend on AE api jar:
-    // http://mvnrepository.com/artifact/com.google.appengine/appengine-api-1.0-sdk/1.2.0
     try {
       Class clazz = Class.forName("com.google.appengine.api.NamespaceManager");
       Method method = clazz.getMethod("get");
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index 1d2bb4889658..f639ca3fdac0 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -459,7 +459,6 @@ public void testRunStructuredQuery() {
     assertEquals("Dan", entity.getString("name"));
     assertEquals(2, entity.properties().size());
     assertFalse(results4.hasNext());
-    // TODO(ozarov): construct a test to verify nextQuery/pagination
   }
 
   @Test

From 22ca3f92e81a6fa1522dc922178652fd103bf312 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 28 Oct 2015 11:56:29 -0700
Subject: [PATCH 029/322] Condense modules' pom.xml for site generation

---
 gcloud-java-core/pom.xml      | 101 +---------------------------------
 gcloud-java-datastore/pom.xml | 101 +---------------------------------
 gcloud-java-examples/pom.xml  |  97 +-------------------------------
 gcloud-java-storage/pom.xml   | 101 +---------------------------------
 gcloud-java/pom.xml           |  98 ---------------------------------
 pom.xml                       |   3 +-
 6 files changed, 14 insertions(+), 487 deletions(-)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index 6d25aa42ce95..e849594226db 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -13,6 +13,9 @@
     gcloud-java-pom
     0.0.11-SNAPSHOT
   
+  
+    gcloud-java-core
+  
   
     
       com.google.auth
@@ -90,102 +93,4 @@
       test
     
   
-  
-    
-      
-        org.apache.maven.plugins
-        maven-site-plugin
-        3.4
-        
-          true
-          
-            
-              org.apache.maven.plugins
-              maven-changelog-plugin
-              2.3
-            
-            
-              org.apache.maven.plugins
-              maven-project-info-reports-plugin
-              2.8
-              
-                
-                  
-                    index
-                    dependency-info
-                    dependencies
-                    dependency-convergence
-                    project-team
-                    mailing-list
-                    cim
-                    issue-tracking
-                    license
-                    scm
-                    dependency-management
-                    distribution-management
-                    summary
-                    modules
-                  
-                
-              
-              
-                true
-                true
-                true
-                true
-                gcloud-java-core
-                jar
-              
-            
-            
-              org.apache.maven.plugins
-              maven-dependency-plugin
-              2.10
-            
-            
-              org.apache.maven.plugins
-              maven-javadoc-plugin
-              2.10.3
-              
-                
-                  html
-                  
-                    javadoc
-                  
-                
-              
-              
-                true
-                protected
-                true
-                ${project.build.directory}/javadoc
-              
-            
-            
-              org.apache.maven.plugins
-              maven-surefire-report-plugin
-              2.18.1
-            
-            
-              org.apache.maven.plugins
-              maven-checkstyle-plugin
-              2.16
-              
-                checkstyle.xml
-                false
-              
-            
-            
-              org.codehaus.mojo
-              cobertura-maven-plugin
-              2.7
-              
-                true
-              
-            
-          
-        
-      
-    
-  
 
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index 6cd56e2c2211..c7c57d91ae1d 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -13,6 +13,9 @@
     gcloud-java-pom
     0.0.11-SNAPSHOT
   
+  
+    gcloud-java-datastore
+  
   
     
       ${project.groupId}
@@ -38,102 +41,4 @@
       test
     
   
-  
-    
-      
-        org.apache.maven.plugins
-        maven-site-plugin
-        3.4
-        
-          true
-          
-            
-              org.apache.maven.plugins
-              maven-changelog-plugin
-              2.3
-            
-            
-              org.apache.maven.plugins
-              maven-project-info-reports-plugin
-              2.8
-              
-                
-                  
-                    index
-                    dependency-info
-                    dependencies
-                    dependency-convergence
-                    project-team
-                    mailing-list
-                    cim
-                    issue-tracking
-                    license
-                    scm
-                    dependency-management
-                    distribution-management
-                    summary
-                    modules
-                  
-                
-              
-              
-                true
-                true
-                true
-                true
-                gcloud-java-datastore
-                jar
-              
-            
-            
-              org.apache.maven.plugins
-              maven-dependency-plugin
-              2.10
-            
-            
-              org.apache.maven.plugins
-              maven-javadoc-plugin
-              2.10.3
-              
-                
-                  html
-                  
-                    javadoc
-                  
-                
-              
-              
-                true
-                protected
-                true
-                ${project.build.directory}/javadoc
-              
-            
-            
-              org.apache.maven.plugins
-              maven-surefire-report-plugin
-              2.18.1
-            
-            
-              org.apache.maven.plugins
-              maven-checkstyle-plugin
-              2.16
-              
-                checkstyle.xml
-                false
-              
-            
-            
-              org.codehaus.mojo
-              cobertura-maven-plugin
-              2.7
-              
-                true
-              
-            
-          
-        
-      
-    
-  
 
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index c795571a0ff1..55548e756be3 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -13,6 +13,9 @@
     gcloud-java-pom
     0.0.11-SNAPSHOT
   
+  
+    gcloud-java-examples
+  
   
     
       ${project.groupId}
@@ -29,100 +32,6 @@
           false
         
       
-      
-        org.apache.maven.plugins
-        maven-site-plugin
-        3.4
-        
-          true
-          
-            
-              org.apache.maven.plugins
-              maven-changelog-plugin
-              2.3
-            
-            
-              org.apache.maven.plugins
-              maven-project-info-reports-plugin
-              2.8
-              
-                
-                  
-                    index
-                    dependency-info
-                    dependencies
-                    dependency-convergence
-                    project-team
-                    mailing-list
-                    cim
-                    issue-tracking
-                    license
-                    scm
-                    dependency-management
-                    distribution-management
-                    summary
-                    modules
-                  
-                
-              
-              
-                true
-                true
-                true
-                true
-                gcloud-java-examples
-                jar
-              
-            
-            
-              org.apache.maven.plugins
-              maven-dependency-plugin
-              2.10
-            
-            
-              org.apache.maven.plugins
-              maven-javadoc-plugin
-              2.10.3
-              
-                
-                  html
-                  
-                    javadoc
-                  
-                
-              
-              
-                true
-                protected
-                true
-                ${project.build.directory}/javadoc
-              
-            
-            
-              org.apache.maven.plugins
-              maven-surefire-report-plugin
-              2.18.1
-            
-            
-              org.apache.maven.plugins
-              maven-checkstyle-plugin
-              2.16
-              
-                checkstyle.xml
-                false
-              
-            
-            
-              org.codehaus.mojo
-              cobertura-maven-plugin
-              2.7
-              
-                true
-              
-            
-          
-        
-      
     
   
 
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index f682f498da6c..82b67277f4fe 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -13,6 +13,9 @@
     gcloud-java-pom
     0.0.11-SNAPSHOT
   
+  
+    gcloud-java-storage
+  
   
     
       ${project.groupId}
@@ -44,102 +47,4 @@
       test
     
   
-  
-    
-      
-        org.apache.maven.plugins
-        maven-site-plugin
-        3.4
-        
-          true
-          
-            
-              org.apache.maven.plugins
-              maven-changelog-plugin
-              2.3
-            
-            
-              org.apache.maven.plugins
-              maven-project-info-reports-plugin
-              2.8
-              
-                
-                  
-                    index
-                    dependency-info
-                    dependencies
-                    dependency-convergence
-                    project-team
-                    mailing-list
-                    cim
-                    issue-tracking
-                    license
-                    scm
-                    dependency-management
-                    distribution-management
-                    summary
-                    modules
-                  
-                
-              
-              
-                true
-                true
-                true
-                true
-                gcloud-java-storage
-                jar
-              
-            
-            
-              org.apache.maven.plugins
-              maven-dependency-plugin
-              2.10
-            
-            
-              org.apache.maven.plugins
-              maven-javadoc-plugin
-              2.10.3
-              
-                
-                  html
-                  
-                    javadoc
-                  
-                
-              
-              
-                true
-                protected
-                true
-                ${project.build.directory}/javadoc
-              
-            
-            
-              org.apache.maven.plugins
-              maven-surefire-report-plugin
-              2.18.1
-            
-            
-              org.apache.maven.plugins
-              maven-checkstyle-plugin
-              2.16
-              
-                checkstyle.xml
-                false
-              
-            
-            
-              org.codehaus.mojo
-              cobertura-maven-plugin
-              2.7
-              
-                true
-              
-            
-          
-        
-      
-    
-  
 
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index df5f1352881e..6ad0fce8f1b1 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -30,102 +30,4 @@
       ${project.version}
     
   
-  
-    
-      
-        org.apache.maven.plugins
-        maven-site-plugin
-        3.4
-        
-          true
-          
-            
-              org.apache.maven.plugins
-              maven-changelog-plugin
-              2.3
-            
-            
-              org.apache.maven.plugins
-              maven-project-info-reports-plugin
-              2.8
-              
-                
-                  
-                    index
-                    dependency-info
-                    dependencies
-                    dependency-convergence
-                    project-team
-                    mailing-list
-                    cim
-                    issue-tracking
-                    license
-                    scm
-                    dependency-management
-                    distribution-management
-                    summary
-                    modules
-                  
-                
-              
-              
-                true
-                true
-                true
-                true
-                gcloud-java
-                jar
-              
-            
-            
-              org.apache.maven.plugins
-              maven-dependency-plugin
-              2.10
-            
-            
-              org.apache.maven.plugins
-              maven-javadoc-plugin
-              2.10.3
-              
-                
-                  html
-                  
-                    javadoc
-                  
-                
-              
-              
-                true
-                protected
-                true
-                ${project.build.directory}/javadoc
-              
-            
-            
-              org.apache.maven.plugins
-              maven-surefire-report-plugin
-              2.18.1
-            
-            
-              org.apache.maven.plugins
-              maven-checkstyle-plugin
-              2.16
-              
-                checkstyle.xml
-                false
-              
-            
-            
-              org.codehaus.mojo
-              cobertura-maven-plugin
-              2.7
-              
-                true
-              
-            
-          
-        
-      
-    
-  
 
diff --git a/pom.xml b/pom.xml
index 91f88db02c0a..e35a620247d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@
     UTF-8
     UTF-8
     github
+    gcloud-java
   
   
     gcloud-java-core
@@ -332,7 +333,7 @@
                 true
                 true
                 true
-                gcloud-java
+                ${site.installationModule}
                 jar
               
             

From 352e09756f24b339619ea5384db9020299766c6a Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 28 Oct 2015 22:25:42 +0100
Subject: [PATCH 030/322] Refactor CopyWriter, Storage and StorageRpc - remove
 StorageRpc.copy - make CopyWriter.result issue requests until copy completes
 - make RewriteResponse and CopyWriter blobSize isDone and totalBytesCopied
 primitive - rename Storage.RewriteRequest megabytesRewrittenPerCall to
 megabytesCopiedPerChunk - update tests - update StorageExample

---
 .../gcloud/examples/StorageExample.java       |  3 -
 .../google/gcloud/spi/DefaultStorageRpc.java  | 24 -------
 .../com/google/gcloud/spi/StorageRpc.java     | 17 +++--
 .../java/com/google/gcloud/storage/Blob.java  |  4 +-
 .../com/google/gcloud/storage/CopyWriter.java | 63 ++++++++++---------
 .../com/google/gcloud/storage/Storage.java    | 39 ++++++------
 .../google/gcloud/storage/StorageImpl.java    |  2 +-
 .../com/google/gcloud/storage/BlobTest.java   |  6 +-
 .../google/gcloud/storage/CopyWriterTest.java | 31 ++++-----
 .../google/gcloud/storage/ITStorageTest.java  | 20 +++---
 .../gcloud/storage/StorageImplTest.java       | 22 +++----
 11 files changed, 94 insertions(+), 137 deletions(-)

diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index 184c4f3d5e0f..b71a51fe6ac6 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -368,9 +368,6 @@ private static class CopyAction extends StorageAction {
     @Override
     public void run(Storage storage, CopyRequest request) {
       CopyWriter copyWriter = storage.copy(request);
-      while (!copyWriter.isDone()) {
-        copyWriter.copyChunk();
-      }
       System.out.println("Copied " + copyWriter.result());
     }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index c627d65363f6..957fbc90095d 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -321,30 +321,6 @@ public StorageObject compose(Iterable sources, StorageObject targ
     }
   }
 
-  @Override
-  public StorageObject copy(StorageObject source, Map sourceOptions,
-      StorageObject target, Map targetOptions) throws StorageException {
-    try {
-      return storage
-          .objects()
-          .copy(source.getBucket(), source.getName(), target.getBucket(), target.getName(),
-              target.getContentType() != null ? target : null)
-          .setProjection(DEFAULT_PROJECTION)
-          .setIfSourceMetagenerationMatch(IF_SOURCE_METAGENERATION_MATCH.getLong(sourceOptions))
-          .setIfSourceMetagenerationNotMatch(
-              IF_SOURCE_METAGENERATION_NOT_MATCH.getLong(sourceOptions))
-          .setIfSourceGenerationMatch(IF_SOURCE_GENERATION_MATCH.getLong(sourceOptions))
-          .setIfSourceGenerationNotMatch(IF_SOURCE_GENERATION_NOT_MATCH.getLong(sourceOptions))
-          .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(targetOptions))
-          .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(targetOptions))
-          .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(targetOptions))
-          .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(targetOptions))
-          .execute();
-    } catch (IOException ex) {
-      throw translate(ex);
-    }
-  }
-
   @Override
   public byte[] load(StorageObject from, Map options)
       throws StorageException {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
index 1a4afa0524e0..40382a857fca 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
@@ -177,13 +177,13 @@ class RewriteResponse {
 
     public final RewriteRequest rewriteRequest;
     public final StorageObject result;
-    public final Long blobSize;
-    public final Boolean isDone;
+    public final long blobSize;
+    public final boolean isDone;
     public final String rewriteToken;
-    public final Long totalBytesRewritten;
+    public final long totalBytesRewritten;
 
-    public RewriteResponse(RewriteRequest rewriteRequest, StorageObject result, Long blobSize,
-        Boolean isDone, String rewriteToken, Long totalBytesRewritten) {
+    public RewriteResponse(RewriteRequest rewriteRequest, StorageObject result, long blobSize,
+        boolean isDone, String rewriteToken, long totalBytesRewritten) {
       this.rewriteRequest = rewriteRequest;
       this.result = result;
       this.blobSize = blobSize;
@@ -204,9 +204,9 @@ public boolean equals(Object obj) {
       return Objects.equals(this.rewriteRequest, other.rewriteRequest)
           && Objects.equals(this.result, other.result)
           && Objects.equals(this.rewriteToken, other.rewriteToken)
-          && Objects.equals(this.blobSize, other.blobSize)
+          && this.blobSize == other.blobSize
           && Objects.equals(this.isDone, other.isDone)
-          && Objects.equals(this.totalBytesRewritten, other.totalBytesRewritten);
+          && this.totalBytesRewritten == other.totalBytesRewritten;
     }
 
     @Override
@@ -245,9 +245,6 @@ StorageObject patch(StorageObject storageObject, Map options)
   StorageObject compose(Iterable sources, StorageObject target,
       Map targetOptions) throws StorageException;
 
-  StorageObject copy(StorageObject source, Map sourceOptions,
-      StorageObject target, Map targetOptions) throws StorageException;
-
   byte[] load(StorageObject storageObject, Map options)
       throws StorageException;
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index dfd112d39c55..284a7818457c 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -223,7 +223,7 @@ public Blob update(BlobInfo blobInfo, BlobTargetOption... options) {
    * @throws StorageException upon failure
    */
   public CopyWriter copyTo(BlobId targetBlob, BlobSourceOption... options) {
-    BlobInfo updatedInfo = info.toBuilder().blobId(targetBlob).build();
+    BlobInfo updatedInfo = BlobInfo.builder(targetBlob).build();
     CopyRequest copyRequest = CopyRequest.builder().source(info.bucket(), info.name())
         .sourceOptions(convert(info, options)).target(updatedInfo).build();
     return storage.copy(copyRequest);
@@ -266,7 +266,7 @@ public CopyWriter copyTo(String targetBucket, BlobSourceOption... options) {
    * @throws StorageException upon failure
    */
   public CopyWriter copyTo(String targetBucket, String targetBlob, BlobSourceOption... options) {
-    BlobInfo updatedInfo = info.toBuilder().blobId(BlobId.of(targetBucket, targetBlob)).build();
+    BlobInfo updatedInfo = BlobInfo.builder(targetBucket, targetBlob).build();
     CopyRequest copyRequest = CopyRequest.builder().source(info.bucket(), info.name())
         .sourceOptions(convert(info, options)).target(updatedInfo).build();
     return storage.copy(copyRequest);
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
index 916d3c18865f..592cd6e0289a 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
@@ -34,8 +34,8 @@
 /**
  * Google Storage blob copy writer. This class holds the result of a copy request.
  * If source and destination blobs do not share the same location or storage class more than one
- * RPC request is needed to copy the blob. When this is the case {@link #copyChunk()} can be used
- * to copy to destination other chunks of the source blob.
+ * RPC request is needed to copy the blob otherwise one or more {@link #copyChunk()} calls are
+ * necessary to complete the copy.
  *
  * @see Rewrite
  */
@@ -52,31 +52,36 @@ public class CopyWriter implements Restorable {
   }
 
   /**
-   * Returns the updated information for the just written blob when {@link #isDone} is {@code true}.
-   * Returns {@code null} otherwise.
+   * Returns the updated information for the just written blob. This method might block and issue
+   * several RPC requests to complete blob copy.
+   *
+   * @throws StorageException upon failure
    */
   public BlobInfo result() {
-    return rewriteResponse.result != null ? BlobInfo.fromPb(rewriteResponse.result) : null;
+    while(!isDone()) {
+      copyChunk();
+    }
+    return BlobInfo.fromPb(rewriteResponse.result);
   }
 
   /**
    * Size of the blob being copied.
    */
-  public Long blobSize() {
+  public long blobSize() {
     return rewriteResponse.blobSize;
   }
 
   /**
    * Returns {@code true} of blob rewrite finished, {@code false} otherwise.
    */
-  public Boolean isDone() {
+  public boolean isDone() {
     return rewriteResponse.isDone;
   }
 
   /**
    * Returns the number of bytes copied. 
    */
-  public Long totalBytesCopied() {
+  public long totalBytesCopied() {
     return rewriteResponse.totalBytesRewritten;
   }
 
@@ -111,7 +116,7 @@ public RestorableState capture() {
         rewriteResponse.rewriteRequest.targetOptions)
         .blobSize(blobSize())
         .isDone(isDone())
-        .megabytesRewrittenPerCall(rewriteResponse.rewriteRequest.megabytesRewrittenPerCall)
+        .megabytesCopiedPerChunk(rewriteResponse.rewriteRequest.megabytesRewrittenPerCall)
         .rewriteToken(rewriteResponse.rewriteToken)
         .totalBytesRewritten(totalBytesCopied())
         .build();
@@ -127,11 +132,11 @@ static class StateImpl implements RestorableState, Serializable {
     private final BlobInfo target;
     private final Map targetOptions;
     private final BlobInfo result;
-    private final Long blobSize;
-    private final Boolean isDone;
+    private final long blobSize;
+    private final boolean isDone;
     private final String rewriteToken;
-    private final Long totalBytesCopied;
-    private final Long megabytesRewrittenPerCall;
+    private final long totalBytesCopied;
+    private final Long megabytesCopiedPerChunk;
 
     StateImpl(Builder builder) {
       this.serviceOptions = builder.serviceOptions;
@@ -144,7 +149,7 @@ static class StateImpl implements RestorableState, Serializable {
       this.isDone = builder.isDone;
       this.rewriteToken = builder.rewriteToken;
       this.totalBytesCopied = builder.totalBytesCopied;
-      this.megabytesRewrittenPerCall = builder.megabytesRewrittenPerCall;
+      this.megabytesCopiedPerChunk = builder.megabytesCopiedPerChunk;
     }
 
     static class Builder {
@@ -155,11 +160,11 @@ static class Builder {
       private final BlobInfo target;
       private final Map targetOptions;
       private BlobInfo result;
-      private Long blobSize;
-      private Boolean isDone;
+      private long blobSize;
+      private boolean isDone;
       private String rewriteToken;
-      private Long totalBytesCopied;
-      private Long megabytesRewrittenPerCall;
+      private long totalBytesCopied;
+      private Long megabytesCopiedPerChunk;
 
       private Builder(StorageOptions options, BlobId source,
           Map sourceOptions,
@@ -176,12 +181,12 @@ Builder result(BlobInfo result) {
         return this;
       }
 
-      Builder blobSize(Long blobSize) {
+      Builder blobSize(long blobSize) {
         this.blobSize = blobSize;
         return this;
       }
 
-      Builder isDone(Boolean isDone) {
+      Builder isDone(boolean isDone) {
         this.isDone = isDone;
         return this;
       }
@@ -191,13 +196,13 @@ Builder rewriteToken(String rewriteToken) {
         return this;
       }
 
-      Builder totalBytesRewritten(Long totalBytesRewritten) {
+      Builder totalBytesRewritten(long totalBytesRewritten) {
         this.totalBytesCopied = totalBytesRewritten;
         return this;
       }
 
-      Builder megabytesRewrittenPerCall(Long megabytesRewrittenPerCall) {
-        this.megabytesRewrittenPerCall = megabytesRewrittenPerCall;
+      Builder megabytesCopiedPerChunk(Long megabytesCopiedPerChunk) {
+        this.megabytesCopiedPerChunk = megabytesCopiedPerChunk;
         return this;
       }
 
@@ -215,7 +220,7 @@ static Builder builder(StorageOptions options, BlobId source,
     @Override
     public CopyWriter restore() {
       RewriteRequest rewriteRequest = new RewriteRequest(
-          source.toPb(), sourceOptions, target.toPb(), targetOptions, megabytesRewrittenPerCall);
+          source.toPb(), sourceOptions, target.toPb(), targetOptions, megabytesCopiedPerChunk);
       RewriteResponse rewriteResponse = new RewriteResponse(rewriteRequest,
           result != null ? result.toPb() : null, blobSize, isDone, rewriteToken,
           totalBytesCopied);
@@ -225,7 +230,7 @@ public CopyWriter restore() {
     @Override
     public int hashCode() {
       return Objects.hash(serviceOptions, source, sourceOptions, target, targetOptions, result,
-          blobSize, isDone, megabytesRewrittenPerCall, rewriteToken, totalBytesCopied);
+          blobSize, isDone, megabytesCopiedPerChunk, rewriteToken, totalBytesCopied);
     }
 
     @Override
@@ -244,10 +249,10 @@ public boolean equals(Object obj) {
           && Objects.equals(this.targetOptions, other.targetOptions)
           && Objects.equals(this.result, other.result)
           && Objects.equals(this.rewriteToken, other.rewriteToken)
-          && Objects.equals(this.blobSize, other.blobSize)
-          && Objects.equals(this.isDone, other.isDone)
-          && Objects.equals(this.megabytesRewrittenPerCall, other.megabytesRewrittenPerCall)
-          && Objects.equals(this.totalBytesCopied, other.totalBytesCopied);
+          && Objects.equals(this.megabytesCopiedPerChunk, other.megabytesCopiedPerChunk)
+          && this.blobSize == other.blobSize
+          && this.isDone == other.isDone
+          && this.totalBytesCopied == other.totalBytesCopied;
     }
 
     @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 8c505a7826aa..1c65ff82dfaa 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -500,7 +500,7 @@ class CopyRequest implements Serializable {
     private final List sourceOptions;
     private final BlobInfo target;
     private final List targetOptions;
-    private final Long megabytesRewrittenPerCall;
+    private final Long megabytesCopiedPerChunk;
 
     public static class Builder {
 
@@ -508,10 +508,10 @@ public static class Builder {
       private final Set targetOptions = new LinkedHashSet<>();
       private BlobId source;
       private BlobInfo target;
-      private Long megabytesRewrittenPerCall;
+      private Long megabytesCopiedPerChunk;
 
       /**
-       * Sets the blob to rewrite given bucket and blob name.
+       * Sets the blob to copy given bucket and blob name.
        *
        * @return the builder.
        */
@@ -521,7 +521,7 @@ public Builder source(String bucket, String blob) {
       }
 
       /**
-       * Sets the blob to rewrite given a {@link BlobId}.
+       * Sets the blob to copy given a {@link BlobId}.
        *
        * @return the builder.
        */
@@ -551,7 +551,7 @@ public Builder sourceOptions(Iterable options) {
       }
 
       /**
-       * Sets the rewrite target.
+       * Sets the copy target.
        *
        * @return the builder.
        */
@@ -582,18 +582,18 @@ public Builder targetOptions(Iterable options) {
 
       /**
        * Sets the maximum number of megabytes to copy for each RPC call. This parameter is ignored
-       * if source and target blob share the same location and storage class as rewrite is made with
+       * if source and target blob share the same location and storage class as copy is made with
        * one single RPC.
        *
        * @return the builder.
        */
-      public Builder megabytesRewrittenPerCall(Long megabytesRewrittenPerCall) {
-        this.megabytesRewrittenPerCall = megabytesRewrittenPerCall;
+      public Builder megabytesCopiedPerChunk(Long megabytesCopiedPerChunk) {
+        this.megabytesCopiedPerChunk = megabytesCopiedPerChunk;
         return this;
       }
 
       /**
-       * Creates a {@code RewriteRequest}.
+       * Creates a {@code CopyRequest}.
        */
       public CopyRequest build() {
         checkNotNull(source);
@@ -607,7 +607,7 @@ private CopyRequest(Builder builder) {
       sourceOptions = ImmutableList.copyOf(builder.sourceOptions);
       target = checkNotNull(builder.target);
       targetOptions = ImmutableList.copyOf(builder.targetOptions);
-      megabytesRewrittenPerCall = builder.megabytesRewrittenPerCall;
+      megabytesCopiedPerChunk = builder.megabytesCopiedPerChunk;
     }
 
     /**
@@ -640,11 +640,11 @@ public List targetOptions() {
 
     /**
      * Returns the maximum number of megabytes to copy for each RPC call. This parameter is ignored
-     * if source and target blob share the same location and storage class as rewrite is made with
+     * if source and target blob share the same location and storage class as copy is made with
      * one single RPC.
      */
-    public Long megabytesRewrittenPerCall() {
-      return megabytesRewrittenPerCall;
+    public Long megabytesCopiedPerChunk() {
+      return megabytesCopiedPerChunk;
     }
 
     public static CopyRequest of(String sourceBucket, String sourceBlob, BlobInfo target) {
@@ -831,16 +831,13 @@ public static Builder builder() {
   /**
    * Sends a copy request. Returns a {@link CopyWriter} object for the provided
    * {@code CopyRequest}. If source and destination objects share the same location and storage
-   * class the source blob is copied and its information can be accessed with
-   * {@link CopyWriter#result()}, regardless of the {@link CopyRequest#megabytesRewrittenPerCall}
-   * parameter. If source and destination have different location or storage class multiple RPC
-   * calls might be needed depending on blob's size.
+   * class the source blob is copied with one request and {@link CopyWriter#result()} immediately
+   * returns, regardless of the {@link CopyRequest#megabytesCopiedPerChunk} parameter.
+   * If source and destination have different location or storage class {@link CopyWriter#result()}
+   * might issue multiple RPC calls depending on blob's size.
    * 

    * Example usage of copy:
-   * 
    {@code CopyWriter copyWriter = service.copy(copyRequest);}
-   *    {@code while(!copyWriter.isDone()) {
-   *       copyWriter.copyChunk();
-   *   }}
+   * 
    {@code BlobInfo blob = service.copy(copyRequest).result();}
    * 

    *
    * @return a {@link CopyWriter} object that can be used to get information on the newly created
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index a9fdee6705a0..ab85dc8b4609 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -457,7 +457,7 @@ public CopyWriter copy(final CopyRequest copyRequest) {
         @Override
         public RewriteResponse call() {
           return storageRpc.openRewrite(new StorageRpc.RewriteRequest(source, sourceOptions, target,
-              targetOptions, copyRequest.megabytesRewrittenPerCall()));
+              targetOptions, copyRequest.megabytesCopiedPerChunk()));
         }
       }, options().retryParams(), EXCEPTION_HANDLER);
       return new CopyWriter(options(), rewriteResponse);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
index 095937981b7f..defb1d35e3f4 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
@@ -121,7 +121,7 @@ public void testDelete() throws Exception {
 
   @Test
   public void testCopyToBucket() throws Exception {
-    BlobInfo target = BLOB_INFO.toBuilder().blobId(BlobId.of("bt", "n")).build();
+    BlobInfo target = BlobInfo.builder(BlobId.of("bt", "n")).build();
     CopyWriter copyWriter = createMock(CopyWriter.class);
     Capture capturedCopyRequest = Capture.newInstance();
     expect(storage.copy(capture(capturedCopyRequest))).andReturn(copyWriter);
@@ -136,7 +136,7 @@ public void testCopyToBucket() throws Exception {
 
   @Test
   public void testCopyTo() throws Exception {
-    BlobInfo target = BLOB_INFO.toBuilder().blobId(BlobId.of("bt", "nt")).build();
+    BlobInfo target = BlobInfo.builder(BlobId.of("bt", "nt")).build();
     CopyWriter copyWriter = createMock(CopyWriter.class);
     Capture capturedCopyRequest = Capture.newInstance();
     expect(storage.copy(capture(capturedCopyRequest))).andReturn(copyWriter);
@@ -153,7 +153,7 @@ public void testCopyTo() throws Exception {
   public void testCopyToBlobId() throws Exception {
     BlobId targetId = BlobId.of("bt", "nt");
     CopyWriter copyWriter = createMock(CopyWriter.class);
-    BlobInfo target = BLOB_INFO.toBuilder().blobId(targetId).build();
+    BlobInfo target = BLOB_INFO.builder(targetId).build();
     Capture capturedCopyRequest = Capture.newInstance();
     expect(storage.copy(capture(capturedCopyRequest))).andReturn(copyWriter);
     replay(storage);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
index feba88d57118..0fcdb744c244 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
@@ -86,11 +86,10 @@ public void testRewrite() {
     EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE_DONE);
     EasyMock.replay(storageRpcMock);
     copyWriter = new CopyWriter(options, RESPONSE);
-    copyWriter.copyChunk();
-    assertTrue(copyWriter.isDone());
     assertEquals(RESULT, copyWriter.result());
-    assertEquals(new Long(42L), copyWriter.totalBytesCopied());
-    assertEquals(new Long(42L), copyWriter.blobSize());
+    assertTrue(copyWriter.isDone());
+    assertEquals(42L, copyWriter.totalBytesCopied());
+    assertEquals(42L, copyWriter.blobSize());
   }
 
   @Test
@@ -99,16 +98,10 @@ public void testRewriteMultipleRequests() {
     EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE_DONE);
     EasyMock.replay(storageRpcMock);
     copyWriter = new CopyWriter(options, RESPONSE);
-    int loopCount = 0;
-    while (!copyWriter.isDone()) {
-      copyWriter.copyChunk();
-      loopCount++;
-    }
-    assertTrue(copyWriter.isDone());
     assertEquals(RESULT, copyWriter.result());
-    assertEquals(new Long(42L), copyWriter.totalBytesCopied());
-    assertEquals(new Long(42L), copyWriter.blobSize());
-    assertEquals(2, loopCount);
+    assertTrue(copyWriter.isDone());
+    assertEquals(42L, copyWriter.totalBytesCopied());
+    assertEquals(42L, copyWriter.blobSize());
   }
 
   @Test
@@ -119,15 +112,13 @@ public void testSaveAndRestore() throws IOException {
     copyWriter = new CopyWriter(options, RESPONSE);
     copyWriter.copyChunk();
     assertTrue(!copyWriter.isDone());
-    assertEquals(null, copyWriter.result());
-    assertEquals(new Long(21L), copyWriter.totalBytesCopied());
-    assertEquals(new Long(42L), copyWriter.blobSize());
+    assertEquals(21L, copyWriter.totalBytesCopied());
+    assertEquals(42L, copyWriter.blobSize());
     RestorableState rewriterState = copyWriter.capture();
     CopyWriter restoredRewriter = rewriterState.restore();
-    restoredRewriter.copyChunk();
-    assertTrue(restoredRewriter.isDone());
     assertEquals(RESULT, restoredRewriter.result());
-    assertEquals(new Long(42L), restoredRewriter.totalBytesCopied());
-    assertEquals(new Long(42L), restoredRewriter.blobSize());
+    assertTrue(restoredRewriter.isDone());
+    assertEquals(42L, restoredRewriter.totalBytesCopied());
+    assertEquals(42L, restoredRewriter.blobSize());
   }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 612d4c37aa07..408c6e7ed6d6 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -319,13 +319,12 @@ public void testCopyBlob() {
     String sourceBlobName = "test-copy-blob-source";
     BlobId source = BlobId.of(BUCKET, sourceBlobName);
     assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
-    String targetBlobName = "test-rewrite-blob-target";
+    String targetBlobName = "test-copy-blob-target";
     BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
     Storage.CopyRequest req = Storage.CopyRequest.of(source, target);
-    CopyWriter rewriter = storage.copy(req);
-    rewriter.copyChunk();
-    assertTrue(rewriter.isDone());
-    assertEquals(rewriter.result(), storage.get(BUCKET, targetBlobName));
+    CopyWriter copyWriter = storage.copy(req);
+    assertEquals(copyWriter.result(), storage.get(BUCKET, targetBlobName));
+    assertTrue(copyWriter.isDone());
     assertTrue(storage.delete(BUCKET, sourceBlobName));
     assertTrue(storage.delete(BUCKET, targetBlobName));
   }
@@ -335,16 +334,15 @@ public void testCopyBlobUpdateMetadata() {
     String sourceBlobName = "test-copy-blob-update-metadata-source";
     BlobId source = BlobId.of(BUCKET, sourceBlobName);
     assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
-    String targetBlobName = "test-rewrite-blob-target";
+    String targetBlobName = "test-copy-blob-target";
     BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName)
         .contentType(CONTENT_TYPE)
         .metadata(ImmutableMap.of("k", "v"))
         .build();
     Storage.CopyRequest req = Storage.CopyRequest.of(source, target);
-    CopyWriter rewriter = storage.copy(req);
-    rewriter.copyChunk();
-    assertTrue(rewriter.isDone());
-    assertEquals(rewriter.result(), storage.get(BUCKET, targetBlobName));
+    CopyWriter copyWriter = storage.copy(req);
+    assertEquals(copyWriter.result(), storage.get(BUCKET, targetBlobName));
+    assertTrue(copyWriter.isDone());
     assertTrue(storage.delete(BUCKET, sourceBlobName));
     assertTrue(storage.delete(BUCKET, targetBlobName));
   }
@@ -354,7 +352,7 @@ public void testCopyBlobFail() {
     String sourceBlobName = "test-copy-blob-source-fail";
     BlobId source = BlobId.of(BUCKET, sourceBlobName);
     assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
-    String targetBlobName = "test-rewrite-blob-target-fail";
+    String targetBlobName = "test-copy-blob-target-fail";
     BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
     Storage.CopyRequest req = Storage.CopyRequest.builder()
         .source(source)
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 1a99741fa4d0..910d614c64d7 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -600,9 +600,8 @@ public void testCopy() {
     EasyMock.replay(storageRpcMock);
     storage = options.service();
     CopyWriter writer = storage.copy(request);
-    assertNull(writer.result());
-    assertEquals(new Long(42L), writer.blobSize());
-    assertEquals(new Long(21L), writer.totalBytesCopied());
+    assertEquals(42L, writer.blobSize());
+    assertEquals(21L, writer.totalBytesCopied());
     assertTrue(!writer.isDone());
   }
 
@@ -622,9 +621,8 @@ public void testCopyWithOptions() {
     EasyMock.replay(storageRpcMock);
     storage = options.service();
     CopyWriter writer = storage.copy(request);
-    assertNull(writer.result());
-    assertEquals(new Long(42L), writer.blobSize());
-    assertEquals(new Long(21L), writer.totalBytesCopied());
+    assertEquals(42L, writer.blobSize());
+    assertEquals(21L, writer.totalBytesCopied());
     assertTrue(!writer.isDone());
   }
 
@@ -642,15 +640,13 @@ public void testCopyMultipleRequests() {
     EasyMock.replay(storageRpcMock);
     storage = options.service();
     CopyWriter writer = storage.copy(request);
-    assertNull(writer.result());
-    assertEquals(new Long(42L), writer.blobSize());
-    assertEquals(new Long(21L), writer.totalBytesCopied());
+    assertEquals(42L, writer.blobSize());
+    assertEquals(21L, writer.totalBytesCopied());
     assertTrue(!writer.isDone());
-    writer.copyChunk();
-    assertTrue(writer.isDone());
     assertEquals(BLOB_INFO1, writer.result());
-    assertEquals(new Long(42L), writer.totalBytesCopied());
-    assertEquals(new Long(42L), writer.blobSize());
+    assertTrue(writer.isDone());
+    assertEquals(42L, writer.totalBytesCopied());
+    assertEquals(42L, writer.blobSize());
   }
 
   @Test

From 23215a1547449f044b0148b7d37cc4ecb958b83e Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 29 Oct 2015 09:02:41 +0100
Subject: [PATCH 031/322] Better javadoc, check contentType and metadata in
 integrationt tests

---
 .../com/google/gcloud/storage/CopyWriter.java | 23 +++++++++++-------
 .../com/google/gcloud/storage/Storage.java    |  8 +++++++
 .../google/gcloud/storage/ITStorageTest.java  | 24 ++++++++++++++-----
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
index 592cd6e0289a..142f8d4b6de7 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
@@ -32,10 +32,11 @@
 import java.util.concurrent.Callable;
 
 /**
- * Google Storage blob copy writer. This class holds the result of a copy request.
- * If source and destination blobs do not share the same location or storage class more than one
- * RPC request is needed to copy the blob otherwise one or more {@link #copyChunk()} calls are
- * necessary to complete the copy.
+ * Google Storage blob copy writer. This class holds the result of a copy request. If source and
+ * destination blobs share the same location and storage class the copy is completed in one RPC call
+ * otherwise one or more {@link #copyChunk} calls are necessary to complete the copy. In addition,
+ * {@link CopyWriter#result()} can be used to automatically complete the copy and return information
+ * on the newly created blob.
  *
  * @see Rewrite
  */
@@ -52,20 +53,26 @@ public class CopyWriter implements Restorable {
   }
 
   /**
-   * Returns the updated information for the just written blob. This method might block and issue
-   * several RPC requests to complete blob copy.
+   * Returns the updated information for the written blob. Calling this method when {@code isDone()}
+   * is {@code false} will block until all pending chunks are copied.
+   * 

+   * This method has the same effect of doing:
+   * 
    {@code while (!copyWriter.isDone()) {
+   *        copyWriter.copyChunk();
+   *    }}
+   * 

    *
    * @throws StorageException upon failure
    */
   public BlobInfo result() {
-    while(!isDone()) {
+    while (!isDone()) {
       copyChunk();
     }
     return BlobInfo.fromPb(rewriteResponse.result);
   }
 
   /**
-   * Size of the blob being copied.
+   * Returns the size of the blob being copied.
    */
   public long blobSize() {
     return rewriteResponse.blobSize;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 1c65ff82dfaa..98698107a205 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -839,6 +839,14 @@ public static Builder builder() {
    * Example usage of copy:
    * 
    {@code BlobInfo blob = service.copy(copyRequest).result();}
    * 

+   * To explicitly issue chunk copy requests use {@link CopyWriter#copyChunk()} instead:
+   * 
    {@code CopyWriter copyWriter = service.copy(copyRequest);
+   *    while (!copyWriter.isDone()) {
+   *        copyWriter.copyChunk();
+   *    }
+   *    BlobInfo blob = copyWriter.result();
+   * }
+   * 

    *
    * @return a {@link CopyWriter} object that can be used to get information on the newly created
    *     blob or to complete the copy if more than one RPC request is needed
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 408c6e7ed6d6..8957ed2b8364 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -318,12 +318,20 @@ public void testComposeBlobFail() {
   public void testCopyBlob() {
     String sourceBlobName = "test-copy-blob-source";
     BlobId source = BlobId.of(BUCKET, sourceBlobName);
-    assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
+    ImmutableMap metadata = ImmutableMap.of("k", "v");
+    BlobInfo blob = BlobInfo.builder(source)
+        .contentType(CONTENT_TYPE)
+        .metadata(metadata)
+        .build();
+    assertNotNull(storage.create(blob, BLOB_BYTE_CONTENT));
     String targetBlobName = "test-copy-blob-target";
-    BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
+    BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).build();
     Storage.CopyRequest req = Storage.CopyRequest.of(source, target);
     CopyWriter copyWriter = storage.copy(req);
-    assertEquals(copyWriter.result(), storage.get(BUCKET, targetBlobName));
+    assertEquals(BUCKET, copyWriter.result().bucket());
+    assertEquals(targetBlobName, copyWriter.result().name());
+    assertEquals(CONTENT_TYPE, copyWriter.result().contentType());
+    assertEquals(metadata, copyWriter.result().metadata());
     assertTrue(copyWriter.isDone());
     assertTrue(storage.delete(BUCKET, sourceBlobName));
     assertTrue(storage.delete(BUCKET, targetBlobName));
@@ -334,14 +342,18 @@ public void testCopyBlobUpdateMetadata() {
     String sourceBlobName = "test-copy-blob-update-metadata-source";
     BlobId source = BlobId.of(BUCKET, sourceBlobName);
     assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
-    String targetBlobName = "test-copy-blob-target";
+    String targetBlobName = "test-copy-blob-update-metadata-target";
+    ImmutableMap metadata = ImmutableMap.of("k", "v");
     BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName)
         .contentType(CONTENT_TYPE)
-        .metadata(ImmutableMap.of("k", "v"))
+        .metadata(metadata)
         .build();
     Storage.CopyRequest req = Storage.CopyRequest.of(source, target);
     CopyWriter copyWriter = storage.copy(req);
-    assertEquals(copyWriter.result(), storage.get(BUCKET, targetBlobName));
+    assertEquals(BUCKET, copyWriter.result().bucket());
+    assertEquals(targetBlobName, copyWriter.result().name());
+    assertEquals(CONTENT_TYPE, copyWriter.result().contentType());
+    assertEquals(metadata, copyWriter.result().metadata());
     assertTrue(copyWriter.isDone());
     assertTrue(storage.delete(BUCKET, sourceBlobName));
     assertTrue(storage.delete(BUCKET, targetBlobName));

From f0fe56a51fbe05f30d53d37fb2ee4bd4c5417bb9 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 29 Oct 2015 16:19:30 +0100
Subject: [PATCH 032/322] Add applicationName to Options, set user agent
 accordingly in Storage

---
 .../com/google/gcloud/ServiceOptions.java     | 35 +++++++++++++++++++
 .../google/gcloud/spi/DefaultStorageRpc.java  |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index c58a71c8b7ef..1be1f16115ad 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -40,10 +40,14 @@
 import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -56,6 +60,11 @@ public abstract class ServiceOptions<
   private static final String DEFAULT_HOST = "https://www.googleapis.com";
   private static final long serialVersionUID = 1203687993961393350L;
   private static final String PROJECT_ENV_NAME = "GCLOUD_PROJECT";
+  private static final String MANIFEST_ARTIFACT_ID_KEY = "artifactId";
+  private static final String MANIFEST_VERSION_KEY = "Implementation-Version";
+  private static final String ARTIFACT_ID = "gcloud-java-core";
+  private static final String APPLICATION_BASE_NAME = "gcloud-java";
+  private static final String APPLICATION_NAME = getApplicationName();
 
   private final String projectId;
   private final String host;
@@ -522,6 +531,13 @@ public Clock clock() {
     return clock;
   }
 
+  /**
+   * Returns the application's name as a string in the format {@code gcloud-java/[version]}.
+   */
+  public String applicationName() {
+    return APPLICATION_NAME;
+  }
+
   protected int baseHashCode() {
     return Objects.hash(projectId, host, httpTransportFactoryClassName, authCredentialsState,
         retryParams, serviceFactoryClassName, serviceRpcFactoryClassName, connectTimeout,
@@ -568,4 +584,23 @@ private static  T newInstance(String className) throws IOException, ClassNotF
   private static  T getFromServiceLoader(Class clazz, T defaultInstance) {
     return Iterables.getFirst(ServiceLoader.load(clazz), defaultInstance);
   }
+
+  private static String getApplicationName() {
+    String version = null;
+    try {
+      Enumeration resources =
+          ServiceOptions.class.getClassLoader().getResources(JarFile.MANIFEST_NAME);
+      while (resources.hasMoreElements() && version == null) {
+        Manifest manifest = new Manifest(resources.nextElement().openStream());
+        Attributes manifestAttributes = manifest.getMainAttributes();
+        String artifactId = manifestAttributes.getValue(MANIFEST_ARTIFACT_ID_KEY);
+        if (artifactId != null && artifactId.equals(ARTIFACT_ID)) {
+          version = manifestAttributes.getValue(MANIFEST_VERSION_KEY);
+        }
+      }
+    } catch (IOException e) {
+      // ignore
+    }
+    return version != null ? APPLICATION_BASE_NAME + "/" + version : APPLICATION_BASE_NAME;
+  }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 90f2c98ad4b8..349cfbf771cb 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -85,7 +85,7 @@ public DefaultStorageRpc(StorageOptions options) {
     this.options = options;
     storage = new Storage.Builder(transport, new JacksonFactory(), initializer)
         .setRootUrl(options.host())
-        .setApplicationName("gcloud-java")
+        .setApplicationName(options.applicationName())
         .build();
   }
 

From 1410494164840cf434a6619619f917d1fe9dd153 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 29 Oct 2015 19:17:41 +0100
Subject: [PATCH 033/322] Update CopyRequest to check target content type - Add
 CopyRequest.target(BlobId) to add target with no contentType checks - Change
 CopyRequest.target(BlobInfo) to CopyRequest.target(BlobInfo,
 BlobTargetOptions...) - Remove CopyRequest.targetOptions method, options are
 only set with a BlobInfo target - Add new CopyRequest.of methods - Update
 tests and example

---
 .../gcloud/examples/StorageExample.java       |   7 +-
 .../java/com/google/gcloud/storage/Blob.java  |   8 +-
 .../com/google/gcloud/storage/Storage.java    | 108 +++++++++++++--
 .../gcloud/storage/CopyRequestTest.java       | 129 ++++++++++++++++++
 .../google/gcloud/storage/ITStorageTest.java  |   3 +-
 .../gcloud/storage/StorageImplTest.java       |   7 +-
 6 files changed, 236 insertions(+), 26 deletions(-)
 create mode 100644 gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyRequestTest.java

diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index b71a51fe6ac6..fb207023203f 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -376,7 +376,7 @@ CopyRequest parse(String... args) {
       if (args.length != 4) {
         throw new IllegalArgumentException();
       }
-      return CopyRequest.of(args[0], args[1], BlobInfo.builder(args[2], args[3]).build());
+      return CopyRequest.of(args[0], args[1], BlobId.of(args[2], args[3]));
     }
 
     @Override
@@ -544,11 +544,14 @@ public static void main(String... args) throws Exception {
     StorageOptions.Builder optionsBuilder =
         StorageOptions.builder().retryParams(RetryParams.getDefaultInstance());
     StorageAction action;
+    String actionName;
     if (args.length >= 2 && !ACTIONS.containsKey(args[0])) {
+      actionName = args[1];
       optionsBuilder.projectId(args[0]);
       action = ACTIONS.get(args[1]);
       args = Arrays.copyOfRange(args, 2, args.length);
     } else {
+      actionName = args[0];
       action = ACTIONS.get(args[0]);
       args = Arrays.copyOfRange(args, 1, args.length);
     }
@@ -562,7 +565,7 @@ public static void main(String... args) throws Exception {
     try {
       request = action.parse(args);
     } catch (IllegalArgumentException ex) {
-      System.out.println("Invalid input for action '" + args[1] + "'");
+      System.out.println("Invalid input for action '" + actionName + "'");
       System.out.println("Expected: " + action.params());
       return;
     } catch (Exception ex) {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index 284a7818457c..8f988922aad9 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -223,9 +223,8 @@ public Blob update(BlobInfo blobInfo, BlobTargetOption... options) {
    * @throws StorageException upon failure
    */
   public CopyWriter copyTo(BlobId targetBlob, BlobSourceOption... options) {
-    BlobInfo updatedInfo = BlobInfo.builder(targetBlob).build();
     CopyRequest copyRequest = CopyRequest.builder().source(info.bucket(), info.name())
-        .sourceOptions(convert(info, options)).target(updatedInfo).build();
+        .sourceOptions(convert(info, options)).target(targetBlob).build();
     return storage.copy(copyRequest);
   }
 
@@ -266,10 +265,7 @@ public CopyWriter copyTo(String targetBucket, BlobSourceOption... options) {
    * @throws StorageException upon failure
    */
   public CopyWriter copyTo(String targetBucket, String targetBlob, BlobSourceOption... options) {
-    BlobInfo updatedInfo = BlobInfo.builder(targetBucket, targetBlob).build();
-    CopyRequest copyRequest = CopyRequest.builder().source(info.bucket(), info.name())
-        .sourceOptions(convert(info, options)).target(updatedInfo).build();
-    return storage.copy(copyRequest);
+    return copyTo(BlobId.of(targetBucket, targetBlob), options);
   }
 
   /**
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 98698107a205..b35abbea8a88 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -555,27 +555,37 @@ public Builder sourceOptions(Iterable options) {
        *
        * @return the builder.
        */
-      public Builder target(BlobInfo target) {
-        this.target = target;
+      public Builder target(BlobId target) {
+        this.target = BlobInfo.builder(target).build();
         return this;
       }
 
       /**
-       * Sets blob's target options.
+       * Sets the copy target and target options. Copied blob metadata is set to {@code target}.
+       * This method throws an exception if target blob's content type is {@code null}.
        *
        * @return the builder.
+       * @throws IllegalArgumentException if {@code target.contentType} is {@code null}
        */
-      public Builder targetOptions(BlobTargetOption... options) {
+      public Builder target(BlobInfo target, BlobTargetOption... options)
+          throws IllegalArgumentException {
+        checkContentType(target);
+        this.target = target;
         Collections.addAll(targetOptions, options);
         return this;
       }
 
       /**
-       * Sets blob's target options.
+       * Sets the copy target and target options. Copied blob metadata is set to {@code target}.
+       * This method throws an exception if target blob's content type is {@code null}.
        *
        * @return the builder.
+       * @throws IllegalArgumentException if {@code target.contentType} is {@code null}
        */
-      public Builder targetOptions(Iterable options) {
+      public Builder target(BlobInfo target, Iterable options)
+          throws IllegalArgumentException {
+        checkContentType(target);
+        this.target = target;
         Iterables.addAll(targetOptions, options);
         return this;
       }
@@ -647,27 +657,101 @@ public Long megabytesCopiedPerChunk() {
       return megabytesCopiedPerChunk;
     }
 
-    public static CopyRequest of(String sourceBucket, String sourceBlob, BlobInfo target) {
+    /**
+     * Creates a copy request. Copied blob metadata is set to {@code target}. This method throws an
+     * exception if target blob's content type is {@code null}.
+     *
+     * @param sourceBucket name of the bucket containing the source blob
+     * @param sourceBlob name of the source blob
+     * @param target a {@code BlobInfo} object for the target blob
+     * @return a copy request.
+     * @throws IllegalArgumentException if {@code target.contentType} is {@code null}
+     */
+    public static CopyRequest of(String sourceBucket, String sourceBlob, BlobInfo target)
+        throws IllegalArgumentException {
+      checkContentType(target);
       return builder().source(sourceBucket, sourceBlob).target(target).build();
     }
 
-    public static CopyRequest of(BlobId sourceBlobId, BlobInfo target) {
+    /**
+     * Creates a copy request. Copied blob metadata is set to {@code target}. This method throws an
+     * exception if target blob's content type is {@code null}.
+     *
+     * @param sourceBlobId a {@code BlobId} object for the source blob
+     * @param target a {@code BlobInfo} object for the target blob
+     * @return a copy request.
+     * @throws IllegalArgumentException if {@code target.contentType} is {@code null}
+     */
+    public static CopyRequest of(BlobId sourceBlobId, BlobInfo target)
+        throws IllegalArgumentException {
+      checkContentType(target);
       return builder().source(sourceBlobId).target(target).build();
     }
 
+    /**
+     * Creates a copy request.
+     *
+     * @param sourceBucket name of the bucket containing both the source and the target blob
+     * @param sourceBlob name of the source blob
+     * @param targetBlob name of the target blob
+     * @return a copy request.
+     */
     public static CopyRequest of(String sourceBucket, String sourceBlob, String targetBlob) {
-      return of(sourceBucket, sourceBlob,
-          BlobInfo.builder(BlobId.of(sourceBucket, targetBlob)).build());
+      return CopyRequest.builder()
+          .source(sourceBucket, sourceBlob)
+          .target(BlobId.of(sourceBucket, targetBlob))
+          .build();
+    }
+
+    /**
+     * Creates a copy request.
+     *
+     * @param sourceBucket name of the bucket containing the source blob
+     * @param sourceBlob name of the source blob
+     * @param target a {@code BlobId} object for the target blob
+     * @return a copy request.
+     */
+    public static CopyRequest of(String sourceBucket, String sourceBlob, BlobId target) {
+      return builder().source(sourceBucket, sourceBlob).target(target).build();
     }
 
+    /**
+     * Creates a copy request.
+     *
+     * @param sourceBlobId a {@code BlobId} object for the source blob
+     * @param targetBlob name of the target blob, in the same bucket of the source blob
+     * @return a copy request.
+     */
     public static CopyRequest of(BlobId sourceBlobId, String targetBlob) {
-      return of(sourceBlobId,
-          BlobInfo.builder(BlobId.of(sourceBlobId.bucket(), targetBlob)).build());
+      return CopyRequest.builder()
+          .source(sourceBlobId)
+          .target(BlobId.of(sourceBlobId.bucket(), targetBlob))
+          .build();
+    }
+
+    /**
+     * Creates a copy request.
+     *
+     * @param sourceBlobId a {@code BlobId} object for the source blob
+     * @param targetBlobId a {@code BlobId} object for the target blob
+     * @return a copy request.
+     */
+    public static CopyRequest of(BlobId sourceBlobId, BlobId targetBlobId) {
+      return CopyRequest.builder()
+          .source(sourceBlobId)
+          .target(targetBlobId)
+          .build();
     }
 
     public static Builder builder() {
       return new Builder();
     }
+
+    private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentException {
+      if (blobInfo.contentType() == null) {
+        throw new IllegalArgumentException("Blob content type can not be null");
+      }
+    }
   }
 
   /**
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyRequestTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyRequestTest.java
new file mode 100644
index 000000000000..febd74feb095
--- /dev/null
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyRequestTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.storage;
+
+import static com.google.gcloud.storage.Storage.PredefinedAcl.PUBLIC_READ;
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.storage.Storage.BlobSourceOption;
+import com.google.gcloud.storage.Storage.BlobTargetOption;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class CopyRequestTest {
+
+  private static final String SOURCE_BUCKET_NAME = "b0";
+  private static final String SOURCE_BLOB_NAME = "o0";
+  private static final String TARGET_BUCKET_NAME = "b1";
+  private static final String TARGET_BLOB_NAME = "o1";
+  private static final String TARGET_BLOB_CONTENT_TYPE = "contentType";
+  private static final BlobId SOURCE_BLOB_ID = BlobId.of(SOURCE_BUCKET_NAME, SOURCE_BLOB_NAME);
+  private static final BlobId TARGET_BLOB_ID = BlobId.of(TARGET_BUCKET_NAME, TARGET_BLOB_NAME);
+  private static final BlobInfo TARGET_BLOB_INFO = BlobInfo.builder(TARGET_BLOB_ID)
+      .contentType(TARGET_BLOB_CONTENT_TYPE).build();
+
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
+
+  @Test
+  public void testCopyRequest() {
+    Storage.CopyRequest copyRequest1 = Storage.CopyRequest.builder()
+        .source(SOURCE_BLOB_ID)
+        .sourceOptions(BlobSourceOption.generationMatch(1))
+        .target(TARGET_BLOB_INFO, BlobTargetOption.predefinedAcl(PUBLIC_READ))
+        .build();
+    assertEquals(SOURCE_BLOB_ID, copyRequest1.source());
+    assertEquals(1, copyRequest1.sourceOptions().size());
+    assertEquals(BlobSourceOption.generationMatch(1), copyRequest1.sourceOptions().get(0));
+    assertEquals(TARGET_BLOB_INFO, copyRequest1.target());
+    assertEquals(1, copyRequest1.targetOptions().size());
+    assertEquals(BlobTargetOption.predefinedAcl(PUBLIC_READ), copyRequest1.targetOptions().get(0));
+
+    Storage.CopyRequest copyRequest2 = Storage.CopyRequest.builder()
+        .source(SOURCE_BUCKET_NAME, SOURCE_BLOB_NAME)
+        .target(TARGET_BLOB_ID)
+        .build();
+    assertEquals(SOURCE_BLOB_ID, copyRequest2.source());
+    assertEquals(BlobInfo.builder(TARGET_BLOB_ID).build(), copyRequest2.target());
+
+    Storage.CopyRequest copyRequest3 = Storage.CopyRequest.builder()
+        .source(SOURCE_BLOB_ID)
+        .target(TARGET_BLOB_INFO, ImmutableList.of(BlobTargetOption.predefinedAcl(PUBLIC_READ)))
+        .build();
+    assertEquals(SOURCE_BLOB_ID, copyRequest3.source());
+    assertEquals(TARGET_BLOB_INFO, copyRequest3.target());
+    assertEquals(ImmutableList.of(BlobTargetOption.predefinedAcl(PUBLIC_READ)),
+        copyRequest3.targetOptions());
+  }
+
+  @Test
+  public void testCopyRequestOf() {
+    Storage.CopyRequest copyRequest1 = Storage.CopyRequest.of(SOURCE_BLOB_ID, TARGET_BLOB_INFO);
+    assertEquals(SOURCE_BLOB_ID, copyRequest1.source());
+    assertEquals(TARGET_BLOB_INFO, copyRequest1.target());
+
+    Storage.CopyRequest copyRequest2 = Storage.CopyRequest.of(SOURCE_BLOB_ID, TARGET_BLOB_NAME);
+    assertEquals(SOURCE_BLOB_ID, copyRequest2.source());
+    assertEquals(BlobInfo.builder(SOURCE_BUCKET_NAME, TARGET_BLOB_NAME).build(),
+        copyRequest2.target());
+
+    Storage.CopyRequest copyRequest3 =
+        Storage.CopyRequest.of(SOURCE_BUCKET_NAME, SOURCE_BLOB_NAME, TARGET_BLOB_INFO);
+    assertEquals(SOURCE_BLOB_ID, copyRequest3.source());
+    assertEquals(TARGET_BLOB_INFO, copyRequest3.target());
+
+    Storage.CopyRequest copyRequest4 =
+        Storage.CopyRequest.of(SOURCE_BUCKET_NAME, SOURCE_BLOB_NAME, TARGET_BLOB_NAME);
+    assertEquals(SOURCE_BLOB_ID, copyRequest4.source());
+    assertEquals(BlobInfo.builder(SOURCE_BUCKET_NAME, TARGET_BLOB_NAME).build(),
+        copyRequest4.target());
+
+    Storage.CopyRequest copyRequest5 = Storage.CopyRequest.of(SOURCE_BLOB_ID, TARGET_BLOB_ID);
+    assertEquals(SOURCE_BLOB_ID, copyRequest5.source());
+    assertEquals(BlobInfo.builder(TARGET_BLOB_ID).build(), copyRequest5.target());
+
+    Storage.CopyRequest copyRequest6 =
+        Storage.CopyRequest.of(SOURCE_BUCKET_NAME, SOURCE_BLOB_NAME, TARGET_BLOB_ID);
+    assertEquals(SOURCE_BLOB_ID, copyRequest6.source());
+    assertEquals(BlobInfo.builder(TARGET_BLOB_ID).build(), copyRequest6.target());
+  }
+
+  @Test
+  public void testCopyRequestFail() {
+    thrown.expect(IllegalArgumentException.class);
+    Storage.CopyRequest.builder()
+        .source(SOURCE_BLOB_ID)
+        .target(BlobInfo.builder(TARGET_BLOB_ID).build())
+        .build();
+  }
+
+  @Test
+  public void testCopyRequestOfBlobInfoFail() {
+    thrown.expect(IllegalArgumentException.class);
+    Storage.CopyRequest.of(SOURCE_BLOB_ID, BlobInfo.builder(TARGET_BLOB_ID).build());
+  }
+
+  @Test
+  public void testCopyRequestOfStringFail() {
+    thrown.expect(IllegalArgumentException.class);
+    Storage.CopyRequest.of(
+        SOURCE_BUCKET_NAME, SOURCE_BLOB_NAME, BlobInfo.builder(TARGET_BLOB_ID).build());
+  }
+}
\ No newline at end of file
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 8957ed2b8364..3aad7b712e48 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -325,8 +325,7 @@ public void testCopyBlob() {
         .build();
     assertNotNull(storage.create(blob, BLOB_BYTE_CONTENT));
     String targetBlobName = "test-copy-blob-target";
-    BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).build();
-    Storage.CopyRequest req = Storage.CopyRequest.of(source, target);
+    Storage.CopyRequest req = Storage.CopyRequest.of(source, BlobId.of(BUCKET, targetBlobName));
     CopyWriter copyWriter = storage.copy(req);
     assertEquals(BUCKET, copyWriter.result().bucket());
     assertEquals(targetBlobName, copyWriter.result().name());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 910d614c64d7..bdac54bcef2d 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -591,7 +591,7 @@ public void testComposeWithOptions() {
 
   @Test
   public void testCopy() {
-    CopyRequest request = Storage.CopyRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2);
+    CopyRequest request = Storage.CopyRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2.blobId());
     StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
         EMPTY_RPC_OPTIONS, request.target().toPb(), EMPTY_RPC_OPTIONS, null);
     StorageRpc.RewriteResponse rpcResponse = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
@@ -610,8 +610,7 @@ public void testCopyWithOptions() {
     CopyRequest request = Storage.CopyRequest.builder()
         .source(BLOB_INFO2.blobId())
         .sourceOptions(BLOB_SOURCE_GENERATION, BLOB_SOURCE_METAGENERATION)
-        .target(BLOB_INFO1)
-        .targetOptions(BLOB_TARGET_GENERATION, BLOB_TARGET_METAGENERATION)
+        .target(BLOB_INFO1, BLOB_TARGET_GENERATION, BLOB_TARGET_METAGENERATION)
         .build();
     StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
         BLOB_SOURCE_OPTIONS_COPY, request.target().toPb(), BLOB_TARGET_OPTIONS_COMPOSE, null);
@@ -628,7 +627,7 @@ public void testCopyWithOptions() {
 
   @Test
   public void testCopyMultipleRequests() {
-    CopyRequest request = Storage.CopyRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2);
+    CopyRequest request = Storage.CopyRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2.blobId());
     StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
         EMPTY_RPC_OPTIONS, request.target().toPb(), EMPTY_RPC_OPTIONS, null);
     StorageRpc.RewriteResponse rpcResponse1 = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,

From 68b0a3d12ee70b3b6dbd70d60d134518c6c8501a Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 30 Oct 2015 09:20:32 +0100
Subject: [PATCH 034/322] Use checkArgument instead of throw, better javadoc

---
 .../com/google/gcloud/storage/Storage.java    | 34 ++++++++++---------
 .../gcloud/storage/CopyRequestTest.java       |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index b35abbea8a88..9bc971a09dba 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -551,7 +551,7 @@ public Builder sourceOptions(Iterable options) {
       }
 
       /**
-       * Sets the copy target.
+       * Sets the copy target. Target blob information is copied from source.
        *
        * @return the builder.
        */
@@ -561,8 +561,9 @@ public Builder target(BlobId target) {
       }
 
       /**
-       * Sets the copy target and target options. Copied blob metadata is set to {@code target}.
-       * This method throws an exception if target blob's content type is {@code null}.
+       * Sets the copy target and target options. {@code target} parameter is used to override
+       * source blob information (e.g. {@code contentType}, {@code contentLanguage}). {@code
+       * target.contentType} is a required field.
        *
        * @return the builder.
        * @throws IllegalArgumentException if {@code target.contentType} is {@code null}
@@ -576,8 +577,9 @@ public Builder target(BlobInfo target, BlobTargetOption... options)
       }
 
       /**
-       * Sets the copy target and target options. Copied blob metadata is set to {@code target}.
-       * This method throws an exception if target blob's content type is {@code null}.
+       * Sets the copy target and target options. {@code target} parameter is used to override
+       * source blob information (e.g. {@code contentType}, {@code contentLanguage}). {@code
+       * target.contentType} is a required field.
        *
        * @return the builder.
        * @throws IllegalArgumentException if {@code target.contentType} is {@code null}
@@ -658,8 +660,9 @@ public Long megabytesCopiedPerChunk() {
     }
 
     /**
-     * Creates a copy request. Copied blob metadata is set to {@code target}. This method throws an
-     * exception if target blob's content type is {@code null}.
+     * Creates a copy request. {@code target} parameter is used to override source blob information
+     * (e.g. {@code contentType}, {@code contentLanguage}). {@code target.contentType} is a required
+     * field.
      *
      * @param sourceBucket name of the bucket containing the source blob
      * @param sourceBlob name of the source blob
@@ -674,8 +677,9 @@ public static CopyRequest of(String sourceBucket, String sourceBlob, BlobInfo ta
     }
 
     /**
-     * Creates a copy request. Copied blob metadata is set to {@code target}. This method throws an
-     * exception if target blob's content type is {@code null}.
+     * Creates a copy request. {@code target} parameter is used to override source blob information
+     * (e.g. {@code contentType}, {@code contentLanguage}). {@code target.contentType} is a required
+     * field.
      *
      * @param sourceBlobId a {@code BlobId} object for the source blob
      * @param target a {@code BlobInfo} object for the target blob
@@ -689,7 +693,7 @@ public static CopyRequest of(BlobId sourceBlobId, BlobInfo target)
     }
 
     /**
-     * Creates a copy request.
+     * Creates a copy request. Target blob information is copied from source.
      *
      * @param sourceBucket name of the bucket containing both the source and the target blob
      * @param sourceBlob name of the source blob
@@ -704,7 +708,7 @@ public static CopyRequest of(String sourceBucket, String sourceBlob, String targ
     }
 
     /**
-     * Creates a copy request.
+     * Creates a copy request. Target blob information is copied from source.
      *
      * @param sourceBucket name of the bucket containing the source blob
      * @param sourceBlob name of the source blob
@@ -716,7 +720,7 @@ public static CopyRequest of(String sourceBucket, String sourceBlob, BlobId targ
     }
 
     /**
-     * Creates a copy request.
+     * Creates a copy request. Target blob information is copied from source.
      *
      * @param sourceBlobId a {@code BlobId} object for the source blob
      * @param targetBlob name of the target blob, in the same bucket of the source blob
@@ -730,7 +734,7 @@ public static CopyRequest of(BlobId sourceBlobId, String targetBlob) {
     }
 
     /**
-     * Creates a copy request.
+     * Creates a copy request. Target blob information is copied from source.
      *
      * @param sourceBlobId a {@code BlobId} object for the source blob
      * @param targetBlobId a {@code BlobId} object for the target blob
@@ -748,9 +752,7 @@ public static Builder builder() {
     }
 
     private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentException {
-      if (blobInfo.contentType() == null) {
-        throw new IllegalArgumentException("Blob content type can not be null");
-      }
+      checkArgument(blobInfo.contentType() != null, "Blob content type can not be null");
     }
   }
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyRequestTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyRequestTest.java
index febd74feb095..b7e8d14e53a1 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyRequestTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyRequestTest.java
@@ -126,4 +126,4 @@ public void testCopyRequestOfStringFail() {
     Storage.CopyRequest.of(
         SOURCE_BUCKET_NAME, SOURCE_BLOB_NAME, BlobInfo.builder(TARGET_BLOB_ID).build());
   }
-}
\ No newline at end of file
+}

From ea36a9e62f6179c557f7f788c37189f9aa3c107d Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 3 Nov 2015 18:06:36 +0100
Subject: [PATCH 035/322] Rename ListResult and move to core module

---
 .../main/java/com/google/gcloud/BasePage.java | 16 +++----
 .../src/main/java/com/google/gcloud/Page.java | 10 ++---
 .../java/com/google/gcloud/BasePageTest.java  | 17 ++++----
 .../{BlobListResult.java => BlobPage.java}    | 17 ++++----
 .../com/google/gcloud/storage/Bucket.java     |  5 ++-
 .../com/google/gcloud/storage/Storage.java    |  5 ++-
 .../google/gcloud/storage/StorageImpl.java    | 20 +++++----
 ...bListResultTest.java => BlobPageTest.java} | 30 +++++++------
 .../com/google/gcloud/storage/BucketTest.java | 14 +++---
 .../gcloud/storage/RemoteGcsHelperTest.java   | 13 +++---
 .../gcloud/storage/SerializationTest.java     |  5 ++-
 .../gcloud/storage/StorageImplTest.java       | 43 +++++++++----------
 12 files changed, 103 insertions(+), 92 deletions(-)
 rename gcloud-java-storage/src/main/java/com/google/gcloud/storage/BaseListResult.java => gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java (79%)
 rename gcloud-java-storage/src/main/java/com/google/gcloud/storage/ListResult.java => gcloud-java-core/src/main/java/com/google/gcloud/Page.java (75%)
 rename gcloud-java-storage/src/test/java/com/google/gcloud/storage/BaseListResultTest.java => gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java (69%)
 rename gcloud-java-storage/src/main/java/com/google/gcloud/storage/{BlobListResult.java => BlobPage.java} (79%)
 rename gcloud-java-storage/src/test/java/com/google/gcloud/storage/{BlobListResultTest.java => BlobPageTest.java} (77%)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BaseListResult.java b/gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java
similarity index 79%
rename from gcloud-java-storage/src/main/java/com/google/gcloud/storage/BaseListResult.java
rename to gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java
index fdcd84705555..ce62b334a785 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BaseListResult.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.storage;
+package com.google.gcloud;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -22,9 +22,9 @@
 import java.util.Objects;
 
 /**
- * Base implementation for Google Cloud storage list result.
+ * Base implementation for Google Cloud paginated results.
  */
-public class BaseListResult implements ListResult, Serializable {
+public class BasePage implements Page, Serializable {
 
   private static final long serialVersionUID = -6937287874908527950L;
 
@@ -33,10 +33,10 @@ public class BaseListResult implements ListResult, Se
   private final NextPageFetcher pageFetcher;
 
   public interface NextPageFetcher extends Serializable {
-    ListResult nextPage();
+    Page nextPage();
   }
 
-  public BaseListResult(NextPageFetcher pageFetcher, String cursor, Iterable results) {
+  public BasePage(NextPageFetcher pageFetcher, String cursor, Iterable results) {
     this.pageFetcher = pageFetcher;
     this.cursor = cursor;
     this.results = results;
@@ -48,7 +48,7 @@ public String nextPageCursor() {
   }
 
   @Override
-  public ListResult nextPage() {
+  public Page nextPage() {
     if (cursor == null || pageFetcher == null) {
       return null;
     }
@@ -67,10 +67,10 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (!(obj instanceof BaseListResult)) {
+    if (!(obj instanceof BasePage)) {
       return false;
     }
-    BaseListResult other = (BaseListResult) obj;
+    BasePage other = (BasePage) obj;
     return Objects.equals(cursor, other.cursor)
         && Objects.equals(results, other.results);
   }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/ListResult.java b/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
similarity index 75%
rename from gcloud-java-storage/src/main/java/com/google/gcloud/storage/ListResult.java
rename to gcloud-java-core/src/main/java/com/google/gcloud/Page.java
index 62b1f442310c..21d465bb79f9 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/ListResult.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.storage;
+package com.google.gcloud;
 
 /**
- * Interface for Google Cloud storage list result.
+ * Interface for Google Cloud paginated results.
  */
-public interface ListResult extends Iterable {
+public interface Page extends Iterable {
 
   /**
    * Returns the cursor for the nextPage or {@code null} if no more results.
@@ -27,8 +27,8 @@ public interface ListResult extends Iterable {
   String nextPageCursor();
 
   /**
-   * Returns the results of the nextPage or {@code null} if no more result.
+   * Returns the next page of results or {@code null} if no more result.
    */
-  ListResult nextPage();
+  Page nextPage();
 
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BaseListResultTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java
similarity index 69%
rename from gcloud-java-storage/src/test/java/com/google/gcloud/storage/BaseListResultTest.java
rename to gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java
index 4c22edbc35c8..888d7ace7ab0 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BaseListResultTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java
@@ -14,31 +14,32 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.storage;
+package com.google.gcloud;
 
 import static org.junit.Assert.assertEquals;
 
 import com.google.common.collect.ImmutableList;
+import com.google.gcloud.BasePage;
 
 import org.junit.Test;
 
 import java.util.Collections;
 
-public class BaseListResultTest {
+public class BasePageTest {
 
   @Test
-  public void testListResult() throws Exception {
+  public void testPage() throws Exception {
     ImmutableList values = ImmutableList.of("1", "2");
-    final BaseListResult nextResult =
-        new BaseListResult<>(null, "c", Collections.emptyList());
-    BaseListResult.NextPageFetcher fetcher = new BaseListResult.NextPageFetcher() {
+    final BasePage nextResult =
+        new BasePage<>(null, "c", Collections.emptyList());
+    BasePage.NextPageFetcher fetcher = new BasePage.NextPageFetcher() {
 
       @Override
-      public BaseListResult nextPage() {
+      public BasePage nextPage() {
         return nextResult;
       }
     };
-    BaseListResult result = new BaseListResult<>(fetcher, "c", values);
+    BasePage result = new BasePage<>(fetcher, "c", values);
     assertEquals(nextResult, result.nextPage());
     assertEquals("c", result.nextPageCursor());
     assertEquals(values, ImmutableList.copyOf(result.iterator()));
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobListResult.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobPage.java
similarity index 79%
rename from gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobListResult.java
rename to gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobPage.java
index 9e6ec9dc5655..1090fdc99bcc 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobListResult.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobPage.java
@@ -20,6 +20,7 @@
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterators;
+import com.google.gcloud.Page;
 
 import java.util.Iterator;
 import java.util.Objects;
@@ -27,12 +28,12 @@
 /**
  * Implementation of a paginated list of Google Cloud storage {@code Blob}.
  */
-public class BlobListResult implements ListResult {
+public class BlobPage implements Page {
 
-  private final ListResult infoList;
+  private final Page infoList;
   private final Storage storage;
 
-  public BlobListResult(Storage storage, ListResult infoList) {
+  public BlobPage(Storage storage, Page infoList) {
     this.storage = checkNotNull(storage);
     this.infoList = checkNotNull(infoList);
   }
@@ -43,12 +44,12 @@ public String nextPageCursor() {
   }
 
   @Override
-  public ListResult nextPage() {
-    ListResult nextPageInfoList = infoList.nextPage();
+  public Page nextPage() {
+    Page nextPageInfoList = infoList.nextPage();
     if (nextPageInfoList == null) {
       return null;
     }
-    return new BlobListResult(storage, nextPageInfoList);
+    return new BlobPage(storage, nextPageInfoList);
   }
 
   @Override
@@ -68,10 +69,10 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (!(obj instanceof BlobListResult)) {
+    if (!(obj instanceof BlobPage)) {
       return false;
     }
-    BlobListResult other = (BlobListResult) obj;
+    BlobPage other = (BlobPage) obj;
     return Objects.equals(infoList, other.infoList);
   }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 8d696dc2ab6b..95e5b36133cf 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -20,6 +20,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.base.MoreObjects;
+import com.google.gcloud.Page;
 import com.google.gcloud.storage.Storage.BlobSourceOption;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
 import com.google.gcloud.storage.Storage.BlobWriteOption;
@@ -134,8 +135,8 @@ public boolean delete(BucketSourceOption... options) {
    * @param options options for listing blobs
    * @throws StorageException upon failure
    */
-  public ListResult list(Storage.BlobListOption... options) {
-    return new BlobListResult(storage, storage.list(info.name(), options));
+  public Page list(Storage.BlobListOption... options) {
+    return new BlobPage(storage, storage.list(info.name(), options));
   }
 
   /**
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 9bc971a09dba..2fd4df0cc6ba 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -24,6 +24,7 @@
 import com.google.common.collect.Lists;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.Service;
+import com.google.gcloud.Page;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 
@@ -827,14 +828,14 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    *
    * @throws StorageException upon failure
    */
-  ListResult list(BucketListOption... options);
+  Page list(BucketListOption... options);
 
   /**
    * List the bucket's blobs.
    *
    * @throws StorageException upon failure
    */
-  ListResult list(String bucket, BlobListOption... options);
+  Page list(String bucket, BlobListOption... options);
 
   /**
    * Update bucket information.
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index ab85dc8b4609..422dfc0e4f4a 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -44,10 +44,12 @@
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.Ints;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
+import com.google.gcloud.BasePage;
 import com.google.gcloud.BaseService;
 import com.google.gcloud.ExceptionHandler;
 import com.google.gcloud.ExceptionHandler.Interceptor;
 import com.google.gcloud.RetryHelper.RetryHelperException;
+import com.google.gcloud.Page;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.RewriteResponse;
 import com.google.gcloud.spi.StorageRpc.Tuple;
@@ -224,7 +226,7 @@ public BlobInfo get(BlobId blob) {
   }
 
   private abstract static class BasePageFetcher
-      implements BaseListResult.NextPageFetcher {
+      implements BasePage.NextPageFetcher {
 
     private static final long serialVersionUID = 8236329004030295223L;
     protected final Map requestOptions;
@@ -256,7 +258,7 @@ private static class BucketPageFetcher extends BasePageFetcher {
     }
 
     @Override
-    public ListResult nextPage() {
+    public Page nextPage() {
       return listBuckets(serviceOptions, requestOptions);
     }
   }
@@ -273,17 +275,17 @@ private static class BlobPageFetcher extends BasePageFetcher {
     }
 
     @Override
-    public ListResult nextPage() {
+    public Page nextPage() {
       return listBlobs(bucket, serviceOptions, requestOptions);
     }
   }
 
   @Override
-  public ListResult list(BucketListOption... options) {
+  public Page list(BucketListOption... options) {
     return listBuckets(options(), optionMap(options));
   }
 
-  private static ListResult listBuckets(final StorageOptions serviceOptions,
+  private static Page listBuckets(final StorageOptions serviceOptions,
       final Map optionsMap) {
     try {
       Tuple> result = runWithRetries(
@@ -302,7 +304,7 @@ public BucketInfo apply(com.google.api.services.storage.model.Bucket bucketPb) {
                   return BucketInfo.fromPb(bucketPb);
                 }
               });
-      return new BaseListResult<>(new BucketPageFetcher(serviceOptions, cursor, optionsMap), cursor,
+      return new BasePage<>(new BucketPageFetcher(serviceOptions, cursor, optionsMap), cursor,
           buckets);
     } catch (RetryHelperException e) {
       throw StorageException.translateAndThrow(e);
@@ -310,11 +312,11 @@ public BucketInfo apply(com.google.api.services.storage.model.Bucket bucketPb) {
   }
 
   @Override
-  public ListResult list(final String bucket, BlobListOption... options) {
+  public Page list(final String bucket, BlobListOption... options) {
     return listBlobs(bucket, options(), optionMap(options));
   }
 
-  private static ListResult listBlobs(final String bucket,
+  private static Page listBlobs(final String bucket,
       final StorageOptions serviceOptions, final Map optionsMap) {
     try {
       Tuple> result = runWithRetries(
@@ -333,7 +335,7 @@ public BlobInfo apply(StorageObject storageObject) {
                   return BlobInfo.fromPb(storageObject);
                 }
               });
-      return new BaseListResult<>(new BlobPageFetcher(bucket, serviceOptions, cursor, optionsMap),
+      return new BasePage<>(new BlobPageFetcher(bucket, serviceOptions, cursor, optionsMap),
           cursor,
           blobs);
     } catch (RetryHelperException e) {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobListResultTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobPageTest.java
similarity index 77%
rename from gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobListResultTest.java
rename to gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobPageTest.java
index 615213ab1516..68ddaf9c550f 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobListResultTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobPageTest.java
@@ -24,13 +24,15 @@
 import static org.junit.Assert.assertFalse;
 
 import com.google.common.collect.ImmutableList;
+import com.google.gcloud.BasePage;
+import com.google.gcloud.Page;
 
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Iterator;
 
-public class BlobListResultTest {
+public class BlobPageTest {
 
   private static final Iterable FIRST_PAGE_RESULTS = ImmutableList.of(
       BlobInfo.builder("b1", "n1").build(),
@@ -40,29 +42,29 @@ public class BlobListResultTest {
       BlobInfo.builder("b1", "n1").build(),
       BlobInfo.builder("b2", "n2").build());
 
-  private BaseListResult firstPage;
-  private BaseListResult secondPage;
+  private BasePage firstPage;
+  private BasePage secondPage;
   private Storage storage;
-  private BlobListResult blobListResult;
+  private BlobPage blobPage;
 
   @Before
   public void setUp() throws Exception {
-    firstPage = createStrictMock(BaseListResult.class);
-    secondPage = createStrictMock(BaseListResult.class);
+    firstPage = createStrictMock(BasePage.class);
+    secondPage = createStrictMock(BasePage.class);
     storage = createStrictMock(Storage.class);
-    blobListResult = new BlobListResult(storage, firstPage);
+    blobPage = new BlobPage(storage, firstPage);
   }
 
   @Test
-  public void testListResult() throws Exception {
+  public void testPage() throws Exception {
     expect(firstPage.iterator()).andReturn(FIRST_PAGE_RESULTS.iterator());
     replay(firstPage);
     Iterator firstPageIterator = FIRST_PAGE_RESULTS.iterator();
-    Iterator blobListIterator = blobListResult.iterator();
-    while (blobListIterator.hasNext() && firstPageIterator.hasNext()) {
-      assertEquals(firstPageIterator.next(), blobListIterator.next().info());
+    Iterator pageIterator = blobPage.iterator();
+    while (pageIterator.hasNext() && firstPageIterator.hasNext()) {
+      assertEquals(firstPageIterator.next(), pageIterator.next().info());
     }
-    assertFalse(blobListIterator.hasNext());
+    assertFalse(pageIterator.hasNext());
     assertFalse(firstPageIterator.hasNext());
     verify(firstPage);
   }
@@ -71,7 +73,7 @@ public void testListResult() throws Exception {
   public void testCursor() throws Exception {
     expect(firstPage.nextPageCursor()).andReturn("c");
     replay(firstPage);
-    assertEquals("c", blobListResult.nextPageCursor());
+    assertEquals("c", blobPage.nextPageCursor());
     verify(firstPage);
   }
 
@@ -81,7 +83,7 @@ public void testNextPage() throws Exception {
     expect(secondPage.iterator()).andReturn(SECOND_PAGE_RESULTS.iterator());
     replay(firstPage);
     replay(secondPage);
-    ListResult nextPageResult = blobListResult.nextPage();
+    Page nextPageResult = blobPage.nextPage();
     Iterator secondPageIterator = SECOND_PAGE_RESULTS.iterator();
     Iterator blobListIterator = nextPageResult.iterator();
     while (blobListIterator.hasNext() && secondPageIterator.hasNext()) {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
index 370850a5b6d4..89e59084c67d 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -27,6 +27,8 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
+import com.google.gcloud.BasePage;
+import com.google.gcloud.Page;
 import com.google.gcloud.storage.BatchResponse.Result;
 
 import org.easymock.Capture;
@@ -114,18 +116,18 @@ public void testDelete() throws Exception {
 
   @Test
   public void testList() throws Exception {
-    BaseListResult blobInfoResult = new BaseListResult<>(null, "c", BLOB_INFO_RESULTS);
-    expect(storage.list(BUCKET_INFO.name())).andReturn(blobInfoResult);
+    BasePage blobInfoPage = new BasePage<>(null, "c", BLOB_INFO_RESULTS);
+    expect(storage.list(BUCKET_INFO.name())).andReturn(blobInfoPage);
     replay(storage);
-    ListResult blobResult = bucket.list();
-    Iterator blobInfoIterator = blobInfoResult.iterator();
-    Iterator blobIterator = blobResult.iterator();
+    Page blobPage = bucket.list();
+    Iterator blobInfoIterator = blobInfoPage.iterator();
+    Iterator blobIterator = blobPage.iterator();
     while (blobInfoIterator.hasNext() && blobIterator.hasNext()) {
       assertEquals(blobInfoIterator.next(), blobIterator.next().info());
     }
     assertFalse(blobInfoIterator.hasNext());
     assertFalse(blobIterator.hasNext());
-    assertEquals(blobInfoResult.nextPageCursor(), blobResult.nextPageCursor());
+    assertEquals(blobInfoPage.nextPageCursor(), blobPage.nextPageCursor());
   }
 
   @Test
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
index 329767e85d4a..91a646b1e11b 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
+import com.google.gcloud.Page;
 import com.google.gcloud.storage.testing.RemoteGcsHelper;
 
 import org.easymock.EasyMock;
@@ -74,15 +75,15 @@ public class RemoteGcsHelperTest {
       BlobInfo.builder(BUCKET_NAME, "n2").build());
   private static final StorageException RETRYABLE_EXCEPTION = new StorageException(409, "", true);
   private static final StorageException FATAL_EXCEPTION = new StorageException(500, "", false);
-  private static final ListResult BLOB_LIST_RESULT = new ListResult() {
+  private static final Page BLOB_PAGE = new Page() {
 
     @Override
     public String nextPageCursor() {
-      return "listResult";
+      return "nextPageCursor";
     }
 
     @Override
-    public ListResult nextPage() {
+    public Page nextPage() {
       return null;
     }
 
@@ -106,7 +107,7 @@ public static void beforeClass() {
   @Test
   public void testForceDelete() throws InterruptedException, ExecutionException {
     Storage storageMock = EasyMock.createMock(Storage.class);
-    EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_LIST_RESULT);
+    EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_PAGE);
     for (BlobInfo info : BLOB_LIST) {
       EasyMock.expect(storageMock.delete(BUCKET_NAME, info.name())).andReturn(true);
     }
@@ -119,7 +120,7 @@ public void testForceDelete() throws InterruptedException, ExecutionException {
   @Test
   public void testForceDeleteTimeout() throws InterruptedException, ExecutionException {
     Storage storageMock = EasyMock.createMock(Storage.class);
-    EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_LIST_RESULT).anyTimes();
+    EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_PAGE).anyTimes();
     for (BlobInfo info : BLOB_LIST) {
       EasyMock.expect(storageMock.delete(BUCKET_NAME, info.name())).andReturn(true).anyTimes();
     }
@@ -132,7 +133,7 @@ public void testForceDeleteTimeout() throws InterruptedException, ExecutionExcep
   @Test
   public void testForceDeleteFail() throws InterruptedException, ExecutionException {
     Storage storageMock = EasyMock.createMock(Storage.class);
-    EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_LIST_RESULT);
+    EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_PAGE);
     for (BlobInfo info : BLOB_LIST) {
       EasyMock.expect(storageMock.delete(BUCKET_NAME, info.name())).andReturn(true);
     }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index 4c22170bba80..0239a2bf0326 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -21,6 +21,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.AuthCredentials;
+import com.google.gcloud.BasePage;
 import com.google.gcloud.RestorableState;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc;
@@ -54,7 +55,7 @@ public class SerializationTest {
       Collections.singletonList(BatchResponse.Result.of(true)),
       Collections.>emptyList(),
       Collections.>emptyList());
-  private static final BaseListResult LIST_RESULT = new BaseListResult<>(
+  private static final BasePage PAGE_RESULT = new BasePage<>(
       null, "c", Collections.singletonList(BlobInfo.builder("b", "n").build()));
   private static final Storage.BlobListOption BLOB_LIST_OPTIONS =
       Storage.BlobListOption.maxResults(100);
@@ -93,7 +94,7 @@ public void testServiceOptions() throws Exception {
   public void testModelAndRequests() throws Exception {
     Serializable[] objects = {ACL_DOMAIN, ACL_GROUP, ACL_PROJECT_, ACL_USER, ACL_RAW, BLOB_INFO,
         BUCKET_INFO,
-        ORIGIN, CORS, BATCH_REQUEST, BATCH_RESPONSE, LIST_RESULT, BLOB_LIST_OPTIONS,
+        ORIGIN, CORS, BATCH_REQUEST, BATCH_RESPONSE, PAGE_RESULT, BLOB_LIST_OPTIONS,
         BLOB_SOURCE_OPTIONS, BLOB_TARGET_OPTIONS, BUCKET_LIST_OPTIONS, BUCKET_SOURCE_OPTIONS,
         BUCKET_TARGET_OPTIONS};
     for (Serializable obj : objects) {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index bdac54bcef2d..a1284ae5c67f 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -35,6 +35,7 @@
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.ServiceOptions;
+import com.google.gcloud.Page;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 import com.google.gcloud.spi.StorageRpcFactory;
@@ -400,9 +401,9 @@ public void testListBuckets() {
     EasyMock.expect(storageRpcMock.list(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    ListResult listResult = storage.list();
-    assertEquals(cursor, listResult.nextPageCursor());
-    assertArrayEquals(bucketList.toArray(), Iterables.toArray(listResult, BucketInfo.class));
+    Page page = storage.list();
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(bucketList.toArray(), Iterables.toArray(page, BucketInfo.class));
   }
 
   @Test
@@ -411,10 +412,10 @@ public void testListBucketsEmpty() {
         Tuple.>of(null, null));
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    ListResult listResult = storage.list();
-    assertNull(listResult.nextPageCursor());
+    Page page = storage.list();
+    assertNull(page.nextPageCursor());
     assertArrayEquals(ImmutableList.of().toArray(),
-        Iterables.toArray(listResult, BucketInfo.class));
+        Iterables.toArray(page, BucketInfo.class));
   }
 
   @Test
@@ -426,9 +427,9 @@ public void testListBucketsWithOptions() {
     EasyMock.expect(storageRpcMock.list(BUCKET_LIST_OPTIONS)).andReturn(result);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    ListResult listResult = storage.list(BUCKET_LIST_MAX_RESULT, BUCKET_LIST_PREFIX);
-    assertEquals(cursor, listResult.nextPageCursor());
-    assertArrayEquals(bucketList.toArray(), Iterables.toArray(listResult, BucketInfo.class));
+    Page page = storage.list(BUCKET_LIST_MAX_RESULT, BUCKET_LIST_PREFIX);
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(bucketList.toArray(), Iterables.toArray(page, BucketInfo.class));
   }
 
   @Test
@@ -440,22 +441,21 @@ public void testListBlobs() {
     EasyMock.expect(storageRpcMock.list(BUCKET_NAME1, EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    ListResult listResult = storage.list(BUCKET_NAME1);
-    assertEquals(cursor, listResult.nextPageCursor());
-    assertArrayEquals(blobList.toArray(), Iterables.toArray(listResult, BlobInfo.class));
+    Page page = storage.list(BUCKET_NAME1);
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(blobList.toArray(), Iterables.toArray(page, BlobInfo.class));
   }
 
   @Test
   public void testListBlobsEmpty() {
     EasyMock.expect(storageRpcMock.list(BUCKET_NAME1, EMPTY_RPC_OPTIONS))
-        .andReturn(
-            Tuple.>of(null,
-                null));
+        .andReturn(Tuple.>of(
+            null, null));
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    ListResult listResult = storage.list(BUCKET_NAME1);
-    assertNull(listResult.nextPageCursor());
-    assertArrayEquals(ImmutableList.of().toArray(), Iterables.toArray(listResult, BlobInfo.class));
+    Page page = storage.list(BUCKET_NAME1);
+    assertNull(page.nextPageCursor());
+    assertArrayEquals(ImmutableList.of().toArray(), Iterables.toArray(page, BlobInfo.class));
   }
 
   @Test
@@ -467,10 +467,9 @@ public void testListBlobsWithOptions() {
     EasyMock.expect(storageRpcMock.list(BUCKET_NAME1, BLOB_LIST_OPTIONS)).andReturn(result);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    ListResult listResult =
-        storage.list(BUCKET_NAME1, BLOB_LIST_MAX_RESULT, BLOB_LIST_PREFIX);
-    assertEquals(cursor, listResult.nextPageCursor());
-    assertArrayEquals(blobList.toArray(), Iterables.toArray(listResult, BlobInfo.class));
+    Page page = storage.list(BUCKET_NAME1, BLOB_LIST_MAX_RESULT, BLOB_LIST_PREFIX);
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(blobList.toArray(), Iterables.toArray(page, BlobInfo.class));
   }
 
   @Test

From 6753c541b99e947d0af13b6e4d88ce65cd65a4c7 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 4 Nov 2015 12:04:01 +0100
Subject: [PATCH 036/322] Remove implements Serializable from BasePage and
 implements Iterable from Page - Add values() method to page, to return
 results - Add javadoc to BasePage to highlight that Iterable must be
 serializable - Delete BlobPage and BlobPageTest classes - Add BlobPageFetcher
 and LazyBlobIterable to Bucket class - Implement Bucket.list using BasePage,
 BlobPageFetcher and LazyBlobIterable - Update StorageExaple to iterate
 through pages

---
 .../main/java/com/google/gcloud/BasePage.java | 21 ++--
 .../src/main/java/com/google/gcloud/Page.java | 19 +++-
 .../java/com/google/gcloud/BasePageTest.java  |  4 +-
 .../gcloud/examples/StorageExample.java       | 17 +++-
 .../com/google/gcloud/storage/BlobPage.java   | 78 ---------------
 .../com/google/gcloud/storage/Bucket.java     | 79 ++++++++++++++-
 .../storage/testing/RemoteGcsHelper.java      |  2 +-
 .../google/gcloud/storage/BlobPageTest.java   | 97 -------------------
 .../com/google/gcloud/storage/BucketTest.java | 10 +-
 .../google/gcloud/storage/ITStorageTest.java  |  4 +-
 .../gcloud/storage/RemoteGcsHelperTest.java   |  5 +-
 .../gcloud/storage/StorageImplTest.java       | 13 +--
 12 files changed, 140 insertions(+), 209 deletions(-)
 delete mode 100644 gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobPage.java
 delete mode 100644 gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobPageTest.java

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java b/gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java
index ce62b334a785..f041b5cf5d59 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java
@@ -18,30 +18,38 @@
 
 import java.io.Serializable;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.Objects;
 
 /**
  * Base implementation for Google Cloud paginated results.
  */
-public class BasePage implements Page, Serializable {
+public class BasePage implements Page, Serializable {
 
-  private static final long serialVersionUID = -6937287874908527950L;
+  private static final long serialVersionUID = 3914827379823557934L;
 
   private final String cursor;
   private final Iterable results;
   private final NextPageFetcher pageFetcher;
 
-  public interface NextPageFetcher extends Serializable {
+  public interface NextPageFetcher extends Serializable {
     Page nextPage();
   }
 
+  /**
+   * Creates a {@code BasePage} object. In order for the object to be serializable the {@code
+   * results} parameter must be serializable.
+   */
   public BasePage(NextPageFetcher pageFetcher, String cursor, Iterable results) {
     this.pageFetcher = pageFetcher;
     this.cursor = cursor;
     this.results = results;
   }
 
+  @Override
+  public Iterable values() {
+    return results == null ? Collections.EMPTY_LIST : results;
+  }
+
   @Override
   public String nextPageCursor() {
     return cursor;
@@ -55,11 +63,6 @@ public Page nextPage() {
     return pageFetcher.nextPage();
   }
 
-  @Override
-  public Iterator iterator() {
-    return results == null ? Collections.emptyIterator() : results.iterator();
-  }
-
   @Override
   public int hashCode() {
     return Objects.hash(cursor, results);
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Page.java b/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
index 21d465bb79f9..1b7754562716 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
@@ -18,8 +18,25 @@
 
 /**
  * Interface for Google Cloud paginated results.
+ *
+ * 

+ * A typical {@code Page} usage:
+ * 
 {@code
+ * Page page = ...; // get a Page instance
+ * while (page != null) {
+ *   for (T value : page.values()) {
+ *     // do something with value
+ *   }
+ *   page = page.nextPage();
+ * }
+ * }

  */
-public interface Page extends Iterable {
+public interface Page {
+
+  /**
+   * Returns the values contained in this page.
+   */
+  Iterable values();
 
   /**
    * Returns the cursor for the nextPage or {@code null} if no more results.
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java
index 888d7ace7ab0..06e7c6167559 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java
@@ -19,7 +19,6 @@
 import static org.junit.Assert.assertEquals;
 
 import com.google.common.collect.ImmutableList;
-import com.google.gcloud.BasePage;
 
 import org.junit.Test;
 
@@ -42,7 +41,6 @@ public BasePage nextPage() {
     BasePage result = new BasePage<>(fetcher, "c", values);
     assertEquals(nextResult, result.nextPage());
     assertEquals("c", result.nextPageCursor());
-    assertEquals(values, ImmutableList.copyOf(result.iterator()));
-
+    assertEquals(values, ImmutableList.copyOf(result.values().iterator()));
   }
 }
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index fb207023203f..7cf7fe2454fc 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -18,6 +18,7 @@
 
 import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
+import com.google.gcloud.Page;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 import com.google.gcloud.storage.Blob;
@@ -213,8 +214,12 @@ String parse(String... args) {
     public void run(Storage storage, String bucketName) {
       if (bucketName == null) {
         // list buckets
-        for (BucketInfo b : storage.list()) {
-          System.out.println(b);
+        Page bucketPage = storage.list();
+        while (bucketPage != null) {
+          for (BucketInfo b : bucketPage.values()) {
+            System.out.println(b);
+          }
+          bucketPage = bucketPage.nextPage();
         }
       } else {
         // list a bucket's blobs
@@ -223,8 +228,12 @@ public void run(Storage storage, String bucketName) {
           System.out.println("No such bucket");
           return;
         }
-        for (Blob b : bucket.list()) {
-          System.out.println(b.info());
+        Page blobPage = bucket.list();
+        while (blobPage != null) {
+          for (Blob b : blobPage.values()) {
+            System.out.println(b.info());
+          }
+          blobPage = blobPage.nextPage();
         }
       }
     }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobPage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobPage.java
deleted file mode 100644
index 1090fdc99bcc..000000000000
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobPage.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.storage;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterators;
-import com.google.gcloud.Page;
-
-import java.util.Iterator;
-import java.util.Objects;
-
-/**
- * Implementation of a paginated list of Google Cloud storage {@code Blob}.
- */
-public class BlobPage implements Page {
-
-  private final Page infoList;
-  private final Storage storage;
-
-  public BlobPage(Storage storage, Page infoList) {
-    this.storage = checkNotNull(storage);
-    this.infoList = checkNotNull(infoList);
-  }
-
-  @Override
-  public String nextPageCursor() {
-    return infoList.nextPageCursor();
-  }
-
-  @Override
-  public Page nextPage() {
-    Page nextPageInfoList = infoList.nextPage();
-    if (nextPageInfoList == null) {
-      return null;
-    }
-    return new BlobPage(storage, nextPageInfoList);
-  }
-
-  @Override
-  public Iterator iterator() {
-    return Iterators.transform(infoList.iterator(), new Function() {
-      @Override
-      public Blob apply(BlobInfo info) {
-        return new Blob(storage, info);
-      }
-    });
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(infoList);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (!(obj instanceof BlobPage)) {
-      return false;
-    }
-    BlobPage other = (BlobPage) obj;
-    return Objects.equals(infoList, other.infoList);
-  }
-}
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 95e5b36133cf..2b366dd7c8b0 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -19,17 +19,24 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
+import com.google.common.collect.Iterators;
+import com.google.gcloud.BasePage;
 import com.google.gcloud.Page;
 import com.google.gcloud.storage.Storage.BlobSourceOption;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
 import com.google.gcloud.storage.Storage.BlobWriteOption;
 import com.google.gcloud.storage.Storage.BucketSourceOption;
 import com.google.gcloud.storage.Storage.BucketTargetOption;
-import java.io.InputStream;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 
@@ -47,6 +54,71 @@ public final class Bucket {
   private final Storage storage;
   private final BucketInfo info;
 
+  private static class BlobPageFetcher implements BasePage.NextPageFetcher {
+
+    private static final long serialVersionUID = 3221100177471323801L;
+
+    private final StorageOptions options;
+    private final Page infoPage;
+
+    BlobPageFetcher(StorageOptions options, Page infoPage) {
+      this.options = options;
+      this.infoPage = infoPage;
+    }
+
+    @Override
+    public Page nextPage() {
+      Page nextInfoPage = infoPage.nextPage();
+      return new BasePage(new BlobPageFetcher(options, nextInfoPage),
+          nextInfoPage.nextPageCursor(), new LazyBlobIterable(options, nextInfoPage.values()));
+    }
+  }
+
+  private static class LazyBlobIterable implements Iterable, Serializable {
+
+    private static final long serialVersionUID = -3092290247725378832L;
+
+    private final StorageOptions options;
+    private Iterable infoIterable;
+    private transient Storage storage;
+
+    public LazyBlobIterable(StorageOptions options, Iterable infoIterable) {
+      this.options = options;
+      this.infoIterable = infoIterable;
+      this.storage = options.service();
+    }
+
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+      in.defaultReadObject();
+      this.storage = options.service();
+    }
+
+    @Override
+    public Iterator iterator() {
+      return Iterators.transform(infoIterable.iterator(), new Function() {
+        @Override
+        public Blob apply(BlobInfo blobInfo) {
+          return new Blob(storage, blobInfo);
+        }
+      });
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(options, infoIterable);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (!(obj instanceof LazyBlobIterable)) {
+        return false;
+      }
+      LazyBlobIterable other = (LazyBlobIterable) obj;
+      return Objects.equals(options, other.options)
+          && Objects.equals(infoIterable, other.infoIterable);
+    }
+  }
+
   /**
    * Constructs a {@code Bucket} object for the provided {@code BucketInfo}. The storage service is
    * used to issue requests.
@@ -136,7 +208,10 @@ public boolean delete(BucketSourceOption... options) {
    * @throws StorageException upon failure
    */
   public Page list(Storage.BlobListOption... options) {
-    return new BlobPage(storage, storage.list(info.name(), options));
+    Page infoPage = storage.list(info.name(), options);
+    StorageOptions storageOptions = storage.options();
+    return new BasePage(new BlobPageFetcher(storageOptions, infoPage),
+        infoPage.nextPageCursor(), new LazyBlobIterable(storageOptions, infoPage.values()));
   }
 
   /**
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
index 6ad655db8670..b15768cffa98 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
@@ -195,7 +195,7 @@ public DeleteBucketTask(Storage storage, String bucket) {
     @Override
     public Boolean call() throws Exception {
       while (true) {
-        for (BlobInfo info : storage.list(bucket)) {
+        for (BlobInfo info : storage.list(bucket).values()) {
           storage.delete(bucket, info.name());
         }
         try {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobPageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobPageTest.java
deleted file mode 100644
index 68ddaf9c550f..000000000000
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobPageTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.storage;
-
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import com.google.common.collect.ImmutableList;
-import com.google.gcloud.BasePage;
-import com.google.gcloud.Page;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Iterator;
-
-public class BlobPageTest {
-
-  private static final Iterable FIRST_PAGE_RESULTS = ImmutableList.of(
-      BlobInfo.builder("b1", "n1").build(),
-      BlobInfo.builder("b2", "n2").build());
-
-  private static final Iterable SECOND_PAGE_RESULTS = ImmutableList.of(
-      BlobInfo.builder("b1", "n1").build(),
-      BlobInfo.builder("b2", "n2").build());
-
-  private BasePage firstPage;
-  private BasePage secondPage;
-  private Storage storage;
-  private BlobPage blobPage;
-
-  @Before
-  public void setUp() throws Exception {
-    firstPage = createStrictMock(BasePage.class);
-    secondPage = createStrictMock(BasePage.class);
-    storage = createStrictMock(Storage.class);
-    blobPage = new BlobPage(storage, firstPage);
-  }
-
-  @Test
-  public void testPage() throws Exception {
-    expect(firstPage.iterator()).andReturn(FIRST_PAGE_RESULTS.iterator());
-    replay(firstPage);
-    Iterator firstPageIterator = FIRST_PAGE_RESULTS.iterator();
-    Iterator pageIterator = blobPage.iterator();
-    while (pageIterator.hasNext() && firstPageIterator.hasNext()) {
-      assertEquals(firstPageIterator.next(), pageIterator.next().info());
-    }
-    assertFalse(pageIterator.hasNext());
-    assertFalse(firstPageIterator.hasNext());
-    verify(firstPage);
-  }
-
-  @Test
-  public void testCursor() throws Exception {
-    expect(firstPage.nextPageCursor()).andReturn("c");
-    replay(firstPage);
-    assertEquals("c", blobPage.nextPageCursor());
-    verify(firstPage);
-  }
-
-  @Test
-  public void testNextPage() throws Exception {
-    expect(firstPage.nextPage()).andReturn(secondPage);
-    expect(secondPage.iterator()).andReturn(SECOND_PAGE_RESULTS.iterator());
-    replay(firstPage);
-    replay(secondPage);
-    Page nextPageResult = blobPage.nextPage();
-    Iterator secondPageIterator = SECOND_PAGE_RESULTS.iterator();
-    Iterator blobListIterator = nextPageResult.iterator();
-    while (blobListIterator.hasNext() && secondPageIterator.hasNext()) {
-      assertEquals(secondPageIterator.next(), blobListIterator.next().info());
-    }
-    assertFalse(blobListIterator.hasNext());
-    assertFalse(secondPageIterator.hasNext());
-    verify(firstPage);
-    verify(secondPage);
-  }
-}
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
index 89e59084c67d..b6fbb09bbb4f 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -116,18 +116,22 @@ public void testDelete() throws Exception {
 
   @Test
   public void testList() throws Exception {
+    StorageOptions storageOptions = createStrictMock(StorageOptions.class);
     BasePage blobInfoPage = new BasePage<>(null, "c", BLOB_INFO_RESULTS);
     expect(storage.list(BUCKET_INFO.name())).andReturn(blobInfoPage);
-    replay(storage);
+    expect(storage.options()).andReturn(storageOptions);
+    expect(storageOptions.service()).andReturn(storage);
+    replay(storage, storageOptions);
     Page blobPage = bucket.list();
-    Iterator blobInfoIterator = blobInfoPage.iterator();
-    Iterator blobIterator = blobPage.iterator();
+    Iterator blobInfoIterator = blobInfoPage.values().iterator();
+    Iterator blobIterator = blobPage.values().iterator();
     while (blobInfoIterator.hasNext() && blobIterator.hasNext()) {
       assertEquals(blobInfoIterator.next(), blobIterator.next().info());
     }
     assertFalse(blobInfoIterator.hasNext());
     assertFalse(blobIterator.hasNext());
     assertEquals(blobInfoPage.nextPageCursor(), blobPage.nextPageCursor());
+    verify(storageOptions);
   }
 
   @Test
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 3aad7b712e48..d15e07dfeff7 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -81,10 +81,10 @@ public static void afterClass()
   @Test(timeout = 5000)
   public void testListBuckets() throws InterruptedException {
     Iterator bucketIterator =
-        storage.list(Storage.BucketListOption.prefix(BUCKET)).iterator();
+        storage.list(Storage.BucketListOption.prefix(BUCKET)).values().iterator();
     while (!bucketIterator.hasNext()) {
       Thread.sleep(500);
-      bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET)).iterator();
+      bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET)).values().iterator();
     }
     while (bucketIterator.hasNext()) {
       assertTrue(bucketIterator.next().name().startsWith(BUCKET));
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
index 91a646b1e11b..ff6fd68fd1eb 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
@@ -33,7 +33,6 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -88,8 +87,8 @@ public Page nextPage() {
     }
 
     @Override
-    public Iterator iterator() {
-      return BLOB_LIST.iterator();
+    public Iterable values() {
+      return BLOB_LIST;
     }
   };
   private static String keyPath = "/does/not/exist/key." + UUID.randomUUID().toString() + ".json";
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index a1284ae5c67f..6c77b4fcfc99 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -403,7 +403,7 @@ public void testListBuckets() {
     storage = options.service();
     Page page = storage.list();
     assertEquals(cursor, page.nextPageCursor());
-    assertArrayEquals(bucketList.toArray(), Iterables.toArray(page, BucketInfo.class));
+    assertArrayEquals(bucketList.toArray(), Iterables.toArray(page.values(), BucketInfo.class));
   }
 
   @Test
@@ -415,7 +415,7 @@ public void testListBucketsEmpty() {
     Page page = storage.list();
     assertNull(page.nextPageCursor());
     assertArrayEquals(ImmutableList.of().toArray(),
-        Iterables.toArray(page, BucketInfo.class));
+        Iterables.toArray(page.values(), BucketInfo.class));
   }
 
   @Test
@@ -429,7 +429,7 @@ public void testListBucketsWithOptions() {
     storage = options.service();
     Page page = storage.list(BUCKET_LIST_MAX_RESULT, BUCKET_LIST_PREFIX);
     assertEquals(cursor, page.nextPageCursor());
-    assertArrayEquals(bucketList.toArray(), Iterables.toArray(page, BucketInfo.class));
+    assertArrayEquals(bucketList.toArray(), Iterables.toArray(page.values(), BucketInfo.class));
   }
 
   @Test
@@ -443,7 +443,7 @@ public void testListBlobs() {
     storage = options.service();
     Page page = storage.list(BUCKET_NAME1);
     assertEquals(cursor, page.nextPageCursor());
-    assertArrayEquals(blobList.toArray(), Iterables.toArray(page, BlobInfo.class));
+    assertArrayEquals(blobList.toArray(), Iterables.toArray(page.values(), BlobInfo.class));
   }
 
   @Test
@@ -455,7 +455,8 @@ public void testListBlobsEmpty() {
     storage = options.service();
     Page page = storage.list(BUCKET_NAME1);
     assertNull(page.nextPageCursor());
-    assertArrayEquals(ImmutableList.of().toArray(), Iterables.toArray(page, BlobInfo.class));
+    assertArrayEquals(ImmutableList.of().toArray(),
+        Iterables.toArray(page.values(), BlobInfo.class));
   }
 
   @Test
@@ -469,7 +470,7 @@ public void testListBlobsWithOptions() {
     storage = options.service();
     Page page = storage.list(BUCKET_NAME1, BLOB_LIST_MAX_RESULT, BLOB_LIST_PREFIX);
     assertEquals(cursor, page.nextPageCursor());
-    assertArrayEquals(blobList.toArray(), Iterables.toArray(page, BlobInfo.class));
+    assertArrayEquals(blobList.toArray(), Iterables.toArray(page.values(), BlobInfo.class));
   }
 
   @Test

From 104bf41e1c6ff76f36816d2e9b8b75cfe5db8f5c Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 4 Nov 2015 19:36:50 +0100
Subject: [PATCH 037/322] Rename BasePage to PageImpl

---
 .../google/gcloud/{BasePage.java => PageImpl.java}   | 10 +++++-----
 .../gcloud/{BasePageTest.java => PageImplTest.java}  | 12 ++++++------
 .../main/java/com/google/gcloud/storage/Bucket.java  |  8 ++++----
 .../java/com/google/gcloud/storage/StorageImpl.java  |  8 ++++----
 .../java/com/google/gcloud/storage/BucketTest.java   |  4 ++--
 .../com/google/gcloud/storage/SerializationTest.java |  4 ++--
 6 files changed, 23 insertions(+), 23 deletions(-)
 rename gcloud-java-core/src/main/java/com/google/gcloud/{BasePage.java => PageImpl.java} (87%)
 rename gcloud-java-core/src/test/java/com/google/gcloud/{BasePageTest.java => PageImplTest.java} (79%)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
similarity index 87%
rename from gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java
rename to gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
index f041b5cf5d59..3925079c8d4b 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BasePage.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -23,7 +23,7 @@
 /**
  * Base implementation for Google Cloud paginated results.
  */
-public class BasePage implements Page, Serializable {
+public class PageImpl implements Page, Serializable {
 
   private static final long serialVersionUID = 3914827379823557934L;
 
@@ -36,10 +36,10 @@ public interface NextPageFetcher extends Serializable {
   }
 
   /**
-   * Creates a {@code BasePage} object. In order for the object to be serializable the {@code
+   * Creates a {@code PageImpl} object. In order for the object to be serializable the {@code
    * results} parameter must be serializable.
    */
-  public BasePage(NextPageFetcher pageFetcher, String cursor, Iterable results) {
+  public PageImpl(NextPageFetcher pageFetcher, String cursor, Iterable results) {
     this.pageFetcher = pageFetcher;
     this.cursor = cursor;
     this.results = results;
@@ -70,10 +70,10 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (!(obj instanceof BasePage)) {
+    if (!(obj instanceof PageImpl)) {
       return false;
     }
-    BasePage other = (BasePage) obj;
+    PageImpl other = (PageImpl) obj;
     return Objects.equals(cursor, other.cursor)
         && Objects.equals(results, other.results);
   }
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java
similarity index 79%
rename from gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java
rename to gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java
index 06e7c6167559..78aa3feaa281 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/BasePageTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java
@@ -24,21 +24,21 @@
 
 import java.util.Collections;
 
-public class BasePageTest {
+public class PageImplTest {
 
   @Test
   public void testPage() throws Exception {
     ImmutableList values = ImmutableList.of("1", "2");
-    final BasePage nextResult =
-        new BasePage<>(null, "c", Collections.emptyList());
-    BasePage.NextPageFetcher fetcher = new BasePage.NextPageFetcher() {
+    final PageImpl nextResult =
+        new PageImpl<>(null, "c", Collections.emptyList());
+    PageImpl.NextPageFetcher fetcher = new PageImpl.NextPageFetcher() {
 
       @Override
-      public BasePage nextPage() {
+      public PageImpl nextPage() {
         return nextResult;
       }
     };
-    BasePage result = new BasePage<>(fetcher, "c", values);
+    PageImpl result = new PageImpl<>(fetcher, "c", values);
     assertEquals(nextResult, result.nextPage());
     assertEquals("c", result.nextPageCursor());
     assertEquals(values, ImmutableList.copyOf(result.values().iterator()));
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 2b366dd7c8b0..fe149a84ccc8 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -22,7 +22,7 @@
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Iterators;
-import com.google.gcloud.BasePage;
+import com.google.gcloud.PageImpl;
 import com.google.gcloud.Page;
 import com.google.gcloud.storage.Storage.BlobSourceOption;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
@@ -54,7 +54,7 @@ public final class Bucket {
   private final Storage storage;
   private final BucketInfo info;
 
-  private static class BlobPageFetcher implements BasePage.NextPageFetcher {
+  private static class BlobPageFetcher implements PageImpl.NextPageFetcher {
 
     private static final long serialVersionUID = 3221100177471323801L;
 
@@ -69,7 +69,7 @@ private static class BlobPageFetcher implements BasePage.NextPageFetcher {
     @Override
     public Page nextPage() {
       Page nextInfoPage = infoPage.nextPage();
-      return new BasePage(new BlobPageFetcher(options, nextInfoPage),
+      return new PageImpl(new BlobPageFetcher(options, nextInfoPage),
           nextInfoPage.nextPageCursor(), new LazyBlobIterable(options, nextInfoPage.values()));
     }
   }
@@ -210,7 +210,7 @@ public boolean delete(BucketSourceOption... options) {
   public Page list(Storage.BlobListOption... options) {
     Page infoPage = storage.list(info.name(), options);
     StorageOptions storageOptions = storage.options();
-    return new BasePage(new BlobPageFetcher(storageOptions, infoPage),
+    return new PageImpl(new BlobPageFetcher(storageOptions, infoPage),
         infoPage.nextPageCursor(), new LazyBlobIterable(storageOptions, infoPage.values()));
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 422dfc0e4f4a..d1e85368fecb 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -44,7 +44,7 @@
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.Ints;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
-import com.google.gcloud.BasePage;
+import com.google.gcloud.PageImpl;
 import com.google.gcloud.BaseService;
 import com.google.gcloud.ExceptionHandler;
 import com.google.gcloud.ExceptionHandler.Interceptor;
@@ -226,7 +226,7 @@ public BlobInfo get(BlobId blob) {
   }
 
   private abstract static class BasePageFetcher
-      implements BasePage.NextPageFetcher {
+      implements PageImpl.NextPageFetcher {
 
     private static final long serialVersionUID = 8236329004030295223L;
     protected final Map requestOptions;
@@ -304,7 +304,7 @@ public BucketInfo apply(com.google.api.services.storage.model.Bucket bucketPb) {
                   return BucketInfo.fromPb(bucketPb);
                 }
               });
-      return new BasePage<>(new BucketPageFetcher(serviceOptions, cursor, optionsMap), cursor,
+      return new PageImpl<>(new BucketPageFetcher(serviceOptions, cursor, optionsMap), cursor,
           buckets);
     } catch (RetryHelperException e) {
       throw StorageException.translateAndThrow(e);
@@ -335,7 +335,7 @@ public BlobInfo apply(StorageObject storageObject) {
                   return BlobInfo.fromPb(storageObject);
                 }
               });
-      return new BasePage<>(new BlobPageFetcher(bucket, serviceOptions, cursor, optionsMap),
+      return new PageImpl<>(new BlobPageFetcher(bucket, serviceOptions, cursor, optionsMap),
           cursor,
           blobs);
     } catch (RetryHelperException e) {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
index b6fbb09bbb4f..decac7b1e0d2 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -27,7 +27,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
-import com.google.gcloud.BasePage;
+import com.google.gcloud.PageImpl;
 import com.google.gcloud.Page;
 import com.google.gcloud.storage.BatchResponse.Result;
 
@@ -117,7 +117,7 @@ public void testDelete() throws Exception {
   @Test
   public void testList() throws Exception {
     StorageOptions storageOptions = createStrictMock(StorageOptions.class);
-    BasePage blobInfoPage = new BasePage<>(null, "c", BLOB_INFO_RESULTS);
+    PageImpl blobInfoPage = new PageImpl<>(null, "c", BLOB_INFO_RESULTS);
     expect(storage.list(BUCKET_INFO.name())).andReturn(blobInfoPage);
     expect(storage.options()).andReturn(storageOptions);
     expect(storageOptions.service()).andReturn(storage);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index 0239a2bf0326..a125a64df6d6 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -21,7 +21,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.AuthCredentials;
-import com.google.gcloud.BasePage;
+import com.google.gcloud.PageImpl;
 import com.google.gcloud.RestorableState;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc;
@@ -55,7 +55,7 @@ public class SerializationTest {
       Collections.singletonList(BatchResponse.Result.of(true)),
       Collections.>emptyList(),
       Collections.>emptyList());
-  private static final BasePage PAGE_RESULT = new BasePage<>(
+  private static final PageImpl PAGE_RESULT = new PageImpl<>(
       null, "c", Collections.singletonList(BlobInfo.builder("b", "n").build()));
   private static final Storage.BlobListOption BLOB_LIST_OPTIONS =
       Storage.BlobListOption.maxResults(100);

From 26471e6c30b19e19671cc73a2ea6c593a91b57ea Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 4 Nov 2015 20:49:45 +0100
Subject: [PATCH 038/322] Use diamond operator instead of explicit type param
 for PageImpl

---
 .../src/main/java/com/google/gcloud/storage/Bucket.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index fe149a84ccc8..1f696d07ac33 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -210,8 +210,8 @@ public boolean delete(BucketSourceOption... options) {
   public Page list(Storage.BlobListOption... options) {
     Page infoPage = storage.list(info.name(), options);
     StorageOptions storageOptions = storage.options();
-    return new PageImpl(new BlobPageFetcher(storageOptions, infoPage),
-        infoPage.nextPageCursor(), new LazyBlobIterable(storageOptions, infoPage.values()));
+    return new PageImpl<>(new BlobPageFetcher(storageOptions, infoPage), infoPage.nextPageCursor(),
+        new LazyBlobIterable(storageOptions, infoPage.values()));
   }
 
   /**

From deecc14fe1015d7f3e62323da57471f9d7dd8ec1 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 2 Nov 2015 13:40:39 +0100
Subject: [PATCH 039/322] Add support for selected fields to blob get and list
 - Add AclField and BlobField classes to Storage - Add BlobGetOption class to
 Storage that supports the .fields option - Use BlobGetOption in Storage.get
 instead of BlobSourceOption - Add .fields option to BlobListOption - Updated
 Blob.exists to use selected fields - Use BlobGetOption in BatchRequest.toGet
 instead of BlobSourceOption - Add unit and integration tests for selected
 fields

---
 .../google/gcloud/spi/DefaultStorageRpc.java  |   5 +-
 .../com/google/gcloud/spi/StorageRpc.java     |   3 +-
 .../google/gcloud/storage/BatchRequest.java   |  11 +-
 .../java/com/google/gcloud/storage/Blob.java  |  33 ++-
 .../com/google/gcloud/storage/Bucket.java     |   4 +-
 .../com/google/gcloud/storage/Storage.java    | 261 +++++++++++++++++-
 .../google/gcloud/storage/StorageImpl.java    |   8 +-
 .../gcloud/storage/BatchRequestTest.java      |  11 +-
 .../com/google/gcloud/storage/BlobTest.java   |   8 +-
 .../com/google/gcloud/storage/BucketTest.java |   2 +-
 .../google/gcloud/storage/ITStorageTest.java  |  83 +++++-
 .../gcloud/storage/StorageImplTest.java       | 121 +++++++-
 12 files changed, 519 insertions(+), 31 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 70cad8c7773e..29552d5121e5 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -15,6 +15,7 @@
 package com.google.gcloud.spi;
 
 import static com.google.gcloud.spi.StorageRpc.Option.DELIMITER;
+import static com.google.gcloud.spi.StorageRpc.Option.FIELDS;
 import static com.google.gcloud.spi.StorageRpc.Option.IF_GENERATION_MATCH;
 import static com.google.gcloud.spi.StorageRpc.Option.IF_GENERATION_NOT_MATCH;
 import static com.google.gcloud.spi.StorageRpc.Option.IF_METAGENERATION_MATCH;
@@ -168,6 +169,7 @@ public Tuple> list(String bucket, Map
           .setPrefix(PREFIX.getString(options))
           .setMaxResults(MAX_RESULTS.getLong(options))
           .setPageToken(PAGE_TOKEN.getString(options))
+          .setFields(FIELDS.getString(options))
           .execute();
       return Tuple.>of(
           objects.getNextPageToken(), objects.getItems());
@@ -207,7 +209,8 @@ private Storage.Objects.Get getRequest(StorageObject object, Map opti
         .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(options))
         .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(options))
         .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(options))
-        .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(options));
+        .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(options))
+        .setFields(FIELDS.getString(options));
   }
 
   @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
index 40382a857fca..e4b1be785951 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
@@ -47,7 +47,8 @@ enum Option {
     MAX_RESULTS("maxResults"),
     PAGE_TOKEN("pageToken"),
     DELIMITER("delimiter"),
-    VERSIONS("versions");
+    VERSIONS("versions"),
+    FIELDS("fields");
 
     private final String value;
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java
index 6e815648497a..bf77c731754e 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java
@@ -18,6 +18,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+import com.google.gcloud.storage.Storage.BlobGetOption;
 import com.google.gcloud.storage.Storage.BlobSourceOption;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
 
@@ -35,13 +36,13 @@ public final class BatchRequest implements Serializable {
 
   private final Map> toDelete;
   private final Map> toUpdate;
-  private final Map> toGet;
+  private final Map> toGet;
 
   public static class Builder {
 
     private Map> toDelete = new LinkedHashMap<>();
     private Map> toUpdate = new LinkedHashMap<>();
-    private Map> toGet = new LinkedHashMap<>();
+    private Map> toGet = new LinkedHashMap<>();
 
     private Builder() {}
 
@@ -72,7 +73,7 @@ public Builder update(BlobInfo blobInfo, BlobTargetOption... options) {
     /**
      * Retrieve metadata for the given blob.
      */
-    public Builder get(String bucket, String blob, BlobSourceOption... options) {
+    public Builder get(String bucket, String blob, BlobGetOption... options) {
       toGet.put(BlobId.of(bucket, blob), Lists.newArrayList(options));
       return this;
     }
@@ -80,7 +81,7 @@ public Builder get(String bucket, String blob, BlobSourceOption... options) {
     /**
      * Retrieve metadata for the given blob.
      */
-    public Builder get(BlobId blob, BlobSourceOption... options) {
+    public Builder get(BlobId blob, BlobGetOption... options) {
       toGet.put(blob, Lists.newArrayList(options));
       return this;
     }
@@ -120,7 +121,7 @@ public Map> toUpdate() {
     return toUpdate;
   }
 
-  public Map> toGet() {
+  public Map> toGet() {
     return toGet;
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index 8f988922aad9..88f25c7e5cbd 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -19,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.gcloud.storage.Blob.BlobSourceOption.convert;
+import static com.google.gcloud.storage.Blob.BlobSourceOption.toGetOptions;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
@@ -29,6 +30,7 @@
 import com.google.gcloud.storage.Storage.SignUrlOption;
 
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -71,6 +73,21 @@ private Storage.BlobSourceOption convert(BlobInfo blobInfo) {
       }
     }
 
+    private Storage.BlobGetOption toGetOption(BlobInfo blobInfo) {
+      switch (rpcOption()) {
+        case IF_GENERATION_MATCH:
+          return Storage.BlobGetOption.generationMatch(blobInfo.generation());
+        case IF_GENERATION_NOT_MATCH:
+          return Storage.BlobGetOption.generationNotMatch(blobInfo.generation());
+        case IF_METAGENERATION_MATCH:
+          return Storage.BlobGetOption.metagenerationMatch(blobInfo.metageneration());
+        case IF_METAGENERATION_NOT_MATCH:
+          return Storage.BlobGetOption.metagenerationNotMatch(blobInfo.metageneration());
+        default:
+          throw new AssertionError("Unexpected enum value");
+      }
+    }
+
     public static BlobSourceOption generationMatch() {
       return new BlobSourceOption(StorageRpc.Option.IF_GENERATION_MATCH);
     }
@@ -95,6 +112,15 @@ static Storage.BlobSourceOption[] convert(BlobInfo blobInfo, BlobSourceOption...
       }
       return convertedOptions;
     }
+
+    static Storage.BlobGetOption[] toGetOptions(BlobInfo blobInfo, BlobSourceOption... options) {
+      Storage.BlobGetOption[] convertedOptions = new Storage.BlobGetOption[options.length];
+      int index = 0;
+      for (BlobSourceOption option : options) {
+        convertedOptions[index++] = option.toGetOption(blobInfo);
+      }
+      return convertedOptions;
+    }
   }
 
   /**
@@ -159,7 +185,10 @@ public BlobId id() {
    * @throws StorageException upon failure
    */
   public boolean exists(BlobSourceOption... options) {
-    return storage.get(info.blobId(), convert(info, options)) != null;
+    int length = options.length;
+    Storage.BlobGetOption[] getOptions = Arrays.copyOf(toGetOptions(info, options), length + 1);
+    getOptions[length] = Storage.BlobGetOption.fields();
+    return storage.get(info.blobId(), getOptions) != null;
   }
 
   /**
@@ -180,7 +209,7 @@ public byte[] content(Storage.BlobSourceOption... options) {
    * @throws StorageException upon failure
    */
   public Blob reload(BlobSourceOption... options) {
-    return new Blob(storage, storage.get(info.blobId(), convert(info, options)));
+    return new Blob(storage, storage.get(info.blobId(), toGetOptions(info, options)));
   }
 
   /**
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 1f696d07ac33..3b659f0cd355 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -24,7 +24,7 @@
 import com.google.common.collect.Iterators;
 import com.google.gcloud.PageImpl;
 import com.google.gcloud.Page;
-import com.google.gcloud.storage.Storage.BlobSourceOption;
+import com.google.gcloud.storage.Storage.BlobGetOption;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
 import com.google.gcloud.storage.Storage.BlobWriteOption;
 import com.google.gcloud.storage.Storage.BucketSourceOption;
@@ -221,7 +221,7 @@ public Page list(Storage.BlobListOption... options) {
    * @param options blob search options
    * @throws StorageException upon failure
    */
-  public Blob get(String blob, BlobSourceOption... options) {
+  public Blob get(String blob, BlobGetOption... options) {
     return new Blob(storage, storage.get(BlobId.of(info.name(), blob), options));
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 2fd4df0cc6ba..4438342b853f 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -19,9 +19,11 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.Service;
 import com.google.gcloud.Page;
@@ -33,6 +35,7 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -70,6 +73,209 @@ String entry() {
     }
   }
 
+  public static abstract class EntityField {
+
+    private final String selector;
+
+    public EntityField(String selector) {
+      this.selector = selector;
+    }
+
+    public String selector() {
+      return selector;
+    }
+  }
+
+  public static class AclField extends EntityField {
+
+    public AclField(String selector) {
+      super(selector);
+    }
+
+    public static AclField bucket() {
+      return new AclField("bucket");
+    }
+
+    public static AclField domain() {
+      return new AclField("domain");
+    }
+
+    public static AclField email() {
+      return new AclField("email");
+    }
+
+    public static AclField entity() {
+      return new AclField("entity");
+    }
+
+    public static AclField entityId() {
+      return new AclField("entityId");
+    }
+
+    public static AclField etag() {
+      return new AclField("etag");
+    }
+
+    public static AclField generation() {
+      return new AclField("generation");
+    }
+
+    public static AclField id() {
+      return new AclField("id");
+    }
+
+    public static AclField kind() {
+      return new AclField("kind");
+    }
+
+    public static AclField object() {
+      return new AclField("object");
+    }
+
+    public static AclField projectTeam() {
+      return new AclField("projectTeam");
+    }
+
+    public static AclField role() {
+      return new AclField("role");
+    }
+
+    public static AclField selfLink() {
+      return new AclField("selfLink");
+    }
+
+    static String selector(AclField... aclFields) {
+      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(aclFields.length + 2);
+      fieldStrings.add(AclField.role().selector());
+      fieldStrings.add(AclField.entity().selector());
+      for (AclField field : aclFields) {
+        fieldStrings.add(field.selector());
+      }
+      return new StringBuffer()
+          .append("acl(")
+          .append(Joiner.on(",").join(fieldStrings))
+          .append(")")
+          .toString();
+    }
+  }
+
+  public static class BlobField extends EntityField {
+
+    public BlobField(String selector) {
+      super(selector);
+    }
+
+    public static BlobField acl(AclField... aclFields) {
+      return new BlobField(AclField.selector(aclFields));
+    }
+
+    public static BlobField bucket() {
+      return new BlobField("bucket");
+    }
+
+    public static BlobField cacheControl() {
+      return new BlobField("cacheControl");
+    }
+
+    public static BlobField componentCount() {
+      return new BlobField("componentCount");
+    }
+
+    public static BlobField contentDisposition() {
+      return new BlobField("contentDisposition");
+    }
+
+    public static BlobField contentEncoding() {
+      return new BlobField("contentEncoding");
+    }
+
+    public static BlobField contentLanguage() {
+      return new BlobField("contentLanguage");
+    }
+
+    public static BlobField contentType() {
+      return new BlobField("contentType");
+    }
+
+    public static BlobField crc32c() {
+      return new BlobField("crc32c");
+    }
+
+    public static BlobField etag() {
+      return new BlobField("etag");
+    }
+
+    public static BlobField generation() {
+      return new BlobField("generation");
+    }
+
+    public static BlobField id() {
+      return new BlobField("id");
+    }
+
+    public static BlobField kind() {
+      return new BlobField("kind");
+    }
+
+    public static BlobField md5Hash() {
+      return new BlobField("md5Hash");
+    }
+
+    public static BlobField mediaLink() {
+      return new BlobField("mediaLink");
+    }
+
+    public static BlobField metadata() {
+      return new BlobField("metadata");
+    }
+
+    public static BlobField metageneration() {
+      return new BlobField("metageneration");
+    }
+
+    public static BlobField name() {
+      return new BlobField("name");
+    }
+
+    public static BlobField owner() {
+      return new BlobField("owner");
+    }
+
+    public static BlobField selfLink() {
+      return new BlobField("selfLink");
+    }
+
+    public static BlobField size() {
+      return new BlobField("size");
+    }
+
+    public static BlobField storageClass() {
+      return new BlobField("storageClass");
+    }
+
+    public static BlobField timeCreated() {
+      return new BlobField("timeCreated");
+    }
+
+    public static BlobField timeDeleted() {
+      return new BlobField("timeDeleted");
+    }
+
+    public static BlobField updated() {
+      return new BlobField("updated");
+    }
+
+    static String selector(BlobField... fields) {
+      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
+      fieldStrings.add(bucket().selector());
+      fieldStrings.add(name().selector());
+      for (BlobField field : fields) {
+        fieldStrings.add(field.selector());
+      }
+      return Joiner.on(',').join(fieldStrings);
+    }
+  }
+
   class BucketTargetOption extends Option {
 
     private static final long serialVersionUID = -5880204616982900975L;
@@ -277,6 +483,45 @@ public static BlobSourceOption metagenerationNotMatch(long metageneration) {
     }
   }
 
+  class BlobGetOption extends Option {
+
+    private static final long serialVersionUID = 803817709703661480L;
+
+    private BlobGetOption(StorageRpc.Option rpcOption, long value) {
+      super(rpcOption, value);
+    }
+
+    private BlobGetOption(StorageRpc.Option rpcOption, String value) {
+      super(rpcOption, value);
+    }
+
+    public static BlobGetOption generationMatch(long generation) {
+      return new BlobGetOption(StorageRpc.Option.IF_GENERATION_MATCH, generation);
+    }
+
+    public static BlobGetOption generationNotMatch(long generation) {
+      return new BlobGetOption(StorageRpc.Option.IF_GENERATION_NOT_MATCH, generation);
+    }
+
+    public static BlobGetOption metagenerationMatch(long metageneration) {
+      return new BlobGetOption(StorageRpc.Option.IF_METAGENERATION_MATCH, metageneration);
+    }
+
+    public static BlobGetOption metagenerationNotMatch(long metageneration) {
+      return new BlobGetOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH, metageneration);
+    }
+
+    /**
+     * Returns an option to specify the blob's fields to be returned by the RPC call. If this option
+     * is not provided all blob's fields are returned. {@code BlobGetOption.fields}) can be used to
+     * specify only the fields of interest. Blob name and bucket are always returned, even if not
+     * specified.
+     */
+    public static BlobGetOption fields(BlobField... fields) {
+      return new BlobGetOption(StorageRpc.Option.FIELDS, BlobField.selector(fields));
+    }
+  }
+
   class BucketListOption extends Option {
 
     private static final long serialVersionUID = 8754017079673290353L;
@@ -321,6 +566,18 @@ public static BlobListOption prefix(String prefix) {
     public static BlobListOption recursive(boolean recursive) {
       return new BlobListOption(StorageRpc.Option.DELIMITER, recursive);
     }
+
+    /**
+     * Returns an option to specify the blob's fields to be returned by the RPC call. If this option
+     * is not provided all blob's fields are returned. {@code BlobListOption.fields}) can be used to
+     * specify only the fields of interest. Blob name and bucket are always returned, even if not
+     * specified.
+     */
+    public static BlobListOption fields(BlobField... fields) {
+      StringBuilder builder = new StringBuilder();
+      builder.append("items(").append(BlobField.selector(fields)).append(")");
+      return new BlobListOption(StorageRpc.Option.FIELDS, builder.toString());
+    }
   }
 
   class SignUrlOption implements Serializable {
@@ -807,14 +1064,14 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    *
    * @throws StorageException upon failure
    */
-  BlobInfo get(String bucket, String blob, BlobSourceOption... options);
+  BlobInfo get(String bucket, String blob, BlobGetOption... options);
 
   /**
    * Return the requested blob or {@code null} if not found.
    *
    * @throws StorageException upon failure
    */
-  BlobInfo get(BlobId blob, BlobSourceOption... options);
+  BlobInfo get(BlobId blob, BlobGetOption... options);
 
   /**
    * Return the requested blob or {@code null} if not found.
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index d1e85368fecb..4d1a2ba09957 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -192,12 +192,12 @@ public com.google.api.services.storage.model.Bucket call() {
   }
 
   @Override
-  public BlobInfo get(String bucket, String blob, BlobSourceOption... options) {
+  public BlobInfo get(String bucket, String blob, BlobGetOption... options) {
     return get(BlobId.of(bucket, blob), options);
   }
 
   @Override
-  public BlobInfo get(BlobId blob, BlobSourceOption... options) {
+  public BlobInfo get(BlobId blob, BlobGetOption... options) {
     final StorageObject storedObject = blob.toPb();
     final Map optionsMap = optionMap(options);
     try {
@@ -222,7 +222,7 @@ public StorageObject call() {
 
   @Override
   public BlobInfo get(BlobId blob) {
-    return get(blob, new BlobSourceOption[0]);
+    return get(blob, new BlobGetOption[0]);
   }
 
   private abstract static class BasePageFetcher
@@ -510,7 +510,7 @@ public BatchResponse apply(BatchRequest batchRequest) {
     }
     List>> toGet =
         Lists.newArrayListWithCapacity(batchRequest.toGet().size());
-    for (Map.Entry> entry : batchRequest.toGet().entrySet()) {
+    for (Map.Entry> entry : batchRequest.toGet().entrySet()) {
       BlobId blob = entry.getKey();
       Map optionsMap = optionMap(null, null, entry.getValue());
       toGet.add(Tuple.>of(blob.toPb(), optionsMap));
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java
index 06b1105d7b9b..600c8af0d554 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.Iterables;
+import com.google.gcloud.storage.Storage.BlobGetOption;
 import com.google.gcloud.storage.Storage.BlobSourceOption;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
 
@@ -42,7 +43,7 @@ public void testBatchRequest() {
         .update(BlobInfo.builder("b2", "o1").build(), BlobTargetOption.predefinedAcl(PUBLIC_READ))
         .update(BlobInfo.builder("b2", "o2").build())
         .get("b3", "o1")
-        .get("b3", "o2", BlobSourceOption.generationMatch(1))
+        .get("b3", "o2", BlobGetOption.generationMatch(1))
         .get("b3", "o3")
         .build();
 
@@ -68,16 +69,14 @@ public void testBatchRequest() {
     assertTrue(Iterables.isEmpty(update.getValue()));
     assertFalse(updates.hasNext());
 
-    Iterator>> gets = request
-        .toGet().entrySet().iterator();
-    Entry> get = gets.next();
+    Iterator>> gets = request.toGet().entrySet().iterator();
+    Entry> get = gets.next();
     assertEquals(BlobId.of("b3", "o1"), get.getKey());
     assertTrue(Iterables.isEmpty(get.getValue()));
     get = gets.next();
     assertEquals(BlobId.of("b3", "o2"), get.getKey());
     assertEquals(1, Iterables.size(get.getValue()));
-    assertEquals(BlobSourceOption.generationMatch(1),
-        Iterables.getFirst(get.getValue(), null));
+    assertEquals(BlobGetOption.generationMatch(1), Iterables.getFirst(get.getValue(), null));
     get = gets.next();
     assertEquals(BlobId.of("b3", "o3"), get.getKey());
     assertTrue(Iterables.isEmpty(get.getValue()));
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
index defb1d35e3f4..02e325716c8b 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
@@ -72,14 +72,16 @@ public void testInfo() throws Exception {
 
   @Test
   public void testExists_True() throws Exception {
-    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobSourceOption[0])).andReturn(BLOB_INFO);
+    Storage.BlobGetOption[] expectedOptions = {Storage.BlobGetOption.fields()};
+    expect(storage.get(BLOB_INFO.blobId(), expectedOptions)).andReturn(BLOB_INFO);
     replay(storage);
     assertTrue(blob.exists());
   }
 
   @Test
   public void testExists_False() throws Exception {
-    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobSourceOption[0])).andReturn(null);
+    Storage.BlobGetOption[] expectedOptions = {Storage.BlobGetOption.fields()};
+    expect(storage.get(BLOB_INFO.blobId(), expectedOptions)).andReturn(null);
     replay(storage);
     assertFalse(blob.exists());
   }
@@ -95,7 +97,7 @@ public void testContent() throws Exception {
   @Test
   public void testReload() throws Exception {
     BlobInfo updatedInfo = BLOB_INFO.toBuilder().cacheControl("c").build();
-    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobSourceOption[0])).andReturn(updatedInfo);
+    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobGetOption[0])).andReturn(updatedInfo);
     replay(storage);
     Blob updatedBlob = blob.reload();
     assertSame(storage, blob.storage());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
index decac7b1e0d2..99c3e6a8737b 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -137,7 +137,7 @@ public void testList() throws Exception {
   @Test
   public void testGet() throws Exception {
     BlobInfo info = BlobInfo.builder("b", "n").build();
-    expect(storage.get(BlobId.of(bucket.info().name(), "n"), new Storage.BlobSourceOption[0]))
+    expect(storage.get(BlobId.of(bucket.info().name(), "n"), new Storage.BlobGetOption[0]))
         .andReturn(info);
     replay(storage);
     Blob blob = bucket.get("n");
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index d15e07dfeff7..ad003cb5f887 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -160,6 +160,87 @@ public void testCreateBlobMd5Fail() throws UnsupportedEncodingException {
     }
   }
 
+  @Test
+  public void testGetBlobEmptySelectedFields() {
+    String blobName = "test-get-empty-selected-fields-blob";
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).contentType(CONTENT_TYPE).build();
+    assertNotNull(storage.create(blob));
+    BlobInfo remoteBlob = storage.get(blob.blobId(), Storage.BlobGetOption.fields());
+    assertEquals(blob.blobId(), remoteBlob.blobId());
+    assertNull(remoteBlob.contentType());
+    assertTrue(storage.delete(BUCKET, blobName));
+  }
+
+  @Test
+  public void testGetBlobSelectedFields() {
+    String blobName = "test-get-selected-fields-blob";
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName)
+        .contentType(CONTENT_TYPE)
+        .metadata(ImmutableMap.of("k", "v"))
+        .build();
+    assertNotNull(storage.create(blob));
+    BlobInfo remoteBlob = storage.get(blob.blobId(), Storage.BlobGetOption.fields(
+        Storage.BlobField.metadata()));
+    assertEquals(blob.blobId(), remoteBlob.blobId());
+    assertEquals(ImmutableMap.of("k", "v"), remoteBlob.metadata());
+    assertNull(remoteBlob.contentType());
+    assertTrue(storage.delete(BUCKET, blobName));
+  }
+
+  @Test
+  public void testListBlobsSelectedFields() {
+    String[] blobNames = {"test-list-blobs-selected-fields-blob1",
+        "test-list-blobs-selected-fields-blob2"};
+    ImmutableMap metadata = ImmutableMap.of("k", "v");
+    BlobInfo blob1 = BlobInfo.builder(BUCKET, blobNames[0])
+        .contentType(CONTENT_TYPE)
+        .metadata(metadata)
+        .build();
+    BlobInfo blob2 = BlobInfo.builder(BUCKET, blobNames[1])
+        .contentType(CONTENT_TYPE)
+        .metadata(metadata)
+        .build();
+    assertNotNull(storage.create(blob1));
+    assertNotNull(storage.create(blob2));
+    ListResult result = storage.list(BUCKET,
+        Storage.BlobListOption.prefix("test-list-blobs-selected-fields-blob"),
+        Storage.BlobListOption.fields(Storage.BlobField.metadata()));
+    int index = 0;
+    for (BlobInfo remoteBlob : result) {
+      assertEquals(BUCKET, remoteBlob.bucket());
+      assertEquals(blobNames[index++], remoteBlob.name());
+      assertEquals(metadata, remoteBlob.metadata());
+      assertNull(remoteBlob.contentType());
+    }
+    assertTrue(storage.delete(BUCKET, blobNames[0]));
+    assertTrue(storage.delete(BUCKET, blobNames[1]));
+  }
+
+  @Test
+  public void testListBlobsEmptySelectedFields() {
+    String[] blobNames = {"test-list-blobs-empty-selected-fields-blob1",
+        "test-list-blobs-empty-selected-fields-blob2"};
+    BlobInfo blob1 = BlobInfo.builder(BUCKET, blobNames[0])
+        .contentType(CONTENT_TYPE)
+        .build();
+    BlobInfo blob2 = BlobInfo.builder(BUCKET, blobNames[1])
+        .contentType(CONTENT_TYPE)
+        .build();
+    assertNotNull(storage.create(blob1));
+    assertNotNull(storage.create(blob2));
+    ListResult result = storage.list(BUCKET,
+        Storage.BlobListOption.prefix("test-list-blobs-empty-selected-fields-blob"),
+        Storage.BlobListOption.fields());
+    int index = 0;
+    for (BlobInfo remoteBlob : result) {
+      assertEquals(BUCKET, remoteBlob.bucket());
+      assertEquals(blobNames[index++], remoteBlob.name());
+      assertNull(remoteBlob.contentType());
+    }
+    assertTrue(storage.delete(BUCKET, blobNames[0]));
+    assertTrue(storage.delete(BUCKET, blobNames[1]));
+  }
+
   @Test
   public void testUpdateBlob() {
     String blobName = "test-update-blob";
@@ -442,7 +523,7 @@ public void testBatchRequestFail() {
     BatchRequest batchRequest = BatchRequest.builder()
         .update(updatedBlob, Storage.BlobTargetOption.generationMatch())
         .delete(BUCKET, blobName, Storage.BlobSourceOption.generationMatch(-1L))
-        .get(BUCKET, blobName, Storage.BlobSourceOption.generationMatch(-1L))
+        .get(BUCKET, blobName, Storage.BlobGetOption.generationMatch(-1L))
         .build();
     BatchResponse updateResponse = storage.apply(batchRequest);
     assertEquals(1, updateResponse.updates().size());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 6c77b4fcfc99..9abb96c63948 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -144,7 +144,18 @@ public class StorageImplTest {
   private static final Map BUCKET_SOURCE_OPTIONS = ImmutableMap.of(
       StorageRpc.Option.IF_METAGENERATION_MATCH, BUCKET_SOURCE_METAGENERATION.value());
 
-  // Blob source options
+  // Blob read/source options
+  private static final Storage.BlobGetOption BLOB_GET_METAGENERATION =
+      Storage.BlobGetOption.metagenerationMatch(BLOB_INFO1.metageneration());
+  private static final Storage.BlobGetOption BLOB_GET_GENERATION =
+      Storage.BlobGetOption.generationMatch(BLOB_INFO1.generation());
+  private static final Storage.BlobGetOption BLOB_GET_FIELDS =
+      Storage.BlobGetOption.fields(Storage.BlobField.contentType(), Storage.BlobField.crc32c());
+  private static final Storage.BlobGetOption BLOB_GET_EMPTY_FIELDS =
+      Storage.BlobGetOption.fields();
+  private static final Map BLOB_GET_OPTIONS = ImmutableMap.of(
+      StorageRpc.Option.IF_METAGENERATION_MATCH, BLOB_GET_METAGENERATION.value(),
+      StorageRpc.Option.IF_GENERATION_MATCH, BLOB_GET_GENERATION.value());
   private static final Storage.BlobSourceOption BLOB_SOURCE_METAGENERATION =
       Storage.BlobSourceOption.metagenerationMatch(BLOB_INFO1.metageneration());
   private static final Storage.BlobSourceOption BLOB_SOURCE_GENERATION =
@@ -170,6 +181,10 @@ public class StorageImplTest {
       Storage.BlobListOption.maxResults(42L);
   private static final Storage.BlobListOption BLOB_LIST_PREFIX =
       Storage.BlobListOption.prefix("prefix");
+  private static final Storage.BlobListOption BLOB_LIST_FIELDS =
+      Storage.BlobListOption.fields(Storage.BlobField.contentType(), Storage.BlobField.md5Hash());
+  private static final Storage.BlobListOption BLOB_LIST_EMPTY_FIELDS =
+      Storage.BlobListOption.fields();
   private static final Map BLOB_LIST_OPTIONS = ImmutableMap.of(
       StorageRpc.Option.MAX_RESULTS, BLOB_LIST_MAX_RESULT.value(),
       StorageRpc.Option.PREFIX, BLOB_LIST_PREFIX.value());
@@ -383,12 +398,56 @@ public void testGetBlob() {
   @Test
   public void testGetBlobWithOptions() {
     EasyMock.expect(
-        storageRpcMock.get(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb(), BLOB_SOURCE_OPTIONS))
+        storageRpcMock.get(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb(), BLOB_GET_OPTIONS))
         .andReturn(BLOB_INFO1.toPb());
     EasyMock.replay(storageRpcMock);
     storage = options.service();
     BlobInfo blob =
-        storage.get(BUCKET_NAME1, BLOB_NAME1, BLOB_SOURCE_METAGENERATION, BLOB_SOURCE_GENERATION);
+        storage.get(BUCKET_NAME1, BLOB_NAME1, BLOB_GET_METAGENERATION, BLOB_GET_GENERATION);
+    assertEquals(BLOB_INFO1, blob);
+  }
+
+  @Test
+  public void testGetWithSelectedFields() {
+    Capture> capturedOptions =
+        Capture.>newInstance();
+    EasyMock.expect(storageRpcMock.get(EasyMock.eq(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb()),
+        EasyMock.capture(capturedOptions))).andReturn(BLOB_INFO1.toPb());
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    BlobInfo blob = storage.get(BUCKET_NAME1, BLOB_NAME1, BLOB_GET_METAGENERATION,
+        BLOB_GET_GENERATION, BLOB_GET_FIELDS);
+    assertEquals(BLOB_GET_METAGENERATION.value(),
+        capturedOptions.getValue().get(BLOB_GET_METAGENERATION.rpcOption()));
+    assertEquals(BLOB_GET_GENERATION.value(),
+        capturedOptions.getValue().get(BLOB_GET_GENERATION.rpcOption()));
+    String selector = (String) capturedOptions.getValue().get(BLOB_GET_FIELDS.rpcOption());
+    assertTrue(selector.contains("bucket"));
+    assertTrue(selector.contains("name"));
+    assertTrue(selector.contains("contentType"));
+    assertTrue(selector.contains("crc32c"));
+    assertEquals(30, selector.length());
+    assertEquals(BLOB_INFO1, blob);
+  }
+
+  @Test
+  public void testGetWithEmptyFields() {
+    Capture> capturedOptions =
+        Capture.>newInstance();
+    EasyMock.expect(storageRpcMock.get(EasyMock.eq(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb()),
+        EasyMock.capture(capturedOptions))).andReturn(BLOB_INFO1.toPb());
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    BlobInfo blob = storage.get(BUCKET_NAME1, BLOB_NAME1, BLOB_GET_METAGENERATION,
+        BLOB_GET_GENERATION, BLOB_GET_EMPTY_FIELDS);
+    assertEquals(BLOB_GET_METAGENERATION.value(),
+        capturedOptions.getValue().get(BLOB_GET_METAGENERATION.rpcOption()));
+    assertEquals(BLOB_GET_GENERATION.value(),
+        capturedOptions.getValue().get(BLOB_GET_GENERATION.rpcOption()));
+    String selector = (String) capturedOptions.getValue().get(BLOB_GET_FIELDS.rpcOption());
+    assertTrue(selector.contains("bucket"));
+    assertTrue(selector.contains("name"));
+    assertEquals(11, selector.length());
     assertEquals(BLOB_INFO1, blob);
   }
 
@@ -473,6 +532,62 @@ public void testListBlobsWithOptions() {
     assertArrayEquals(blobList.toArray(), Iterables.toArray(page.values(), BlobInfo.class));
   }
 
+  @Test
+  public void testListBlobsWithSelectedFields() {
+    String cursor = "cursor";
+    Capture> capturedOptions =
+        Capture.>newInstance();
+    ImmutableList blobList = ImmutableList.of(BLOB_INFO1, BLOB_INFO2);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(blobList, BlobInfo.TO_PB_FUNCTION));
+    EasyMock.expect(
+        storageRpcMock.list(EasyMock.eq(BUCKET_NAME1), EasyMock.capture(capturedOptions)))
+        .andReturn(result);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    ListResult listResult =
+        storage.list(BUCKET_NAME1, BLOB_LIST_MAX_RESULT, BLOB_LIST_PREFIX, BLOB_LIST_FIELDS);
+    assertEquals(BLOB_LIST_MAX_RESULT.value(),
+        capturedOptions.getValue().get(BLOB_LIST_MAX_RESULT.rpcOption()));
+    assertEquals(BLOB_LIST_PREFIX.value(),
+        capturedOptions.getValue().get(BLOB_LIST_PREFIX.rpcOption()));
+    String selector = (String) capturedOptions.getValue().get(BLOB_LIST_FIELDS.rpcOption());
+    assertTrue(selector.contains("bucket"));
+    assertTrue(selector.contains("name"));
+    assertTrue(selector.contains("contentType"));
+    assertTrue(selector.contains("md5Hash"));
+    assertEquals(38, selector.length());
+    assertEquals(cursor, listResult.nextPageCursor());
+    assertArrayEquals(blobList.toArray(), Iterables.toArray(listResult, BlobInfo.class));
+  }
+
+  @Test
+  public void testListBlobsWithEmptyFields() {
+    String cursor = "cursor";
+    Capture> capturedOptions =
+        Capture.>newInstance();
+    ImmutableList blobList = ImmutableList.of(BLOB_INFO1, BLOB_INFO2);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(blobList, BlobInfo.TO_PB_FUNCTION));
+    EasyMock.expect(
+        storageRpcMock.list(EasyMock.eq(BUCKET_NAME1), EasyMock.capture(capturedOptions)))
+        .andReturn(result);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    ListResult listResult =
+        storage.list(BUCKET_NAME1, BLOB_LIST_MAX_RESULT, BLOB_LIST_PREFIX, BLOB_LIST_EMPTY_FIELDS);
+    assertEquals(BLOB_LIST_MAX_RESULT.value(),
+        capturedOptions.getValue().get(BLOB_LIST_MAX_RESULT.rpcOption()));
+    assertEquals(BLOB_LIST_PREFIX.value(),
+        capturedOptions.getValue().get(BLOB_LIST_PREFIX.rpcOption()));
+    String selector = (String) capturedOptions.getValue().get(BLOB_LIST_EMPTY_FIELDS.rpcOption());
+    assertTrue(selector.contains("bucket"));
+    assertTrue(selector.contains("name"));
+    assertEquals(18, selector.length());
+    assertEquals(cursor, listResult.nextPageCursor());
+    assertArrayEquals(blobList.toArray(), Iterables.toArray(listResult, BlobInfo.class));
+  }
+
   @Test
   public void testUpdateBucket() {
     BucketInfo updatedBucketInfo = BUCKET_INFO1.toBuilder().indexPage("some-page").build();

From bea01573f3aec62ff7c96867467089eebf872975 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 3 Nov 2015 16:22:23 +0100
Subject: [PATCH 040/322] Add support for selected fields to bucket get and
 list - Remove AclField and make BlobField an enum type - Add BucketField enum
 to Storage - Add BucketGetOption class and use if for storage.get(bucket) -
 Add BucketSourceOption class to Bucket - Updated and add tests

---
 .../java/com/google/gcloud/storage/Blob.java  |  21 +-
 .../com/google/gcloud/storage/Bucket.java     |  67 ++++-
 .../com/google/gcloud/storage/Storage.java    | 268 +++++++-----------
 .../google/gcloud/storage/StorageImpl.java    |   2 +-
 .../google/gcloud/storage/ITStorageTest.java  |   4 +-
 .../gcloud/storage/StorageImplTest.java       | 111 +++++++-
 6 files changed, 282 insertions(+), 191 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index 88f25c7e5cbd..d35fcef026c8 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.gcloud.storage.Blob.BlobSourceOption.convert;
+import static com.google.gcloud.storage.Blob.BlobSourceOption.toSourceOptions;
 import static com.google.gcloud.storage.Blob.BlobSourceOption.toGetOptions;
 
 import com.google.common.base.Function;
@@ -58,7 +58,7 @@ private BlobSourceOption(StorageRpc.Option rpcOption) {
       super(rpcOption, null);
     }
 
-    private Storage.BlobSourceOption convert(BlobInfo blobInfo) {
+    private Storage.BlobSourceOption toSourceOptions(BlobInfo blobInfo) {
       switch (rpcOption()) {
         case IF_GENERATION_MATCH:
           return Storage.BlobSourceOption.generationMatch(blobInfo.generation());
@@ -104,11 +104,12 @@ public static BlobSourceOption metagenerationNotMatch() {
       return new BlobSourceOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH);
     }
 
-    static Storage.BlobSourceOption[] convert(BlobInfo blobInfo, BlobSourceOption... options) {
+    static Storage.BlobSourceOption[] toSourceOptions(BlobInfo blobInfo,
+        BlobSourceOption... options) {
       Storage.BlobSourceOption[] convertedOptions = new Storage.BlobSourceOption[options.length];
       int index = 0;
       for (BlobSourceOption option : options) {
-        convertedOptions[index++] = option.convert(blobInfo);
+        convertedOptions[index++] = option.toSourceOptions(blobInfo);
       }
       return convertedOptions;
     }
@@ -126,7 +127,7 @@ static Storage.BlobGetOption[] toGetOptions(BlobInfo blobInfo, BlobSourceOption.
   /**
    * Constructs a {@code Blob} object for the provided {@code BlobInfo}. The storage service is used
    * to issue requests.
-   * 
+   *
    * @param storage the storage service used for issuing requests
    * @param info blob's info
    */
@@ -138,7 +139,7 @@ public Blob(Storage storage, BlobInfo info) {
   /**
    * Creates a {@code Blob} object for the provided bucket and blob names. Performs an RPC call to
    * get the latest blob information.
-   * 
+   *
    * @param storage the storage service used for issuing requests
    * @param bucket bucket's name
    * @param blob blob's name
@@ -152,7 +153,7 @@ public static Blob load(Storage storage, String bucket, String blob) {
   /**
    * Creates a {@code Blob} object for the provided {@code blobId}. Performs an RPC call to get the
    * latest blob information.
-   * 
+   *
    * @param storage the storage service used for issuing requests
    * @param blobId blob's identifier
    * @return the {@code Blob} object or {@code null} if not found.
@@ -253,7 +254,7 @@ public Blob update(BlobInfo blobInfo, BlobTargetOption... options) {
    */
   public CopyWriter copyTo(BlobId targetBlob, BlobSourceOption... options) {
     CopyRequest copyRequest = CopyRequest.builder().source(info.bucket(), info.name())
-        .sourceOptions(convert(info, options)).target(targetBlob).build();
+        .sourceOptions(toSourceOptions(info, options)).target(targetBlob).build();
     return storage.copy(copyRequest);
   }
 
@@ -265,7 +266,7 @@ public CopyWriter copyTo(BlobId targetBlob, BlobSourceOption... options) {
    * @throws StorageException upon failure
    */
   public boolean delete(BlobSourceOption... options) {
-    return storage.delete(info.blobId(), convert(info, options));
+    return storage.delete(info.blobId(), toSourceOptions(info, options));
   }
 
   /**
@@ -304,7 +305,7 @@ public CopyWriter copyTo(String targetBucket, String targetBlob, BlobSourceOptio
    * @throws StorageException upon failure
    */
   public BlobReadChannel reader(BlobSourceOption... options) {
-    return storage.reader(info.blobId(), convert(info, options));
+    return storage.reader(info.blobId(), toSourceOptions(info, options));
   }
 
   /**
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 3b659f0cd355..4f2b5731e47a 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -24,10 +24,10 @@
 import com.google.common.collect.Iterators;
 import com.google.gcloud.PageImpl;
 import com.google.gcloud.Page;
+import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.storage.Storage.BlobGetOption;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
 import com.google.gcloud.storage.Storage.BlobWriteOption;
-import com.google.gcloud.storage.Storage.BucketSourceOption;
 import com.google.gcloud.storage.Storage.BucketTargetOption;
 
 import java.io.IOException;
@@ -119,6 +119,66 @@ public boolean equals(Object obj) {
     }
   }
 
+  public static class BucketSourceOption extends Option {
+
+    private static final long serialVersionUID = 6928872234155522371L;
+
+    private BucketSourceOption(StorageRpc.Option rpcOption) {
+      super(rpcOption, null);
+    }
+
+    private Storage.BucketSourceOption toSourceOptions(BucketInfo bucketInfo) {
+      switch (rpcOption()) {
+        case IF_METAGENERATION_MATCH:
+          return Storage.BucketSourceOption.metagenerationMatch(bucketInfo.metageneration());
+        case IF_METAGENERATION_NOT_MATCH:
+          return Storage.BucketSourceOption.metagenerationNotMatch(bucketInfo.metageneration());
+        default:
+          throw new AssertionError("Unexpected enum value");
+      }
+    }
+
+    private Storage.BucketGetOption toGetOption(BucketInfo bucketInfo) {
+      switch (rpcOption()) {
+        case IF_METAGENERATION_MATCH:
+          return Storage.BucketGetOption.metagenerationMatch(bucketInfo.metageneration());
+        case IF_METAGENERATION_NOT_MATCH:
+          return Storage.BucketGetOption.metagenerationNotMatch(bucketInfo.metageneration());
+        default:
+          throw new AssertionError("Unexpected enum value");
+      }
+    }
+
+    public static BucketSourceOption metagenerationMatch() {
+      return new BucketSourceOption(StorageRpc.Option.IF_METAGENERATION_MATCH);
+    }
+
+    public static BucketSourceOption metagenerationNotMatch() {
+      return new BucketSourceOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH);
+    }
+
+    static Storage.BucketSourceOption[] toSourceOptions(BucketInfo bucketInfo,
+         BucketSourceOption... options) {
+      Storage.BucketSourceOption[] convertedOptions =
+          new Storage.BucketSourceOption[options.length];
+      int index = 0;
+      for (BucketSourceOption option : options) {
+        convertedOptions[index++] = option.toSourceOptions(bucketInfo);
+      }
+      return convertedOptions;
+    }
+
+    static Storage.BucketGetOption[] toGetOptions(BucketInfo bucketInfo,
+        BucketSourceOption... options) {
+      Storage.BucketGetOption[] convertedOptions = new Storage.BucketGetOption[options.length];
+      int index = 0;
+      for (BucketSourceOption option : options) {
+        convertedOptions[index++] = option.toGetOption(bucketInfo);
+      }
+      return convertedOptions;
+    }
+  }
+
   /**
    * Constructs a {@code Bucket} object for the provided {@code BucketInfo}. The storage service is
    * used to issue requests.
@@ -170,7 +230,8 @@ public boolean exists() {
    * @throws StorageException upon failure
    */
   public Bucket reload(BucketSourceOption... options) {
-    return new Bucket(storage, storage.get(info.name(), options));
+    return new Bucket(storage, storage.get(info.name(),
+        BucketSourceOption.toGetOptions(info, options)));
   }
 
   /**
@@ -198,7 +259,7 @@ public Bucket update(BucketInfo bucketInfo, BucketTargetOption... options) {
    * @throws StorageException upon failure
    */
   public boolean delete(BucketSourceOption... options) {
-    return storage.delete(info.name(), options);
+    return storage.delete(info.name(), BucketSourceOption.toSourceOptions(info, options));
   }
 
   /**
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 4438342b853f..04e3a6bc687f 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -86,189 +86,84 @@ public String selector() {
     }
   }
 
-  public static class AclField extends EntityField {
+  enum BucketField {
+    ID("id"),
+    SELF_LINK("selfLink"),
+    NAME("name"),
+    TIME_CREATED("timeCreated"),
+    UPDATED("updated"),
+    METAGENERATION("metageneration"),
+    ACL("acl"),
+    DEFAULT_OBJECT_ACL("defaultObjectAcl"),
+    OWNER("owner"),
+    LOCATION("location"),
+    WEBSITE("website"),
+    VERSIONING("versioning"),
+    CORS("cors"),
+    STORAGE_CLASS("storageClass"),
+    ETAG("etag");
 
-    public AclField(String selector) {
-      super(selector);
-    }
-
-    public static AclField bucket() {
-      return new AclField("bucket");
-    }
-
-    public static AclField domain() {
-      return new AclField("domain");
-    }
-
-    public static AclField email() {
-      return new AclField("email");
-    }
-
-    public static AclField entity() {
-      return new AclField("entity");
-    }
-
-    public static AclField entityId() {
-      return new AclField("entityId");
-    }
-
-    public static AclField etag() {
-      return new AclField("etag");
-    }
-
-    public static AclField generation() {
-      return new AclField("generation");
-    }
-
-    public static AclField id() {
-      return new AclField("id");
-    }
-
-    public static AclField kind() {
-      return new AclField("kind");
-    }
-
-    public static AclField object() {
-      return new AclField("object");
-    }
-
-    public static AclField projectTeam() {
-      return new AclField("projectTeam");
-    }
+    private final String selector;
 
-    public static AclField role() {
-      return new AclField("role");
+    BucketField(String selector) {
+      this.selector = selector;
     }
 
-    public static AclField selfLink() {
-      return new AclField("selfLink");
+    public String selector() {
+      return selector;
     }
 
-    static String selector(AclField... aclFields) {
-      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(aclFields.length + 2);
-      fieldStrings.add(AclField.role().selector());
-      fieldStrings.add(AclField.entity().selector());
-      for (AclField field : aclFields) {
+    static String selector(BucketField... fields) {
+      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
+      fieldStrings.add(NAME.selector());
+      for (BucketField field : fields) {
         fieldStrings.add(field.selector());
       }
-      return new StringBuffer()
-          .append("acl(")
-          .append(Joiner.on(",").join(fieldStrings))
-          .append(")")
-          .toString();
+      return Joiner.on(',').join(fieldStrings);
     }
   }
 
-  public static class BlobField extends EntityField {
-
-    public BlobField(String selector) {
-      super(selector);
-    }
-
-    public static BlobField acl(AclField... aclFields) {
-      return new BlobField(AclField.selector(aclFields));
-    }
-
-    public static BlobField bucket() {
-      return new BlobField("bucket");
-    }
-
-    public static BlobField cacheControl() {
-      return new BlobField("cacheControl");
-    }
-
-    public static BlobField componentCount() {
-      return new BlobField("componentCount");
-    }
-
-    public static BlobField contentDisposition() {
-      return new BlobField("contentDisposition");
-    }
-
-    public static BlobField contentEncoding() {
-      return new BlobField("contentEncoding");
-    }
-
-    public static BlobField contentLanguage() {
-      return new BlobField("contentLanguage");
-    }
-
-    public static BlobField contentType() {
-      return new BlobField("contentType");
-    }
-
-    public static BlobField crc32c() {
-      return new BlobField("crc32c");
-    }
-
-    public static BlobField etag() {
-      return new BlobField("etag");
-    }
-
-    public static BlobField generation() {
-      return new BlobField("generation");
-    }
-
-    public static BlobField id() {
-      return new BlobField("id");
-    }
-
-    public static BlobField kind() {
-      return new BlobField("kind");
-    }
-
-    public static BlobField md5Hash() {
-      return new BlobField("md5Hash");
-    }
-
-    public static BlobField mediaLink() {
-      return new BlobField("mediaLink");
-    }
-
-    public static BlobField metadata() {
-      return new BlobField("metadata");
-    }
-
-    public static BlobField metageneration() {
-      return new BlobField("metageneration");
-    }
+  enum BlobField {
+    ACL("acl"),
+    BUCKET("bucket"),
+    CACHE_CONTROL("cacheControl"),
+    COMPONENT_COUNT("componentCount"),
+    CONTENT_DISPOSITION("contentDisposition"),
+    CONTENT_ENCODING("contentEncoding"),
+    CONTENT_LANGUAGE("contentLanguage"),
+    CONTENT_TYPE("contentType"),
+    CRC32C("crc32c"),
+    ETAG("etag"),
+    GENERATION("generation"),
+    ID("id"),
+    KIND("kind"),
+    MD5HASH("md5Hash"),
+    MEDIA_LINK("mediaLink"),
+    METADATA("metadata"),
+    METAGENERATION("metageneration"),
+    NAME("name"),
+    OWNER("owner"),
+    SELF_LINK("selfLink"),
+    SIZE("size"),
+    STORAGE_CLASS("storageClass"),
+    TIME_CREATED("timeCreated"),
+    TIME_DELETED("timeDeleted"),
+    UPDATED("updated");
 
-    public static BlobField name() {
-      return new BlobField("name");
-    }
-
-    public static BlobField owner() {
-      return new BlobField("owner");
-    }
-
-    public static BlobField selfLink() {
-      return new BlobField("selfLink");
-    }
-
-    public static BlobField size() {
-      return new BlobField("size");
-    }
-
-    public static BlobField storageClass() {
-      return new BlobField("storageClass");
-    }
-
-    public static BlobField timeCreated() {
-      return new BlobField("timeCreated");
-    }
+    private final String selector;
 
-    public static BlobField timeDeleted() {
-      return new BlobField("timeDeleted");
+    BlobField(String selector) {
+      this.selector = selector;
     }
 
-    public static BlobField updated() {
-      return new BlobField("updated");
+    public String selector() {
+      return selector;
     }
 
     static String selector(BlobField... fields) {
       HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
-      fieldStrings.add(bucket().selector());
-      fieldStrings.add(name().selector());
+      fieldStrings.add(BUCKET.selector());
+      fieldStrings.add(NAME.selector());
       for (BlobField field : fields) {
         fieldStrings.add(field.selector());
       }
@@ -322,6 +217,37 @@ public static BucketSourceOption metagenerationNotMatch(long metageneration) {
     }
   }
 
+  class BucketGetOption extends Option {
+
+    private static final long serialVersionUID = 1901844869484087395L;
+
+    private BucketGetOption(StorageRpc.Option rpcOption, long metageneration) {
+      super(rpcOption, metageneration);
+    }
+
+    private BucketGetOption(StorageRpc.Option rpcOption, String value) {
+      super(rpcOption, value);
+    }
+
+    public static BucketGetOption metagenerationMatch(long metageneration) {
+      return new BucketGetOption(StorageRpc.Option.IF_METAGENERATION_MATCH, metageneration);
+    }
+
+    public static BucketGetOption metagenerationNotMatch(long metageneration) {
+      return new BucketGetOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH, metageneration);
+    }
+
+    /**
+     * Returns an option to specify the bucket's fields to be returned by the RPC call. If this
+     * option is not provided all bucket's fields are returned. {@code BucketGetOption.fields}) can
+     * be used to specify only the fields of interest. Bucket name is always returned, even if not
+     * specified.
+     */
+    public static BucketGetOption fields(BucketField... fields) {
+      return new BucketGetOption(StorageRpc.Option.FIELDS, BucketField.selector(fields));
+    }
+  }
+
   class BlobTargetOption extends Option {
 
     private static final long serialVersionUID = 214616862061934846L;
@@ -541,6 +467,18 @@ public static BucketListOption startPageToken(String pageToken) {
     public static BucketListOption prefix(String prefix) {
       return new BucketListOption(StorageRpc.Option.PREFIX, prefix);
     }
+
+    /**
+     * Returns an option to specify the bucket's fields to be returned by the RPC call. If this
+     * option is not provided all bucket's fields are returned. {@code BucketListOption.fields}) can
+     * be used to specify only the fields of interest. Bucket name is always returned, even if not
+     * specified.
+     */
+    public static BucketListOption fields(BucketField... fields) {
+      StringBuilder builder = new StringBuilder();
+      builder.append("items(").append(BucketField.selector(fields)).append(")");
+      return new BucketListOption(StorageRpc.Option.FIELDS, builder.toString());
+    }
   }
 
   class BlobListOption extends Option {
@@ -1057,7 +995,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    *
    * @throws StorageException upon failure
    */
-  BucketInfo get(String bucket, BucketSourceOption... options);
+  BucketInfo get(String bucket, BucketGetOption... options);
 
   /**
    * Return the requested blob or {@code null} if not found.
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 4d1a2ba09957..4c85113e940e 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -167,7 +167,7 @@ public StorageObject call() {
   }
 
   @Override
-  public BucketInfo get(String bucket, BucketSourceOption... options) {
+  public BucketInfo get(String bucket, BucketGetOption... options) {
     final com.google.api.services.storage.model.Bucket bucketPb = BucketInfo.of(bucket).toPb();
     final Map optionsMap = optionMap(options);
     try {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index ad003cb5f887..8a9a747f948d 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -180,7 +180,7 @@ public void testGetBlobSelectedFields() {
         .build();
     assertNotNull(storage.create(blob));
     BlobInfo remoteBlob = storage.get(blob.blobId(), Storage.BlobGetOption.fields(
-        Storage.BlobField.metadata()));
+        Storage.BlobField.METADATA));
     assertEquals(blob.blobId(), remoteBlob.blobId());
     assertEquals(ImmutableMap.of("k", "v"), remoteBlob.metadata());
     assertNull(remoteBlob.contentType());
@@ -204,7 +204,7 @@ public void testListBlobsSelectedFields() {
     assertNotNull(storage.create(blob2));
     ListResult result = storage.list(BUCKET,
         Storage.BlobListOption.prefix("test-list-blobs-selected-fields-blob"),
-        Storage.BlobListOption.fields(Storage.BlobField.metadata()));
+        Storage.BlobListOption.fields(Storage.BlobField.METADATA));
     int index = 0;
     for (BlobInfo remoteBlob : result) {
       assertEquals(BUCKET, remoteBlob.bucket());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 9abb96c63948..f5c8cff1a335 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -138,19 +138,27 @@ public class StorageImplTest {
   private static final Storage.BlobWriteOption BLOB_WRITE_CRC2C =
       Storage.BlobWriteOption.crc32cMatch();
 
-  // Bucket source options
+  // Bucket get/source options
   private static final Storage.BucketSourceOption BUCKET_SOURCE_METAGENERATION =
       Storage.BucketSourceOption.metagenerationMatch(BUCKET_INFO1.metageneration());
   private static final Map BUCKET_SOURCE_OPTIONS = ImmutableMap.of(
       StorageRpc.Option.IF_METAGENERATION_MATCH, BUCKET_SOURCE_METAGENERATION.value());
+  private static final Storage.BucketGetOption BUCKET_GET_METAGENERATION =
+      Storage.BucketGetOption.metagenerationMatch(BUCKET_INFO1.metageneration());
+  private static final Storage.BucketGetOption BUCKET_GET_FIELDS =
+      Storage.BucketGetOption.fields(Storage.BucketField.LOCATION, Storage.BucketField.ACL);
+  private static final Storage.BucketGetOption BUCKET_GET_EMPTY_FIELDS =
+      Storage.BucketGetOption.fields();
+  private static final Map BUCKET_GET_OPTIONS = ImmutableMap.of(
+      StorageRpc.Option.IF_METAGENERATION_MATCH, BUCKET_SOURCE_METAGENERATION.value());
 
-  // Blob read/source options
+  // Blob get/source options
   private static final Storage.BlobGetOption BLOB_GET_METAGENERATION =
       Storage.BlobGetOption.metagenerationMatch(BLOB_INFO1.metageneration());
   private static final Storage.BlobGetOption BLOB_GET_GENERATION =
       Storage.BlobGetOption.generationMatch(BLOB_INFO1.generation());
   private static final Storage.BlobGetOption BLOB_GET_FIELDS =
-      Storage.BlobGetOption.fields(Storage.BlobField.contentType(), Storage.BlobField.crc32c());
+      Storage.BlobGetOption.fields(Storage.BlobField.CONTENT_TYPE, Storage.BlobField.CRC32C);
   private static final Storage.BlobGetOption BLOB_GET_EMPTY_FIELDS =
       Storage.BlobGetOption.fields();
   private static final Map BLOB_GET_OPTIONS = ImmutableMap.of(
@@ -172,6 +180,10 @@ public class StorageImplTest {
       Storage.BucketListOption.maxResults(42L);
   private static final Storage.BucketListOption BUCKET_LIST_PREFIX =
       Storage.BucketListOption.prefix("prefix");
+  private static final Storage.BucketListOption BUCKET_LIST_FIELDS =
+      Storage.BucketListOption.fields(Storage.BucketField.LOCATION, Storage.BucketField.ACL);
+  private static final Storage.BucketListOption BUCKET_LIST_EMPTY_FIELDS =
+      Storage.BucketListOption.fields();
   private static final Map BUCKET_LIST_OPTIONS = ImmutableMap.of(
       StorageRpc.Option.MAX_RESULTS, BUCKET_LIST_MAX_RESULT.value(),
       StorageRpc.Option.PREFIX, BUCKET_LIST_PREFIX.value());
@@ -182,7 +194,7 @@ public class StorageImplTest {
   private static final Storage.BlobListOption BLOB_LIST_PREFIX =
       Storage.BlobListOption.prefix("prefix");
   private static final Storage.BlobListOption BLOB_LIST_FIELDS =
-      Storage.BlobListOption.fields(Storage.BlobField.contentType(), Storage.BlobField.md5Hash());
+      Storage.BlobListOption.fields(Storage.BlobField.CONTENT_TYPE, Storage.BlobField.MD5HASH);
   private static final Storage.BlobListOption BLOB_LIST_EMPTY_FIELDS =
       Storage.BlobListOption.fields();
   private static final Map BLOB_LIST_OPTIONS = ImmutableMap.of(
@@ -374,16 +386,51 @@ public void testGetBucket() {
 
   @Test
   public void testGetBucketWithOptions() {
-    EasyMock.expect(storageRpcMock.get(BucketInfo.of(BUCKET_NAME1).toPb(), BUCKET_SOURCE_OPTIONS))
+    EasyMock.expect(storageRpcMock.get(BucketInfo.of(BUCKET_NAME1).toPb(), BUCKET_GET_OPTIONS))
         .andReturn(BUCKET_INFO1.toPb());
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    BucketInfo bucket =
-        storage.get(BUCKET_NAME1,
-            Storage.BucketSourceOption.metagenerationMatch(BUCKET_INFO1.metageneration()));
+    BucketInfo bucket = storage.get(BUCKET_NAME1, BUCKET_GET_METAGENERATION);
     assertEquals(BUCKET_INFO1, bucket);
   }
 
+  @Test
+  public void testGetBucketWithSelectedFields() {
+    Capture> capturedOptions =
+        Capture.>newInstance();
+    EasyMock.expect(storageRpcMock.get(EasyMock.eq(BucketInfo.of(BUCKET_NAME1).toPb()),
+        EasyMock.capture(capturedOptions))).andReturn(BUCKET_INFO1.toPb());
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    BucketInfo bucket = storage.get(BUCKET_NAME1, BUCKET_GET_METAGENERATION, BUCKET_GET_FIELDS);
+    assertEquals(BUCKET_GET_METAGENERATION.value(),
+        capturedOptions.getValue().get(BUCKET_GET_METAGENERATION.rpcOption()));
+    String selector = (String) capturedOptions.getValue().get(BLOB_GET_FIELDS.rpcOption());
+    assertTrue(selector.contains("name"));
+    assertTrue(selector.contains("location"));
+    assertTrue(selector.contains("acl"));
+    assertEquals(17, selector.length());
+    assertEquals(BUCKET_INFO1.name(), bucket.name());
+  }
+
+  @Test
+  public void testGetBucketWithEmptyFields() {
+    Capture> capturedOptions =
+        Capture.>newInstance();
+    EasyMock.expect(storageRpcMock.get(EasyMock.eq(BucketInfo.of(BUCKET_NAME1).toPb()),
+        EasyMock.capture(capturedOptions))).andReturn(BUCKET_INFO1.toPb());
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    BucketInfo bucket = storage.get(BUCKET_NAME1, BUCKET_GET_METAGENERATION,
+        BUCKET_GET_EMPTY_FIELDS);
+    assertEquals(BUCKET_GET_METAGENERATION.value(),
+        capturedOptions.getValue().get(BUCKET_GET_METAGENERATION.rpcOption()));
+    String selector = (String) capturedOptions.getValue().get(BLOB_GET_FIELDS.rpcOption());
+    assertTrue(selector.contains("name"));
+    assertEquals(4, selector.length());
+    assertEquals(BUCKET_INFO1.name(), bucket.name());
+  }
+
   @Test
   public void testGetBlob() {
     EasyMock.expect(
@@ -408,7 +455,7 @@ public void testGetBlobWithOptions() {
   }
 
   @Test
-  public void testGetWithSelectedFields() {
+  public void testGetBlobWithSelectedFields() {
     Capture> capturedOptions =
         Capture.>newInstance();
     EasyMock.expect(storageRpcMock.get(EasyMock.eq(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb()),
@@ -431,7 +478,7 @@ public void testGetWithSelectedFields() {
   }
 
   @Test
-  public void testGetWithEmptyFields() {
+  public void testGetBlobWithEmptyFields() {
     Capture> capturedOptions =
         Capture.>newInstance();
     EasyMock.expect(storageRpcMock.get(EasyMock.eq(BlobId.of(BUCKET_NAME1, BLOB_NAME1).toPb()),
@@ -491,6 +538,48 @@ public void testListBucketsWithOptions() {
     assertArrayEquals(bucketList.toArray(), Iterables.toArray(page.values(), BucketInfo.class));
   }
 
+  @Test
+  public void testListBucketsWithSelectedFields() {
+    String cursor = "cursor";
+    Capture> capturedOptions =
+        Capture.>newInstance();
+    ImmutableList bucketList = ImmutableList.of(BUCKET_INFO1, BUCKET_INFO2);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(bucketList, BucketInfo.TO_PB_FUNCTION));
+    EasyMock.expect(storageRpcMock.list(EasyMock.capture(capturedOptions))).andReturn(result);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    ListResult listResult = storage.list(BUCKET_LIST_FIELDS);
+    String selector = (String) capturedOptions.getValue().get(BLOB_LIST_FIELDS.rpcOption());
+    assertTrue(selector.contains("items"));
+    assertTrue(selector.contains("name"));
+    assertTrue(selector.contains("acl"));
+    assertTrue(selector.contains("location"));
+    assertEquals(24, selector.length());
+    assertEquals(cursor, listResult.nextPageCursor());
+    assertArrayEquals(bucketList.toArray(), Iterables.toArray(listResult, BucketInfo.class));
+  }
+
+  @Test
+  public void testListBucketsWithEmptyFields() {
+    String cursor = "cursor";
+    Capture> capturedOptions =
+        Capture.>newInstance();
+    ImmutableList bucketList = ImmutableList.of(BUCKET_INFO1, BUCKET_INFO2);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(bucketList, BucketInfo.TO_PB_FUNCTION));
+    EasyMock.expect(storageRpcMock.list(EasyMock.capture(capturedOptions))).andReturn(result);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    ListResult listResult = storage.list(BUCKET_LIST_EMPTY_FIELDS);
+    String selector = (String) capturedOptions.getValue().get(BLOB_LIST_FIELDS.rpcOption());
+    assertTrue(selector.contains("items"));
+    assertTrue(selector.contains("name"));
+    assertEquals(11, selector.length());
+    assertEquals(cursor, listResult.nextPageCursor());
+    assertArrayEquals(bucketList.toArray(), Iterables.toArray(listResult, BucketInfo.class));
+  }
+
   @Test
   public void testListBlobs() {
     String cursor = "cursor";
@@ -552,6 +641,7 @@ public void testListBlobsWithSelectedFields() {
     assertEquals(BLOB_LIST_PREFIX.value(),
         capturedOptions.getValue().get(BLOB_LIST_PREFIX.rpcOption()));
     String selector = (String) capturedOptions.getValue().get(BLOB_LIST_FIELDS.rpcOption());
+    assertTrue(selector.contains("items"));
     assertTrue(selector.contains("bucket"));
     assertTrue(selector.contains("name"));
     assertTrue(selector.contains("contentType"));
@@ -581,6 +671,7 @@ public void testListBlobsWithEmptyFields() {
     assertEquals(BLOB_LIST_PREFIX.value(),
         capturedOptions.getValue().get(BLOB_LIST_PREFIX.rpcOption()));
     String selector = (String) capturedOptions.getValue().get(BLOB_LIST_EMPTY_FIELDS.rpcOption());
+    assertTrue(selector.contains("items"));
     assertTrue(selector.contains("bucket"));
     assertTrue(selector.contains("name"));
     assertEquals(18, selector.length());

From f11c05a4846d598984fee5c132493d962fdf92e0 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 4 Nov 2015 08:47:27 +0100
Subject: [PATCH 041/322] Add field selection to StorageRpc bucket get and list

---
 .../src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 29552d5121e5..b1e188f1d1fb 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -151,6 +151,7 @@ public Tuple> list(Map options) {
           .setPrefix(PREFIX.getString(options))
           .setMaxResults(MAX_RESULTS.getLong(options))
           .setPageToken(PAGE_TOKEN.getString(options))
+          .setFields(FIELDS.getString(options))
           .execute();
       return Tuple.>of(buckets.getNextPageToken(), buckets.getItems());
     } catch (IOException ex) {
@@ -186,6 +187,7 @@ public Bucket get(Bucket bucket, Map options) {
           .setProjection(DEFAULT_PROJECTION)
           .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(options))
           .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(options))
+          .setFields(FIELDS.getString(options))
           .execute();
     } catch (IOException ex) {
       throw translate(ex);

From ba4bfa6017b39800abfda831ee071664802e6186 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 4 Nov 2015 08:49:43 +0100
Subject: [PATCH 042/322] Add field selection to Bucket.exist

---
 .../java/com/google/gcloud/storage/Bucket.java    | 15 ++++++++++-----
 .../com/google/gcloud/storage/BucketTest.java     |  6 ++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 4f2b5731e47a..7c386373995f 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -18,6 +18,8 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.gcloud.storage.Bucket.BucketSourceOption.toGetOptions;
+import static com.google.gcloud.storage.Bucket.BucketSourceOption.toSourceOptions;
 
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
@@ -35,6 +37,7 @@
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -218,8 +221,11 @@ public BucketInfo info() {
    * @return true if this bucket exists, false otherwise
    * @throws StorageException upon failure
    */
-  public boolean exists() {
-    return storage.get(info.name()) != null;
+  public boolean exists(BucketSourceOption... options) {
+    int length = options.length;
+    Storage.BucketGetOption[] getOptions = Arrays.copyOf(toGetOptions(info, options), length + 1);
+    getOptions[length] = Storage.BucketGetOption.fields();
+    return storage.get(info.name(), getOptions) != null;
   }
 
   /**
@@ -230,8 +236,7 @@ public boolean exists() {
    * @throws StorageException upon failure
    */
   public Bucket reload(BucketSourceOption... options) {
-    return new Bucket(storage, storage.get(info.name(),
-        BucketSourceOption.toGetOptions(info, options)));
+    return new Bucket(storage, storage.get(info.name(), toGetOptions(info, options)));
   }
 
   /**
@@ -259,7 +264,7 @@ public Bucket update(BucketInfo bucketInfo, BucketTargetOption... options) {
    * @throws StorageException upon failure
    */
   public boolean delete(BucketSourceOption... options) {
-    return storage.delete(info.name(), BucketSourceOption.toSourceOptions(info, options));
+    return storage.delete(info.name(), toSourceOptions(info, options));
   }
 
   /**
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
index 99c3e6a8737b..5d8fc5a9dffc 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -75,14 +75,16 @@ public void testInfo() throws Exception {
 
   @Test
   public void testExists_True() throws Exception {
-    expect(storage.get(BUCKET_INFO.name())).andReturn(BUCKET_INFO);
+    Storage.BucketGetOption[] expectedOptions = {Storage.BucketGetOption.fields()};
+    expect(storage.get(BUCKET_INFO.name(), expectedOptions)).andReturn(BUCKET_INFO);
     replay(storage);
     assertTrue(bucket.exists());
   }
 
   @Test
   public void testExists_False() throws Exception {
-    expect(storage.get(BUCKET_INFO.name())).andReturn(null);
+    Storage.BucketGetOption[] expectedOptions = {Storage.BucketGetOption.fields()};
+    expect(storage.get(BUCKET_INFO.name(), expectedOptions)).andReturn(null);
     replay(storage);
     assertFalse(bucket.exists());
   }

From 46b60df4a132b669bb8752bc7bf02bd5f24c57d1 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 4 Nov 2015 08:51:40 +0100
Subject: [PATCH 043/322] Delete EntityField class and remove non-accessible
 fields from Bucket/BlobField

---
 .../java/com/google/gcloud/storage/Storage.java | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 04e3a6bc687f..52387310de71 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -73,25 +73,11 @@ String entry() {
     }
   }
 
-  public static abstract class EntityField {
-
-    private final String selector;
-
-    public EntityField(String selector) {
-      this.selector = selector;
-    }
-
-    public String selector() {
-      return selector;
-    }
-  }
-
   enum BucketField {
     ID("id"),
     SELF_LINK("selfLink"),
     NAME("name"),
     TIME_CREATED("timeCreated"),
-    UPDATED("updated"),
     METAGENERATION("metageneration"),
     ACL("acl"),
     DEFAULT_OBJECT_ACL("defaultObjectAcl"),
@@ -114,7 +100,7 @@ public String selector() {
     }
 
     static String selector(BucketField... fields) {
-      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
+      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 1);
       fieldStrings.add(NAME.selector());
       for (BucketField field : fields) {
         fieldStrings.add(field.selector());
@@ -146,7 +132,6 @@ enum BlobField {
     SELF_LINK("selfLink"),
     SIZE("size"),
     STORAGE_CLASS("storageClass"),
-    TIME_CREATED("timeCreated"),
     TIME_DELETED("timeDeleted"),
     UPDATED("updated");
 

From 603d50c0bddbc5c816ced52211cdfb6ae0e55a64 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 4 Nov 2015 09:02:47 +0100
Subject: [PATCH 044/322] Add IT tests for bucket's field selection, add test
 for selecting all fields

---
 .../google/gcloud/storage/ITStorageTest.java  | 77 ++++++++++++++++---
 .../gcloud/storage/StorageImplTest.java       | 24 +++---
 2 files changed, 79 insertions(+), 22 deletions(-)

diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 8a9a747f948d..659c3d94ad4d 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -26,7 +26,10 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.Page;
 import com.google.gcloud.RestorableState;
+import com.google.gcloud.storage.Storage.BlobField;
+import com.google.gcloud.storage.Storage.BucketField;
 import com.google.gcloud.storage.testing.RemoteGcsHelper;
 
 import org.junit.AfterClass;
@@ -80,17 +83,49 @@ public static void afterClass()
 
   @Test(timeout = 5000)
   public void testListBuckets() throws InterruptedException {
-    Iterator bucketIterator =
-        storage.list(Storage.BucketListOption.prefix(BUCKET)).values().iterator();
+    Iterator bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
+        Storage.BucketListOption.fields()).values().iterator();
     while (!bucketIterator.hasNext()) {
       Thread.sleep(500);
-      bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET)).values().iterator();
+      bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
+          Storage.BucketListOption.fields()).values().iterator();
     }
     while (bucketIterator.hasNext()) {
-      assertTrue(bucketIterator.next().name().startsWith(BUCKET));
+      BucketInfo remoteBucket = bucketIterator.next();
+      assertTrue(remoteBucket.name().startsWith(BUCKET));
+      assertNull(remoteBucket.createTime());
+      assertNull(remoteBucket.selfLink());
     }
   }
 
+  @Test
+  public void testGetBucketSelectedFields() {
+    BucketInfo remoteBucket = storage.get(BUCKET, Storage.BucketGetOption.fields(BucketField.ID));
+    assertEquals(BUCKET, remoteBucket.name());
+    assertNull(remoteBucket.createTime());
+    assertNotNull(remoteBucket.id());
+  }
+
+  @Test
+  public void testGetBucketAllSelectedFields() {
+    BucketInfo remoteBucket = storage.get(BUCKET, Storage.BucketGetOption.fields(BucketField.ACL,
+        BucketField.CORS, BucketField.DEFAULT_OBJECT_ACL, BucketField.ETAG, BucketField.ID,
+        BucketField.LOCATION, BucketField.METAGENERATION, BucketField.NAME, BucketField.OWNER,
+        BucketField.SELF_LINK, BucketField.STORAGE_CLASS, BucketField.TIME_CREATED,
+        BucketField.VERSIONING, BucketField.WEBSITE));
+    assertEquals(BUCKET, remoteBucket.name());
+    assertNotNull(remoteBucket.createTime());
+    assertNotNull(remoteBucket.selfLink());
+  }
+
+  @Test
+  public void testGetBucketEmptyFields() {
+    BucketInfo remoteBucket = storage.get(BUCKET, Storage.BucketGetOption.fields());
+    assertEquals(BUCKET, remoteBucket.name());
+    assertNull(remoteBucket.createTime());
+    assertNull(remoteBucket.selfLink());
+  }
+
   @Test
   public void testCreateBlob() {
     String blobName = "test-create-blob";
@@ -180,13 +215,35 @@ public void testGetBlobSelectedFields() {
         .build();
     assertNotNull(storage.create(blob));
     BlobInfo remoteBlob = storage.get(blob.blobId(), Storage.BlobGetOption.fields(
-        Storage.BlobField.METADATA));
+        BlobField.METADATA));
     assertEquals(blob.blobId(), remoteBlob.blobId());
     assertEquals(ImmutableMap.of("k", "v"), remoteBlob.metadata());
     assertNull(remoteBlob.contentType());
     assertTrue(storage.delete(BUCKET, blobName));
   }
 
+  @Test
+  public void testGetBlobAllSelectedFields() {
+    String blobName = "test-get-all-selected-fields-blob";
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName)
+        .contentType(CONTENT_TYPE)
+        .metadata(ImmutableMap.of("k", "v"))
+        .build();
+    assertNotNull(storage.create(blob));
+    BlobInfo remoteBlob = storage.get(blob.blobId(), Storage.BlobGetOption.fields(
+        BlobField.ACL, BlobField.BUCKET, BlobField.CACHE_CONTROL, BlobField.COMPONENT_COUNT,
+        BlobField.CONTENT_DISPOSITION, BlobField.CONTENT_ENCODING, BlobField.CONTENT_LANGUAGE,
+        BlobField.CONTENT_TYPE, BlobField.CRC32C, BlobField.ETAG, BlobField.GENERATION,
+        BlobField.ID, BlobField.KIND, BlobField.MD5HASH, BlobField.MEDIA_LINK, BlobField.METADATA,
+        BlobField.METAGENERATION, BlobField.NAME, BlobField.OWNER, BlobField.SELF_LINK,
+        BlobField.SIZE, BlobField.STORAGE_CLASS, BlobField.TIME_DELETED, BlobField.UPDATED));
+    assertEquals(blob.blobId(), remoteBlob.blobId());
+    assertEquals(ImmutableMap.of("k", "v"), remoteBlob.metadata());
+    assertNotNull(remoteBlob.id());
+    assertNotNull(remoteBlob.selfLink());
+    assertTrue(storage.delete(BUCKET, blobName));
+  }
+
   @Test
   public void testListBlobsSelectedFields() {
     String[] blobNames = {"test-list-blobs-selected-fields-blob1",
@@ -202,11 +259,11 @@ public void testListBlobsSelectedFields() {
         .build();
     assertNotNull(storage.create(blob1));
     assertNotNull(storage.create(blob2));
-    ListResult result = storage.list(BUCKET,
+    Page page = storage.list(BUCKET,
         Storage.BlobListOption.prefix("test-list-blobs-selected-fields-blob"),
-        Storage.BlobListOption.fields(Storage.BlobField.METADATA));
+        Storage.BlobListOption.fields(BlobField.METADATA));
     int index = 0;
-    for (BlobInfo remoteBlob : result) {
+    for (BlobInfo remoteBlob : page.values()) {
       assertEquals(BUCKET, remoteBlob.bucket());
       assertEquals(blobNames[index++], remoteBlob.name());
       assertEquals(metadata, remoteBlob.metadata());
@@ -228,11 +285,11 @@ public void testListBlobsEmptySelectedFields() {
         .build();
     assertNotNull(storage.create(blob1));
     assertNotNull(storage.create(blob2));
-    ListResult result = storage.list(BUCKET,
+    Page page = storage.list(BUCKET,
         Storage.BlobListOption.prefix("test-list-blobs-empty-selected-fields-blob"),
         Storage.BlobListOption.fields());
     int index = 0;
-    for (BlobInfo remoteBlob : result) {
+    for (BlobInfo remoteBlob : page.values()) {
       assertEquals(BUCKET, remoteBlob.bucket());
       assertEquals(blobNames[index++], remoteBlob.name());
       assertNull(remoteBlob.contentType());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index f5c8cff1a335..d5e2f8de7397 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -549,15 +549,15 @@ public void testListBucketsWithSelectedFields() {
     EasyMock.expect(storageRpcMock.list(EasyMock.capture(capturedOptions))).andReturn(result);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    ListResult listResult = storage.list(BUCKET_LIST_FIELDS);
+    Page page = storage.list(BUCKET_LIST_FIELDS);
     String selector = (String) capturedOptions.getValue().get(BLOB_LIST_FIELDS.rpcOption());
     assertTrue(selector.contains("items"));
     assertTrue(selector.contains("name"));
     assertTrue(selector.contains("acl"));
     assertTrue(selector.contains("location"));
     assertEquals(24, selector.length());
-    assertEquals(cursor, listResult.nextPageCursor());
-    assertArrayEquals(bucketList.toArray(), Iterables.toArray(listResult, BucketInfo.class));
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(bucketList.toArray(), Iterables.toArray(page.values(), BucketInfo.class));
   }
 
   @Test
@@ -571,13 +571,13 @@ public void testListBucketsWithEmptyFields() {
     EasyMock.expect(storageRpcMock.list(EasyMock.capture(capturedOptions))).andReturn(result);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    ListResult listResult = storage.list(BUCKET_LIST_EMPTY_FIELDS);
+    Page page = storage.list(BUCKET_LIST_EMPTY_FIELDS);
     String selector = (String) capturedOptions.getValue().get(BLOB_LIST_FIELDS.rpcOption());
     assertTrue(selector.contains("items"));
     assertTrue(selector.contains("name"));
     assertEquals(11, selector.length());
-    assertEquals(cursor, listResult.nextPageCursor());
-    assertArrayEquals(bucketList.toArray(), Iterables.toArray(listResult, BucketInfo.class));
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(bucketList.toArray(), Iterables.toArray(page.values(), BucketInfo.class));
   }
 
   @Test
@@ -634,7 +634,7 @@ public void testListBlobsWithSelectedFields() {
         .andReturn(result);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    ListResult listResult =
+    Page page =
         storage.list(BUCKET_NAME1, BLOB_LIST_MAX_RESULT, BLOB_LIST_PREFIX, BLOB_LIST_FIELDS);
     assertEquals(BLOB_LIST_MAX_RESULT.value(),
         capturedOptions.getValue().get(BLOB_LIST_MAX_RESULT.rpcOption()));
@@ -647,8 +647,8 @@ public void testListBlobsWithSelectedFields() {
     assertTrue(selector.contains("contentType"));
     assertTrue(selector.contains("md5Hash"));
     assertEquals(38, selector.length());
-    assertEquals(cursor, listResult.nextPageCursor());
-    assertArrayEquals(blobList.toArray(), Iterables.toArray(listResult, BlobInfo.class));
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(blobList.toArray(), Iterables.toArray(page.values(), BlobInfo.class));
   }
 
   @Test
@@ -664,7 +664,7 @@ public void testListBlobsWithEmptyFields() {
         .andReturn(result);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    ListResult listResult =
+    Page page =
         storage.list(BUCKET_NAME1, BLOB_LIST_MAX_RESULT, BLOB_LIST_PREFIX, BLOB_LIST_EMPTY_FIELDS);
     assertEquals(BLOB_LIST_MAX_RESULT.value(),
         capturedOptions.getValue().get(BLOB_LIST_MAX_RESULT.rpcOption()));
@@ -675,8 +675,8 @@ public void testListBlobsWithEmptyFields() {
     assertTrue(selector.contains("bucket"));
     assertTrue(selector.contains("name"));
     assertEquals(18, selector.length());
-    assertEquals(cursor, listResult.nextPageCursor());
-    assertArrayEquals(blobList.toArray(), Iterables.toArray(listResult, BlobInfo.class));
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(blobList.toArray(), Iterables.toArray(page.values(), BlobInfo.class));
   }
 
   @Test

From af7a08b4e03506fd830fa8d0fcbed8b7e279e8e1 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 4 Nov 2015 23:05:53 +0100
Subject: [PATCH 045/322] Use BlobField and BucketField .values() in IT tests

---
 .../com/google/gcloud/storage/ITStorageTest.java | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 659c3d94ad4d..423e972a8de6 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -108,11 +108,8 @@ public void testGetBucketSelectedFields() {
 
   @Test
   public void testGetBucketAllSelectedFields() {
-    BucketInfo remoteBucket = storage.get(BUCKET, Storage.BucketGetOption.fields(BucketField.ACL,
-        BucketField.CORS, BucketField.DEFAULT_OBJECT_ACL, BucketField.ETAG, BucketField.ID,
-        BucketField.LOCATION, BucketField.METAGENERATION, BucketField.NAME, BucketField.OWNER,
-        BucketField.SELF_LINK, BucketField.STORAGE_CLASS, BucketField.TIME_CREATED,
-        BucketField.VERSIONING, BucketField.WEBSITE));
+    BucketInfo remoteBucket = storage.get(BUCKET,
+        Storage.BucketGetOption.fields(BucketField.values()));
     assertEquals(BUCKET, remoteBucket.name());
     assertNotNull(remoteBucket.createTime());
     assertNotNull(remoteBucket.selfLink());
@@ -230,13 +227,8 @@ public void testGetBlobAllSelectedFields() {
         .metadata(ImmutableMap.of("k", "v"))
         .build();
     assertNotNull(storage.create(blob));
-    BlobInfo remoteBlob = storage.get(blob.blobId(), Storage.BlobGetOption.fields(
-        BlobField.ACL, BlobField.BUCKET, BlobField.CACHE_CONTROL, BlobField.COMPONENT_COUNT,
-        BlobField.CONTENT_DISPOSITION, BlobField.CONTENT_ENCODING, BlobField.CONTENT_LANGUAGE,
-        BlobField.CONTENT_TYPE, BlobField.CRC32C, BlobField.ETAG, BlobField.GENERATION,
-        BlobField.ID, BlobField.KIND, BlobField.MD5HASH, BlobField.MEDIA_LINK, BlobField.METADATA,
-        BlobField.METAGENERATION, BlobField.NAME, BlobField.OWNER, BlobField.SELF_LINK,
-        BlobField.SIZE, BlobField.STORAGE_CLASS, BlobField.TIME_DELETED, BlobField.UPDATED));
+    BlobInfo remoteBlob = storage.get(blob.blobId(),
+        Storage.BlobGetOption.fields(BlobField.values()));
     assertEquals(blob.blobId(), remoteBlob.blobId());
     assertEquals(ImmutableMap.of("k", "v"), remoteBlob.metadata());
     assertNotNull(remoteBlob.id());

From 6636e23cac4c18a9fcc4a826aecc531294a564c0 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 4 Nov 2015 17:04:25 -0800
Subject: [PATCH 046/322] Create BaseServiceException in gcloud-java-core

---
 .../google/gcloud/BaseServiceException.java   | 51 +++++++++++++++++++
 .../gcloud/BaseServiceExceptionTest.java      | 45 ++++++++++++++++
 .../gcloud/datastore/DatastoreException.java  | 50 +++++++++---------
 .../datastore/DatastoreExceptionTest.java     | 12 ++---
 .../gcloud/datastore/DatastoreTest.java       |  4 +-
 .../gcloud/storage/StorageException.java      | 24 ++-------
 6 files changed, 135 insertions(+), 51 deletions(-)
 create mode 100644 gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
 create mode 100644 gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
new file mode 100644
index 000000000000..45c047d4710a
--- /dev/null
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud;
+
+/**
+ * Base service exception.
+ */
+public class BaseServiceException extends RuntimeException {
+
+  private static final long serialVersionUID = 5028833760039966178L;
+
+  private final int code;
+  private final boolean retryable;
+
+  public BaseServiceException(int code, String message, boolean retryable) {
+    super(message);
+    this.code = code;
+    this.retryable = retryable;
+  }
+
+  public BaseServiceException(int code, String message, boolean retryable, Exception cause) {
+    super(message, cause);
+    this.code = code;
+    this.retryable = retryable;
+  }
+
+  /**
+   * Returns the code associated with this exception.
+   */
+  public int code() {
+    return code;
+  }
+
+  public boolean retryable() {
+    return retryable;
+  }
+}
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
new file mode 100644
index 000000000000..f30fd3abfb79
--- /dev/null
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * Tests for {@link BaseServiceException}.
+ */
+public class BaseServiceExceptionTest {
+
+  private final int code = 1;
+  private final String message = "some message";
+  private final boolean retryable = true;
+
+  @Test
+  public void testBaseServiceException() {
+    BaseServiceException serviceException = new BaseServiceException(code, message, retryable);
+    assertEquals(serviceException.code(), code);
+    assertEquals(serviceException.getMessage(), message);
+    assertEquals(serviceException.getCause(), null);
+
+    Exception cause = new RuntimeException();
+    serviceException = new BaseServiceException(code, message, retryable, cause);
+    assertEquals(serviceException.code(), code);
+    assertEquals(serviceException.getMessage(), message);
+    assertEquals(serviceException.getCause(), cause);
+  }
+}
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
index 562578a26428..ecbdd57b6bfb 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
@@ -18,6 +18,7 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.BaseServiceException;
 import com.google.gcloud.RetryHelper;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
@@ -26,21 +27,21 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class DatastoreException extends RuntimeException {
+public class DatastoreException extends BaseServiceException {
 
-  private static final long serialVersionUID = 8170357898917041899L;
-  private static final ImmutableMap REASON_TO_CODE;
-  private static final ImmutableMap HTTP_TO_CODE;
+  private static final long serialVersionUID = -2336749234060754893L;
+  private static final ImmutableMap REASON_TO_CODE;
+  private static final ImmutableMap HTTP_TO_CODE;
 
-  private final Code code;
+  private final ErrorInfo errorInfo;
 
   /**
-   * An error code to represent the failure.
+   * Represent metadata about {@link DatastoreException}s.
    *
    * @see Google Cloud
    *     Datastore error codes
    */
-  public enum Code {
+  public enum ErrorInfo {
 
     ABORTED(Reason.ABORTED),
     DEADLINE_EXCEEDED(Reason.DEADLINE_EXCEEDED),
@@ -57,11 +58,11 @@ public enum Code {
     private final String description;
     private final int httpStatus;
 
-    Code(Reason reason) {
+    ErrorInfo(Reason reason) {
       this(reason.retryable(), reason.description(), reason.httpStatus());
     }
 
-    Code(boolean retryable, String description, int httpStatus) {
+    ErrorInfo(boolean retryable, String description, int httpStatus) {
       this.retryable = retryable;
       this.description = description;
       this.httpStatus = httpStatus;
@@ -89,9 +90,9 @@ DatastoreException translate(DatastoreRpcException exception, String message) {
   }
 
   static {
-    ImmutableMap.Builder builder = ImmutableMap.builder();
-    Map httpCodes = new HashMap<>();
-    for (Code code : Code.values()) {
+    ImmutableMap.Builder builder = ImmutableMap.builder();
+    Map httpCodes = new HashMap<>();
+    for (ErrorInfo code : ErrorInfo.values()) {
       builder.put(code.name(), code);
       httpCodes.put(code.httpStatus(), code);
     }
@@ -99,20 +100,21 @@ DatastoreException translate(DatastoreRpcException exception, String message) {
     HTTP_TO_CODE = ImmutableMap.copyOf(httpCodes);
   }
 
-  public DatastoreException(Code code, String message, Exception cause) {
-    super(MoreObjects.firstNonNull(message, code.description), cause);
-    this.code = code;
+  public DatastoreException(ErrorInfo errorInfo, String message, Exception cause) {
+    super(errorInfo.httpStatus(), MoreObjects.firstNonNull(message, errorInfo.description),
+        errorInfo.retryable(), cause);
+    this.errorInfo = errorInfo;
   }
 
-  public DatastoreException(Code code, String message) {
-    this(code, message, null);
+  public DatastoreException(ErrorInfo errorInfo, String message) {
+    this(errorInfo, message, null);
   }
 
   /**
    * Returns the code associated with this exception.
    */
-  public Code code() {
-    return code;
+  public ErrorInfo errorInfo() {
+    return errorInfo;
   }
 
   static DatastoreException translateAndThrow(RetryHelperException ex) {
@@ -122,7 +124,7 @@ static DatastoreException translateAndThrow(RetryHelperException ex) {
     if (ex instanceof RetryHelper.RetryInterruptedException) {
       RetryHelper.RetryInterruptedException.propagate();
     }
-    throw new DatastoreException(Code.UNKNOWN, ex.getMessage(), ex);
+    throw new DatastoreException(ErrorInfo.UNKNOWN, ex.getMessage(), ex);
   }
 
   /**
@@ -133,9 +135,9 @@ static DatastoreException translateAndThrow(RetryHelperException ex) {
    */
   static DatastoreException translateAndThrow(DatastoreRpcException exception) {
     String message = exception.getMessage();
-    Code code = REASON_TO_CODE.get(exception.reason());
+    ErrorInfo code = REASON_TO_CODE.get(exception.reason());
     if (code == null) {
-      code = MoreObjects.firstNonNull(HTTP_TO_CODE.get(exception.httpStatus()), Code.UNKNOWN);
+      code = MoreObjects.firstNonNull(HTTP_TO_CODE.get(exception.httpStatus()), ErrorInfo.UNKNOWN);
     }
     throw code.translate(exception, message);
   }
@@ -147,10 +149,10 @@ static DatastoreException translateAndThrow(DatastoreRpcException exception) {
    * @throws DatastoreException every time
    */
   static DatastoreException throwInvalidRequest(String massage, Object... params) {
-    throw new DatastoreException(Code.FAILED_PRECONDITION, String.format(massage, params));
+    throw new DatastoreException(ErrorInfo.FAILED_PRECONDITION, String.format(massage, params));
   }
 
   static DatastoreException propagateUserException(Exception ex) {
-    throw new DatastoreException(Code.UNKNOWN, ex.getMessage(), ex);
+    throw new DatastoreException(ErrorInfo.UNKNOWN, ex.getMessage(), ex);
   }
 }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
index a64a3531c19d..20c2f742579a 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import com.google.gcloud.datastore.DatastoreException.Code;
+import com.google.gcloud.datastore.DatastoreException.ErrorInfo;
 import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
 import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
 
@@ -30,14 +30,14 @@ public class DatastoreExceptionTest {
   @Test
   public void testCode() throws Exception {
     for (Reason reason : Reason.values()) {
-      Code code = Code.valueOf(reason.name());
+      ErrorInfo code = ErrorInfo.valueOf(reason.name());
       assertEquals(reason.retryable(), code.retryable());
       assertEquals(reason.description(), code.description());
       assertEquals(reason.httpStatus(), code.httpStatus());
     }
 
-    DatastoreException exception = new DatastoreException(Code.ABORTED, "bla");
-    assertEquals(Code.ABORTED, exception.code());
+    DatastoreException exception = new DatastoreException(ErrorInfo.ABORTED, "bla");
+    assertEquals(ErrorInfo.ABORTED, exception.errorInfo());
   }
 
   @Test
@@ -47,7 +47,7 @@ public void testTranslateAndThrow() throws Exception {
         DatastoreException.translateAndThrow(new DatastoreRpcException(reason));
         fail("Exception expected");
       } catch (DatastoreException ex) {
-        assertEquals(reason.name(), ex.code().name());
+        assertEquals(reason.name(), ex.errorInfo().name());
       }
     }
   }
@@ -58,7 +58,7 @@ public void testThrowInvalidRequest() throws Exception {
       DatastoreException.throwInvalidRequest("message %s %d", "a", 1);
       fail("Exception expected");
     } catch (DatastoreException ex) {
-      assertEquals(Code.FAILED_PRECONDITION, ex.code());
+      assertEquals(ErrorInfo.FAILED_PRECONDITION, ex.errorInfo());
       assertEquals("message a 1", ex.getMessage());
     }
   }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index f639ca3fdac0..9b42c99b0da1 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -197,7 +197,7 @@ public void testTransactionWithRead() {
       transaction.commit();
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals(DatastoreException.Code.ABORTED, expected.code());
+      assertEquals(DatastoreException.ErrorInfo.ABORTED, expected.errorInfo());
     }
   }
 
@@ -225,7 +225,7 @@ public void testTransactionWithQuery() {
       transaction.commit();
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals(DatastoreException.Code.ABORTED, expected.code());
+      assertEquals(DatastoreException.ErrorInfo.ABORTED, expected.errorInfo());
     }
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
index e354e3a6d427..c1075ae28c8b 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
@@ -16,8 +16,10 @@
 
 package com.google.gcloud.storage;
 
+import com.google.gcloud.BaseServiceException;
 import com.google.gcloud.RetryHelper;
 import com.google.gcloud.RetryHelper.RetryHelperException;
+import com.google.gcloud.RetryHelper.RetryInterruptedException;
 
 /**
  * Storage service exception.
@@ -25,29 +27,13 @@
  * @see Google Cloud
  *      Storage error codes
  */
-public class StorageException extends RuntimeException {
+public class StorageException extends BaseServiceException {
 
-  private static final long serialVersionUID = -3748432005065428084L;
+  private static final long serialVersionUID = 8088235105953640145L;
   private static final int UNKNOWN_CODE = -1;
 
-  private final int code;
-  private final boolean retryable;
-
   public StorageException(int code, String message, boolean retryable) {
-    super(message);
-    this.code = code;
-    this.retryable = retryable;
-  }
-
-  /**
-   * Returns the code associated with this exception.
-   */
-  public int code() {
-    return code;
-  }
-
-  public boolean retryable() {
-    return retryable;
+    super(code, message, retryable);
   }
 
   /**

From b57a13d6d0e44a7bb5374bf9950551d5e4d5a23b Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 4 Nov 2015 19:06:58 -0800
Subject: [PATCH 047/322] Rename enum, fix docs, and make accessors package
 private

---
 .../google/gcloud/BaseServiceException.java   |  5 +-
 .../gcloud/datastore/DatastoreException.java  | 75 +++++++++----------
 .../datastore/DatastoreExceptionTest.java     | 20 ++---
 .../gcloud/datastore/DatastoreTest.java       |  4 +-
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
index 45c047d4710a..cd0933426756 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
@@ -17,7 +17,7 @@
 package com.google.gcloud;
 
 /**
- * Base service exception.
+ * Base class for all service exceptions.
  */
 public class BaseServiceException extends RuntimeException {
 
@@ -45,6 +45,9 @@ public int code() {
     return code;
   }
 
+  /**
+   * Returns {@code true} when it is safe to retry the operation that caused this exception.
+   */
   public boolean retryable() {
     return retryable;
   }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
index ecbdd57b6bfb..dded1d11875e 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
@@ -30,18 +30,18 @@
 public class DatastoreException extends BaseServiceException {
 
   private static final long serialVersionUID = -2336749234060754893L;
-  private static final ImmutableMap REASON_TO_CODE;
-  private static final ImmutableMap HTTP_TO_CODE;
+  private static final ImmutableMap REASON_TO_ERROR;
+  private static final ImmutableMap HTTP_TO_ERROR;
 
-  private final ErrorInfo errorInfo;
+  private final DatastoreError error;
 
   /**
-   * Represent metadata about {@link DatastoreException}s.
+   * Represents Datastore errors.
    *
    * @see Google Cloud
    *     Datastore error codes
    */
-  public enum ErrorInfo {
+  public enum DatastoreError {
 
     ABORTED(Reason.ABORTED),
     DEADLINE_EXCEEDED(Reason.DEADLINE_EXCEEDED),
@@ -58,29 +58,25 @@ public enum ErrorInfo {
     private final String description;
     private final int httpStatus;
 
-    ErrorInfo(Reason reason) {
+    DatastoreError(Reason reason) {
       this(reason.retryable(), reason.description(), reason.httpStatus());
     }
 
-    ErrorInfo(boolean retryable, String description, int httpStatus) {
+    DatastoreError(boolean retryable, String description, int httpStatus) {
       this.retryable = retryable;
       this.description = description;
       this.httpStatus = httpStatus;
     }
 
-    public String description() {
+    String description() {
       return description;
     }
 
-    public int httpStatus() {
+    int httpStatus() {
       return httpStatus;
     }
 
-    /**
-     * Returns {@code true} if this exception is transient and the same request could be retried.
-     * For any retry it is highly recommended to apply an exponential backoff.
-     */
-    public boolean retryable() {
+    boolean retryable() {
       return retryable;
     }
 
@@ -90,31 +86,31 @@ DatastoreException translate(DatastoreRpcException exception, String message) {
   }
 
   static {
-    ImmutableMap.Builder builder = ImmutableMap.builder();
-    Map httpCodes = new HashMap<>();
-    for (ErrorInfo code : ErrorInfo.values()) {
-      builder.put(code.name(), code);
-      httpCodes.put(code.httpStatus(), code);
+    ImmutableMap.Builder builder = ImmutableMap.builder();
+    Map httpCodes = new HashMap<>();
+    for (DatastoreError error : DatastoreError.values()) {
+      builder.put(error.name(), error);
+      httpCodes.put(error.httpStatus(), error);
     }
-    REASON_TO_CODE = builder.build();
-    HTTP_TO_CODE = ImmutableMap.copyOf(httpCodes);
+    REASON_TO_ERROR = builder.build();
+    HTTP_TO_ERROR = ImmutableMap.copyOf(httpCodes);
   }
 
-  public DatastoreException(ErrorInfo errorInfo, String message, Exception cause) {
-    super(errorInfo.httpStatus(), MoreObjects.firstNonNull(message, errorInfo.description),
-        errorInfo.retryable(), cause);
-    this.errorInfo = errorInfo;
+  public DatastoreException(DatastoreError error, String message, Exception cause) {
+    super(error.httpStatus(), MoreObjects.firstNonNull(message, error.description),
+        error.retryable(), cause);
+    this.error = error;
   }
 
-  public DatastoreException(ErrorInfo errorInfo, String message) {
-    this(errorInfo, message, null);
+  public DatastoreException(DatastoreError error, String message) {
+    this(error, message, null);
   }
 
   /**
-   * Returns the code associated with this exception.
+   * Returns the DatastoreError associated with this exception.
    */
-  public ErrorInfo errorInfo() {
-    return errorInfo;
+  public DatastoreError datastoreError() {
+    return error;
   }
 
   static DatastoreException translateAndThrow(RetryHelperException ex) {
@@ -124,35 +120,36 @@ static DatastoreException translateAndThrow(RetryHelperException ex) {
     if (ex instanceof RetryHelper.RetryInterruptedException) {
       RetryHelper.RetryInterruptedException.propagate();
     }
-    throw new DatastoreException(ErrorInfo.UNKNOWN, ex.getMessage(), ex);
+    throw new DatastoreException(DatastoreError.UNKNOWN, ex.getMessage(), ex);
   }
 
   /**
-   * Translate DatastoreException to DatastoreException based on their
+   * Translate DatastoreRpcExceptions to DatastoreExceptions based on their
    * HTTP error codes. This method will always throw a new DatastoreException.
    *
    * @throws DatastoreException every time
    */
   static DatastoreException translateAndThrow(DatastoreRpcException exception) {
     String message = exception.getMessage();
-    ErrorInfo code = REASON_TO_CODE.get(exception.reason());
-    if (code == null) {
-      code = MoreObjects.firstNonNull(HTTP_TO_CODE.get(exception.httpStatus()), ErrorInfo.UNKNOWN);
+    DatastoreError error = REASON_TO_ERROR.get(exception.reason());
+    if (error == null) {
+      error = MoreObjects.firstNonNull(
+          HTTP_TO_ERROR.get(exception.httpStatus()), DatastoreError.UNKNOWN);
     }
-    throw code.translate(exception, message);
+    throw error.translate(exception, message);
   }
 
   /**
-   * Throw a DatastoreException with {@code FAILED_PRECONDITION} code and the {@code message}
+   * Throw a DatastoreException with {@code FAILED_PRECONDITION} error and the {@code message}
    * in a nested exception.
    *
    * @throws DatastoreException every time
    */
   static DatastoreException throwInvalidRequest(String massage, Object... params) {
-    throw new DatastoreException(ErrorInfo.FAILED_PRECONDITION, String.format(massage, params));
+    throw new DatastoreException(DatastoreError.FAILED_PRECONDITION, String.format(massage, params));
   }
 
   static DatastoreException propagateUserException(Exception ex) {
-    throw new DatastoreException(ErrorInfo.UNKNOWN, ex.getMessage(), ex);
+    throw new DatastoreException(DatastoreError.UNKNOWN, ex.getMessage(), ex);
   }
 }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
index 20c2f742579a..9ad836b15a4e 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import com.google.gcloud.datastore.DatastoreException.ErrorInfo;
+import com.google.gcloud.datastore.DatastoreException.DatastoreError;
 import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
 import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
 
@@ -28,16 +28,16 @@
 public class DatastoreExceptionTest {
 
   @Test
-  public void testCode() throws Exception {
+  public void testDatastoreError() throws Exception {
     for (Reason reason : Reason.values()) {
-      ErrorInfo code = ErrorInfo.valueOf(reason.name());
-      assertEquals(reason.retryable(), code.retryable());
-      assertEquals(reason.description(), code.description());
-      assertEquals(reason.httpStatus(), code.httpStatus());
+      DatastoreError error = DatastoreError.valueOf(reason.name());
+      assertEquals(reason.retryable(), error.retryable());
+      assertEquals(reason.description(), error.description());
+      assertEquals(reason.httpStatus(), error.httpStatus());
     }
 
-    DatastoreException exception = new DatastoreException(ErrorInfo.ABORTED, "bla");
-    assertEquals(ErrorInfo.ABORTED, exception.errorInfo());
+    DatastoreException exception = new DatastoreException(DatastoreError.ABORTED, "bla");
+    assertEquals(DatastoreError.ABORTED, exception.datastoreError());
   }
 
   @Test
@@ -47,7 +47,7 @@ public void testTranslateAndThrow() throws Exception {
         DatastoreException.translateAndThrow(new DatastoreRpcException(reason));
         fail("Exception expected");
       } catch (DatastoreException ex) {
-        assertEquals(reason.name(), ex.errorInfo().name());
+        assertEquals(reason.name(), ex.datastoreError().name());
       }
     }
   }
@@ -58,7 +58,7 @@ public void testThrowInvalidRequest() throws Exception {
       DatastoreException.throwInvalidRequest("message %s %d", "a", 1);
       fail("Exception expected");
     } catch (DatastoreException ex) {
-      assertEquals(ErrorInfo.FAILED_PRECONDITION, ex.errorInfo());
+      assertEquals(DatastoreError.FAILED_PRECONDITION, ex.datastoreError());
       assertEquals("message a 1", ex.getMessage());
     }
   }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index 9b42c99b0da1..6afd40927264 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -197,7 +197,7 @@ public void testTransactionWithRead() {
       transaction.commit();
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals(DatastoreException.ErrorInfo.ABORTED, expected.errorInfo());
+      assertEquals(DatastoreException.DatastoreError.ABORTED, expected.datastoreError());
     }
   }
 
@@ -225,7 +225,7 @@ public void testTransactionWithQuery() {
       transaction.commit();
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals(DatastoreException.ErrorInfo.ABORTED, expected.errorInfo());
+      assertEquals(DatastoreException.DatastoreError.ABORTED, expected.datastoreError());
     }
   }
 

From 73d379ba5afd65fa0a112093f48eace1e5acb931 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 5 Nov 2015 16:56:16 +0100
Subject: [PATCH 048/322] Add sbt/gradle dependencies to READMEs, change
 update_docs_version.sh

---
 README.md                        | 10 +++++++++-
 gcloud-java-core/README.md       | 10 +++++++++-
 gcloud-java-datastore/README.md  | 10 +++++++++-
 gcloud-java-examples/README.md   | 10 +++++++++-
 gcloud-java-storage/README.md    | 10 +++++++++-
 gcloud-java/README.md            | 10 +++++++++-
 utilities/update_docs_version.sh |  2 ++
 7 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 1b9867fd198f..85a3ef7993f8 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ This client supports the following Google Cloud Platform services:
 
 Quickstart
 ----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
 ```xml
 
   com.google.gcloud
@@ -28,6 +28,14 @@ Add this to your pom.xml file
   0.0.10
 
 ```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.10"
+```
 
 Example Applications
 --------------------
diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index 2a3be300f4ac..032127540d19 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -12,7 +12,7 @@ This module provides common functionality required by service-specific modules o
 
 Quickstart
 ----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
 ```xml
 
   com.google.gcloud
@@ -20,6 +20,14 @@ Add this to your pom.xml file
   0.0.10
 
 ```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java-core:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.10"
+```
 
 Java Versions
 -------------
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index bbcdd9d8857c..8915f2d37a55 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -15,7 +15,7 @@ Java idiomatic client for [Google Cloud Datastore] (https://cloud.google.com/dat
 
 Quickstart
 ----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
 ```xml
 
   com.google.gcloud
@@ -23,6 +23,14 @@ Add this to your pom.xml file
   0.0.10
 
 ```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java-datastore:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.10"
+```
 
 Example Application
 --------------------
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index 366acd5de929..9afe16a2b1a5 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -12,7 +12,7 @@ Examples for gcloud-java (Java idiomatic client for [Google Cloud Platform][clou
 
 Quickstart
 ----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
 ```xml
 
   com.google.gcloud
@@ -20,6 +20,14 @@ Add this to your pom.xml file
   0.0.10
 
 ```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java-examples:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.10"
+```
 
 To run examples from your command line:
 
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 717fd1f1f3e4..8722da76cec4 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -15,7 +15,7 @@ Java idiomatic client for [Google Cloud Storage] (https://cloud.google.com/stora
 
 Quickstart
 ----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
 ```xml
 
   com.google.gcloud
@@ -23,6 +23,14 @@ Add this to your pom.xml file
   0.0.10
 
 ```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java-storage:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.0.10"
+```
 
 Example Application
 -------------------
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index 7e2eee84a8c4..baa1e5c53b1c 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -20,7 +20,7 @@ This client supports the following Google Cloud Platform services:
 
 Quickstart
 ----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
 ```xml
 
   com.google.gcloud
@@ -28,6 +28,14 @@ Add this to your pom.xml file
   0.0.10
 
 ```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.10"
+```
 
 Java Versions
 -------------
diff --git a/utilities/update_docs_version.sh b/utilities/update_docs_version.sh
index d7e7bdbfb830..4b1641a0bd81 100755
--- a/utilities/update_docs_version.sh
+++ b/utilities/update_docs_version.sh
@@ -14,6 +14,8 @@ if [ "${RELEASED_VERSION##*-}" != "SNAPSHOT" ]; then
     for item in ${module_folders[*]}
     do
         sed -ri "s/[0-9]+\.[0-9]+\.[0-9]+<\/version>/${RELEASED_VERSION}<\/version>/g" ${item}/README.md
+        sed -ri "s/:[0-9]+\.[0-9]+\.[0-9]+'/:${RELEASED_VERSION}'/g" ${item}/README.md
+        sed -ri "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${RELEASED_VERSION}\"/g" ${item}/README.md
     done
     
     git add README.md */README.md

From 2203b9188f89a1a410b86888d8c5f7369fb22465 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 4 Nov 2015 18:31:22 -0800
Subject: [PATCH 049/322] Run coveralls for PRs as well

---
 utilities/after_success.sh | 56 ++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/utilities/after_success.sh b/utilities/after_success.sh
index 26405bcd9db3..05ab5fb373d6 100755
--- a/utilities/after_success.sh
+++ b/utilities/after_success.sh
@@ -7,35 +7,37 @@ source ./utilities/integration_test_env.sh
 echo "Travis branch:       " ${TRAVIS_BRANCH}
 echo "Travis pull request: " ${TRAVIS_PULL_REQUEST}
 echo "Travis JDK version:  " ${TRAVIS_JDK_VERSION}
-if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -a "${TRAVIS_PULL_REQUEST}" == "false" ]; then
-    mvn cobertura:cobertura coveralls:report
 
-    SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)')
-    if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then
-        # Deploy site if not a SNAPSHOT
-        git config --global user.name "travis-ci"
-        git config --global user.email "travis@travis-ci.org"
-        git clone --branch gh-pages --single-branch https://github.com/GoogleCloudPlatform/gcloud-java/ tmp_gh-pages
-        mkdir -p tmp_gh-pages/$SITE_VERSION
-        mvn site -DskipTests=true
-        mvn site:stage -DtopSiteURL=http://googlecloudplatform.github.io/gcloud-java/site/${SITE_VERSION}/
-        cd tmp_gh-pages
-        cp -r ../target/staging/$SITE_VERSION/* $SITE_VERSION/
-        sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" ${SITE_VERSION}/index.html # Update "Quickstart with Maven" to reflect version change
-        git add $SITE_VERSION
-        echo "" > index.html
-        git add index.html
-        echo "" > apidocs/index.html
-        git add apidocs/index.html
-        git commit -m "Added a new site for version $SITE_VERSION and updated the root directory's redirect."
-        git config --global push.default simple
-        git push --quiet "https://${CI_DEPLOY_USERNAME}:${CI_DEPLOY_PASSWORD}@github.com/GoogleCloudPlatform/gcloud-java.git" > /dev/null 2>&1
+if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" ]; then
+    mvn clean cobertura:cobertura coveralls:report
+    if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then 
+      SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)')
+      if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then
+          # Deploy site if not a SNAPSHOT
+          git config --global user.name "travis-ci"
+          git config --global user.email "travis@travis-ci.org"
+          git clone --branch gh-pages --single-branch https://github.com/GoogleCloudPlatform/gcloud-java/ tmp_gh-pages
+          mkdir -p tmp_gh-pages/$SITE_VERSION
+          mvn site -DskipTests=true
+          mvn site:stage -DtopSiteURL=http://googlecloudplatform.github.io/gcloud-java/site/${SITE_VERSION}/
+          cd tmp_gh-pages
+          cp -r ../target/staging/$SITE_VERSION/* $SITE_VERSION/
+          sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" ${SITE_VERSION}/index.html # Update "Quickstart with Maven" to reflect version change
+          git add $SITE_VERSION
+          echo "" > index.html
+          git add index.html
+          echo "" > apidocs/index.html
+          git add apidocs/index.html
+          git commit -m "Added a new site for version $SITE_VERSION and updated the root directory's redirect."
+          git config --global push.default simple
+          git push --quiet "https://${CI_DEPLOY_USERNAME}:${CI_DEPLOY_PASSWORD}@github.com/GoogleCloudPlatform/gcloud-java.git" > /dev/null 2>&1
 
-        cd ..
-        utilities/update_docs_version.sh # Update version in READMEs
-        mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
-    else
-        mvn clean deploy -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml
+          cd ..
+          utilities/update_docs_version.sh # Update version in READMEs
+          mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
+      else
+          mvn clean deploy -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml
+      fi
     fi
 else
     echo "Not deploying artifacts. This is only done with non-pull-request commits to master branch with Oracle Java 7 builds."

From fa9348edd3316ad230a8c93a2f858f8cb364a6b0 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 5 Nov 2015 16:19:53 -0800
Subject: [PATCH 050/322] update location where we look for config file when
 using gcloud SDK to get project ID

---
 .../java/com/google/gcloud/ServiceOptions.java    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 1be1f16115ad..898897833287 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -30,6 +30,7 @@
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -387,8 +388,18 @@ protected static String googleCloudProjectId() {
     } else {
       configDir = new File(System.getProperty("user.home"), ".config/gcloud");
     }
-    try (BufferedReader reader =
-        new BufferedReader(new FileReader(new File(configDir, "properties")))) {
+    FileReader fileReader;
+    try {
+      fileReader = new FileReader(new File(configDir, "configurations/config_default"));
+    } catch (FileNotFoundException newConfigFileNotFoundEx) {
+      try {
+        fileReader = new FileReader(new File(configDir, "properties"));
+      } catch (FileNotFoundException oldConfigFileNotFoundEx) {
+        // return null if we can't find config file
+        return null;
+      }
+    }
+    try (BufferedReader reader = new BufferedReader(fileReader)) {
       String line;
       String section = null;
       Pattern projectPattern = Pattern.compile("^project\\s*=\\s*(.*)$");

From f4c3a327ca0030fed4326a004e717bb62e0e969e Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 5 Nov 2015 19:08:14 -0800
Subject: [PATCH 051/322] Add more detail to README's authentication section

---
 README.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1b9867fd198f..4b07bc7579d1 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,19 @@ There are multiple ways to authenticate to use Google Cloud services.
 
 1. When using `gcloud-java` libraries from within Compute/App Engine, no additional authentication steps are necessary.
 2. When using `gcloud-java` libraries elsewhere, there are two options:
-  * [Generate a JSON service account key](https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts).  Supply a path to the downloaded JSON credentials file when building the options supplied to datastore/storage constructor.
+  * [Generate a JSON service account key](https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts).  After downloading that key, you must do one of the following:
+    * Define the environment variable GOOGLE_APPLICATION_CREDENTIALS to be the location of the key.  For example, `export GOOGLE_APPLICATION_CREDENTIALS=/path/to/my/key.json`
+    * Supply the downloaded JSON credentials file when building the options supplied to datastore/storage constructor.  For example, `StorageOptions.builder().authCredentials(AuthCredentials.createForJson(new FileInputStream("/path/to/my/key.json")).build().service()` returns a `Storage` object that has the necessary permissions.
   * If running locally for development/testing, you can use use [Google Cloud SDK](https://cloud.google.com/sdk/?hl=en).  To use the SDK authentication, [download the SDK](https://cloud.google.com/sdk/?hl=en) if you haven't already.  Then login using the SDK (`gcloud auth login` in command line), and set your current project using `gcloud config set project PROJECT_ID`.
 
+`gcloud-java` looks for credentials in the following order, stopping once it finds credentials:
+
+1. Credentials supplied to the `DatastoreOptions`/`ServiceOptions` builder
+2. App Engine credentials
+3. Key file pointed to by the GOOGLE_APPLICATION_CREDENTIALS environment variable
+4. Google SDK credentials
+5. Compute Engine credentials
+
 Google Cloud Datastore
 ----------------------
 

From fe57e9865b20a4dee394c8042cd9306a20291149 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 5 Nov 2015 19:57:55 -0800
Subject: [PATCH 052/322] Add project ID order and clean docs language

---
 README.md | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4b07bc7579d1..d6da19e83ed0 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,30 @@ There are multiple ways to authenticate to use Google Cloud services.
 2. When using `gcloud-java` libraries elsewhere, there are two options:
   * [Generate a JSON service account key](https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts).  After downloading that key, you must do one of the following:
     * Define the environment variable GOOGLE_APPLICATION_CREDENTIALS to be the location of the key.  For example, `export GOOGLE_APPLICATION_CREDENTIALS=/path/to/my/key.json`
-    * Supply the downloaded JSON credentials file when building the options supplied to datastore/storage constructor.  For example, `StorageOptions.builder().authCredentials(AuthCredentials.createForJson(new FileInputStream("/path/to/my/key.json")).build().service()` returns a `Storage` object that has the necessary permissions.
+    * Supply the JSON credentials file when building the service options.  For example, this Storage object has the necessary permissions to interact with your Google Cloud Storage data:
+    ```java
+    Storage storage = StorageOptions.builder()
+      .authCredentials(AuthCredentials.createForJson(new FileInputStream("/path/to/my/key.json"))
+      .build()
+      .service();
+    ```
   * If running locally for development/testing, you can use use [Google Cloud SDK](https://cloud.google.com/sdk/?hl=en).  To use the SDK authentication, [download the SDK](https://cloud.google.com/sdk/?hl=en) if you haven't already.  Then login using the SDK (`gcloud auth login` in command line), and set your current project using `gcloud config set project PROJECT_ID`.
 
 `gcloud-java` looks for credentials in the following order, stopping once it finds credentials:
 
-1. Credentials supplied to the `DatastoreOptions`/`ServiceOptions` builder
+1. Credentials supplied when building the service options
 2. App Engine credentials
 3. Key file pointed to by the GOOGLE_APPLICATION_CREDENTIALS environment variable
-4. Google SDK credentials
+4. Google Cloud SDK credentials
 5. Compute Engine credentials
 
+Note that this sequence is different than the order in which `gcloud-java` determines the project ID.  The project ID is determined in the following order:
+
+1. Project ID supplied when building the service options
+2. Project ID specified by the environment variable `GCLOUD_PROJECT`
+3. App Engine project ID
+4. Google Cloud SDK project ID
+
 Google Cloud Datastore
 ----------------------
 

From 81744f7ffe7cb838154341018e80fd4b8deabd64 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 5 Nov 2015 15:34:42 +0100
Subject: [PATCH 053/322] Create packages for bigquery and outline spi layer

---
 gcloud-java-bigquery/README.md                |  86 +++++++++++
 gcloud-java-bigquery/pom.xml                  |  50 ++++++
 .../com/google/gcloud/bigquery/Bigquery.java  |  29 ++++
 .../gcloud/bigquery/BigqueryException.java    |  54 +++++++
 .../gcloud/bigquery/BigqueryFactory.java      |  26 ++++
 .../gcloud/bigquery/BigqueryOptions.java      | 112 ++++++++++++++
 .../google/gcloud/bigquery/package-info.java  |  27 ++++
 .../com/google/gcloud/spi/BigqueryRpc.java    | 142 ++++++++++++++++++
 .../google/gcloud/spi/BigqueryRpcFactory.java |  26 ++++
 9 files changed, 552 insertions(+)
 create mode 100644 gcloud-java-bigquery/README.md
 create mode 100644 gcloud-java-bigquery/pom.xml
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Bigquery.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryException.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryFactory.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryOptions.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpc.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpcFactory.java

diff --git a/gcloud-java-bigquery/README.md b/gcloud-java-bigquery/README.md
new file mode 100644
index 000000000000..17ae3a267b0e
--- /dev/null
+++ b/gcloud-java-bigquery/README.md
@@ -0,0 +1,86 @@
+Google Cloud Java Client for BigQuery
+====================================
+
+Java idiomatic client for [Google Cloud BigQuery] (https://cloud.google.com/bigquery).
+
+[![Build Status](https://travis-ci.org/GoogleCloudPlatform/gcloud-java.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/gcloud-java)
+[![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/gcloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/gcloud-java?branch=master)
+
+
+-  [Homepage] (https://googlecloudplatform.github.io/gcloud-java/)
++
+
+> Note: This client is a work-in-progress, and may occasionally
+> make backwards-incompatible changes.
+
+Quickstart
+----------
+Add this to your pom.xml file
+
+
+
+Example Application
+-------------------
+
+
+
+Authentication
+--------------
+
+See the [Authentication](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) section in the base directory's README.
+
+About Google Cloud BigQuery
+--------------------------
+
+[Google Cloud BigQuery][cloud-bigquery] is a fully managed, NoOps, low cost data analytics service.
+Data can be streamed into BigQuery at millions of rows per second to enable real-time analysis.
+With BigQuery you can easily deploy Petabyte-scale Databases.
+
+Be sure to activate the Google Cloud BigQuery API on the Developer's Console to use BigQuery from your project.
+
+See the ``gcloud-java`` API [bigquery documentation][bigquery-api] to learn how to interact
+with Google Cloud BigQuery using this Client Library.
+
+Here is a code snippet showing a simple usage example from within Compute/App Engine. Note that you must [supply credentials](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) and a project ID if running this snippet elsewhere.
+
+
+
+Java Versions
+-------------
+
+Java 7 or above is required for using this client.
+
+Testing
+-------
+
+
+
+Versioning
+----------
+
+This library follows [Semantic Versioning] (http://semver.org/).
+
+It is currently in major version zero (``0.y.z``), which means that anything
+may change at any time and the public API should not be considered
+stable.
+
+Contributing
+------------
+
+Contributions to this library are always welcome and highly encouraged.
+
+See [CONTRIBUTING] for more information on how to get started.
+
+License
+-------
+
+Apache 2.0 - See [LICENSE] for more information.
+
+
+[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
+[LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
+[TESTING]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/TESTING.md#testing-code-that-uses-bigquery
+[cloud-platform]: https://cloud.google.com/
+
+[cloud-bigquery]: https://cloud.google.com/bigquery/
+[bigquery-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/bigquery/package-summary.html
\ No newline at end of file
diff --git a/gcloud-java-bigquery/pom.xml b/gcloud-java-bigquery/pom.xml
new file mode 100644
index 000000000000..f4d459ab82f7
--- /dev/null
+++ b/gcloud-java-bigquery/pom.xml
@@ -0,0 +1,50 @@
+
+
+  4.0.0
+  com.google.gcloud
+  gcloud-java-bigquery
+  jar
+  GCloud Java bigquery
+  
+    Java idiomatic client for Google Cloud BigQuery.
+  
+  
+    com.google.gcloud
+    gcloud-java-pom
+    0.0.11-SNAPSHOT
+  
+  
+    gcloud-java-bigquery
+  
+  
+    
+      ${project.groupId}
+      gcloud-java-core
+      ${project.version}
+    
+    
+      com.google.apis
+      google-api-services-bigquery
+      v2-rev244-1.20.0
+      compile
+      
+	
+	  com.google.guava
+	  guava-jdk5
+	
+      
+    
+    
+      junit
+      junit
+      4.12
+      test
+    
+    
+      org.easymock
+      easymock
+      3.3
+      test
+    
+  
+
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Bigquery.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Bigquery.java
new file mode 100644
index 000000000000..558e18a5e3e4
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Bigquery.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.gcloud.Service;
+
+/**
+ * An interface for Google Cloud BigQuery.
+ *
+ * @see Google Cloud BigQuery
+ */
+public interface Bigquery extends Service {
+
+  // TODO(mziccard) add missing methods
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryException.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryException.java
new file mode 100644
index 000000000000..fbfb895da6a3
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryException.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.gcloud.BaseServiceException;
+import com.google.gcloud.RetryHelper.RetryHelperException;
+import com.google.gcloud.RetryHelper.RetryInterruptedException;
+
+/**
+ * BigQuery service exception.
+ *
+ * @see Google Cloud
+ *      BigQuery error codes
+ */
+public class BigqueryException extends BaseServiceException {
+
+  private static final long serialVersionUID = -5504832700512784654L;
+  public static final int UNKNOWN_CODE = -1;
+
+  public BigqueryException(int code, String message, boolean retryable) {
+    super(code, message, retryable);
+  }
+
+  /**
+   * Translate RetryHelperException to the BigqueryException that caused the error. This method will
+   * always throw an exception.
+   *
+   * @throws BigqueryException when {@code ex} was caused by a {@code BigqueryException}
+   * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
+   */
+  static BigqueryException translateAndThrow(RetryHelperException ex) {
+    if (ex.getCause() instanceof BigqueryException) {
+      throw (BigqueryException) ex.getCause();
+    }
+    if (ex instanceof RetryInterruptedException) {
+      RetryInterruptedException.propagate();
+    }
+    throw new BigqueryException(UNKNOWN_CODE, ex.getMessage(), false);
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryFactory.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryFactory.java
new file mode 100644
index 000000000000..04454052edec
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryFactory.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+
+import com.google.gcloud.ServiceFactory;
+
+/**
+ * An interface for BigQuery factories.
+ */
+public interface BigqueryFactory extends ServiceFactory {
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryOptions.java
new file mode 100644
index 000000000000..74b6dba6c3c8
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryOptions.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.gcloud.ServiceOptions;
+import com.google.gcloud.spi.DefaultBigqueryRpc;
+import com.google.gcloud.spi.BigqueryRpc;
+import com.google.gcloud.spi.BigqueryRpcFactory;
+
+import java.util.Set;
+
+public class BigqueryOptions extends ServiceOptions {
+
+  private static final String BIGQUERY_SCOPE = "https://www.googleapis.com/auth/bigquery";
+  private static final Set SCOPES = ImmutableSet.of(BIGQUERY_SCOPE);
+  private static final long serialVersionUID = -215981591481708043L;
+
+  public static class DefaultBigqueryFactory implements BigqueryFactory {
+
+    private static final BigqueryFactory INSTANCE = new DefaultBigqueryFactory();
+
+    @Override
+    public Bigquery create(BigqueryOptions options) {
+      // TODO(mziccard) return new BigqueryImpl(options);
+      return null;
+    }
+  }
+
+  public static class DefaultBigqueryRpcFactory implements BigqueryRpcFactory {
+
+    private static final BigqueryRpcFactory INSTANCE = new DefaultBigqueryRpcFactory();
+
+    @Override
+    public BigqueryRpc create(BigqueryOptions options) {
+      // TODO(mziccard) return new DefaultBigqueryRpc(options);
+      return null;
+    }
+  }
+
+  public static class Builder extends
+      ServiceOptions.Builder {
+
+    private Builder() {
+    }
+
+    private Builder(BigqueryOptions options) {
+      super(options);
+    }
+
+    @Override
+    public BigqueryOptions build() {
+      return new BigqueryOptions(this);
+    }
+  }
+
+  private BigqueryOptions(Builder builder) {
+    super(BigqueryFactory.class, BigqueryRpcFactory.class, builder);
+  }
+
+  @Override
+  protected BigqueryFactory defaultServiceFactory() {
+    return DefaultBigqueryFactory.INSTANCE;
+  }
+
+  @Override
+  protected BigqueryRpcFactory defaultRpcFactory() {
+    return DefaultBigqueryRpcFactory.INSTANCE;
+  }
+
+  @Override
+  protected Set scopes() {
+    return SCOPES;
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  public int hashCode() {
+    return baseHashCode();
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (!(obj instanceof BigqueryOptions)) {
+      return false;
+    }
+    BigqueryOptions other = (BigqueryOptions) obj;
+    return baseEquals(other);
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
new file mode 100644
index 000000000000..4acaa40ca851
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 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.
+ */
+
+/**
+ * A client to Google Cloud BigQuery.
+ *
+ * 
A simple usage example:
+ * 
{@code
+ * //TODO(mziccard): add code example
+ * }

+ *
+ * @see Google Cloud BigQuery
+ */
+package com.google.gcloud.bigquery;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpc.java
new file mode 100644
index 000000000000..9e4e486422d6
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpc.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.spi;
+
+import com.google.api.services.bigquery.model.Dataset;
+import com.google.api.services.bigquery.model.DatasetReference;
+import com.google.api.services.bigquery.model.GetQueryResultsResponse;
+import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.JobReference;
+import com.google.api.services.bigquery.model.QueryRequest;
+import com.google.api.services.bigquery.model.QueryResponse;
+import com.google.api.services.bigquery.model.Table;
+import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
+import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
+import com.google.api.services.bigquery.model.TableReference;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.gcloud.bigquery.BigqueryException;
+
+import java.util.Map;
+
+public interface BigqueryRpc {
+
+  // These options are part of the Google Cloud BigQuery query parameters
+  enum Option {
+    QUOTA_USER("quotaUser"),
+    USER_IP("userIp"),
+    FIELDS("fields"),
+    DELETE_CONTENTS("deleteContents"),
+    ALL_DATASETS("all"),
+    ALL_USERS("allUsers"),
+    MAX_RESULTS("maxResults"),
+    PAGE_TOKEN("pageToken"),
+    START_INDEX("startIndex"),
+    STATE_FILTER("stateFilter"),
+    TIMEOUT("timeOut");
+
+    private final String value;
+
+    Option(String value) {
+      this.value = value;
+    }
+
+    public String value() {
+      return value;
+    }
+
+    @SuppressWarnings("unchecked")
+     T get(Map options) {
+      return (T) options.get(this);
+    }
+
+    String getString(Map options) {
+      return get(options);
+    }
+
+    Long getLong(Map options) {
+      return get(options);
+    }
+
+    Boolean getBoolean(Map options) {
+      return get(options);
+    }
+  }
+
+  class Tuple {
+
+    private final X x;
+    private final Y y;
+
+    private Tuple(X x, Y y) {
+      this.x = x;
+      this.y = y;
+    }
+
+    public static  Tuple of(X x, Y y) {
+      return new Tuple<>(x, y);
+    }
+
+    public X x() {
+      return x;
+    }
+
+    public Y y() {
+      return y;
+    }
+  }
+
+  Dataset getDataset(String datasetId, Map options) throws BigqueryException;
+
+  Tuple> listDatasets(Map options) throws BigqueryException;
+
+  Dataset create(Dataset dataset, Map options) throws BigqueryException;
+
+  boolean deleteDataset(String datasetId, Map options) throws BigqueryException;
+
+  Dataset patch(Dataset dataset, Map options) throws BigqueryException;
+
+  Table getTable(String datasetId, String tableId, Map options) throws BigqueryException;
+
+  Tuple> listTables(String dataset, Map options)
+      throws BigqueryException;
+
+  Table create(String dataset, Table table, Map options) throws BigqueryException;
+
+  boolean deleteTable(String datasetId, String tableId, Map options)
+      throws BigqueryException;
+
+  Table patch(Table table, Map options) throws BigqueryException;
+
+  TableDataInsertAllResponse insertAll(TableReference table, TableDataInsertAllRequest request,
+      Map options) throws BigqueryException;
+
+  Tuple> listTableData(String datasetId, String tableId,
+      Map options) throws BigqueryException;
+
+  Job getJob(String jobId, Map options) throws BigqueryException;
+
+  Tuple> listJobs(Map options) throws BigqueryException;
+
+  Job create(Job job, Map options) throws BigqueryException;
+
+  boolean cancel(String jobId, Map options) throws BigqueryException;
+
+  GetQueryResultsResponse getQueryResults(JobReference job, Map options)
+      throws BigqueryException;
+
+  QueryResponse query(QueryRequest request, Map options) throws BigqueryException;
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpcFactory.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpcFactory.java
new file mode 100644
index 000000000000..09c2d836127f
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpcFactory.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.spi;
+
+import com.google.gcloud.bigquery.BigqueryOptions;
+
+/**
+ * An interface for BigQuery RPC factory.
+ * Implementation will be loaded via {@link java.util.ServiceLoader}.
+ */
+public interface BigqueryRpcFactory extends ServiceRpcFactory {
+}

From 7a723996f7c352fd93ceae91f41e474de256873d Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 6 Nov 2015 11:31:14 +0100
Subject: [PATCH 054/322] Add iterateAll method to Page, update example and
 snippet

---
 .../src/main/java/com/google/gcloud/Page.java | 22 ++++++++++--
 .../main/java/com/google/gcloud/PageImpl.java | 35 +++++++++++++++++++
 .../java/com/google/gcloud/PageImplTest.java  | 31 ++++++++++++----
 .../gcloud/examples/StorageExample.java       | 19 ++++------
 .../gcloud/storage/RemoteGcsHelperTest.java   |  6 ++++
 5 files changed, 91 insertions(+), 22 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Page.java b/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
index 1b7754562716..2819b56a17a0 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
@@ -16,11 +16,22 @@
 
 package com.google.gcloud;
 
+import java.util.Iterator;
+
 /**
  * Interface for Google Cloud paginated results.
  *
  * 

- * A typical {@code Page} usage:
+ * Use {@code Page} to iterate through all values (also in next pages):
+ * 
 {@code
+ * Page page = ...; // get a Page instance
+ * Iterator iterator = page.iterateAll();
+ * while (iterator.hasNext()) {
+ *   T value = iterator.next();
+ *   // do something with value
+ * }}

+ * 

+ * Or handle pagination explicitly:
  * 
 {@code
  * Page page = ...; // get a Page instance
  * while (page != null) {
@@ -28,8 +39,7 @@
  *     // do something with value
  *   }
  *   page = page.nextPage();
- * }
- * }

+ * }}

  */
 public interface Page {
 
@@ -38,6 +48,12 @@ public interface Page {
    */
   Iterable values();
 
+  /**
+   * Returns an iterator for all values, possibly also in the next pages. Once current page's values
+   * are traversed the iterator fetches next page, if any.
+   */
+  Iterator iterateAll();
+
   /**
    * Returns the cursor for the nextPage or {@code null} if no more results.
    */
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
index 3925079c8d4b..5f70b22ec577 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -16,8 +16,11 @@
 
 package com.google.gcloud;
 
+import com.google.common.collect.AbstractIterator;
+
 import java.io.Serializable;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.Objects;
 
 /**
@@ -35,6 +38,33 @@ public interface NextPageFetcher extends Serializable {
     Page nextPage();
   }
 
+  static class PageIterator extends AbstractIterator {
+
+    private Iterator currentPageIterator;
+    private Page currentPage;
+
+    PageIterator(Page currentPage) {
+      this.currentPageIterator = currentPage.values().iterator();
+      this.currentPage = currentPage;
+    }
+
+    @Override
+    protected T computeNext() {
+      if (currentPageIterator.hasNext()) {
+        return currentPageIterator.next();
+      }
+      Page nextPage = currentPage.nextPage();
+      if (nextPage != null) {
+        currentPage = nextPage;
+        currentPageIterator = currentPage.values().iterator();
+        if (currentPageIterator.hasNext()) {
+          return currentPageIterator.next();
+        }
+      }
+      return endOfData();
+    }
+  }
+
   /**
    * Creates a {@code PageImpl} object. In order for the object to be serializable the {@code
    * results} parameter must be serializable.
@@ -50,6 +80,11 @@ public Iterable values() {
     return results == null ? Collections.EMPTY_LIST : results;
   }
 
+  @Override
+  public Iterator iterateAll() {
+    return new PageIterator(this);
+  }
+
   @Override
   public String nextPageCursor() {
     return cursor;
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java
index 78aa3feaa281..fb289186de8d 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java
@@ -26,21 +26,38 @@
 
 public class PageImplTest {
 
+  private static final ImmutableList VALUES = ImmutableList.of("1", "2");
+  private static final ImmutableList NEXT_VALUES = ImmutableList.of("3", "4");
+  private static final ImmutableList ALL_VALUES = ImmutableList.builder()
+      .addAll(VALUES)
+      .addAll(NEXT_VALUES)
+      .build();
+
   @Test
-  public void testPage() throws Exception {
-    ImmutableList values = ImmutableList.of("1", "2");
-    final PageImpl nextResult =
-        new PageImpl<>(null, "c", Collections.emptyList());
+  public void testPage() {
+    final PageImpl nextResult = new PageImpl<>(null, "c", NEXT_VALUES);
     PageImpl.NextPageFetcher fetcher = new PageImpl.NextPageFetcher() {
-
       @Override
       public PageImpl nextPage() {
         return nextResult;
       }
     };
-    PageImpl result = new PageImpl<>(fetcher, "c", values);
+    PageImpl result = new PageImpl<>(fetcher, "c", VALUES);
     assertEquals(nextResult, result.nextPage());
     assertEquals("c", result.nextPageCursor());
-    assertEquals(values, ImmutableList.copyOf(result.values().iterator()));
+    assertEquals(VALUES, result.values());
+  }
+
+  @Test
+  public void testIterateAll() {
+    final PageImpl nextResult = new PageImpl<>(null, "c", NEXT_VALUES);
+    PageImpl.NextPageFetcher fetcher = new PageImpl.NextPageFetcher() {
+      @Override
+      public PageImpl nextPage() {
+        return nextResult;
+      }
+    };
+    PageImpl result = new PageImpl<>(fetcher, "c", VALUES);
+    assertEquals(ALL_VALUES, ImmutableList.copyOf(result.iterateAll()));
   }
 }
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index 7cf7fe2454fc..b7a36de7589e 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -53,6 +53,7 @@
 import java.security.cert.CertificateException;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -214,12 +215,9 @@ String parse(String... args) {
     public void run(Storage storage, String bucketName) {
       if (bucketName == null) {
         // list buckets
-        Page bucketPage = storage.list();
-        while (bucketPage != null) {
-          for (BucketInfo b : bucketPage.values()) {
-            System.out.println(b);
-          }
-          bucketPage = bucketPage.nextPage();
+        Iterator bucketInfoIterator = storage.list().iterateAll();
+        while (bucketInfoIterator.hasNext()) {
+          System.out.println(bucketInfoIterator.next());
         }
       } else {
         // list a bucket's blobs
@@ -228,12 +226,9 @@ public void run(Storage storage, String bucketName) {
           System.out.println("No such bucket");
           return;
         }
-        Page blobPage = bucket.list();
-        while (blobPage != null) {
-          for (Blob b : blobPage.values()) {
-            System.out.println(b.info());
-          }
-          blobPage = blobPage.nextPage();
+        Iterator blobIterator = bucket.list().iterateAll();
+        while (blobIterator.hasNext()) {
+          System.out.println(blobIterator.next().info());
         }
       }
     }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
index ff6fd68fd1eb..1da45fae466e 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
@@ -33,6 +33,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -90,6 +91,11 @@ public Page nextPage() {
     public Iterable values() {
       return BLOB_LIST;
     }
+
+    @Override
+    public Iterator iterateAll() {
+      return BLOB_LIST.iterator();
+    }
   };
   private static String keyPath = "/does/not/exist/key." + UUID.randomUUID().toString() + ".json";
 

From c0842501db691237da0a2f0d4c466dfbe596bad1 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 6 Nov 2015 10:00:34 -0800
Subject: [PATCH 055/322] Add project ID section

---
 README.md | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index d6da19e83ed0..3f76a2d28211 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,36 @@ Example Applications
 - [`StorageExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java) - A simple command line interface providing some of Cloud Storage's functionality
   - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/StorageExample.html).
 
+Specifying a Project
+--------------------
+
+Most `gcloud-java` libraries require a project ID.  There are multiple ways to specify this project ID.
+
+1. When using `gcloud-java` libraries from within Compute/App Engine, there's no need to specify a project ID.  It is automatically inferred from the production environment.
+2. When using `gcloud-java` elsewhere, you can do one of the following:
+  * Supply the project ID when building the service options.  For example, to use Datastore from a project with ID "PROJECT_ID", you can write:
+
+  ```java
+  Datastore datastore = DatastoreOptions.builder().projectId("PROJECT_ID").build().service(); 
+  ```
+  * Specify the environment variable `GCLOUD_PROJECT`.  For example, type the following into command line:
+
+  ```bash
+  export GCLOUD_PROJECT=PROJECT_ID
+  ```
+  * Set the project ID using the [Google Cloud SDK](https://cloud.google.com/sdk/?hl=en).  To use the SDK, [download the SDK](https://cloud.google.com/sdk/?hl=en) if you haven't already, and set the project ID from the command line.  For example:
+
+  ```
+  gcloud config set project PROJECT_ID
+  ```
+
+`gcloud-java` determines the project ID from the following sources in the listed order, stopping once it finds a value:
+
+1. Project ID supplied when building the service options.
+2. Project ID specified by the environment variable `GCLOUD_PROJECT`.
+3. Project ID used by App Engine.
+4. Project ID specified in the Google Cloud SDK.
+
 Authentication
 --------------
 
@@ -45,7 +75,10 @@ There are multiple ways to authenticate to use Google Cloud services.
 1. When using `gcloud-java` libraries from within Compute/App Engine, no additional authentication steps are necessary.
 2. When using `gcloud-java` libraries elsewhere, there are two options:
   * [Generate a JSON service account key](https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts).  After downloading that key, you must do one of the following:
-    * Define the environment variable GOOGLE_APPLICATION_CREDENTIALS to be the location of the key.  For example, `export GOOGLE_APPLICATION_CREDENTIALS=/path/to/my/key.json`
+    * Define the environment variable GOOGLE_APPLICATION_CREDENTIALS to be the location of the key.  For example:
+    ```bash
+    export GOOGLE_APPLICATION_CREDENTIALS=/path/to/my/key.json
+    ```
     * Supply the JSON credentials file when building the service options.  For example, this Storage object has the necessary permissions to interact with your Google Cloud Storage data:
     ```java
     Storage storage = StorageOptions.builder()
@@ -53,7 +86,7 @@ There are multiple ways to authenticate to use Google Cloud services.
       .build()
       .service();
     ```
-  * If running locally for development/testing, you can use use [Google Cloud SDK](https://cloud.google.com/sdk/?hl=en).  To use the SDK authentication, [download the SDK](https://cloud.google.com/sdk/?hl=en) if you haven't already.  Then login using the SDK (`gcloud auth login` in command line), and set your current project using `gcloud config set project PROJECT_ID`.
+  * If running locally for development/testing, you can use use Google Cloud SDK.  Download the SDK if you haven't already, then login using the SDK (`gcloud auth login` in command line).  Be sure your current project is set correctly by running `gcloud config set project PROJECT_ID`.
 
 `gcloud-java` looks for credentials in the following order, stopping once it finds credentials:
 
@@ -63,13 +96,6 @@ There are multiple ways to authenticate to use Google Cloud services.
 4. Google Cloud SDK credentials
 5. Compute Engine credentials
 
-Note that this sequence is different than the order in which `gcloud-java` determines the project ID.  The project ID is determined in the following order:
-
-1. Project ID supplied when building the service options
-2. Project ID specified by the environment variable `GCLOUD_PROJECT`
-3. App Engine project ID
-4. Google Cloud SDK project ID
-
 Google Cloud Datastore
 ----------------------
 

From 67fdcc08177ec9973465da032f1c504160709f34 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 6 Nov 2015 11:00:44 -0800
Subject: [PATCH 056/322] fix order of project ID lookup, cleanup

---
 README.md | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 3f76a2d28211..0447040de628 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,8 @@ Example Applications
 - [`StorageExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java) - A simple command line interface providing some of Cloud Storage's functionality
   - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/StorageExample.html).
 
-Specifying a Project
---------------------
+Specifying a Project ID
+-----------------------
 
 Most `gcloud-java` libraries require a project ID.  There are multiple ways to specify this project ID.
 
@@ -49,11 +49,7 @@ Most `gcloud-java` libraries require a project ID.  There are multiple ways to s
   ```java
   Datastore datastore = DatastoreOptions.builder().projectId("PROJECT_ID").build().service(); 
   ```
-  * Specify the environment variable `GCLOUD_PROJECT`.  For example, type the following into command line:
-
-  ```bash
-  export GCLOUD_PROJECT=PROJECT_ID
-  ```
+  * Specify the environment variable `GCLOUD_PROJECT` to be your desired project ID.
   * Set the project ID using the [Google Cloud SDK](https://cloud.google.com/sdk/?hl=en).  To use the SDK, [download the SDK](https://cloud.google.com/sdk/?hl=en) if you haven't already, and set the project ID from the command line.  For example:
 
   ```
@@ -62,10 +58,11 @@ Most `gcloud-java` libraries require a project ID.  There are multiple ways to s
 
 `gcloud-java` determines the project ID from the following sources in the listed order, stopping once it finds a value:
 
-1. Project ID supplied when building the service options.
-2. Project ID specified by the environment variable `GCLOUD_PROJECT`.
-3. Project ID used by App Engine.
-4. Project ID specified in the Google Cloud SDK.
+1. Project ID supplied when building the service options
+2. Project ID specified by the environment variable `GCLOUD_PROJECT`
+3. App Engine project ID
+4. Compute Engine project ID
+5. Google Cloud SDK project ID
 
 Authentication
 --------------
@@ -86,7 +83,7 @@ There are multiple ways to authenticate to use Google Cloud services.
       .build()
       .service();
     ```
-  * If running locally for development/testing, you can use use Google Cloud SDK.  Download the SDK if you haven't already, then login using the SDK (`gcloud auth login` in command line).  Be sure your current project is set correctly by running `gcloud config set project PROJECT_ID`.
+  * If running locally for development/testing, you can use use Google Cloud SDK.  Download the SDK if you haven't already, then login using the SDK (`gcloud auth login` in command line).  Be sure to set your project ID as described above.
 
 `gcloud-java` looks for credentials in the following order, stopping once it finds credentials:
 

From 2ce257f54600cf4c5e1342635c6eb9bf287cbc7b Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 6 Nov 2015 17:41:50 -0800
Subject: [PATCH 057/322] update auth dependency

---
 gcloud-java-core/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index e849594226db..f12267db49e4 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -20,12 +20,12 @@
     
       com.google.auth
       google-auth-library-credentials
-      0.1.0
+      0.3.0
     
     
       com.google.auth
       google-auth-library-oauth2-http
-      0.1.0
+      0.3.0
     
     
       com.google.http-client

From e063bc5707ae1cac53f8d2ec0d3d971dd94e617e Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 6 Nov 2015 18:10:50 -0800
Subject: [PATCH 058/322] Auth cleanup

---
 README.md                                     |   6 +-
 .../com/google/gcloud/AuthCredentials.java    | 113 +-----------------
 .../com/google/gcloud/ServiceOptions.java     |  35 +++---
 .../gcloud/datastore/SerializationTest.java   |  24 ++--
 .../gcloud/storage/SerializationTest.java     |  22 ++--
 5 files changed, 45 insertions(+), 155 deletions(-)

diff --git a/README.md b/README.md
index 9ba994d572c1..0833de90dfde 100644
--- a/README.md
+++ b/README.md
@@ -96,9 +96,9 @@ There are multiple ways to authenticate to use Google Cloud services.
 `gcloud-java` looks for credentials in the following order, stopping once it finds credentials:
 
 1. Credentials supplied when building the service options
-2. App Engine credentials
-3. Key file pointed to by the GOOGLE_APPLICATION_CREDENTIALS environment variable
-4. Google Cloud SDK credentials
+2. Key file pointed to by the GOOGLE_APPLICATION_CREDENTIALS environment variable
+3. Google Cloud SDK credentials
+4. App Engine credentials
 5. Compute Engine credentials
 
 Google Cloud Datastore
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
index 73c66279ea53..990d30eca618 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -19,12 +19,8 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.googleapis.compute.ComputeCredential;
-import com.google.api.client.googleapis.extensions.appengine.auth.oauth2.AppIdentityCredential;
-import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.jackson.JacksonFactory;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auth.oauth2.GoogleCredentials;
@@ -32,7 +28,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
-import java.security.GeneralSecurityException;
 import java.security.PrivateKey;
 import java.util.Objects;
 import java.util.Set;
@@ -42,45 +37,6 @@
  */
 public abstract class AuthCredentials implements Restorable {
 
-  private static class AppEngineAuthCredentials extends AuthCredentials {
-
-    private static final AuthCredentials INSTANCE = new AppEngineAuthCredentials();
-    private static final AppEngineAuthCredentialsState STATE =
-        new AppEngineAuthCredentialsState();
-
-    private static class AppEngineAuthCredentialsState
-        implements RestorableState, Serializable {
-
-      private static final long serialVersionUID = 3558563960848658928L;
-
-      @Override
-      public AuthCredentials restore() {
-        return INSTANCE;
-      }
-
-      @Override
-      public int hashCode() {
-        return getClass().getName().hashCode();
-      }
-
-      @Override
-      public boolean equals(Object obj) {
-        return obj instanceof AppEngineAuthCredentialsState;
-      }
-    }
-
-    @Override
-    protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
-        Set scopes) {
-      return new AppIdentityCredential(scopes);
-    }
-
-    @Override
-    public RestorableState capture() {
-      return STATE;
-    }
-  }
-
   public static class ServiceAccountAuthCredentials extends AuthCredentials {
 
     private final String account;
@@ -163,55 +119,6 @@ public RestorableState capture() {
     }
   }
 
-  private static class ComputeEngineAuthCredentials extends AuthCredentials {
-
-    private ComputeCredential computeCredential;
-
-    private static final ComputeEngineAuthCredentialsState STATE =
-        new ComputeEngineAuthCredentialsState();
-
-    private static class ComputeEngineAuthCredentialsState
-        implements RestorableState, Serializable {
-
-      private static final long serialVersionUID = -6168594072854417404L;
-
-      @Override
-      public AuthCredentials restore() {
-        try {
-          return new ComputeEngineAuthCredentials();
-        } catch (IOException | GeneralSecurityException e) {
-          throw new IllegalStateException(
-              "Could not restore " + ComputeEngineAuthCredentials.class.getSimpleName(), e);
-        }
-      }
-
-      @Override
-      public int hashCode() {
-        return getClass().getName().hashCode();
-      }
-
-      @Override
-      public boolean equals(Object obj) {
-        return obj instanceof ComputeEngineAuthCredentialsState;
-      }
-    }
-
-    ComputeEngineAuthCredentials() throws IOException, GeneralSecurityException {
-      computeCredential = getComputeCredential();
-    }
-
-    @Override
-    protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
-        Set scopes) {
-      return computeCredential;
-    }
-
-    @Override
-    public RestorableState capture() {
-      return STATE;
-    }
-  }
-
   private static class ApplicationDefaultAuthCredentials extends AuthCredentials {
 
     private GoogleCredentials googleCredentials;
@@ -264,21 +171,12 @@ public RestorableState capture() {
   protected abstract HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
       Set scopes);
 
-  public static AuthCredentials createForAppEngine() {
-    return AppEngineAuthCredentials.INSTANCE;
-  }
-
-  public static AuthCredentials createForComputeEngine()
-      throws IOException, GeneralSecurityException {
-    return new ComputeEngineAuthCredentials();
-  }
-
   /**
    * Returns the Application Default Credentials.
    *
    * 
Returns the Application Default Credentials which are credentials that identify and
    * authorize the whole application. This is the built-in service account if running on
-   * Google Compute Engine or the credentials file can be read from the path in the environment
+   * Google App/Compute Engine or the credentials file can be read from the path in the environment
    * variable GOOGLE_APPLICATION_CREDENTIALS.
    * 

    *
@@ -327,13 +225,4 @@ public static ServiceAccountAuthCredentials createForJson(InputStream jsonCreden
   public static AuthCredentials noCredentials() {
     return ServiceAccountAuthCredentials.NO_CREDENTIALS;
   }
-
-  static ComputeCredential getComputeCredential() throws IOException, GeneralSecurityException {
-    NetHttpTransport transport = GoogleNetHttpTransport.newTrustedTransport();
-    // Try to connect using Google Compute Engine service account credentials.
-    ComputeCredential credential = new ComputeCredential(transport, new JacksonFactory());
-    // Force token refresh to detect if we are running on Google Compute Engine.
-    credential.refreshToken();
-    return credential;
-  }
 }
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 898897833287..876317162add 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -21,10 +21,13 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.client.extensions.appengine.http.UrlFetchTransport;
+import com.google.api.client.googleapis.compute.ComputeCredential;
+import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.jackson.JacksonFactory;
 import com.google.common.collect.Iterables;
 import com.google.gcloud.spi.ServiceRpcFactory;
 
@@ -41,6 +44,7 @@
 import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.security.GeneralSecurityException;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Objects;
@@ -111,12 +115,22 @@ public HttpTransport create() {
       }
       // Consider Compute
       try {
-        return AuthCredentials.getComputeCredential().getTransport();
+        return getComputeHttpTransport();
       } catch (Exception e) {
         // Maybe not on GCE
       }
       return new NetHttpTransport();
     }
+
+    private static HttpTransport getComputeHttpTransport()
+        throws IOException, GeneralSecurityException {
+      NetHttpTransport transport = GoogleNetHttpTransport.newTrustedTransport();
+      // Try to connect using Google Compute Engine service account credentials.
+      ComputeCredential credential = new ComputeCredential(transport, new JacksonFactory());
+      // Force token refresh to detect if we are running on Google Compute Engine.
+      credential.refreshToken();
+      return transport;
+    }
   }
 
   /**
@@ -326,28 +340,11 @@ protected ServiceOptions(Class> ser
   }
 
   private static AuthCredentials defaultAuthCredentials() {
-    // Consider App Engine. This will not be needed once issue #21 is fixed.
-    if (appEngineAppId() != null) {
-      try {
-        return AuthCredentials.createForAppEngine();
-      } catch (Exception ignore) {
-        // Maybe not on App Engine
-      }
-    }
-
     try {
       return AuthCredentials.createApplicationDefaults();
     } catch (Exception ex) {
-      // fallback to old-style
-    }
-
-    // Consider old-style Compute. This will not be needed once issue #21 is fixed.
-    try {
-      return AuthCredentials.createForComputeEngine();
-    } catch (Exception ignore) {
-      // Maybe not on GCE
+      return AuthCredentials.noCredentials();
     }
-    return AuthCredentials.noCredentials();
   }
 
   protected static String appEngineAppId() {
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
index 1ad690938ef5..89da268562b3 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
@@ -133,20 +133,22 @@ public class SerializationTest {
 
   @Test
   public void testServiceOptions() throws Exception {
-    DatastoreOptions options = DatastoreOptions.builder()
-        .authCredentials(AuthCredentials.createForAppEngine())
-        .normalizeDataset(false)
-        .projectId("ds1")
-        .build();
+    DatastoreOptions options =
+        DatastoreOptions.builder()
+            .authCredentials(AuthCredentials.createApplicationDefaults())
+            .normalizeDataset(false)
+            .projectId("ds1")
+            .build();
     DatastoreOptions serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);
 
-    options = options.toBuilder()
-        .namespace("ns1")
-        .retryParams(RetryParams.getDefaultInstance())
-        .authCredentials(AuthCredentials.noCredentials())
-        .force(true)
-        .build();
+    options =
+        options.toBuilder()
+            .namespace("ns1")
+            .retryParams(RetryParams.getDefaultInstance())
+            .authCredentials(AuthCredentials.noCredentials())
+            .force(true)
+            .build();
     serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);
   }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index a125a64df6d6..e8481a2f0d90 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -73,19 +73,21 @@ public class SerializationTest {
 
   @Test
   public void testServiceOptions() throws Exception {
-    StorageOptions options = StorageOptions.builder()
-        .projectId("p1")
-        .authCredentials(AuthCredentials.createForAppEngine())
-        .build();
+    StorageOptions options =
+        StorageOptions.builder()
+            .projectId("p1")
+            .authCredentials(AuthCredentials.createApplicationDefaults())
+            .build();
     StorageOptions serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);
 
-    options = options.toBuilder()
-        .projectId("p2")
-        .retryParams(RetryParams.getDefaultInstance())
-        .authCredentials(AuthCredentials.noCredentials())
-        .pathDelimiter(":")
-        .build();
+    options =
+        options.toBuilder()
+            .projectId("p2")
+            .retryParams(RetryParams.getDefaultInstance())
+            .authCredentials(AuthCredentials.noCredentials())
+            .pathDelimiter(":")
+            .build();
     serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);
   }

From 9394d2819d2c92dc3421d986846c101d5e65f7ac Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 6 Nov 2015 19:10:24 -0800
Subject: [PATCH 059/322] Remove DefaultAuthCredentials from serialization
 tests, since there are no default auth credentials on Travis

---
 .../test/java/com/google/gcloud/datastore/SerializationTest.java | 1 -
 .../test/java/com/google/gcloud/storage/SerializationTest.java   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
index 89da268562b3..129122c8643d 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
@@ -135,7 +135,6 @@ public class SerializationTest {
   public void testServiceOptions() throws Exception {
     DatastoreOptions options =
         DatastoreOptions.builder()
-            .authCredentials(AuthCredentials.createApplicationDefaults())
             .normalizeDataset(false)
             .projectId("ds1")
             .build();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index e8481a2f0d90..a0bfa0213796 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -76,7 +76,6 @@ public void testServiceOptions() throws Exception {
     StorageOptions options =
         StorageOptions.builder()
             .projectId("p1")
-            .authCredentials(AuthCredentials.createApplicationDefaults())
             .build();
     StorageOptions serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);

From 076127d6ce599716519eeffd5595fe8c5313b5df Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Sat, 7 Nov 2015 23:50:45 +0100
Subject: [PATCH 060/322] Add loop for empty pages in PageImpl.iterateAll

---
 .../main/java/com/google/gcloud/PageImpl.java    | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
index 5f70b22ec577..5e83b53b33a9 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -50,18 +50,14 @@ static class PageIterator extends AbstractIterator {
 
     @Override
     protected T computeNext() {
-      if (currentPageIterator.hasNext()) {
-        return currentPageIterator.next();
-      }
-      Page nextPage = currentPage.nextPage();
-      if (nextPage != null) {
-        currentPage = nextPage;
-        currentPageIterator = currentPage.values().iterator();
-        if (currentPageIterator.hasNext()) {
-          return currentPageIterator.next();
+      while (!currentPageIterator.hasNext()) {
+        currentPage = currentPage.nextPage();
+        if (currentPage == null) {
+          return endOfData();
         }
+        currentPageIterator = currentPage.values().iterator();
       }
-      return endOfData();
+      return currentPageIterator.next();
     }
   }
 

From 607460518d477a235ebcd8afd155b5c35c220fd2 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 9 Nov 2015 08:19:46 -0800
Subject: [PATCH 061/322] Modify project id lookup order and revert style
 changes

---
 README.md                                     |  4 +-
 .../com/google/gcloud/ServiceOptions.java     | 67 ++++++++++---------
 .../gcloud/datastore/SerializationTest.java   | 22 +++---
 .../gcloud/storage/SerializationTest.java     | 20 +++---
 4 files changed, 55 insertions(+), 58 deletions(-)

diff --git a/README.md b/README.md
index 0833de90dfde..9cdee74ee8f8 100644
--- a/README.md
+++ b/README.md
@@ -69,8 +69,8 @@ Most `gcloud-java` libraries require a project ID.  There are multiple ways to s
 1. Project ID supplied when building the service options
 2. Project ID specified by the environment variable `GCLOUD_PROJECT`
 3. App Engine project ID
-4. Compute Engine project ID
-5. Google Cloud SDK project ID
+4. Google Cloud SDK project ID
+5. Compute Engine project ID
 
 Authentication
 --------------
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 876317162add..298a1223acac 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -364,19 +364,6 @@ protected String defaultProject() {
   }
 
   protected static String googleCloudProjectId() {
-    try {
-      URL url = new URL("http://metadata/computeMetadata/v1/project/project-id");
-      HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-      connection.setRequestProperty("X-Google-Metadata-Request", "True");
-      InputStream input = connection.getInputStream();
-      if (connection.getResponseCode() == 200) {
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(input, UTF_8))) {
-          return reader.readLine();
-        }
-      }
-    } catch (IOException ignore) {
-      // ignore
-    }
     File configDir;
     if (System.getenv().containsKey("CLOUDSDK_CONFIG")) {
       configDir = new File(System.getenv("CLOUDSDK_CONFIG"));
@@ -385,38 +372,52 @@ protected static String googleCloudProjectId() {
     } else {
       configDir = new File(System.getProperty("user.home"), ".config/gcloud");
     }
-    FileReader fileReader;
+    FileReader fileReader = null;
     try {
       fileReader = new FileReader(new File(configDir, "configurations/config_default"));
     } catch (FileNotFoundException newConfigFileNotFoundEx) {
       try {
         fileReader = new FileReader(new File(configDir, "properties"));
       } catch (FileNotFoundException oldConfigFileNotFoundEx) {
-        // return null if we can't find config file
-        return null;
+        // ignore
       }
     }
-    try (BufferedReader reader = new BufferedReader(fileReader)) {
-      String line;
-      String section = null;
-      Pattern projectPattern = Pattern.compile("^project\\s*=\\s*(.*)$");
-      Pattern sectionPattern = Pattern.compile("^\\[(.*)\\]$");
-      while ((line = reader.readLine()) != null) {
-        if (line.isEmpty() || line.startsWith(";")) {
-          continue;
-        }
-        line = line.trim();
-        Matcher matcher = sectionPattern.matcher(line);
-        if (matcher.matches()) {
-          section = matcher.group(1);
-        } else if (section == null || section.equals("core")) {
-          matcher = projectPattern.matcher(line);
+    if (fileReader != null) {
+      try (BufferedReader reader = new BufferedReader(fileReader)) {
+        String line;
+        String section = null;
+        Pattern projectPattern = Pattern.compile("^project\\s*=\\s*(.*)$");
+        Pattern sectionPattern = Pattern.compile("^\\[(.*)\\]$");
+        while ((line = reader.readLine()) != null) {
+          if (line.isEmpty() || line.startsWith(";")) {
+            continue;
+          }
+          line = line.trim();
+          Matcher matcher = sectionPattern.matcher(line);
           if (matcher.matches()) {
-            return matcher.group(1);
+            section = matcher.group(1);
+          } else if (section == null || section.equals("core")) {
+            matcher = projectPattern.matcher(line);
+            if (matcher.matches()) {
+              return matcher.group(1);
+            }
           }
         }
+      } catch (IOException ex) {
+        // ignore
       }
-    } catch (IOException ex) {
+    }
+    try {
+      URL url = new URL("http://metadata/computeMetadata/v1/project/project-id");
+      HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+      connection.setRequestProperty("X-Google-Metadata-Request", "True");
+      InputStream input = connection.getInputStream();
+      if (connection.getResponseCode() == 200) {
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(input, UTF_8))) {
+          return reader.readLine();
+        }
+      }
+    } catch (IOException ignore) {
       // ignore
     }
     // return null if can't determine
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
index 129122c8643d..48259f7a1395 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
@@ -133,21 +133,19 @@ public class SerializationTest {
 
   @Test
   public void testServiceOptions() throws Exception {
-    DatastoreOptions options =
-        DatastoreOptions.builder()
-            .normalizeDataset(false)
-            .projectId("ds1")
-            .build();
+    DatastoreOptions options = DatastoreOptions.builder()
+        .normalizeDataset(false)
+        .projectId("ds1")
+        .build();
     DatastoreOptions serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);
 
-    options =
-        options.toBuilder()
-            .namespace("ns1")
-            .retryParams(RetryParams.getDefaultInstance())
-            .authCredentials(AuthCredentials.noCredentials())
-            .force(true)
-            .build();
+    options = options.toBuilder()
+        .namespace("ns1")
+        .retryParams(RetryParams.getDefaultInstance())
+        .authCredentials(AuthCredentials.noCredentials())
+        .force(true)
+        .build();
     serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);
   }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index a0bfa0213796..6ed8046e35a2 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -73,20 +73,18 @@ public class SerializationTest {
 
   @Test
   public void testServiceOptions() throws Exception {
-    StorageOptions options =
-        StorageOptions.builder()
-            .projectId("p1")
-            .build();
+    StorageOptions options = StorageOptions.builder()
+        .projectId("p1")
+        .build();
     StorageOptions serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);
 
-    options =
-        options.toBuilder()
-            .projectId("p2")
-            .retryParams(RetryParams.getDefaultInstance())
-            .authCredentials(AuthCredentials.noCredentials())
-            .pathDelimiter(":")
-            .build();
+    options = options.toBuilder()
+        .projectId("p2")
+        .retryParams(RetryParams.getDefaultInstance())
+        .authCredentials(AuthCredentials.noCredentials())
+        .pathDelimiter(":")
+        .build();
     serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);
   }

From b2e11319cd3263b9489d47327462586660a49ea3 Mon Sep 17 00:00:00 2001
From: aozarov 
Date: Tue, 10 Nov 2015 09:09:24 -0800
Subject: [PATCH 062/322] scope appliation default credentials

---
 .../src/main/java/com/google/gcloud/AuthCredentials.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
index 73c66279ea53..800fcf340689 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -252,7 +252,7 @@ public boolean equals(Object obj) {
     @Override
     protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
         Set scopes) {
-      return new HttpCredentialsAdapter(googleCredentials);
+      return new HttpCredentialsAdapter(googleCredentials.createScoped(scopes));
     }
 
     @Override

From d3db640dcf383bced4618f0d3e52f974d4e09690 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 10 Nov 2015 09:45:33 -0800
Subject: [PATCH 063/322] Revert 2de9135149e57cec18b070028452db1efef03125

---
 gcloud-java-core/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index f12267db49e4..e849594226db 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -20,12 +20,12 @@
     
       com.google.auth
       google-auth-library-credentials
-      0.3.0
+      0.1.0
     
     
       com.google.auth
       google-auth-library-oauth2-http
-      0.3.0
+      0.1.0
     
     
       com.google.http-client

From ad12f4143bbcb5d6557055452717c7380cf54959 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 10 Nov 2015 12:59:34 -0800
Subject: [PATCH 064/322] Allow services to avoid setting project ID

---
 .../java/com/google/gcloud/ServiceOptions.java  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 898897833287..d91b3c35c8dd 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -306,7 +306,10 @@ public B readTimeout(int readTimeout) {
   protected ServiceOptions(Class> serviceFactoryClass,
       Class> rpcFactoryClass,
       Builder builder) {
-    projectId = checkNotNull(builder.projectId != null ? builder.projectId : defaultProject());
+    projectId = builder.projectId != null ? builder.projectId : defaultProject();
+    if (projectIdRequired()) {
+      checkNotNull(projectId);
+    }
     host = firstNonNull(builder.host, defaultHost());
     httpTransportFactory = firstNonNull(builder.httpTransportFactory,
         getFromServiceLoader(HttpTransportFactory.class, DefaultHttpTransportFactory.INSTANCE));
@@ -325,6 +328,16 @@ protected ServiceOptions(Class> ser
     clock = firstNonNull(builder.clock, Clock.defaultClock());
   }
 
+  /**
+   * Returns whether a service requires a project ID. This method may be overridden in
+   * service-specific Options objects.
+   *
+   * @return true if a project ID is required to use the service, false if not.
+   */
+  public boolean projectIdRequired() {
+    return true;
+  }
+
   private static AuthCredentials defaultAuthCredentials() {
     // Consider App Engine. This will not be needed once issue #21 is fixed.
     if (appEngineAppId() != null) {
@@ -462,6 +475,8 @@ public ServiceRpcT rpc() {
 
   /**
    * Returns the project id.
+   *
+   * Return value can be null (for services that don't require a project id).
    */
   public String projectId() {
     return projectId;

From 93c834e954e7ce595d86b8fd45a9f2851dfcad4a Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 10 Nov 2015 13:18:01 -0800
Subject: [PATCH 065/322] Update version to 0.0.11 in preparation for 0.0.11
 release

---
 gcloud-java-core/pom.xml      | 2 +-
 gcloud-java-datastore/pom.xml | 2 +-
 gcloud-java-examples/pom.xml  | 2 +-
 gcloud-java-storage/pom.xml   | 2 +-
 gcloud-java/pom.xml           | 2 +-
 pom.xml                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index e849594226db..0dd04b1e837d 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11-SNAPSHOT
+    0.0.11
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index c7c57d91ae1d..b576ce47fdc8 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11-SNAPSHOT
+    0.0.11
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index 55548e756be3..b1d3a3f27c2b 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11-SNAPSHOT
+    0.0.11
   
   
     gcloud-java-examples
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 82b67277f4fe..910aab0e35f7 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11-SNAPSHOT
+    0.0.11
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 6ad0fce8f1b1..1ccb13fcb214 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11-SNAPSHOT
+    0.0.11
   
   
     
diff --git a/pom.xml b/pom.xml
index e35a620247d1..df842cdb9bbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.0.11-SNAPSHOT
+  0.0.11
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From ffbfba48a6426ff63c08ff2117e58681f251fbf2 Mon Sep 17 00:00:00 2001
From: travis-ci 
Date: Tue, 10 Nov 2015 22:15:04 +0000
Subject: [PATCH 066/322] Updating version in README files.

---
 README.md                       | 6 +++---
 gcloud-java-core/README.md      | 6 +++---
 gcloud-java-datastore/README.md | 6 +++---
 gcloud-java-examples/README.md  | 6 +++---
 gcloud-java-storage/README.md   | 6 +++---
 gcloud-java/README.md           | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 9ba994d572c1..0fd576a6a127 100644
--- a/README.md
+++ b/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.0.10
+  0.0.11
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:jar:0.0.10'
+compile 'com.google.gcloud:gcloud-java:jar:0.0.11'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.10"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.11"
 ```
 
 Example Applications
diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index 032127540d19..f84fb33993e7 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-core
-  0.0.10
+  0.0.11
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-core:jar:0.0.10'
+compile 'com.google.gcloud:gcloud-java-core:jar:0.0.11'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.10"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.11"
 ```
 
 Java Versions
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index 8915f2d37a55..67483fae2b6e 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-datastore
-  0.0.10
+  0.0.11
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-datastore:jar:0.0.10'
+compile 'com.google.gcloud:gcloud-java-datastore:jar:0.0.11'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.10"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.11"
 ```
 
 Example Application
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index 9afe16a2b1a5..bc738de41b51 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-examples
-  0.0.10
+  0.0.11
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-examples:jar:0.0.10'
+compile 'com.google.gcloud:gcloud-java-examples:jar:0.0.11'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.10"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.11"
 ```
 
 To run examples from your command line:
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 8722da76cec4..f2b99388ff0f 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-storage
-  0.0.10
+  0.0.11
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-storage:jar:0.0.10'
+compile 'com.google.gcloud:gcloud-java-storage:jar:0.0.11'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.0.10"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.0.11"
 ```
 
 Example Application
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index baa1e5c53b1c..eaaed21af5fe 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.0.10
+  0.0.11
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:jar:0.0.10'
+compile 'com.google.gcloud:gcloud-java:jar:0.0.11'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.10"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.11"
 ```
 
 Java Versions

From fc72ea0b0e246921c491f8460cd9ce7dab94e82c Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 10 Nov 2015 14:35:11 -0800
Subject: [PATCH 067/322] Update version to 0.0.12-SNAPSHOT

---
 gcloud-java-core/pom.xml      | 2 +-
 gcloud-java-datastore/pom.xml | 2 +-
 gcloud-java-examples/pom.xml  | 2 +-
 gcloud-java-storage/pom.xml   | 2 +-
 gcloud-java/pom.xml           | 2 +-
 pom.xml                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index 0dd04b1e837d..e13933bd2beb 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11
+    0.0.12-SNAPSHOT
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index b576ce47fdc8..b58e9e0ffc74 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11
+    0.0.12-SNAPSHOT
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index b1d3a3f27c2b..c461846acab2 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11
+    0.0.12-SNAPSHOT
   
   
     gcloud-java-examples
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 910aab0e35f7..ef3ddec79816 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11
+    0.0.12-SNAPSHOT
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 1ccb13fcb214..d26c38f517d5 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11
+    0.0.12-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index df842cdb9bbc..78cbfe11d351 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.0.11
+  0.0.12-SNAPSHOT
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From 6c408256e1621c7e0f3640fb7a4ffdef139f5241 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 10 Nov 2015 15:02:44 -0800
Subject: [PATCH 068/322] Make projectIdRequired() method protected.  Also
 supply nice error message if project could not be determined and is required

---
 .../src/main/java/com/google/gcloud/ServiceOptions.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index d91b3c35c8dd..0793470ade83 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -17,7 +17,7 @@
 package com.google.gcloud;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkArgument;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.client.extensions.appengine.http.UrlFetchTransport;
@@ -308,7 +308,10 @@ protected ServiceOptions(Class> ser
       Builder builder) {
     projectId = builder.projectId != null ? builder.projectId : defaultProject();
     if (projectIdRequired()) {
-      checkNotNull(projectId);
+      checkArgument(
+          projectId != null,
+          "A project ID is required for this service but could not be determined from the builder or "
+          + "the environment.  Please set a project ID using the builder.");
     }
     host = firstNonNull(builder.host, defaultHost());
     httpTransportFactory = firstNonNull(builder.httpTransportFactory,
@@ -334,7 +337,7 @@ protected ServiceOptions(Class> ser
    *
    * @return true if a project ID is required to use the service, false if not.
    */
-  public boolean projectIdRequired() {
+  protected boolean projectIdRequired() {
     return true;
   }
 

From bfd54bdefbf2e8b79b1e96d71c7adbd05eda2e7a Mon Sep 17 00:00:00 2001
From: aozarov 
Date: Tue, 10 Nov 2015 16:37:56 -0800
Subject: [PATCH 069/322] replace rewrite with copy in the javadoc

---
 .../src/main/java/com/google/gcloud/storage/CopyWriter.java   | 4 ++--
 .../src/main/java/com/google/gcloud/storage/Storage.java      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
index 142f8d4b6de7..5f2632b2acde 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/CopyWriter.java
@@ -79,14 +79,14 @@ public long blobSize() {
   }
 
   /**
-   * Returns {@code true} of blob rewrite finished, {@code false} otherwise.
+   * Returns {@code true} if blob copy has finished, {@code false} otherwise.
    */
   public boolean isDone() {
     return rewriteResponse.isDone;
   }
 
   /**
-   * Returns the number of bytes copied. 
+   * Returns the number of bytes copied.
    */
   public long totalBytesCopied() {
     return rewriteResponse.totalBytesRewritten;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 52387310de71..115449064c66 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -804,7 +804,7 @@ private CopyRequest(Builder builder) {
     }
 
     /**
-     * Returns the blob to rewrite, as a {@link BlobId}.
+     * Returns the blob to copy, as a {@link BlobId}.
      */
     public BlobId source() {
       return source;
@@ -818,7 +818,7 @@ public List sourceOptions() {
     }
 
     /**
-     * Returns the rewrite target.
+     * Returns the {@link BlobInfo} for the target blob.
      */
     public BlobInfo target() {
       return target;

From dde30aaf085b0cf3a6615af0495309b2596e488f Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 15:32:36 +0100
Subject: [PATCH 070/322] Add javadoc to Acl

---
 .../java/com/google/gcloud/storage/Acl.java   | 74 ++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java
index 3d9731352400..fd75e10d92fa 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java
@@ -23,7 +23,10 @@
 import java.util.Objects;
 
 /**
- *  Access Control List on for buckets or blobs.
+ * Access Control List for buckets or blobs.
+ *
+ * @see 
+ *     About Access Control Lists
  */
 public final class Acl implements Serializable {
 
@@ -36,6 +39,9 @@ public enum Role {
     OWNER, READER, WRITER
   }
 
+  /**
+   * Base class for Access Control List entities.
+   */
   public abstract static class Entity implements Serializable {
 
     private static final long serialVersionUID = -2707407252771255840L;
@@ -52,10 +58,16 @@ public enum Type {
       this.value = value;
     }
 
+    /**
+     * Returns the type of entity.
+     */
     public Type type() {
       return type;
     }
 
+    /**
+     * Returns the entity's value.
+     */
     protected String value() {
       return value;
     }
@@ -112,42 +124,75 @@ static Entity fromPb(String entity) {
     }
   }
 
+  /**
+   * Class for ACL Domain entities.
+   */
   public static final class Domain extends Entity {
 
     private static final long serialVersionUID = -3033025857280447253L;
 
+    /**
+     * Creates a domain entity.
+     *
+     * @param domain the domain associated to this entity
+     */
     public Domain(String domain) {
       super(Type.DOMAIN, domain);
     }
 
+    /**
+     * Returns the domain associated to this entity.
+     */
     public String domain() {
       return value();
     }
   }
 
+  /**
+   * Class for ACL Group entities.
+   */
   public static final class Group extends Entity {
 
     private static final long serialVersionUID = -1660987136294408826L;
 
+    /**
+     * Creates a group entity.
+     *
+     * @param email the group email
+     */
     public Group(String email) {
       super(Type.GROUP, email);
     }
 
+    /**
+     * Returns the group email.
+     */
     public String email() {
       return value();
     }
   }
 
+  /**
+   * Class for ACL User entities.
+   */
   public static final class User extends Entity {
 
     private static final long serialVersionUID = 3076518036392737008L;
     private static final String ALL_USERS = "allUsers";
     private static final String ALL_AUTHENTICATED_USERS = "allAuthenticatedUsers";
 
+    /**
+     * Creates a user entity.
+     *
+     * @param email the user email
+     */
     public User(String email) {
       super(Type.USER, email);
     }
 
+    /**
+     * Returns the user email.
+     */
     public String email() {
       return value();
     }
@@ -174,6 +219,9 @@ public static User ofAllAuthenticatedUsers() {
     }
   }
 
+  /**
+   * Class for ACL Project entities.
+   */
   public static final class Project extends Entity {
 
     private static final long serialVersionUID = 7933776866530023027L;
@@ -185,16 +233,28 @@ public enum ProjectRole {
       OWNERS, EDITORS, VIEWERS
     }
 
+    /**
+     * Creates a project entity.
+     *
+     * @param pRole a role in the project, used to select project's teams
+     * @param projectId id of the project
+     */
     public Project(ProjectRole pRole, String projectId) {
       super(Type.PROJECT, pRole.name().toLowerCase() + "-" + projectId);
       this.pRole = pRole;
       this.projectId = projectId;
     }
 
+    /**
+     * Returns the role in the project for this entity.
+     */
     public ProjectRole projectRole() {
       return pRole;
     }
 
+    /**
+     * Returns the project id for this entity.
+     */
     public String projectId() {
       return projectId;
     }
@@ -214,15 +274,27 @@ String toPb() {
     }
   }
 
+  /**
+   * Creats an ACL object.
+   *
+   * @param entity the entity for this ACL object
+   * @param role the role to associate to the {@code entity} object
+   */
   public Acl(Entity entity, Role role) {
     this.entity = entity;
     this.role = role;
   }
 
+  /**
+   * Returns the entity for this ACL object.
+   */
   public Entity entity() {
     return entity;
   }
 
+  /**
+   * Returns the role associated to the entity in this ACL object.
+   */
   public Role role() {
     return role;
   }

From 93dd0c244fdbc6843ed2fc43912fa55a4c9e6258 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 15:34:49 +0100
Subject: [PATCH 071/322] Add javadoc to Blob

---
 .../java/com/google/gcloud/storage/Blob.java  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index d35fcef026c8..a8e315be0e45 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -50,6 +50,9 @@ public final class Blob {
   private final Storage storage;
   private final BlobInfo info;
 
+  /**
+   * Class for specifying blob source options when {@code Blob} methods are used.
+   */
   public static class BlobSourceOption extends Option {
 
     private static final long serialVersionUID = 214616862061934846L;
@@ -88,18 +91,34 @@ private Storage.BlobGetOption toGetOption(BlobInfo blobInfo) {
       }
     }
 
+    /**
+     * Returns an option for blob's generation match. If this option is used the request will fail
+     * if generation does not match.
+     */
     public static BlobSourceOption generationMatch() {
       return new BlobSourceOption(StorageRpc.Option.IF_GENERATION_MATCH);
     }
 
+    /**
+     * Returns an option for blob's generation mismatch. If this option is used the request will
+     * fail if generation matches.
+     */
     public static BlobSourceOption generationNotMatch() {
       return new BlobSourceOption(StorageRpc.Option.IF_GENERATION_NOT_MATCH);
     }
 
+    /**
+     * Returns an option for blob's metageneration match. If this option is used the request will
+     * fail if metageneration does not match.
+     */
     public static BlobSourceOption metagenerationMatch() {
       return new BlobSourceOption(StorageRpc.Option.IF_METAGENERATION_MATCH);
     }
 
+    /**
+     * Returns an option for blob's metageneration mismatch. If this option is used the request will
+     * fail if metageneration matches.
+     */
     public static BlobSourceOption metagenerationNotMatch() {
       return new BlobSourceOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH);
     }

From 6de12f20c202386d66588059b6c9ec55ff47a058 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 15:35:36 +0100
Subject: [PATCH 072/322] Add javadoc to BlobId

---
 .../main/java/com/google/gcloud/storage/BlobId.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
index eafebe09a4cb..d1209826cc3e 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
@@ -38,10 +38,16 @@ private BlobId(String bucket, String name) {
     this.name = name;
   }
 
+  /**
+   * Returns the name of the bucket containing the blob.
+   */
   public String bucket() {
     return bucket;
   }
 
+  /**
+   * Returns the name of the blob.
+   */
   public String name() {
     return name;
   }
@@ -72,6 +78,12 @@ StorageObject toPb() {
     return storageObject;
   }
 
+  /**
+   * Creates a blob identifier.
+   *
+   * @param bucket the name of the bucket that contains the blob
+   * @param name the name of the blob
+   */
   public static BlobId of(String bucket, String name) {
     return new BlobId(checkNotNull(bucket), checkNotNull(name));
   }

From e2a4500e57e7dd458223cff5020e990539795828 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 15:37:47 +0100
Subject: [PATCH 073/322] Add javadoc to Bucket

---
 .../main/java/com/google/gcloud/storage/Bucket.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 7c386373995f..21aafd92b5d4 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -122,6 +122,9 @@ public boolean equals(Object obj) {
     }
   }
 
+  /**
+   * Class for specifying bucket source options when {@code Bucket} methods are used.
+   */
   public static class BucketSourceOption extends Option {
 
     private static final long serialVersionUID = 6928872234155522371L;
@@ -152,10 +155,18 @@ private Storage.BucketGetOption toGetOption(BucketInfo bucketInfo) {
       }
     }
 
+    /**
+     * Returns an option for bucket's metageneration match. If this option is used the request will
+     * fail if metageneration does not match.
+     */
     public static BucketSourceOption metagenerationMatch() {
       return new BucketSourceOption(StorageRpc.Option.IF_METAGENERATION_MATCH);
     }
 
+    /**
+     * Returns an option for bucket's metageneration mismatch. If this option is used the request
+     * will fail if metageneration matches.
+     */
     public static BucketSourceOption metagenerationNotMatch() {
       return new BucketSourceOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH);
     }

From 9608e61fe5228de7c4faddb9e9c4a850eda69611 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 15:40:43 +0100
Subject: [PATCH 074/322] Add javadoc to Cors

---
 .../java/com/google/gcloud/storage/Cors.java  | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Cors.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Cors.java
index a94359f17a79..bcbbd1030dbc 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Cors.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Cors.java
@@ -33,6 +33,9 @@
 
 /**
  * Cross-Origin Resource Sharing (CORS) configuration for a bucket.
+ *
+ * @see 
+ *     Cross-Origin Resource Sharing (CORS)
  */
 public final class Cors implements Serializable {
 
@@ -57,6 +60,9 @@ public Bucket.Cors apply(Cors cors) {
   private final ImmutableList origins;
   private final ImmutableList responseHeaders;
 
+  /**
+   * Class for a CORS origin.
+   */
   public static final class Origin implements Serializable {
 
     private static final long serialVersionUID = -4447958124895577993L;
@@ -69,10 +75,16 @@ private Origin(String value) {
       this.value = checkNotNull(value);
     }
 
+    /**
+     * Returns an {@code Origin} object for all possible origins.
+     */
     public static Origin any() {
       return ANY;
     }
 
+    /**
+     * Returns an {@code Origin} object for the given scheme, host and port.
+     */
     public static Origin of(String scheme, String host, int port) {
       try {
         return of(new URI(scheme, null, host, port, null, null, null).toString());
@@ -81,6 +93,9 @@ public static Origin of(String scheme, String host, int port) {
       }
     }
 
+    /**
+     * Creates an {@code Origin} object for the provided value.
+     */
     public static Origin of(String value) {
       if (ANY_URI.equals(value)) {
         return any();
@@ -111,6 +126,9 @@ public String value() {
     }
   }
 
+  /**
+   * CORS configuration builder.
+   */
   public static final class Builder {
 
     private Integer maxAgeSeconds;
@@ -120,26 +138,42 @@ public static final class Builder {
 
     private Builder() {}
 
+    /**
+     * Sets the max time in seconds in which a client can issue requests before sending a new
+     * preflight request.
+     */
     public Builder maxAgeSeconds(Integer maxAgeSeconds) {
       this.maxAgeSeconds = maxAgeSeconds;
       return this;
     }
 
+    /**
+     * Sets the HTTP methods supported by this CORS configuration.
+     */
     public Builder methods(Iterable methods) {
       this.methods = methods != null ? ImmutableList.copyOf(methods) : null;
       return this;
     }
 
+    /**
+     * Sets the origins for this CORS configuration.
+     */
     public Builder origins(Iterable origins) {
       this.origins = origins != null ? ImmutableList.copyOf(origins) : null;
       return this;
     }
 
+    /**
+     * Sets the response headers supported by this CORS configuration.
+     */
     public Builder responseHeaders(Iterable headers) {
       this.responseHeaders = headers != null ? ImmutableList.copyOf(headers) : null;
       return this;
     }
 
+    /**
+     * Creates a CORS configuration.
+     */
     public Cors build() {
       return new Cors(this);
     }
@@ -152,22 +186,38 @@ private Cors(Builder builder) {
     this.responseHeaders = builder.responseHeaders;
   }
 
+  /**
+   * Returns the max time in seconds in which a client can issue requests before sending a new
+   * preflight request.
+   */
   public Integer maxAgeSeconds() {
     return maxAgeSeconds;
   }
 
+  /**
+   * Returns the HTTP methods supported by this CORS configuration.
+   */
   public List methods() {
     return methods;
   }
 
+  /**
+   * Returns the origins in this CORS configuration.
+   */
   public List origins() {
     return origins;
   }
 
+  /**
+   * Returns the response headers supported by this CORS configuration.
+   */
   public List responseHeaders() {
     return responseHeaders;
   }
 
+  /**
+   * Returns a builder for this CORS configuration.
+   */
   public Builder toBuilder() {
     return builder()
         .maxAgeSeconds(maxAgeSeconds)
@@ -193,6 +243,9 @@ public boolean equals(Object obj) {
         && Objects.equals(responseHeaders, other.responseHeaders);
   }
 
+  /**
+   * Returns a CORS configuration builder.
+   */
   public static Builder builder() {
     return new Builder();
   }

From 67bfcdd00e1c475eb74f222d1ea59ef7b0b3e130 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 14:31:53 +0100
Subject: [PATCH 075/322] Switch from enum to String for location and
 storageClass in BucketInfo, add javadoc

---
 .../com/google/gcloud/storage/BucketInfo.java | 330 ++++++++++--------
 .../google/gcloud/storage/BucketInfoTest.java |  16 +-
 2 files changed, 187 insertions(+), 159 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
index 5d69c54e0d96..3f21f74dcd66 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
@@ -80,9 +80,15 @@ public com.google.api.services.storage.model.Bucket apply(BucketInfo bucketInfo)
   private final List cors;
   private final List acl;
   private final List defaultAcl;
-  private final Location location;
-  private final StorageClass storageClass;
-
+  private final String location;
+  private final String storageClass;
+
+  /**
+   * Base class for bucket's delete rules. Allows to configure automatic deletion of blobs and blobs
+   * versions.
+   *
+   * @see Object Lifecycle Management
+   */
   public abstract static class DeleteRule implements Serializable {
 
     private static final long serialVersionUID = 3137971668395933033L;
@@ -153,11 +159,23 @@ static DeleteRule fromPb(Rule rule) {
     }
   }
 
+  /**
+   * Delete rule class that sets a Time To Live for blobs in the bucket.
+   *
+   * @see Object Lifecycle Management
+   */
   public static class AgeDeleteRule extends DeleteRule {
 
     private static final long serialVersionUID = 5697166940712116380L;
     private final int daysToLive;
 
+    /**
+     * Creates an {@code AgeDeleteRule} object.
+     *
+     * @param daysToLive blobs' Time To Live expressed in days. The time when the age condition is
+     *     considered to be satisfied is computed by adding {@code daysToLive} days to the
+     *     midnight following blob's creation time in UTC.
+     */
     public AgeDeleteRule(int daysToLive) {
       super(Type.AGE);
       this.daysToLive = daysToLive;
@@ -205,11 +223,22 @@ Rule toPb() {
     }
   }
 
+  /**
+   * Delete rule class for blobs in the bucket that have been created before a certain date.
+   *
+   * @see Object Lifecycle Management
+   */
   public static class CreatedBeforeDeleteRule extends DeleteRule {
 
     private static final long serialVersionUID = 881692650279195867L;
     private final long timeMillis;
 
+    /**
+     * Creates an {@code CreatedBeforeDeleteRule} object.
+     *
+     * @param timeMillis a date in UTC. Blobs that have been created before midnight of the provided
+     *     date meet the delete condition
+     */
     public CreatedBeforeDeleteRule(long timeMillis) {
       super(Type.CREATE_BEFORE);
       this.timeMillis = timeMillis;
@@ -225,11 +254,23 @@ void populateCondition(Rule.Condition condition) {
     }
   }
 
+  /**
+   * Delete rule class for versioned blobs. Specifies when to delete a blob's version according to
+   * the number of available newer versions for that blob.
+   *
+   * @see Object Lifecycle Management
+   */
   public static class NumNewerVersionsDeleteRule extends DeleteRule {
 
     private static final long serialVersionUID = -1955554976528303894L;
     private final int numNewerVersions;
 
+    /**
+     * Creates an {@code NumNewerVersionsDeleteRule} object.
+     *
+     * @param numNewerVersions the number of newer versions. A blob's version meets the delete
+     *     condition when {@code numNewerVersions} newer versions are available.
+     */
     public NumNewerVersionsDeleteRule(int numNewerVersions) {
       super(Type.NUM_NEWER_VERSIONS);
       this.numNewerVersions = numNewerVersions;
@@ -245,11 +286,22 @@ void populateCondition(Rule.Condition condition) {
     }
   }
 
+  /**
+   * Delete rule class to distinguish between live and archived blobs.
+   *
+   * @see Object Lifecycle Management
+   */
   public static class IsLiveDeleteRule extends DeleteRule {
 
     private static final long serialVersionUID = -3502994563121313364L;
     private final boolean isLive;
 
+    /**
+     * Creates an {@code IsLiveDeleteRule} object.
+     *
+     * @param isLive if set to {@code true} live blobs meet the delete condition. If set to
+     *     {@code false} delete condition is met by archived objects.
+     */
     public IsLiveDeleteRule(boolean isLive) {
       super(Type.IS_LIVE);
       this.isLive = isLive;
@@ -265,134 +317,6 @@ void populateCondition(Rule.Condition condition) {
     }
   }
 
-  public static final class StorageClass implements Serializable {
-
-    private static final long serialVersionUID = 374002156285326563L;
-    private static final ImmutableMap STRING_TO_OPTION;
-    private static final StorageClass NULL_VALUE =
-        new StorageClass(Data.nullOf(String.class));
-
-    private final String value;
-
-    public enum Option {
-      DURABLE_REDUCED_AVAILABILITY, STANDARD;
-
-      private final StorageClass storageClass;
-
-      Option() {
-        storageClass = new StorageClass(name());
-      }
-    }
-
-    private StorageClass(String value) {
-      this.value = checkNotNull(value);
-    }
-
-    @Override
-    public String toString() {
-      return value();
-    }
-
-    public String value() {
-      return value;
-    }
-
-    public static StorageClass standard() {
-      return Option.STANDARD.storageClass;
-    }
-
-    public static StorageClass durableReducedAvailability() {
-      return Option.DURABLE_REDUCED_AVAILABILITY.storageClass;
-    }
-
-    public static StorageClass of(String value) {
-      Option option = STRING_TO_OPTION.get(value.toUpperCase());
-      return option == null ? new StorageClass(value) : option.storageClass;
-    }
-
-    static {
-      ImmutableMap.Builder map = ImmutableMap.builder();
-      for (Option option : Option.values()) {
-        map.put(option.name(), option);
-      }
-      STRING_TO_OPTION = map.build();
-    }
-  }
-
-  public static final class Location implements Serializable {
-
-    private static final long serialVersionUID = 9073107666838637662L;
-    private static final ImmutableMap STRING_TO_OPTION;
-    private static final Location NULL_VALUE = new Location(Data.nullOf(String.class));
-
-    private final String value;
-
-    public enum Option {
-      US, EU, ASIA;
-
-      private final Location location;
-
-      Option() {
-        location = new Location(name());
-      }
-    }
-
-    private Location(String value) {
-      this.value = checkNotNull(value);
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(value);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (this == obj) {
-        return true;
-      }
-      if (obj == null || getClass() != obj.getClass()) {
-        return false;
-      }
-      final Location other = (Location) obj;
-      return Objects.equals(this.value, other.value);
-    }
-
-    @Override
-    public String toString() {
-      return value();
-    }
-
-    public String value() {
-      return value;
-    }
-
-    public static Location us() {
-      return Option.US.location;
-    }
-
-    public static Location eu() {
-      return Option.EU.location;
-    }
-
-    public static Location asia() {
-      return Option.ASIA.location;
-    }
-
-    public static Location of(String value) {
-      Option option = STRING_TO_OPTION.get(value.toUpperCase());
-      return option == null ? new Location(value) : option.location;
-    }
-
-    static {
-      ImmutableMap.Builder map = ImmutableMap.builder();
-      for (Option option : Option.values()) {
-        map.put(option.name(), option);
-      }
-      STRING_TO_OPTION = map.build();
-    }
-  }
-
   public static final class Builder {
 
     private String id;
@@ -403,8 +327,8 @@ public static final class Builder {
     private String indexPage;
     private String notFoundPage;
     private ImmutableList deleteRules;
-    private StorageClass storageClass;
-    private Location location;
+    private String storageClass;
+    private String location;
     private String etag;
     private Long createTime;
     private Long metageneration;
@@ -414,6 +338,9 @@ public static final class Builder {
 
     private Builder() {}
 
+    /**
+     * Sets the bucket's name.
+     */
     public Builder name(String name) {
       this.name = checkNotNull(name);
       return this;
@@ -434,33 +361,57 @@ Builder selfLink(String selfLink) {
       return this;
     }
 
+    /**
+     * Sets whether blob versioning should be enabled or not for the bucket.
+     */
     public Builder versioningEnabled(Boolean enable) {
       this.versioningEnabled = firstNonNull(enable, Data.nullOf(Boolean.class));
       return this;
     }
 
+    /**
+     * Sets the bucket's website index page.
+     */
     public Builder indexPage(String indexPage) {
       this.indexPage = indexPage;
       return this;
     }
 
+    /**
+     * Sets the bucket's website page to return when a resource is not found.
+     */
     public Builder notFoundPage(String notFoundPage) {
       this.notFoundPage = notFoundPage;
       return this;
     }
 
+    /**
+     * Sets bucket's delete rules.
+     *
+     * @see Lifecycle Management
+     */
     public Builder deleteRules(Iterable rules) {
       this.deleteRules = rules != null ? ImmutableList.copyOf(rules) : null;
       return this;
     }
 
-    public Builder storageClass(StorageClass storageClass) {
-      this.storageClass = firstNonNull(storageClass, StorageClass.NULL_VALUE);
+    /**
+     * Sets the bucket's storage class. A list of supported values is available
+     * here.
+     *
+     * @see Storage Classes
+     */
+    public Builder storageClass(String storageClass) {
+      this.storageClass = storageClass;
       return this;
     }
 
-    public Builder location(Location location) {
-      this.location = firstNonNull(location, Location.NULL_VALUE);
+    /**
+     * Sets the bucket's location. A list of supported values is available
+     * here.
+     */
+    public Builder location(String location) {
+      this.location = location;
       return this;
     }
 
@@ -479,21 +430,43 @@ Builder metageneration(Long metageneration) {
       return this;
     }
 
+    /**
+     * Sets the bucket's Cross-Origin Resource Sharing (CORS) configuration.
+     *
+     * @see 
+     *     Cross-Origin Resource Sharing (CORS)
+     */
     public Builder cors(Iterable cors) {
       this.cors = cors != null ? ImmutableList.copyOf(cors) : null;
       return this;
     }
 
+    /**
+     * Sets the bucket's access control configuration.
+     *
+     * @see 
+     *     About Access Control Lists
+     */
     public Builder acl(Iterable acl) {
       this.acl = acl != null ? ImmutableList.copyOf(acl) : null;
       return this;
     }
 
+    /**
+     * Sets the default access control configuration to apply to bucket's blobs when no other
+     * configuration is specified.
+     *
+     * @see 
+     *     About Access Control Lists
+     */
     public Builder defaultAcl(Iterable acl) {
       this.defaultAcl = acl != null ? ImmutableList.copyOf(acl) : null;
       return this;
     }
 
+    /**
+     * Creates a {@code BucketInfo} object.
+     */
     public BucketInfo build() {
       checkNotNull(name);
       return new BucketInfo(this);
@@ -519,70 +492,131 @@ private BucketInfo(Builder builder) {
     deleteRules = builder.deleteRules;
   }
 
+  /**
+   * Returns the bucket's id.
+   */
   public String id() {
     return id;
   }
 
+  /**
+   * Returns the bucket's name.
+   */
   public String name() {
     return name;
   }
 
+  /**
+   * Returns the bucket's owner.
+   */
   public Entity owner() {
     return owner;
   }
 
+  /**
+   * Returns the URI of this bucket as a string.
+   */
   public String selfLink() {
     return selfLink;
   }
 
+  /**
+   * Returns {@code true} if blob versioning is enabled for this bucket, {@code false} otherwise.
+   */
   public Boolean versioningEnabled() {
     return Data.isNull(versioningEnabled) ? null : versioningEnabled;
   }
 
+  /**
+   * Returns bucket's website index page.
+   */
   public String indexPage() {
     return indexPage;
   }
 
+  /**
+   * Returns bucket's website not found page, used we a resource could not be found.
+   */
   public String notFoundPage() {
     return notFoundPage;
   }
 
+  /**
+   * Returns bucket's delete rules.
+   */
   public List deleteRules() {
     return deleteRules;
   }
 
+  /**
+   * Returns bucket resource's entity tag.
+   */
   public String etag() {
     return etag;
   }
 
+  /**
+   * Returns the time at which the bucket was created.
+   */
   public Long createTime() {
     return createTime;
   }
 
+  /**
+   * Returns the metadata generation of this bucket.
+   */
   public Long metageneration() {
     return metageneration;
   }
 
-  public Location location() {
-    return location == null || Data.isNull(location.value) ? null : location;
+  /**
+   * Returns the bucket's location.
+   *
+   * @see Bucket Locations
+   */
+  public String location() {
+    return location;
   }
 
-  public StorageClass storageClass() {
-    return storageClass == null || Data.isNull(storageClass.value) ? null : storageClass;
+  /**
+   * Returns the bucket's storage class.
+   *
+   * @see Storage Classes
+   */
+  public String storageClass() {
+    return storageClass;
   }
 
+  /**
+   * Returns the bucket's Cross-Origin Resource Sharing (CORS) configuration.
+   */
   public List cors() {
     return cors;
   }
 
+  /**
+   * Returns the bucket's access control configuration.
+   *
+   * @see 
+   *     About Access Control Lists
+   */
   public List acl() {
     return acl;
   }
 
+  /**
+   * Returns the default access control configuration for this bucket's blobs.
+   *
+   * @see 
+   *     About Access Control Lists
+   */
   public List defaultAcl() {
     return defaultAcl;
   }
 
+  /**
+   * Returns a builder for the current bucket.
+   */
   public Builder toBuilder() {
     return new Builder()
         .name(name)
@@ -633,10 +667,10 @@ com.google.api.services.storage.model.Bucket toPb() {
       bucketPb.setMetageneration(metageneration);
     }
     if (location != null) {
-      bucketPb.setLocation(location.value());
+      bucketPb.setLocation(location);
     }
     if (storageClass != null) {
-      bucketPb.setStorageClass(storageClass.value());
+      bucketPb.setStorageClass(storageClass);
     }
     if (cors != null) {
       bucketPb.setCors(transform(cors, Cors.TO_PB_FUNCTION));
@@ -683,10 +717,16 @@ public Rule apply(DeleteRule deleteRule) {
     return bucketPb;
   }
 
+  /**
+   * Creates a {@code BucketInfo} object for the provided bucket name.
+   */
   public static BucketInfo of(String name) {
     return builder(name).build();
   }
 
+  /**
+   * Returns a {@code BucketInfo} builder where the bucket's name is set to the provided name.
+   */
   public static Builder builder(String name) {
     return new Builder().name(name);
   }
@@ -709,10 +749,10 @@ static BucketInfo fromPb(com.google.api.services.storage.model.Bucket bucketPb)
       builder.createTime(bucketPb.getTimeCreated().getValue());
     }
     if (bucketPb.getLocation() != null) {
-      builder.location(Location.of(bucketPb.getLocation()));
+      builder.location(bucketPb.getLocation());
     }
     if (bucketPb.getStorageClass() != null) {
-      builder.storageClass(StorageClass.of(bucketPb.getStorageClass()));
+      builder.storageClass(bucketPb.getStorageClass());
     }
     if (bucketPb.getCors() != null) {
       builder.cors(transform(bucketPb.getCors(), Cors.FROM_PB_FUNCTION));
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
index 09ba0e8cda8e..4fa420b4b6e1 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
@@ -31,10 +31,8 @@
 import com.google.gcloud.storage.BucketInfo.DeleteRule;
 import com.google.gcloud.storage.BucketInfo.DeleteRule.Type;
 import com.google.gcloud.storage.BucketInfo.IsLiveDeleteRule;
-import com.google.gcloud.storage.BucketInfo.Location;
 import com.google.gcloud.storage.BucketInfo.NumNewerVersionsDeleteRule;
 import com.google.gcloud.storage.BucketInfo.RawDeleteRule;
-import com.google.gcloud.storage.BucketInfo.StorageClass;
 
 import org.junit.Test;
 
@@ -59,8 +57,8 @@ public class BucketInfoTest {
       Collections.singletonList(new AgeDeleteRule(5));
   private static final String INDEX_PAGE = "index.html";
   private static final String NOT_FOUND_PAGE = "error.html";
-  private static final Location LOCATION = Location.asia();
-  private static final StorageClass STORAGE_CLASS = StorageClass.standard();
+  private static final String LOCATION = "ASIA";
+  private static final String STORAGE_CLASS = "STANDARD";
   private static final Boolean VERSIONING_ENABLED = true;
   private static final BucketInfo BUCKET_INFO = BucketInfo.builder("b")
       .acl(ACL)
@@ -149,16 +147,6 @@ private void compareBuckets(BucketInfo expected, BucketInfo value) {
     assertEquals(expected.versioningEnabled(), value.versioningEnabled());
   }
 
-  @Test
-  public void testLocation() {
-    assertEquals("ASIA", Location.asia().value());
-    assertEquals("EU", Location.eu().value());
-    assertEquals("US", Location.us().value());
-    assertSame(Location.asia(), Location.of("asia"));
-    assertSame(Location.eu(), Location.of("EU"));
-    assertSame(Location.us(), Location.of("uS"));
-  }
-
   @Test
   public void testDeleteRules() {
     AgeDeleteRule ageRule = new AgeDeleteRule(10);

From ecaf7519522b43431f4c7c24b31b0bd4a09c54ed Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 17:14:52 +0100
Subject: [PATCH 076/322] Add javadoc to BlobInfo

---
 .../com/google/gcloud/storage/BlobInfo.java   | 125 ++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
index 01711a53613e..9662635160e8 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
@@ -123,6 +123,9 @@ public static final class Builder {
 
     private Builder() {}
 
+    /**
+     * Sets the blob identity.
+     */
     public Builder blobId(BlobId blobId) {
       this.blobId = checkNotNull(blobId);
       return this;
@@ -133,21 +136,33 @@ Builder id(String id) {
       return this;
     }
 
+    /**
+     * Sets the blob's data content type.
+     */
     public Builder contentType(String contentType) {
       this.contentType = firstNonNull(contentType, Data.nullOf(String.class));
       return this;
     }
 
+    /**
+     * Sets the blob's data content disposition.
+     */
     public Builder contentDisposition(String contentDisposition) {
       this.contentDisposition = firstNonNull(contentDisposition, Data.nullOf(String.class));
       return this;
     }
 
+    /**
+     * Sets the blob's data content language.
+     */
     public Builder contentLanguage(String contentLanguage) {
       this.contentLanguage = firstNonNull(contentLanguage, Data.nullOf(String.class));
       return this;
     }
 
+    /**
+     * Sets the blob's data content encoding.
+     */
     public Builder contentEncoding(String contentEncoding) {
       this.contentEncoding = firstNonNull(contentEncoding, Data.nullOf(String.class));
       return this;
@@ -158,11 +173,20 @@ Builder componentCount(Integer componentCount) {
       return this;
     }
 
+    /**
+     * Sets the blob's data cache control.
+     */
     public Builder cacheControl(String cacheControl) {
       this.cacheControl = firstNonNull(cacheControl, Data.nullOf(String.class));
       return this;
     }
 
+    /**
+     * Sets the blob's access control configuration.
+     *
+     * @see 
+     *     About Access Control Lists
+     */
     public Builder acl(List acl) {
       this.acl = acl != null ? ImmutableList.copyOf(acl) : null;
       return this;
@@ -188,11 +212,18 @@ Builder selfLink(String selfLink) {
       return this;
     }
 
+    /**
+     * Sets the MD5 hash of blob's data. MD5 value must be encoded in base64.
+     */
     public Builder md5(String md5) {
       this.md5 = firstNonNull(md5, Data.nullOf(String.class));
       return this;
     }
 
+    /**
+     * Sets the CRC32C checksum of blob's data. CRC32C value must be encoded in base64 in big-endian
+     * order.
+     */
     public Builder crc32c(String crc32c) {
       this.crc32c = firstNonNull(crc32c, Data.nullOf(String.class));
       return this;
@@ -203,6 +234,9 @@ Builder mediaLink(String mediaLink) {
       return this;
     }
 
+    /**
+     * Sets the blob's metadata.
+     */
     public Builder metadata(Map metadata) {
       this.metadata = metadata != null
           ? new HashMap(metadata) : Data.nullOf(ImmutableEmptyMap.class);
@@ -229,6 +263,9 @@ Builder updateTime(Long updateTime) {
       return this;
     }
 
+    /**
+     * Creates a {@code BlobInfo} object.
+     */
     public BlobInfo build() {
       checkNotNull(blobId);
       return new BlobInfo(this);
@@ -259,98 +296,177 @@ private BlobInfo(Builder builder) {
     updateTime = builder.updateTime;
   }
 
+  /**
+   * Returns the blob's identity.
+   */
   public BlobId blobId() {
     return blobId;
   }
 
+  /**
+   * Returns the name of the containing bucket.
+   */
   public String bucket() {
     return blobId().bucket();
   }
 
+  /**
+   * Returns the blob's id.
+   */
   public String id() {
     return id;
   }
 
+  /**
+   * Returns the blob's name.
+   */
   public String name() {
     return blobId().name();
   }
 
+  /**
+   * Returns the blob's data cache control.
+   */
   public String cacheControl() {
     return Data.isNull(cacheControl) ? null : cacheControl;
   }
 
+  /**
+   * Returns the blob's access control configuration.
+   *
+   * @see 
+   *     About Access Control Lists
+   */
   public List acl() {
     return acl;
   }
 
+  /**
+   * Returns the blob's owner.
+   */
   public Acl.Entity owner() {
     return owner;
   }
 
+  /**
+   * Returns the blob's data size in bytes.
+   */
   public Long size() {
     return size;
   }
 
+  /**
+   * Returns the blob's data content type.
+   */
   public String contentType() {
     return Data.isNull(contentType) ? null : contentType;
   }
 
+  /**
+   * Returns the blob's data content encoding.
+   */
   public String contentEncoding() {
     return Data.isNull(contentEncoding) ? null : contentEncoding;
   }
 
+  /**
+   * Returns the blob's data content disposition.
+   */
   public String contentDisposition() {
     return Data.isNull(contentDisposition) ? null : contentDisposition;
   }
 
+  /**
+   * Returns the blob's data content language.
+   */
   public String contentLanguage() {
     return Data.isNull(contentLanguage) ? null : contentLanguage;
   }
 
+  /**
+   * Returns the number of components that make up this object. Components are accumulated through
+   * the {@link Storage#compose(Storage.ComposeRequest)} operation.
+   *
+   * @see Component Count
+   *     Property
+   */
   public Integer componentCount() {
     return componentCount;
   }
 
+  /**
+   * Returns blob resource's entity tag.
+   */
   public String etag() {
     return etag;
   }
 
+  /**
+   * Returns the URI of this blob as a string.
+   */
   public String selfLink() {
     return selfLink;
   }
 
+  /**
+   * Returns the MD5 hash of blob's data encoded in base64.
+   */
   public String md5() {
     return Data.isNull(md5) ? null : md5;
   }
 
+  /**
+   * Returns the CRC32C checksum of blob's data encoded in base64 in big-endian order.
+   */
   public String crc32c() {
     return Data.isNull(crc32c) ? null : crc32c;
   }
 
+  /**
+   * Returns the blob's media download link.
+   */
   public String mediaLink() {
     return mediaLink;
   }
 
+  /**
+   * Returns blob's metadata.
+   */
   public Map metadata() {
     return metadata == null || Data.isNull(metadata) ? null : Collections.unmodifiableMap(metadata);
   }
 
+  /**
+   * Returns blob's data generation.
+   */
   public Long generation() {
     return generation;
   }
 
+  /**
+   * Returns blob's metageneration.
+   */
   public Long metageneration() {
     return metageneration;
   }
 
+  /**
+   * Returns the deletion time of the blob.
+   */
   public Long deleteTime() {
     return deleteTime;
   }
 
+  /**
+   * Returns the last modification time of the blob's metadata.
+   */
   public Long updateTime() {
     return updateTime;
   }
 
+  /**
+   * Returns a builder for the current blob.
+   */
   public Builder toBuilder() {
     return new Builder()
         .blobId(blobId)
@@ -444,14 +560,23 @@ public ObjectAccessControl apply(Acl acl) {
     return storageObject;
   }
 
+  /**
+   * Returns a {@code BlobInfo} builder where blob identity is set using the provided values.
+   */
   public static Builder builder(BucketInfo bucketInfo, String name) {
     return builder(bucketInfo.name(), name);
   }
 
+  /**
+   * Returns a {@code BlobInfo} builder where blob identity is set using the provided values.
+   */
   public static Builder builder(String bucket, String name) {
     return new Builder().blobId(BlobId.of(bucket, name));
   }
 
+  /**
+   * Returns a {@code BlobInfo} builder where blob identity is set to the provided value.
+   */
   public static Builder builder(BlobId blobId) {
     return new Builder().blobId(blobId);
   }

From b9ef50883ddda7e19f1f9ec4599dca4c279c6ce8 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 17:15:08 +0100
Subject: [PATCH 077/322] Add javadoc to Storage

---
 .../com/google/gcloud/storage/Storage.java    | 222 +++++++++++++++++-
 1 file changed, 221 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 115449064c66..128099b7eab3 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -156,6 +156,9 @@ static String selector(BlobField... fields) {
     }
   }
 
+  /**
+   * Class for specifying bucket target options.
+   */
   class BucketTargetOption extends Option {
 
     private static final long serialVersionUID = -5880204616982900975L;
@@ -168,23 +171,40 @@ private BucketTargetOption(StorageRpc.Option rpcOption) {
       this(rpcOption, null);
     }
 
+    /**
+     * Returns an option for specifying bucket's predefined ACL configuration.
+     */
     public static BucketTargetOption predefinedAcl(PredefinedAcl acl) {
       return new BucketTargetOption(StorageRpc.Option.PREDEFINED_ACL, acl.entry());
     }
 
+    /**
+     * Returns an option for specifying bucket's default ACL configuration for blobs.
+     */
     public static BucketTargetOption predefinedDefaultObjectAcl(PredefinedAcl acl) {
       return new BucketTargetOption(StorageRpc.Option.PREDEFINED_DEFAULT_OBJECT_ACL, acl.entry());
     }
 
+    /**
+     * Returns an option for bucket's metageneration match. If this option is used the request will
+     * fail if metageneration does not match.
+     */
     public static BucketTargetOption metagenerationMatch() {
       return new BucketTargetOption(StorageRpc.Option.IF_METAGENERATION_MATCH);
     }
 
+    /**
+     * Returns an option for bucket's metageneration mismatch. If this option is used the request
+     * will fail if metageneration matches.
+     */
     public static BucketTargetOption metagenerationNotMatch() {
       return new BucketTargetOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH);
     }
   }
 
+  /**
+   * Class for specifying bucket source options.
+   */
   class BucketSourceOption extends Option {
 
     private static final long serialVersionUID = 5185657617120212117L;
@@ -193,15 +213,26 @@ private BucketSourceOption(StorageRpc.Option rpcOption, long metageneration) {
       super(rpcOption, metageneration);
     }
 
+    /**
+     * Returns an option for bucket's metageneration match. If this option is used the request will
+     * fail if bucket's metageneration does not match the provided value.
+     */
     public static BucketSourceOption metagenerationMatch(long metageneration) {
       return new BucketSourceOption(StorageRpc.Option.IF_METAGENERATION_MATCH, metageneration);
     }
 
+    /**
+     * Returns an option for bucket's metageneration mismatch. If this option is used the request
+     * will fail if bucket's metageneration matches the provided value.
+     */
     public static BucketSourceOption metagenerationNotMatch(long metageneration) {
       return new BucketSourceOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH, metageneration);
     }
   }
 
+  /**
+   * Class for specifying bucket source options.
+   */
   class BucketGetOption extends Option {
 
     private static final long serialVersionUID = 1901844869484087395L;
@@ -214,10 +245,18 @@ private BucketGetOption(StorageRpc.Option rpcOption, String value) {
       super(rpcOption, value);
     }
 
+    /**
+     * Returns an option for bucket's metageneration match. If this option is used the request will
+     * fail if bucket's metageneration does not match the provided value.
+     */
     public static BucketGetOption metagenerationMatch(long metageneration) {
       return new BucketGetOption(StorageRpc.Option.IF_METAGENERATION_MATCH, metageneration);
     }
 
+    /**
+     * Returns an option for bucket's metageneration mismatch. If this option is used the request
+     * will fail if bucket's metageneration matches the provided value.
+     */
     public static BucketGetOption metagenerationNotMatch(long metageneration) {
       return new BucketGetOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH, metageneration);
     }
@@ -233,6 +272,9 @@ public static BucketGetOption fields(BucketField... fields) {
     }
   }
 
+  /**
+   * Class for specifying blob target options.
+   */
   class BlobTargetOption extends Option {
 
     private static final long serialVersionUID = 214616862061934846L;
@@ -245,26 +287,48 @@ private BlobTargetOption(StorageRpc.Option rpcOption) {
       this(rpcOption, null);
     }
 
+    /**
+     * Returns an option for specifying blob's predefined ACL configuration.
+     */
     public static BlobTargetOption predefinedAcl(PredefinedAcl acl) {
       return new BlobTargetOption(StorageRpc.Option.PREDEFINED_ACL, acl.entry());
     }
 
+    /**
+     * Returns an option that causes an operation to succeed only if the target blob does not exist.
+     */
     public static BlobTargetOption doesNotExist() {
       return new BlobTargetOption(StorageRpc.Option.IF_GENERATION_MATCH, 0L);
     }
 
+    /**
+     * Returns an option for blob's data generation match. If this option is used the request will
+     * fail if generation does not match.
+     */
     public static BlobTargetOption generationMatch() {
       return new BlobTargetOption(StorageRpc.Option.IF_GENERATION_MATCH);
     }
 
+    /**
+     * Returns an option for blob's data generation mismatch. If this option is used the request
+     * will fail if generation matches.
+     */
     public static BlobTargetOption generationNotMatch() {
       return new BlobTargetOption(StorageRpc.Option.IF_GENERATION_NOT_MATCH);
     }
 
+    /**
+     * Returns an option for blob's metageneration match. If this option is used the request will
+     * fail if metageneration does not match.
+     */
     public static BlobTargetOption metagenerationMatch() {
       return new BlobTargetOption(StorageRpc.Option.IF_METAGENERATION_MATCH);
     }
 
+    /**
+     * Returns an option for blob's metageneration mismatch. If this option is used the request will
+     * fail if metageneration matches.
+     */
     public static BlobTargetOption metagenerationNotMatch() {
       return new BlobTargetOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH);
     }
@@ -290,6 +354,9 @@ static Tuple convert(BlobInfo info, BlobWriteOptio
     }
   }
 
+  /**
+   * Class for specifying blob write options.
+   */
   class BlobWriteOption implements Serializable {
 
     private static final long serialVersionUID = -3880421670966224580L;
@@ -336,39 +403,72 @@ public boolean equals(Object obj) {
       return this.option == other.option && Objects.equals(this.value, other.value);
     }
 
+    /**
+     * Returns an option for specifying blob's predefined ACL configuration.
+     */
     public static BlobWriteOption predefinedAcl(PredefinedAcl acl) {
       return new BlobWriteOption(Option.PREDEFINED_ACL, acl.entry());
     }
 
+    /**
+     * Returns an option that causes an operation to succeed only if the target blob does not exist.
+     */
     public static BlobWriteOption doesNotExist() {
       return new BlobWriteOption(Option.IF_GENERATION_MATCH, 0L);
     }
 
+    /**
+     * Returns an option for blob's data generation match. If this option is used the request will
+     * fail if generation does not match.
+     */
     public static BlobWriteOption generationMatch() {
       return new BlobWriteOption(Option.IF_GENERATION_MATCH);
     }
 
+    /**
+     * Returns an option for blob's data generation mismatch. If this option is used the request
+     * will fail if generation matches.
+     */
     public static BlobWriteOption generationNotMatch() {
       return new BlobWriteOption(Option.IF_GENERATION_NOT_MATCH);
     }
 
+    /**
+     * Returns an option for blob's metageneration match. If this option is used the request will
+     * fail if metageneration does not match.
+     */
     public static BlobWriteOption metagenerationMatch() {
       return new BlobWriteOption(Option.IF_METAGENERATION_MATCH);
     }
 
+    /**
+     * Returns an option for blob's metageneration mismatch. If this option is used the request will
+     * fail if metageneration matches.
+     */
     public static BlobWriteOption metagenerationNotMatch() {
       return new BlobWriteOption(Option.IF_METAGENERATION_NOT_MATCH);
     }
 
+    /**
+     * Returns an option for blob's data MD5 hash match. If this option is used the request will
+     * fail if blobs' data MD5 hash does not match.
+     */
     public static BlobWriteOption md5Match() {
       return new BlobWriteOption(Option.IF_MD5_MATCH, true);
     }
 
+    /**
+     * Returns an option for blob's data CRC32C checksum match. If this option is used the request
+     * will fail if blobs' data CRC32C checksum does not match.
+     */
     public static BlobWriteOption crc32cMatch() {
       return new BlobWriteOption(Option.IF_CRC32C_MATCH, true);
     }
   }
 
+  /**
+   * Class for specifying blob source options.
+   */
   class BlobSourceOption extends Option {
 
     private static final long serialVersionUID = -3712768261070182991L;
@@ -377,23 +477,42 @@ private BlobSourceOption(StorageRpc.Option rpcOption, long value) {
       super(rpcOption, value);
     }
 
+    /**
+     * Returns an option for blob's data generation match. If this option is used the request will
+     * fail if blob's generation does not match the provided value.
+     */
     public static BlobSourceOption generationMatch(long generation) {
       return new BlobSourceOption(StorageRpc.Option.IF_GENERATION_MATCH, generation);
     }
 
+    /**
+     * Returns an option for blob's data generation mismatch. If this option is used the request
+     * will fail if blob's generation matches the provided value.
+     */
     public static BlobSourceOption generationNotMatch(long generation) {
       return new BlobSourceOption(StorageRpc.Option.IF_GENERATION_NOT_MATCH, generation);
     }
 
+    /**
+     * Returns an option for blob's metageneration match. If this option is used the request will
+     * fail if blob's metageneration does not match the provided value.
+     */
     public static BlobSourceOption metagenerationMatch(long metageneration) {
       return new BlobSourceOption(StorageRpc.Option.IF_METAGENERATION_MATCH, metageneration);
     }
 
+    /**
+     * Returns an option for blob's metageneration mismatch. If this option is used the request will
+     * fail if blob's metageneration matches the provided value.
+     */
     public static BlobSourceOption metagenerationNotMatch(long metageneration) {
       return new BlobSourceOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH, metageneration);
     }
   }
 
+  /**
+   * Class for specifying blob get options.
+   */
   class BlobGetOption extends Option {
 
     private static final long serialVersionUID = 803817709703661480L;
@@ -406,18 +525,34 @@ private BlobGetOption(StorageRpc.Option rpcOption, String value) {
       super(rpcOption, value);
     }
 
+    /**
+     * Returns an option for blob's data generation match. If this option is used the request will
+     * fail if blob's generation does not match the provided value.
+     */
     public static BlobGetOption generationMatch(long generation) {
       return new BlobGetOption(StorageRpc.Option.IF_GENERATION_MATCH, generation);
     }
 
+    /**
+     * Returns an option for blob's data generation mismatch. If this option is used the request
+     * will fail if blob's generation matches the provided value.
+     */
     public static BlobGetOption generationNotMatch(long generation) {
       return new BlobGetOption(StorageRpc.Option.IF_GENERATION_NOT_MATCH, generation);
     }
 
+    /**
+     * Returns an option for blob's metageneration match. If this option is used the request will
+     * fail if blob's metageneration does not match the provided value.
+     */
     public static BlobGetOption metagenerationMatch(long metageneration) {
       return new BlobGetOption(StorageRpc.Option.IF_METAGENERATION_MATCH, metageneration);
     }
 
+    /**
+     * Returns an option for blob's metageneration mismatch. If this option is used the request will
+     * fail if blob's metageneration matches the provided value.
+     */
     public static BlobGetOption metagenerationNotMatch(long metageneration) {
       return new BlobGetOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH, metageneration);
     }
@@ -433,6 +568,9 @@ public static BlobGetOption fields(BlobField... fields) {
     }
   }
 
+  /**
+   * Class for specifying bucket list options.
+   */
   class BucketListOption extends Option {
 
     private static final long serialVersionUID = 8754017079673290353L;
@@ -441,14 +579,23 @@ private BucketListOption(StorageRpc.Option option, Object value) {
       super(option, value);
     }
 
+    /**
+     * Returns an option to specify the maximum number of buckets to be returned.
+     */
     public static BucketListOption maxResults(long maxResults) {
       return new BucketListOption(StorageRpc.Option.MAX_RESULTS, maxResults);
     }
 
+    /**
+     * Returns an option to specify the page token from which to start listing buckets.
+     */
     public static BucketListOption startPageToken(String pageToken) {
       return new BucketListOption(StorageRpc.Option.PAGE_TOKEN, pageToken);
     }
 
+    /**
+     * Returns an option to set a prefix for listed buckets names.
+     */
     public static BucketListOption prefix(String prefix) {
       return new BucketListOption(StorageRpc.Option.PREFIX, prefix);
     }
@@ -466,6 +613,9 @@ public static BucketListOption fields(BucketField... fields) {
     }
   }
 
+  /**
+   * Class for specifying blob list options.
+   */
   class BlobListOption extends Option {
 
     private static final long serialVersionUID = 9083383524788661294L;
@@ -474,18 +624,30 @@ private BlobListOption(StorageRpc.Option option, Object value) {
       super(option, value);
     }
 
+    /**
+     * Returns an option to specify the maximum number of blobs to be returned.
+     */
     public static BlobListOption maxResults(long maxResults) {
       return new BlobListOption(StorageRpc.Option.MAX_RESULTS, maxResults);
     }
 
+    /**
+     * Returns an option to specify the page token from which to start listing blobs.
+     */
     public static BlobListOption startPageToken(String pageToken) {
       return new BlobListOption(StorageRpc.Option.PAGE_TOKEN, pageToken);
     }
 
+    /**
+     * Returns an option to set a prefix for listed blobs names.
+     */
     public static BlobListOption prefix(String prefix) {
       return new BlobListOption(StorageRpc.Option.PREFIX, prefix);
     }
 
+    /**
+     * Returns an option to specify whether blob listing should include subdirectories or not.
+     */
     public static BlobListOption recursive(boolean recursive) {
       return new BlobListOption(StorageRpc.Option.DELIMITER, recursive);
     }
@@ -503,6 +665,9 @@ public static BlobListOption fields(BlobField... fields) {
     }
   }
 
+  /**
+   * Class for specifying signed URL options.
+   */
   class SignUrlOption implements Serializable {
 
     private static final long serialVersionUID = 7850569877451099267L;
@@ -562,6 +727,12 @@ public static SignUrlOption serviceAccount(ServiceAccountAuthCredentials credent
     }
   }
 
+  /**
+   * A class to contain all information needed for a Google Cloud Storage Compose operation.
+   *
+   * @see 
+   *     Compose Operation
+   */
   class ComposeRequest implements Serializable {
 
     private static final long serialVersionUID = -7385681353748590911L;
@@ -570,6 +741,9 @@ class ComposeRequest implements Serializable {
     private final BlobInfo target;
     private final List targetOptions;
 
+    /**
+     * Class for Compose source blobs.
+     */
     public static class SourceBlob implements Serializable {
 
       private static final long serialVersionUID = 4094962795951990439L;
@@ -601,6 +775,9 @@ public static class Builder {
       private final Set targetOptions = new LinkedHashSet<>();
       private BlobInfo target;
 
+      /**
+       * Add source blobs for compose operation.
+       */
       public Builder addSource(Iterable blobs) {
         for (String blob : blobs) {
           sourceBlobs.add(new SourceBlob(blob));
@@ -608,6 +785,9 @@ public Builder addSource(Iterable blobs) {
         return this;
       }
 
+      /**
+       * Add source blobs for compose operation.
+       */
       public Builder addSource(String... blobs) {
         return addSource(Arrays.asList(blobs));
       }
@@ -620,21 +800,33 @@ public Builder addSource(String blob, long generation) {
         return this;
       }
 
+      /**
+       * Sets compose operation's target blob.
+       */
       public Builder target(BlobInfo target) {
         this.target = target;
         return this;
       }
 
+      /**
+       * Sets compose operation's target blob options.
+       */
       public Builder targetOptions(BlobTargetOption... options) {
         Collections.addAll(targetOptions, options);
         return this;
       }
 
+      /**
+       * Sets compose operation's target blob options.
+       */
       public Builder targetOptions(Iterable options) {
         Iterables.addAll(targetOptions, options);
         return this;
       }
 
+      /**
+       * Creates a {@code ComposeRequest} object.
+       */
       public ComposeRequest build() {
         checkArgument(!sourceBlobs.isEmpty());
         checkNotNull(target);
@@ -648,31 +840,59 @@ private ComposeRequest(Builder builder) {
       targetOptions = ImmutableList.copyOf(builder.targetOptions);
     }
 
+    /**
+     * Returns compose operation's source blobs.
+     */
     public List sourceBlobs() {
       return sourceBlobs;
     }
 
+    /**
+     * Returns compose operation's target blob.
+     */
     public BlobInfo target() {
       return target;
     }
 
+    /**
+     * Returns compose operation's target blob's options.
+     */
     public List targetOptions() {
       return targetOptions;
     }
 
+    /**
+     * Creates a {@code ComposeRequest} object.
+     *
+     * @param sources source blobs names
+     * @param target target blob
+     */
     public static ComposeRequest of(Iterable sources, BlobInfo target) {
       return builder().target(target).addSource(sources).build();
     }
 
+    /**
+     * Creates a {@code ComposeRequest} object.
+     *
+     * @param bucket name of the bucket where the compose operation takes place
+     * @param sources source blobs names
+     * @param target target blob name
+     */
     public static ComposeRequest of(String bucket, Iterable sources, String target) {
       return of(sources, BlobInfo.builder(BlobId.of(bucket, target)).build());
     }
 
+    /**
+     * Returns a {@code ComposeRequest} builder.
+     */
     public static Builder builder() {
       return new Builder();
     }
   }
 
+  /**
+   * A class to contain all information needed for a Google Cloud Storage Copy operation.
+   */
   class CopyRequest implements Serializable {
 
     private static final long serialVersionUID = -4498650529476219937L;
@@ -786,7 +1006,7 @@ public Builder megabytesCopiedPerChunk(Long megabytesCopiedPerChunk) {
       }
 
       /**
-       * Creates a {@code CopyRequest}.
+       * Creates a {@code CopyRequest} object.
        */
       public CopyRequest build() {
         checkNotNull(source);

From eeae71f5f1dfd9bef1e716ccec0d3f4ca0e1597b Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 9 Nov 2015 16:17:22 +0100
Subject: [PATCH 078/322] Rename Bigquery to BigQuery across bigquery module

---
 .../bigquery/{Bigquery.java => BigQuery.java} |  2 +-
 ...yException.java => BigQueryException.java} | 16 +++----
 ...queryFactory.java => BigQueryFactory.java} |  2 +-
 ...queryOptions.java => BigQueryOptions.java} | 42 +++++++++---------
 .../{BigqueryRpc.java => BigQueryRpc.java}    | 43 +++++++++----------
 ...pcFactory.java => BigQueryRpcFactory.java} |  4 +-
 6 files changed, 54 insertions(+), 55 deletions(-)
 rename gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/{Bigquery.java => BigQuery.java} (93%)
 rename gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/{BigqueryException.java => BigQueryException.java} (74%)
 rename gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/{BigqueryFactory.java => BigQueryFactory.java} (89%)
 rename gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/{BigqueryOptions.java => BigQueryOptions.java} (61%)
 rename gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/{BigqueryRpc.java => BigQueryRpc.java} (80%)
 rename gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/{BigqueryRpcFactory.java => BigQueryRpcFactory.java} (84%)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Bigquery.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
similarity index 93%
rename from gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Bigquery.java
rename to gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
index 558e18a5e3e4..28fb33dcc58c 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Bigquery.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
@@ -23,7 +23,7 @@
  *
  * @see Google Cloud BigQuery
  */
-public interface Bigquery extends Service {
+public interface BigQuery extends Service {
 
   // TODO(mziccard) add missing methods
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryException.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
similarity index 74%
rename from gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryException.java
rename to gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
index fbfb895da6a3..020917762fa3 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryException.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
@@ -26,29 +26,29 @@
  * @see Google Cloud
  *      BigQuery error codes
  */
-public class BigqueryException extends BaseServiceException {
+public class BigQueryException extends BaseServiceException {
 
   private static final long serialVersionUID = -5504832700512784654L;
   public static final int UNKNOWN_CODE = -1;
 
-  public BigqueryException(int code, String message, boolean retryable) {
+  public BigQueryException(int code, String message, boolean retryable) {
     super(code, message, retryable);
   }
 
   /**
-   * Translate RetryHelperException to the BigqueryException that caused the error. This method will
+   * Translate RetryHelperException to the BigQueryException that caused the error. This method will
    * always throw an exception.
    *
-   * @throws BigqueryException when {@code ex} was caused by a {@code BigqueryException}
+   * @throws BigQueryException when {@code ex} was caused by a {@code BigQueryException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  static BigqueryException translateAndThrow(RetryHelperException ex) {
-    if (ex.getCause() instanceof BigqueryException) {
-      throw (BigqueryException) ex.getCause();
+  static BigQueryException translateAndThrow(RetryHelperException ex) {
+    if (ex.getCause() instanceof BigQueryException) {
+      throw (BigQueryException) ex.getCause();
     }
     if (ex instanceof RetryInterruptedException) {
       RetryInterruptedException.propagate();
     }
-    throw new BigqueryException(UNKNOWN_CODE, ex.getMessage(), false);
+    throw new BigQueryException(UNKNOWN_CODE, ex.getMessage(), false);
   }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryFactory.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryFactory.java
similarity index 89%
rename from gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryFactory.java
rename to gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryFactory.java
index 04454052edec..2fc98125f4be 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryFactory.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryFactory.java
@@ -22,5 +22,5 @@
 /**
  * An interface for BigQuery factories.
  */
-public interface BigqueryFactory extends ServiceFactory {
+public interface BigQueryFactory extends ServiceFactory {
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryOptions.java
similarity index 61%
rename from gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryOptions.java
rename to gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryOptions.java
index 74b6dba6c3c8..59a4b3229f68 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigqueryOptions.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryOptions.java
@@ -18,68 +18,68 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.ServiceOptions;
-import com.google.gcloud.spi.DefaultBigqueryRpc;
-import com.google.gcloud.spi.BigqueryRpc;
-import com.google.gcloud.spi.BigqueryRpcFactory;
+import com.google.gcloud.spi.DefaultBigQueryRpc;
+import com.google.gcloud.spi.BigQueryRpc;
+import com.google.gcloud.spi.BigQueryRpcFactory;
 
 import java.util.Set;
 
-public class BigqueryOptions extends ServiceOptions {
+public class BigQueryOptions extends ServiceOptions {
 
   private static final String BIGQUERY_SCOPE = "https://www.googleapis.com/auth/bigquery";
   private static final Set SCOPES = ImmutableSet.of(BIGQUERY_SCOPE);
   private static final long serialVersionUID = -215981591481708043L;
 
-  public static class DefaultBigqueryFactory implements BigqueryFactory {
+  public static class DefaultBigqueryFactory implements BigQueryFactory {
 
-    private static final BigqueryFactory INSTANCE = new DefaultBigqueryFactory();
+    private static final BigQueryFactory INSTANCE = new DefaultBigqueryFactory();
 
     @Override
-    public Bigquery create(BigqueryOptions options) {
+    public BigQuery create(BigQueryOptions options) {
       // TODO(mziccard) return new BigqueryImpl(options);
       return null;
     }
   }
 
-  public static class DefaultBigqueryRpcFactory implements BigqueryRpcFactory {
+  public static class DefaultBigQueryRpcFactory implements BigQueryRpcFactory {
 
-    private static final BigqueryRpcFactory INSTANCE = new DefaultBigqueryRpcFactory();
+    private static final BigQueryRpcFactory INSTANCE = new DefaultBigQueryRpcFactory();
 
     @Override
-    public BigqueryRpc create(BigqueryOptions options) {
+    public BigQueryRpc create(BigQueryOptions options) {
       // TODO(mziccard) return new DefaultBigqueryRpc(options);
       return null;
     }
   }
 
   public static class Builder extends
-      ServiceOptions.Builder {
+      ServiceOptions.Builder {
 
     private Builder() {
     }
 
-    private Builder(BigqueryOptions options) {
+    private Builder(BigQueryOptions options) {
       super(options);
     }
 
     @Override
-    public BigqueryOptions build() {
-      return new BigqueryOptions(this);
+    public BigQueryOptions build() {
+      return new BigQueryOptions(this);
     }
   }
 
-  private BigqueryOptions(Builder builder) {
-    super(BigqueryFactory.class, BigqueryRpcFactory.class, builder);
+  private BigQueryOptions(Builder builder) {
+    super(BigQueryFactory.class, BigQueryRpcFactory.class, builder);
   }
 
   @Override
-  protected BigqueryFactory defaultServiceFactory() {
+  protected BigQueryFactory defaultServiceFactory() {
     return DefaultBigqueryFactory.INSTANCE;
   }
 
   @Override
-  protected BigqueryRpcFactory defaultRpcFactory() {
-    return DefaultBigqueryRpcFactory.INSTANCE;
+  protected BigQueryRpcFactory defaultRpcFactory() {
+    return DefaultBigQueryRpcFactory.INSTANCE;
   }
 
   @Override
@@ -99,10 +99,10 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (!(obj instanceof BigqueryOptions)) {
+    if (!(obj instanceof BigQueryOptions)) {
       return false;
     }
-    BigqueryOptions other = (BigqueryOptions) obj;
+    BigQueryOptions other = (BigQueryOptions) obj;
     return baseEquals(other);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
similarity index 80%
rename from gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpc.java
rename to gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
index 9e4e486422d6..7cce35ab3eb9 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
@@ -17,7 +17,6 @@
 package com.google.gcloud.spi;
 
 import com.google.api.services.bigquery.model.Dataset;
-import com.google.api.services.bigquery.model.DatasetReference;
 import com.google.api.services.bigquery.model.GetQueryResultsResponse;
 import com.google.api.services.bigquery.model.Job;
 import com.google.api.services.bigquery.model.JobReference;
@@ -28,11 +27,11 @@
 import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
 import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.TableRow;
-import com.google.gcloud.bigquery.BigqueryException;
+import com.google.gcloud.bigquery.BigQueryException;
 
 import java.util.Map;
 
-public interface BigqueryRpc {
+public interface BigQueryRpc {
 
   // These options are part of the Google Cloud BigQuery query parameters
   enum Option {
@@ -46,7 +45,7 @@ enum Option {
     PAGE_TOKEN("pageToken"),
     START_INDEX("startIndex"),
     STATE_FILTER("stateFilter"),
-    TIMEOUT("timeOut");
+    TIMEOUT("timeoutMs");
 
     private final String value;
 
@@ -99,44 +98,44 @@ public Y y() {
     }
   }
 
-  Dataset getDataset(String datasetId, Map options) throws BigqueryException;
+  Dataset getDataset(String datasetId, Map options) throws BigQueryException;
 
-  Tuple> listDatasets(Map options) throws BigqueryException;
+  Tuple> listDatasets(Map options) throws BigQueryException;
 
-  Dataset create(Dataset dataset, Map options) throws BigqueryException;
+  Dataset create(Dataset dataset, Map options) throws BigQueryException;
 
-  boolean deleteDataset(String datasetId, Map options) throws BigqueryException;
+  boolean deleteDataset(String datasetId, Map options) throws BigQueryException;
 
-  Dataset patch(Dataset dataset, Map options) throws BigqueryException;
+  Dataset patch(Dataset dataset, Map options) throws BigQueryException;
 
-  Table getTable(String datasetId, String tableId, Map options) throws BigqueryException;
+  Table getTable(String datasetId, String tableId, Map options) throws BigQueryException;
 
   Tuple> listTables(String dataset, Map options)
-      throws BigqueryException;
+      throws BigQueryException;
 
-  Table create(String dataset, Table table, Map options) throws BigqueryException;
+  Table create(Table table, Map options) throws BigQueryException;
 
   boolean deleteTable(String datasetId, String tableId, Map options)
-      throws BigqueryException;
+      throws BigQueryException;
 
-  Table patch(Table table, Map options) throws BigqueryException;
+  Table patch(Table table, Map options) throws BigQueryException;
 
   TableDataInsertAllResponse insertAll(TableReference table, TableDataInsertAllRequest request,
-      Map options) throws BigqueryException;
+      Map options) throws BigQueryException;
 
   Tuple> listTableData(String datasetId, String tableId,
-      Map options) throws BigqueryException;
+      Map options) throws BigQueryException;
 
-  Job getJob(String jobId, Map options) throws BigqueryException;
+  Job getJob(String jobId, Map options) throws BigQueryException;
 
-  Tuple> listJobs(Map options) throws BigqueryException;
+  Tuple> listJobs(Map options) throws BigQueryException;
 
-  Job create(Job job, Map options) throws BigqueryException;
+  Job create(Job job, Map options) throws BigQueryException;
 
-  boolean cancel(String jobId, Map options) throws BigqueryException;
+  boolean cancel(String jobId, Map options) throws BigQueryException;
 
   GetQueryResultsResponse getQueryResults(JobReference job, Map options)
-      throws BigqueryException;
+      throws BigQueryException;
 
-  QueryResponse query(QueryRequest request, Map options) throws BigqueryException;
+  QueryResponse query(QueryRequest request, Map options) throws BigQueryException;
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpcFactory.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpcFactory.java
similarity index 84%
rename from gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpcFactory.java
rename to gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpcFactory.java
index 09c2d836127f..2706868756a5 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigqueryRpcFactory.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpcFactory.java
@@ -16,11 +16,11 @@
 
 package com.google.gcloud.spi;
 
-import com.google.gcloud.bigquery.BigqueryOptions;
+import com.google.gcloud.bigquery.BigQueryOptions;
 
 /**
  * An interface for BigQuery RPC factory.
  * Implementation will be loaded via {@link java.util.ServiceLoader}.
  */
-public interface BigqueryRpcFactory extends ServiceRpcFactory {
+public interface BigQueryRpcFactory extends ServiceRpcFactory {
 }

From 3125167ad845cc5f0c5deeeffa215a56e9fff896 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 17:55:34 +0100
Subject: [PATCH 079/322] Add getDefaultInstance method to StorageOptions and
 DatastoreOptions

---
 .../java/com/google/gcloud/datastore/DatastoreOptions.java | 7 +++++++
 .../java/com/google/gcloud/storage/StorageOptions.java     | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
index 5338c03a6d56..58c361229f07 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -171,6 +171,13 @@ public String namespace() {
     return namespace;
   }
 
+  /**
+   * Returns a default {@code DatastoreOptions} instance.
+   */
+  public static DatastoreOptions getDefaultInstance() {
+    return builder().build();
+  }
+
   private static String defaultNamespace() {
     try {
       Class clazz = Class.forName("com.google.appengine.api.NamespaceManager");
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
index 16c17c3e8d98..4b295fc97b29 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
@@ -111,6 +111,13 @@ public String pathDelimiter() {
     return pathDelimiter;
   }
 
+  /**
+   * Returns a default {@code StorageOptions} instance.
+   */
+  public static StorageOptions getDefaultInstance() {
+    return builder().build();
+  }
+
   @Override
   public Builder toBuilder() {
     return new Builder(this);

From d7845b86bcc38abc5a444fd8f08ec98a0d73d0c5 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 21:39:44 +0100
Subject: [PATCH 080/322] Rename getDefaultInstance to defaultInstance and
 update READMEs

---
 README.md                                                       | 2 +-
 gcloud-java-datastore/README.md                                 | 2 +-
 .../main/java/com/google/gcloud/datastore/DatastoreOptions.java | 2 +-
 .../src/main/java/com/google/gcloud/storage/StorageOptions.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0fd576a6a127..5ed44e91adfd 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,7 @@ import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
 import com.google.gcloud.datastore.KeyFactory;
 
-Datastore datastore = DatastoreOptions.getDefaultInstance().service();
+Datastore datastore = DatastoreOptions.defaultInstance().service();
 KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
 Key key = keyFactory.newKey(keyName);
 Entity entity = datastore.get(key);
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index 67483fae2b6e..6d9fc0e8c4d6 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -66,7 +66,7 @@ import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
 import com.google.gcloud.datastore.KeyFactory;
 
-Datastore datastore = DatastoreOptions.getDefaultInstance().service();
+Datastore datastore = DatastoreOptions.defaultInstance().service();
 KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
 Key key = keyFactory.newKey(keyName);
 Entity entity = datastore.get(key);
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
index 58c361229f07..ee15393a8048 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -174,7 +174,7 @@ public String namespace() {
   /**
    * Returns a default {@code DatastoreOptions} instance.
    */
-  public static DatastoreOptions getDefaultInstance() {
+  public static DatastoreOptions defaultInstance() {
     return builder().build();
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
index 4b295fc97b29..2ad0950aa6aa 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
@@ -114,7 +114,7 @@ public String pathDelimiter() {
   /**
    * Returns a default {@code StorageOptions} instance.
    */
-  public static StorageOptions getDefaultInstance() {
+  public static StorageOptions defaultInstance() {
     return builder().build();
   }
 

From d0265406392a9c30f96903c5647874e82f92117b Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 21:50:51 +0100
Subject: [PATCH 081/322] Make RetryParams conform with our code style

---
 .../java/com/google/gcloud/RetryHelper.java   | 14 ++++----
 .../java/com/google/gcloud/RetryParams.java   | 30 ++++++++--------
 .../com/google/gcloud/RetryHelperTest.java    |  2 +-
 .../com/google/gcloud/RetryParamsTest.java    | 34 +++++++++----------
 .../gcloud/datastore/DatastoreTest.java       |  6 ++--
 .../gcloud/datastore/SerializationTest.java   |  2 +-
 .../gcloud/examples/StorageExample.java       |  3 +-
 .../gcloud/storage/RemoteGcsHelperTest.java   | 10 +++---
 .../gcloud/storage/SerializationTest.java     |  6 ++--
 .../gcloud/storage/StorageImplTest.java       |  6 ++--
 10 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/RetryHelper.java b/gcloud-java-core/src/main/java/com/google/gcloud/RetryHelper.java
index 7b47209cd3ff..90f403758e45 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/RetryHelper.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/RetryHelper.java
@@ -194,9 +194,9 @@ private V doRetry() throws RetryHelperException {
         }
         exception = e;
       }
-      if (attemptNumber >= params.getRetryMaxAttempts()
-          || attemptNumber >= params.getRetryMinAttempts()
-          && stopwatch.elapsed(MILLISECONDS) >= params.getTotalRetryPeriodMillis()) {
+      if (attemptNumber >= params.retryMaxAttempts()
+          || attemptNumber >= params.retryMinAttempts()
+          && stopwatch.elapsed(MILLISECONDS) >= params.totalRetryPeriodMillis()) {
         throw new RetriesExhaustedException(this + ": Too many failures, giving up", exception);
       }
       long sleepDurationMillis = getSleepDuration(params, attemptNumber);
@@ -215,9 +215,9 @@ private V doRetry() throws RetryHelperException {
 
   @VisibleForTesting
   static long getSleepDuration(RetryParams retryParams, int attemptsSoFar) {
-    long initialDelay = retryParams.getInitialRetryDelayMillis();
-    double backoffFactor = retryParams.getRetryDelayBackoffFactor();
-    long maxDelay = retryParams.getMaxRetryDelayMillis();
+    long initialDelay = retryParams.initialRetryDelayMillis();
+    double backoffFactor = retryParams.retryDelayBackoffFactor();
+    long maxDelay = retryParams.maxRetryDelayMillis();
     long retryDelay = getExponentialValue(initialDelay, backoffFactor, maxDelay, attemptsSoFar);
     return (long) ((random() / 2.0 + .75) * retryDelay);
   }
@@ -228,7 +228,7 @@ private static long getExponentialValue(long initialDelay, double backoffFactor,
   }
 
   public static  V runWithRetries(Callable callable) throws RetryHelperException {
-    return runWithRetries(callable, RetryParams.getDefaultInstance(),
+    return runWithRetries(callable, RetryParams.defaultInstance(),
         ExceptionHandler.getDefaultInstance());
   }
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/RetryParams.java b/gcloud-java-core/src/main/java/com/google/gcloud/RetryParams.java
index 461dbac77ff2..ab3644c6d747 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/RetryParams.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/RetryParams.java
@@ -38,8 +38,8 @@
  * {@code RetryParams}, first create a {@link RetryParams.Builder}. The builder is mutable and each
  * of the parameters can be set (any unset parameters will fallback to the defaults). The
  * {@code Builder} can be then used to create an immutable {@code RetryParams} object. For default
- * {@code RetryParams} use {@link #getDefaultInstance}. Default settings are subject to change
- * release to release. If you require specific settings, explicitly create an instance of
+ * {@code RetryParams} use {@link #defaultInstance}. Default settings are subject to change release
+ * to release. If you require specific settings, explicitly create an instance of
  * {@code RetryParams} with all the required settings.
  *
  * @see RetryHelper
@@ -91,12 +91,12 @@ private Builder() {
         retryDelayBackoffFactor = DEFAULT_RETRY_DELAY_BACKOFF_FACTOR;
         totalRetryPeriodMillis = DEFAULT_TOTAL_RETRY_PERIOD_MILLIS;
       } else {
-        retryMinAttempts = retryParams.getRetryMinAttempts();
-        retryMaxAttempts = retryParams.getRetryMaxAttempts();
-        initialRetryDelayMillis = retryParams.getInitialRetryDelayMillis();
-        maxRetryDelayMillis = retryParams.getMaxRetryDelayMillis();
-        retryDelayBackoffFactor = retryParams.getRetryDelayBackoffFactor();
-        totalRetryPeriodMillis = retryParams.getTotalRetryPeriodMillis();
+        retryMinAttempts = retryParams.retryMinAttempts();
+        retryMaxAttempts = retryParams.retryMaxAttempts();
+        initialRetryDelayMillis = retryParams.initialRetryDelayMillis();
+        maxRetryDelayMillis = retryParams.maxRetryDelayMillis();
+        retryDelayBackoffFactor = retryParams.retryDelayBackoffFactor();
+        totalRetryPeriodMillis = retryParams.totalRetryPeriodMillis();
       }
     }
 
@@ -201,7 +201,7 @@ private RetryParams(Builder builder) {
   /**
    * Returns an instance with the default parameters.
    */
-  public static RetryParams getDefaultInstance() {
+  public static RetryParams defaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -216,14 +216,14 @@ public static RetryParams noRetries() {
   /**
    * Returns the retryMinAttempts. Default value is {@value #DEFAULT_RETRY_MIN_ATTEMPTS}.
    */
-  public int getRetryMinAttempts() {
+  public int retryMinAttempts() {
     return retryMinAttempts;
   }
 
   /**
    * Returns the retryMaxAttempts. Default value is {@value #DEFAULT_RETRY_MAX_ATTEMPTS}.
    */
-  public int getRetryMaxAttempts() {
+  public int retryMaxAttempts() {
     return retryMaxAttempts;
   }
 
@@ -231,14 +231,14 @@ public int getRetryMaxAttempts() {
    * Returns the initialRetryDelayMillis. Default value is
    * {@value #DEFAULT_INITIAL_RETRY_DELAY_MILLIS}.
    */
-  public long getInitialRetryDelayMillis() {
+  public long initialRetryDelayMillis() {
     return initialRetryDelayMillis;
   }
 
   /**
    * Returns the maxRetryDelayMillis. Default values is {@value #DEFAULT_MAX_RETRY_DELAY_MILLIS}.
    */
-  public long getMaxRetryDelayMillis() {
+  public long maxRetryDelayMillis() {
     return maxRetryDelayMillis;
   }
 
@@ -246,7 +246,7 @@ public long getMaxRetryDelayMillis() {
    * Returns the maxRetryDelayBackoffFactor. Default values is
    * {@value #DEFAULT_RETRY_DELAY_BACKOFF_FACTOR}.
    */
-  public double getRetryDelayBackoffFactor() {
+  public double retryDelayBackoffFactor() {
     return retryDelayBackoffFactor;
   }
 
@@ -254,7 +254,7 @@ public double getRetryDelayBackoffFactor() {
    * Returns the totalRetryPeriodMillis. Default value is
    * {@value #DEFAULT_TOTAL_RETRY_PERIOD_MILLIS}.
    */
-  public long getTotalRetryPeriodMillis() {
+  public long totalRetryPeriodMillis() {
     return totalRetryPeriodMillis;
   }
 
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/RetryHelperTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/RetryHelperTest.java
index dfd933bcae46..bf11e744dbbf 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/RetryHelperTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/RetryHelperTest.java
@@ -118,7 +118,7 @@ public void testTriesAtLeastMinTimes() {
       @Override public Integer call() throws IOException {
         timesCalled++;
         assertEquals(timesCalled, RetryHelper.getContext().getAttemptNumber());
-        assertEquals(10, RetryHelper.getContext().getRetryParams().getRetryMaxAttempts());
+        assertEquals(10, RetryHelper.getContext().getRetryParams().retryMaxAttempts());
         if (timesCalled <= timesToFail) {
           throw new IOException();
         }
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/RetryParamsTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/RetryParamsTest.java
index d1d5e3c076d8..eae44693929b 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/RetryParamsTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/RetryParamsTest.java
@@ -41,15 +41,15 @@ public class RetryParamsTest {
 
   @Test
   public void testDefaults() {
-    RetryParams params1 = RetryParams.getDefaultInstance();
+    RetryParams params1 = RetryParams.defaultInstance();
     RetryParams params2 = RetryParams.builder().build();
     for (RetryParams params : Arrays.asList(params1, params2)) {
-      assertEquals(DEFAULT_INITIAL_RETRY_DELAY_MILLIS, params.getInitialRetryDelayMillis());
-      assertEquals(DEFAULT_MAX_RETRY_DELAY_MILLIS, params.getMaxRetryDelayMillis());
-      assertEquals(DEFAULT_RETRY_DELAY_BACKOFF_FACTOR, params.getRetryDelayBackoffFactor(), 0);
-      assertEquals(DEFAULT_RETRY_MAX_ATTEMPTS, params.getRetryMaxAttempts());
-      assertEquals(DEFAULT_RETRY_MIN_ATTEMPTS, params.getRetryMinAttempts());
-      assertEquals(DEFAULT_TOTAL_RETRY_PERIOD_MILLIS, params.getTotalRetryPeriodMillis());
+      assertEquals(DEFAULT_INITIAL_RETRY_DELAY_MILLIS, params.initialRetryDelayMillis());
+      assertEquals(DEFAULT_MAX_RETRY_DELAY_MILLIS, params.maxRetryDelayMillis());
+      assertEquals(DEFAULT_RETRY_DELAY_BACKOFF_FACTOR, params.retryDelayBackoffFactor(), 0);
+      assertEquals(DEFAULT_RETRY_MAX_ATTEMPTS, params.retryMaxAttempts());
+      assertEquals(DEFAULT_RETRY_MIN_ATTEMPTS, params.retryMinAttempts());
+      assertEquals(DEFAULT_TOTAL_RETRY_PERIOD_MILLIS, params.totalRetryPeriodMillis());
     }
   }
 
@@ -65,12 +65,12 @@ public void testSetAndCopy() {
     RetryParams params1 = builder.build();
     RetryParams params2 = new RetryParams.Builder(params1).build();
     for (RetryParams params : Arrays.asList(params1, params2)) {
-      assertEquals(101, params.getInitialRetryDelayMillis());
-      assertEquals(102, params.getMaxRetryDelayMillis());
-      assertEquals(103, params.getRetryDelayBackoffFactor(), 0);
-      assertEquals(107, params.getRetryMinAttempts());
-      assertEquals(108, params.getRetryMaxAttempts());
-      assertEquals(109, params.getTotalRetryPeriodMillis());
+      assertEquals(101, params.initialRetryDelayMillis());
+      assertEquals(102, params.maxRetryDelayMillis());
+      assertEquals(103, params.retryDelayBackoffFactor(), 0);
+      assertEquals(107, params.retryMinAttempts());
+      assertEquals(108, params.retryMaxAttempts());
+      assertEquals(109, params.totalRetryPeriodMillis());
     }
   }
 
@@ -79,19 +79,19 @@ public void testBadSettings() {
     RetryParams.Builder builder = RetryParams.builder();
     builder.initialRetryDelayMillis(-1);
     builder = assertFailure(builder);
-    builder.maxRetryDelayMillis(RetryParams.getDefaultInstance().getInitialRetryDelayMillis() - 1);
+    builder.maxRetryDelayMillis(RetryParams.defaultInstance().initialRetryDelayMillis() - 1);
     builder = assertFailure(builder);
     builder.retryDelayBackoffFactor(-1);
     builder = assertFailure(builder);
     builder.retryMinAttempts(-1);
     builder = assertFailure(builder);
-    builder.retryMaxAttempts(RetryParams.getDefaultInstance().getRetryMinAttempts() - 1);
+    builder.retryMaxAttempts(RetryParams.defaultInstance().retryMinAttempts() - 1);
     builder = assertFailure(builder);
     builder.totalRetryPeriodMillis(-1);
     builder = assertFailure(builder);
     // verify that it is OK for min and max to be equal
-    builder.retryMaxAttempts(RetryParams.getDefaultInstance().getRetryMinAttempts());
-    builder.maxRetryDelayMillis(RetryParams.getDefaultInstance().getInitialRetryDelayMillis());
+    builder.retryMaxAttempts(RetryParams.defaultInstance().retryMinAttempts());
+    builder.maxRetryDelayMillis(RetryParams.defaultInstance().initialRetryDelayMillis());
     builder.build();
   }
 
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index 6afd40927264..162104c0dd84 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -625,7 +625,7 @@ private Datastore createDatastoreForDeferredLookup() throws DatastoreRpcExceptio
     EasyMock.replay(rpcFactoryMock, rpcMock);
     DatastoreOptions options =
         this.options.toBuilder()
-            .retryParams(RetryParams.getDefaultInstance())
+            .retryParams(RetryParams.defaultInstance())
             .serviceRpcFactory(rpcFactoryMock)
             .build();
     return options.service();
@@ -738,7 +738,7 @@ public void testRetryableException() throws Exception {
         .andReturn(responsePb);
     EasyMock.replay(rpcFactoryMock, rpcMock);
     DatastoreOptions options = this.options.toBuilder()
-        .retryParams(RetryParams.getDefaultInstance())
+        .retryParams(RetryParams.defaultInstance())
         .serviceRpcFactory(rpcFactoryMock)
         .build();
     Datastore datastore = options.service();
@@ -784,7 +784,7 @@ public void testRuntimeException() throws Exception {
         .andThrow(new RuntimeException(exceptionMessage));
     EasyMock.replay(rpcFactoryMock, rpcMock);
     DatastoreOptions options = this.options.toBuilder()
-        .retryParams(RetryParams.getDefaultInstance())
+        .retryParams(RetryParams.defaultInstance())
         .serviceRpcFactory(rpcFactoryMock)
         .build();
     Datastore datastore = options.service();
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
index 1ad690938ef5..32e14fb47ea0 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
@@ -143,7 +143,7 @@ public void testServiceOptions() throws Exception {
 
     options = options.toBuilder()
         .namespace("ns1")
-        .retryParams(RetryParams.getDefaultInstance())
+        .retryParams(RetryParams.defaultInstance())
         .authCredentials(AuthCredentials.noCredentials())
         .force(true)
         .build();
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index b7a36de7589e..0e7d6bbbf3ea 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -18,7 +18,6 @@
 
 import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
-import com.google.gcloud.Page;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 import com.google.gcloud.storage.Blob;
@@ -546,7 +545,7 @@ public static void main(String... args) throws Exception {
       return;
     }
     StorageOptions.Builder optionsBuilder =
-        StorageOptions.builder().retryParams(RetryParams.getDefaultInstance());
+        StorageOptions.builder().retryParams(RetryParams.defaultInstance());
     StorageAction action;
     String actionName;
     if (args.length >= 2 && !ACTIONS.containsKey(args[0])) {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
index 1da45fae466e..3c3d1aebb3df 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
@@ -159,11 +159,11 @@ public void testCreateFromStream() {
     assertEquals(PROJECT_ID, options.projectId());
     assertEquals(60000, options.connectTimeout());
     assertEquals(60000, options.readTimeout());
-    assertEquals(10, options.retryParams().getRetryMaxAttempts());
-    assertEquals(6, options.retryParams().getRetryMinAttempts());
-    assertEquals(30000, options.retryParams().getMaxRetryDelayMillis());
-    assertEquals(120000, options.retryParams().getTotalRetryPeriodMillis());
-    assertEquals(250, options.retryParams().getInitialRetryDelayMillis());
+    assertEquals(10, options.retryParams().retryMaxAttempts());
+    assertEquals(6, options.retryParams().retryMinAttempts());
+    assertEquals(30000, options.retryParams().maxRetryDelayMillis());
+    assertEquals(120000, options.retryParams().totalRetryPeriodMillis());
+    assertEquals(250, options.retryParams().initialRetryDelayMillis());
   }
 
   @Test
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index a125a64df6d6..2d80191aeb2d 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -82,7 +82,7 @@ public void testServiceOptions() throws Exception {
 
     options = options.toBuilder()
         .projectId("p2")
-        .retryParams(RetryParams.getDefaultInstance())
+        .retryParams(RetryParams.defaultInstance())
         .authCredentials(AuthCredentials.noCredentials())
         .pathDelimiter(":")
         .build();
@@ -110,7 +110,7 @@ public void testModelAndRequests() throws Exception {
   public void testReadChannelState() throws IOException, ClassNotFoundException {
     StorageOptions options = StorageOptions.builder()
         .projectId("p2")
-        .retryParams(RetryParams.getDefaultInstance())
+        .retryParams(RetryParams.defaultInstance())
         .authCredentials(AuthCredentials.noCredentials())
         .build();
     BlobReadChannel reader =
@@ -126,7 +126,7 @@ public void testReadChannelState() throws IOException, ClassNotFoundException {
   public void testWriteChannelState() throws IOException, ClassNotFoundException {
     StorageOptions options = StorageOptions.builder()
         .projectId("p2")
-        .retryParams(RetryParams.getDefaultInstance())
+        .retryParams(RetryParams.defaultInstance())
         .authCredentials(AuthCredentials.noCredentials())
         .build();
     BlobWriteChannelImpl writer = new BlobWriteChannelImpl(
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index d5e2f8de7397..f07c7000813e 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -1202,7 +1202,7 @@ public void testRetryableException() {
         .andThrow(new StorageException(500, "InternalError", true))
         .andReturn(BLOB_INFO1.toPb());
     EasyMock.replay(storageRpcMock);
-    storage = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
+    storage = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
     BlobInfo readBlob = storage.get(blob);
     assertEquals(BLOB_INFO1, readBlob);
   }
@@ -1214,7 +1214,7 @@ public void testNonRetryableException() {
     EasyMock.expect(storageRpcMock.get(blob.toPb(), EMPTY_RPC_OPTIONS))
         .andThrow(new StorageException(501, exceptionMessage, false));
     EasyMock.replay(storageRpcMock);
-    storage = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
+    storage = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
     thrown.expect(StorageException.class);
     thrown.expectMessage(exceptionMessage);
     storage.get(blob);
@@ -1227,7 +1227,7 @@ public void testRuntimeException() {
     EasyMock.expect(storageRpcMock.get(blob.toPb(), EMPTY_RPC_OPTIONS))
         .andThrow(new RuntimeException(exceptionMessage));
     EasyMock.replay(storageRpcMock);
-    storage = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
+    storage = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
     thrown.expect(StorageException.class);
     thrown.expectMessage(exceptionMessage);
     storage.get(blob);

From b28b3079539e2c1635da8a2e795055c05f2f5a07 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 21:55:39 +0100
Subject: [PATCH 082/322] Make ExceptionHandler conform with our code style

---
 .../src/main/java/com/google/gcloud/ExceptionHandler.java   | 6 +++---
 .../src/main/java/com/google/gcloud/RetryHelper.java        | 2 +-
 .../test/java/com/google/gcloud/ExceptionHandlerTest.java   | 2 +-
 .../src/test/java/com/google/gcloud/RetryHelperTest.java    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ExceptionHandler.java b/gcloud-java-core/src/main/java/com/google/gcloud/ExceptionHandler.java
index a0fab3dca566..c1f068594443 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ExceptionHandler.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ExceptionHandler.java
@@ -231,11 +231,11 @@ void verifyCaller(Callable callable) {
     }
   }
 
-  public Set> getRetriableExceptions() {
+  public Set> retriableExceptions() {
     return retriableExceptions;
   }
 
-  public Set> getNonRetriableExceptions() {
+  public Set> nonRetriableExceptions() {
     return nonRetriableExceptions;
   }
 
@@ -262,7 +262,7 @@ boolean shouldRetry(Exception ex) {
   /**
    * Returns an instance which retry any checked exception and abort on any runtime exception.
    */
-  public static ExceptionHandler getDefaultInstance() {
+  public static ExceptionHandler defaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/RetryHelper.java b/gcloud-java-core/src/main/java/com/google/gcloud/RetryHelper.java
index 90f403758e45..9b9c1f6a3124 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/RetryHelper.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/RetryHelper.java
@@ -229,7 +229,7 @@ private static long getExponentialValue(long initialDelay, double backoffFactor,
 
   public static  V runWithRetries(Callable callable) throws RetryHelperException {
     return runWithRetries(callable, RetryParams.defaultInstance(),
-        ExceptionHandler.getDefaultInstance());
+        ExceptionHandler.defaultInstance());
   }
 
   public static  V runWithRetries(Callable callable, RetryParams params,
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/ExceptionHandlerTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/ExceptionHandlerTest.java
index c182515dbb16..cedc995ddbd0 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/ExceptionHandlerTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/ExceptionHandlerTest.java
@@ -82,7 +82,7 @@ public Object call() throws Error {
     }
 
     // using default exception handler (retry upon any non-runtime exceptions)
-    ExceptionHandler handler = ExceptionHandler.getDefaultInstance();
+    ExceptionHandler handler = ExceptionHandler.defaultInstance();
     assertValidCallable(new A(), handler);
     assertValidCallable(new B(), handler);
     assertValidCallable(new C(), handler);
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/RetryHelperTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/RetryHelperTest.java
index bf11e744dbbf..9a7cc2104f4a 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/RetryHelperTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/RetryHelperTest.java
@@ -124,7 +124,7 @@ public void testTriesAtLeastMinTimes() {
         }
         return timesCalled;
       }
-    }, params, ExceptionHandler.getDefaultInstance());
+    }, params, ExceptionHandler.defaultInstance());
     assertEquals(timesToFail + 1, attempted);
     assertNull(RetryHelper.getContext());
   }

From abc11cea3aedd69e47ae88fa50fd5ad96d16823e Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 11 Nov 2015 23:06:01 +0100
Subject: [PATCH 083/322] Use DatastoreOptions.defaultInstance in site example

---
 src/site/resources/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/site/resources/index.html b/src/site/resources/index.html
index 25c769db2fbf..3ed496b5bbb3 100644
--- a/src/site/resources/index.html
+++ b/src/site/resources/index.html
@@ -143,7 +143,7 @@ 
Example: Retrieve Datastore Entries

 
 // Authentication is automatic inside Google Compute Engine
 // and Google App Engine.
-DatastoreOptions options = DatastoreOptions.builder().build();
+DatastoreOptions options = DatastoreOptions.defaultInstance();
 Datastore datastore = options.service();
 KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
 Key key = keyFactory.newKey(keyName);

From 7193d0d02a252f9c8cb0ece901fc6e16e59f5413 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 12 Nov 2015 07:58:35 +0100
Subject: [PATCH 084/322] More detailed javadoc for BlobInfo

---
 .../com/google/gcloud/storage/BlobInfo.java   | 67 +++++++++++++++----
 1 file changed, 55 insertions(+), 12 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
index 9662635160e8..65b87498b6cc 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
@@ -138,6 +138,8 @@ Builder id(String id) {
 
     /**
      * Sets the blob's data content type.
+     *
+     * @see Content-Type
      */
     public Builder contentType(String contentType) {
       this.contentType = firstNonNull(contentType, Data.nullOf(String.class));
@@ -146,6 +148,8 @@ public Builder contentType(String contentType) {
 
     /**
      * Sets the blob's data content disposition.
+     *
+     * @see Content-Disposition
      */
     public Builder contentDisposition(String contentDisposition) {
       this.contentDisposition = firstNonNull(contentDisposition, Data.nullOf(String.class));
@@ -154,6 +158,8 @@ public Builder contentDisposition(String contentDisposition) {
 
     /**
      * Sets the blob's data content language.
+     *
+     * @see Content-Language
      */
     public Builder contentLanguage(String contentLanguage) {
       this.contentLanguage = firstNonNull(contentLanguage, Data.nullOf(String.class));
@@ -162,6 +168,8 @@ public Builder contentLanguage(String contentLanguage) {
 
     /**
      * Sets the blob's data content encoding.
+     *
+     * @see Content-Encoding
      */
     public Builder contentEncoding(String contentEncoding) {
       this.contentEncoding = firstNonNull(contentEncoding, Data.nullOf(String.class));
@@ -175,6 +183,8 @@ Builder componentCount(Integer componentCount) {
 
     /**
      * Sets the blob's data cache control.
+     *
+     * @see Cache-Control
      */
     public Builder cacheControl(String cacheControl) {
       this.cacheControl = firstNonNull(cacheControl, Data.nullOf(String.class));
@@ -214,6 +224,9 @@ Builder selfLink(String selfLink) {
 
     /**
      * Sets the MD5 hash of blob's data. MD5 value must be encoded in base64.
+     *
+     * @see 
+     *     Hashes and ETags: Best Practices
      */
     public Builder md5(String md5) {
       this.md5 = firstNonNull(md5, Data.nullOf(String.class));
@@ -221,8 +234,12 @@ public Builder md5(String md5) {
     }
 
     /**
-     * Sets the CRC32C checksum of blob's data. CRC32C value must be encoded in base64 in big-endian
-     * order.
+     * Sets the CRC32C checksum of blob's data as described in
+     * RFC 4960, Appendix B; encoded in
+     * base64 in big-endian order.
+     *
+     * @see 
+     *     Hashes and ETags: Best Practices
      */
     public Builder crc32c(String crc32c) {
       this.crc32c = firstNonNull(crc32c, Data.nullOf(String.class));
@@ -235,7 +252,7 @@ Builder mediaLink(String mediaLink) {
     }
 
     /**
-     * Sets the blob's metadata.
+     * Sets the blob's user provided metadata.
      */
     public Builder metadata(Map metadata) {
       this.metadata = metadata != null
@@ -326,6 +343,8 @@ public String name() {
 
   /**
    * Returns the blob's data cache control.
+   *
+   * @see Cache-Control
    */
   public String cacheControl() {
     return Data.isNull(cacheControl) ? null : cacheControl;
@@ -342,14 +361,16 @@ public List acl() {
   }
 
   /**
-   * Returns the blob's owner.
+   * Returns the blob's owner. This will always be the uploader of the blob.
    */
   public Acl.Entity owner() {
     return owner;
   }
 
   /**
-   * Returns the blob's data size in bytes.
+   * Returns the content length of the data in bytes.
+   *
+   * @see Content-Length
    */
   public Long size() {
     return size;
@@ -357,6 +378,8 @@ public Long size() {
 
   /**
    * Returns the blob's data content type.
+   *
+   * @see Content-Type
    */
   public String contentType() {
     return Data.isNull(contentType) ? null : contentType;
@@ -364,6 +387,8 @@ public String contentType() {
 
   /**
    * Returns the blob's data content encoding.
+   *
+   * @see Content-Encoding
    */
   public String contentEncoding() {
     return Data.isNull(contentEncoding) ? null : contentEncoding;
@@ -371,6 +396,8 @@ public String contentEncoding() {
 
   /**
    * Returns the blob's data content disposition.
+   *
+   * @see Content-Disposition
    */
   public String contentDisposition() {
     return Data.isNull(contentDisposition) ? null : contentDisposition;
@@ -378,14 +405,18 @@ public String contentDisposition() {
 
   /**
    * Returns the blob's data content language.
+   *
+   * @see Content-Language
    */
   public String contentLanguage() {
     return Data.isNull(contentLanguage) ? null : contentLanguage;
   }
 
   /**
-   * Returns the number of components that make up this object. Components are accumulated through
-   * the {@link Storage#compose(Storage.ComposeRequest)} operation.
+   * Returns the number of components that make up this blob. Components are accumulated through
+   * the {@link Storage#compose(Storage.ComposeRequest)} operation and are limited to a count of
+   * 1024, counting 1 for each non-composite component blob and componentCount for each composite
+   * component blob. This value is set only for composite blobs.
    *
    * @see Component Count
    *     Property
@@ -395,7 +426,9 @@ public Integer componentCount() {
   }
 
   /**
-   * Returns blob resource's entity tag.
+   * Returns HTTP 1.1 Entity tag for the blob.
+   *
+   * @see Entity Tags
    */
   public String etag() {
     return etag;
@@ -410,13 +443,21 @@ public String selfLink() {
 
   /**
    * Returns the MD5 hash of blob's data encoded in base64.
+   *
+   * @see 
+   *     Hashes and ETags: Best Practices
    */
   public String md5() {
     return Data.isNull(md5) ? null : md5;
   }
 
   /**
-   * Returns the CRC32C checksum of blob's data encoded in base64 in big-endian order.
+   * Returns the CRC32C checksum of blob's data as described in
+   * RFC 4960, Appendix B; encoded in
+   * base64 in big-endian order.
+   *
+   * @see 
+   *     Hashes and ETags: Best Practices
    */
   public String crc32c() {
     return Data.isNull(crc32c) ? null : crc32c;
@@ -430,21 +471,23 @@ public String mediaLink() {
   }
 
   /**
-   * Returns blob's metadata.
+   * Returns blob's user provided metadata.
    */
   public Map metadata() {
     return metadata == null || Data.isNull(metadata) ? null : Collections.unmodifiableMap(metadata);
   }
 
   /**
-   * Returns blob's data generation.
+   * Returns blob's data generation. Used for blob versioning.
    */
   public Long generation() {
     return generation;
   }
 
   /**
-   * Returns blob's metageneration.
+   * Returns blob's metageneration. Used for preconditions and for detecting changes in metadata.
+   * A metageneration number is only meaningful in the context of a particular generation of a
+   * particular blob.
    */
   public Long metageneration() {
     return metageneration;

From 5f9eaa4cab417c161b436bb5c5da4046b056b3e6 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 12 Nov 2015 07:59:38 +0100
Subject: [PATCH 085/322] Better javadoc for (Bucket/Blob)ListOptions.prefix

---
 .../src/main/java/com/google/gcloud/storage/Storage.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 128099b7eab3..2e95e69aa445 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -594,7 +594,8 @@ public static BucketListOption startPageToken(String pageToken) {
     }
 
     /**
-     * Returns an option to set a prefix for listed buckets names.
+     * Returns an option to set a prefix to filter results to buckets whose names begin with this
+     * prefix.
      */
     public static BucketListOption prefix(String prefix) {
       return new BucketListOption(StorageRpc.Option.PREFIX, prefix);
@@ -639,7 +640,8 @@ public static BlobListOption startPageToken(String pageToken) {
     }
 
     /**
-     * Returns an option to set a prefix for listed blobs names.
+     * Returns an option to set a prefix to filter results to blobs whose names begin with this
+     * prefix.
      */
     public static BlobListOption prefix(String prefix) {
       return new BlobListOption(StorageRpc.Option.PREFIX, prefix);

From 381d0563f1035395a4dbad759bef3c8bfc9166a6 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 12 Nov 2015 19:01:23 +0100
Subject: [PATCH 086/322] Add BigQueryRpc default implementation

---
 .../google/gcloud/spi/DefaultBigQueryRpc.java | 421 ++++++++++++++++++
 1 file changed, 421 insertions(+)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
new file mode 100644
index 000000000000..fc9760bfa794
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -0,0 +1,421 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.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.QUOTA_USER;
+import static com.google.gcloud.spi.BigQueryRpc.Option.START_INDEX;
+import static com.google.gcloud.spi.BigQueryRpc.Option.TIMEOUT;
+import static com.google.gcloud.spi.BigQueryRpc.Option.USER_IP;
+
+import com.google.api.client.googleapis.json.GoogleJsonError;
+import com.google.api.client.googleapis.json.GoogleJsonResponseException;
+import com.google.api.client.http.HttpRequestInitializer;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.json.jackson.JacksonFactory;
+import com.google.api.services.bigquery.Bigquery;
+import com.google.api.services.bigquery.model.Dataset;
+import com.google.api.services.bigquery.model.DatasetList;
+import com.google.api.services.bigquery.model.DatasetReference;
+import com.google.api.services.bigquery.model.GetQueryResultsResponse;
+import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.JobList;
+import com.google.api.services.bigquery.model.JobReference;
+import com.google.api.services.bigquery.model.QueryRequest;
+import com.google.api.services.bigquery.model.QueryResponse;
+import com.google.api.services.bigquery.model.Table;
+import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
+import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
+import com.google.api.services.bigquery.model.TableDataList;
+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.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+
+import static com.google.gcloud.spi.BigQueryRpc.Option.MAX_RESULTS;
+import static com.google.gcloud.spi.BigQueryRpc.Option.PAGE_TOKEN;
+
+import com.google.gcloud.bigquery.BigQueryException;
+import com.google.gcloud.bigquery.BigQueryOptions;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class DefaultBigQueryRpc implements BigQueryRpc {
+
+  public static final String DEFAULT_PROJECTION = "full";
+  // see: https://cloud.google.com/bigquery/troubleshooting-errors
+  private static final Set RETRYABLE_CODES = ImmutableSet.of(503);
+  private final BigQueryOptions options;
+  private final Bigquery bigquery;
+
+  public DefaultBigQueryRpc(BigQueryOptions options) {
+    HttpTransport transport = options.httpTransportFactory().create();
+    HttpRequestInitializer initializer = options.httpRequestInitializer();
+    this.options = options;
+    bigquery = new Bigquery.Builder(transport, new JacksonFactory(), initializer)
+        .setRootUrl(options.host())
+        .setApplicationName(options.applicationName())
+        .build();
+  }
+
+  private static BigQueryException translate(IOException exception) {
+    BigQueryException translated;
+    if (exception instanceof GoogleJsonResponseException) {
+      translated = translate(((GoogleJsonResponseException) exception).getDetails());
+    } else {
+      translated =
+          new BigQueryException(BigQueryException.UNKNOWN_CODE, exception.getMessage(), false);
+    }
+    translated.initCause(exception);
+    return translated;
+  }
+
+  private static BigQueryException translate(GoogleJsonError exception) {
+    boolean retryable = RETRYABLE_CODES.contains(exception.getCode())
+        || "InternalError".equals(exception.getMessage());
+    return new BigQueryException(exception.getCode(), exception.getMessage(), retryable);
+  }
+
+  @Override
+  public Dataset getDataset(String datasetId, Map options) throws BigQueryException {
+    try {
+      return bigquery.datasets()
+          .get(this.options.projectId(), datasetId)
+          .setFields(FIELDS.getString(options))
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public Tuple> listDatasets(Map options)
+      throws BigQueryException {
+    try {
+      DatasetList datasetsList = bigquery.datasets()
+          .list(this.options.projectId())
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .setAll(Option.ALL_DATASETS.getBoolean(options))
+          .setMaxResults(MAX_RESULTS.getLong(options))
+          .setPageToken(PAGE_TOKEN.getString(options))
+          .execute();
+      Iterable datasets = datasetsList.getDatasets();
+      return Tuple.of(datasetsList.getNextPageToken(),
+          Iterables.transform(datasets != null ? datasets : ImmutableList.of(),
+              new Function() {
+                @Override
+                public Dataset apply(DatasetList.Datasets f) {
+                  return new Dataset()
+                      .setDatasetReference(f.getDatasetReference())
+                      .setFriendlyName(f.getFriendlyName())
+                      .setId(f.getId())
+                      .setKind(f.getKind());
+                }
+              }));
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public Dataset create(Dataset dataset, Map options) throws BigQueryException {
+    try {
+      return bigquery.datasets().insert(this.options.projectId(), dataset)
+          .setFields(FIELDS.getString(options))
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public boolean deleteDataset(String datasetId, Map options) throws BigQueryException {
+    try {
+      bigquery.datasets().delete(this.options.projectId(), datasetId)
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .setDeleteContents(DELETE_CONTENTS.getBoolean(options))
+          .execute();
+      return true;
+    } catch (IOException ex) {
+      BigQueryException serviceException = translate(ex);
+      if (serviceException.code() == 404) {
+        return false;
+      }
+      throw serviceException;
+    }
+  }
+
+  @Override
+  public Dataset patch(Dataset dataset, Map options) throws BigQueryException {
+    try {
+      DatasetReference reference = dataset.getDatasetReference();
+      return bigquery.datasets().patch(reference.getProjectId(), reference.getDatasetId(), dataset)
+          .setFields(FIELDS.getString(options))
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public Table getTable(String datasetId, String tableId, Map options)
+      throws BigQueryException {
+    try {
+      return bigquery.tables()
+          .get(this.options.projectId(), datasetId, tableId)
+          .setFields(FIELDS.getString(options))
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public Tuple> listTables(String datasetId, Map options)
+      throws BigQueryException {
+    try {
+      TableList tableList = bigquery.tables()
+          .list(this.options.projectId(), datasetId)
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .setMaxResults(MAX_RESULTS.getLong(options))
+          .setPageToken(PAGE_TOKEN.getString(options))
+          .execute();
+      return Tuple.of(tableList.getNextPageToken(),
+          Iterables.transform(tableList.getTables(),
+              new Function() {
+                @Override
+                public Table apply(TableList.Tables f) {
+                  return new Table()
+                      .setFriendlyName(f.getFriendlyName())
+                      .setId(f.getId())
+                      .setKind(f.getKind())
+                      .setTableReference(f.getTableReference())
+                      .setType(f.getType());
+                }
+              }));
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public Table create(Table table, Map options)
+      throws BigQueryException {
+    try {
+      return bigquery.tables()
+          .insert(this.options.projectId(), table.getTableReference().getDatasetId(), table)
+          .setFields(FIELDS.getString(options))
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public boolean deleteTable(String datasetId, String tableId, Map options)
+      throws BigQueryException {
+    try {
+      bigquery.tables().delete(this.options.projectId(), datasetId, tableId)
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+      return true;
+    } catch (IOException ex) {
+      BigQueryException serviceException = translate(ex);
+      if (serviceException.code() == 404) {
+        return false;
+      }
+      throw serviceException;
+    }
+  }
+
+  @Override
+  public Table patch(Table table, Map options) throws BigQueryException {
+    try {
+      TableReference reference = table.getTableReference();
+      return bigquery.tables()
+          .patch(reference.getProjectId(), reference.getDatasetId(), reference.getTableId(), table)
+          .setFields(FIELDS.getString(options))
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public TableDataInsertAllResponse insertAll(TableReference table,
+      TableDataInsertAllRequest request, Map options) throws BigQueryException {
+    try {
+      return bigquery.tabledata()
+          .insertAll(this.options.projectId(), table.getDatasetId(), table.getTableId(), request)
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public Tuple> listTableData(String datasetId, String tableId,
+      Map options) throws BigQueryException {
+    try {
+      TableDataList tableDataList = bigquery.tabledata()
+          .list(this.options.projectId(), datasetId, tableId)
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .setMaxResults(MAX_RESULTS.getLong(options))
+          .setPageToken(PAGE_TOKEN.getString(options))
+          .setStartIndex(START_INDEX.getLong(options) != null ?
+              BigInteger.valueOf(START_INDEX.getLong(options)) : null)
+          .execute();
+      return Tuple.>of(tableDataList.getPageToken(),
+          tableDataList.getRows());
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public Job getJob(String jobId, Map options) throws BigQueryException {
+    try {
+      return bigquery.jobs()
+          .get(this.options.projectId(), jobId)
+          .setFields(FIELDS.getString(options))
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public Tuple> listJobs(Map options) throws BigQueryException {
+    try {
+      JobList jobsList = bigquery.jobs()
+          .list(this.options.projectId())
+          .setAllUsers(Option.ALL_USERS.getBoolean(options))
+          .setFields(Option.FIELDS.getString(options))
+          .setStateFilter(Option.STATE_FILTER.>get(options))
+          .setMaxResults(MAX_RESULTS.getLong(options))
+          .setPageToken(PAGE_TOKEN.getString(options))
+          .setProjection(DEFAULT_PROJECTION)
+          .execute();
+      return Tuple.of(jobsList.getNextPageToken(),
+          Iterables.transform(jobsList.getJobs(),
+              new Function() {
+                @Override
+                public Job apply(JobList.Jobs f) {
+                  return new Job()
+                      .setConfiguration(f.getConfiguration())
+                      .setId(f.getId())
+                      .setJobReference(f.getJobReference())
+                      .setKind(f.getKind())
+                      .setStatistics(f.getStatistics())
+                      .setStatus(f.getStatus())
+                      .setUserEmail(f.getUserEmail());
+                }
+              }));
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public Job create(Job job, Map options) throws BigQueryException {
+    try {
+      return bigquery.jobs()
+          .insert(this.options.projectId(), job)
+          .setFields(FIELDS.getString(options))
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public boolean cancel(String jobId, Map options) throws BigQueryException {
+    try {
+      bigquery.jobs().cancel(this.options.projectId(), jobId)
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+      return true;
+    } catch (IOException ex) {
+      BigQueryException serviceException = translate(ex);
+      if (serviceException.code() == 404) {
+        return false;
+      }
+      throw serviceException;
+    }
+  }
+
+  @Override
+  public GetQueryResultsResponse getQueryResults(JobReference job, Map options)
+      throws BigQueryException {
+    try {
+      return bigquery.jobs().getQueryResults(this.options.projectId(), job.getProjectId())
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .setMaxResults(MAX_RESULTS.getLong(options))
+          .setPageToken(PAGE_TOKEN.getString(options))
+          .setStartIndex(START_INDEX.getLong(options) != null ?
+              BigInteger.valueOf(START_INDEX.getLong(options)) : null)
+          .setTimeoutMs(TIMEOUT.getLong(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public QueryResponse query(QueryRequest request, Map options)
+      throws BigQueryException {
+    try {
+      return bigquery.jobs().query(this.options.projectId(), request)
+          .setQuotaUser(QUOTA_USER.getString(options))
+          .setUserIp(USER_IP.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+}

From b8defb8e585468e0b95142080248a9f00be87c18 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 12 Nov 2015 07:30:55 +0100
Subject: [PATCH 087/322] Better javadoc for BucketInfo

---
 .../com/google/gcloud/storage/BucketInfo.java | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
index 3f21f74dcd66..b40e023cc47e 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
@@ -300,7 +300,7 @@ public static class IsLiveDeleteRule extends DeleteRule {
      * Creates an {@code IsLiveDeleteRule} object.
      *
      * @param isLive if set to {@code true} live blobs meet the delete condition. If set to
-     *     {@code false} delete condition is met by archived objects.
+     *     {@code false} delete condition is met by archived blobs.
      */
     public IsLiveDeleteRule(boolean isLive) {
       super(Type.IS_LIVE);
@@ -362,7 +362,8 @@ Builder selfLink(String selfLink) {
     }
 
     /**
-     * Sets whether blob versioning should be enabled or not for the bucket.
+     * Sets whether versioning should be enabled for this bucket. When set to true, versioning is
+     * fully enabled.
      */
     public Builder versioningEnabled(Boolean enable) {
       this.versioningEnabled = firstNonNull(enable, Data.nullOf(Boolean.class));
@@ -370,7 +371,8 @@ public Builder versioningEnabled(Boolean enable) {
     }
 
     /**
-     * Sets the bucket's website index page.
+     * Sets the bucket's website index page. Behaves as the bucket's directory index where missing
+     * blobs are treated as potential directories.
      */
     public Builder indexPage(String indexPage) {
       this.indexPage = indexPage;
@@ -378,7 +380,7 @@ public Builder indexPage(String indexPage) {
     }
 
     /**
-     * Sets the bucket's website page to return when a resource is not found.
+     * Sets the custom object to return when a requested resource is not found.
      */
     public Builder notFoundPage(String notFoundPage) {
       this.notFoundPage = notFoundPage;
@@ -386,7 +388,7 @@ public Builder notFoundPage(String notFoundPage) {
     }
 
     /**
-     * Sets bucket's delete rules.
+     * Sets the bucket's lifecycle configuration as a number of delete rules.
      *
      * @see Lifecycle Management
      */
@@ -396,10 +398,9 @@ public Builder deleteRules(Iterable rules) {
     }
 
     /**
-     * Sets the bucket's storage class. A list of supported values is available
-     * here.
-     *
-     * @see Storage Classes
+     * Sets the bucket's storage class. This defines how blobs in the bucket are stored and
+     * determines the SLA and the cost of storage. A list of supported values is available
+     * here.
      */
     public Builder storageClass(String storageClass) {
       this.storageClass = storageClass;
@@ -407,7 +408,8 @@ public Builder storageClass(String storageClass) {
     }
 
     /**
-     * Sets the bucket's location. A list of supported values is available
+     * Sets the bucket's location. Data for blobs in the bucket resides in physical storage within
+     * this region. A list of supported values is available
      * here.
      */
     public Builder location(String location) {
@@ -507,7 +509,7 @@ public String name() {
   }
 
   /**
-   * Returns the bucket's owner.
+   * Returns the bucket's owner. This is always the project team's owner group.
    */
   public Entity owner() {
     return owner;
@@ -521,35 +523,40 @@ public String selfLink() {
   }
 
   /**
-   * Returns {@code true} if blob versioning is enabled for this bucket, {@code false} otherwise.
+   * Returns {@code true} if versioning is fully enabled for this bucket, {@code false} otherwise.
    */
   public Boolean versioningEnabled() {
     return Data.isNull(versioningEnabled) ? null : versioningEnabled;
   }
 
   /**
-   * Returns bucket's website index page.
+   * Returns bucket's website index page. Behaves as the bucket's directory index where missing
+   * blobs are treated as potential directories.
    */
   public String indexPage() {
     return indexPage;
   }
 
   /**
-   * Returns bucket's website not found page, used we a resource could not be found.
+   * Returns the custom object to return when a requested resource is not found.
    */
   public String notFoundPage() {
     return notFoundPage;
   }
 
   /**
-   * Returns bucket's delete rules.
+   * Returns bucket's lifecycle configuration as a number of delete rules.
+   *
+   * @see Lifecycle Management
    */
   public List deleteRules() {
     return deleteRules;
   }
 
   /**
-   * Returns bucket resource's entity tag.
+   * Returns HTTP 1.1 Entity tag for the bucket.
+   *
+   * @see Entity Tags
    */
   public String etag() {
     return etag;
@@ -570,7 +577,8 @@ public Long metageneration() {
   }
 
   /**
-   * Returns the bucket's location.
+   * Returns the bucket's location. Data for blobs in the bucket resides in physical storage within
+   * this region.
    *
    * @see Bucket Locations
    */
@@ -579,7 +587,8 @@ public String location() {
   }
 
   /**
-   * Returns the bucket's storage class.
+   * Returns the bucket's storage class. This defines how blobs in the bucket are stored and
+   * determines the SLA and the cost of storage.
    *
    * @see Storage Classes
    */
@@ -589,6 +598,9 @@ public String storageClass() {
 
   /**
    * Returns the bucket's Cross-Origin Resource Sharing (CORS) configuration.
+   *
+   * @see 
+   *     Cross-Origin Resource Sharing (CORS)
    */
   public List cors() {
     return cors;

From da0ea589ff5362b261e92d1b755a16699abacd42 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 12 Nov 2015 07:34:54 +0100
Subject: [PATCH 088/322] Removed unused import from BucketInfo

---
 .../src/main/java/com/google/gcloud/storage/BucketInfo.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
index b40e023cc47e..d5a382446709 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
@@ -33,7 +33,6 @@
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.storage.Acl.Entity;
 
 import java.io.IOException;

From 2ffac2db4744375d2c5cbd8e1f84475ffcca4347 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 12 Nov 2015 12:34:45 +0100
Subject: [PATCH 089/322] Move generation from BlobInfo to BlobId - Add
 generation to BlobId and remove from BlobInfo, update tests - Add
 generationMatch() and generationNotMatch() methods to
 (BlobSource/BlobGet)Option - Add setGeneration method to set generation value
 in empty generation options from BlobId - Add support for empty generation
 options in storage.get - Add support for empty generation options in
 storage.readAllBytes - Add support for empty generation options in
 storage.reader - Add support for empty generation options in storage.delete -
 Add support for empty generation options in BatchRequest - Add support for
 empty generation options in CopyRequest - Update/and unit and integration
 tests

---
 .../google/gcloud/storage/BatchRequest.java   |   4 +-
 .../com/google/gcloud/storage/BlobId.java     |  41 +++++-
 .../com/google/gcloud/storage/BlobInfo.java   |  29 ++---
 .../com/google/gcloud/storage/Storage.java    |  83 +++++++++++-
 .../google/gcloud/storage/StorageImpl.java    |  17 ++-
 .../gcloud/storage/BatchRequestTest.java      |  17 ++-
 .../google/gcloud/storage/BlobInfoTest.java   |   7 +-
 .../google/gcloud/storage/ITStorageTest.java  | 121 ++++++++++++++----
 .../gcloud/storage/StorageImplTest.java       |  78 ++++++++++-
 9 files changed, 322 insertions(+), 75 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java
index bf77c731754e..ae48c5790a77 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java
@@ -58,7 +58,7 @@ public Builder delete(String bucket, String blob, BlobSourceOption... options) {
      * Delete the given blob.
      */
     public Builder delete(BlobId blob, BlobSourceOption... options) {
-      toDelete.put(blob, Lists.newArrayList(options));
+      toDelete.put(blob, Lists.newArrayList(BlobSourceOption.setGeneration(blob, options)));
       return this;
     }
 
@@ -82,7 +82,7 @@ public Builder get(String bucket, String blob, BlobGetOption... options) {
      * Retrieve metadata for the given blob.
      */
     public Builder get(BlobId blob, BlobGetOption... options) {
-      toGet.put(blob, Lists.newArrayList(options));
+      toGet.put(blob, Lists.newArrayList(BlobGetOption.setGeneration(blob, options)));
       return this;
     }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
index d1209826cc3e..d30003d632db 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
@@ -25,17 +25,21 @@
 import java.util.Objects;
 
 /**
- * Google Storage object identifier.
+ * Google Storage Object identifier. A {@code BlobId} object includes the name of the containing
+ * bucket, the blob's name and possibly the blob's generation. If {@link #generation()} is
+ * {@code null} the identifier refers to the latest blob's generation.
  */
 public final class BlobId implements Serializable {
 
   private static final long serialVersionUID = -6156002883225601925L;
   private final String bucket;
   private final String name;
+  private final Long generation;
 
-  private BlobId(String bucket, String name) {
+  private BlobId(String bucket, String name, Long generation) {
     this.bucket = bucket;
     this.name = name;
+    this.generation = generation;
   }
 
   /**
@@ -52,43 +56,66 @@ public String name() {
     return name;
   }
 
+  /**
+   * Returns blob's data generation. Used for versioning.
+   */
+  public Long generation() {
+    return generation;
+  }
+
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("bucket", bucket())
         .add("name", name())
+        .add("generation", generation())
         .toString();
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(bucket, name);
+    return Objects.hash(bucket, name, generation);
   }
 
   @Override
   public boolean equals(Object obj) {
     return obj instanceof BlobId && Objects.equals(bucket, ((BlobId) obj).bucket)
-        && Objects.equals(name, ((BlobId) obj).name);
+        && Objects.equals(name, ((BlobId) obj).name)
+        && Objects.equals(generation, ((BlobId) obj).generation);
   }
 
   StorageObject toPb() {
     StorageObject storageObject = new StorageObject();
     storageObject.setBucket(bucket);
     storageObject.setName(name);
+    storageObject.setGeneration(generation);
     return storageObject;
   }
 
   /**
-   * Creates a blob identifier.
+   * Creates a blob identifier. Generation is set to {@code null}.
    *
    * @param bucket the name of the bucket that contains the blob
    * @param name the name of the blob
    */
   public static BlobId of(String bucket, String name) {
-    return new BlobId(checkNotNull(bucket), checkNotNull(name));
+    return new BlobId(checkNotNull(bucket), checkNotNull(name), null);
+  }
+
+  /**
+   * Creates a {@code BlobId} object.
+   *
+   * @param bucket name of the containing bucket
+   * @param name blob's name
+   * @param generation blob's data generation, used for versioning. If {@code null} the identifier
+   *     refers to the latest blob's generation
+   */
+  public static BlobId of(String bucket, String name, Long generation) {
+    return new BlobId(checkNotNull(bucket), checkNotNull(name), generation);
   }
 
   static BlobId fromPb(StorageObject storageObject) {
-    return BlobId.of(storageObject.getBucket(), storageObject.getName());
+    return BlobId.of(storageObject.getBucket(), storageObject.getName(),
+        storageObject.getGeneration());
   }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
index 65b87498b6cc..29cf16dcd617 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
@@ -76,7 +76,6 @@ public StorageObject apply(BlobInfo blobInfo) {
   private final String crc32c;
   private final String mediaLink;
   private final Map metadata;
-  private final Long generation;
   private final Long metageneration;
   private final Long deleteTime;
   private final Long updateTime;
@@ -116,7 +115,6 @@ public static final class Builder {
     private String crc32c;
     private String mediaLink;
     private Map metadata;
-    private Long generation;
     private Long metageneration;
     private Long deleteTime;
     private Long updateTime;
@@ -260,11 +258,6 @@ public Builder metadata(Map metadata) {
       return this;
     }
 
-    Builder generation(Long generation) {
-      this.generation = generation;
-      return this;
-    }
-
     Builder metageneration(Long metageneration) {
       this.metageneration = metageneration;
       return this;
@@ -307,7 +300,6 @@ private BlobInfo(Builder builder) {
     crc32c = builder.crc32c;
     mediaLink = builder.mediaLink;
     metadata = builder.metadata;
-    generation = builder.generation;
     metageneration = builder.metageneration;
     deleteTime = builder.deleteTime;
     updateTime = builder.updateTime;
@@ -481,7 +473,7 @@ public Map metadata() {
    * Returns blob's data generation. Used for blob versioning.
    */
   public Long generation() {
-    return generation;
+    return blobId().generation();
   }
 
   /**
@@ -514,7 +506,6 @@ public Builder toBuilder() {
     return new Builder()
         .blobId(blobId)
         .id(id)
-        .generation(generation)
         .cacheControl(cacheControl)
         .contentEncoding(contentEncoding)
         .contentType(contentType)
@@ -540,6 +531,7 @@ public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("bucket", bucket())
         .add("name", name())
+        .add("generation", generation())
         .add("size", size())
         .add("content-type", contentType())
         .add("metadata", metadata())
@@ -590,7 +582,6 @@ public ObjectAccessControl apply(Acl acl) {
     storageObject.setContentEncoding(contentEncoding);
     storageObject.setCrc32c(crc32c);
     storageObject.setContentType(contentType);
-    storageObject.setGeneration(generation);
     storageObject.setMd5Hash(md5);
     storageObject.setMediaLink(mediaLink);
     storageObject.setMetageneration(metageneration);
@@ -618,8 +609,19 @@ public static Builder builder(String bucket, String name) {
   }
 
   /**
-   * Returns a {@code BlobInfo} builder where blob identity is set to the provided value.
+   * Returns a {@code BlobInfo} builder where blob identity is set using the provided values.
+   */
+  public static Builder builder(BucketInfo bucketInfo, String name, Long generation) {
+    return builder(bucketInfo.name(), name, generation);
+  }
+
+  /**
+   * Returns a {@code BlobInfo} builder where blob identity is set using the provided values.
    */
+  public static Builder builder(String bucket, String name, Long generation) {
+    return new Builder().blobId(BlobId.of(bucket, name, generation));
+  }
+
   public static Builder builder(BlobId blobId) {
     return new Builder().blobId(blobId);
   }
@@ -638,9 +640,6 @@ static BlobInfo fromPb(StorageObject storageObject) {
     if (storageObject.getContentType() != null) {
       builder.contentType(storageObject.getContentType());
     }
-    if (storageObject.getGeneration() != null) {
-      builder.generation(storageObject.getGeneration());
-    }
     if (storageObject.getMd5Hash() != null) {
       builder.md5(storageObject.getMd5Hash());
     }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 2e95e69aa445..4210a278c413 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -473,14 +473,32 @@ class BlobSourceOption extends Option {
 
     private static final long serialVersionUID = -3712768261070182991L;
 
-    private BlobSourceOption(StorageRpc.Option rpcOption, long value) {
+    private BlobSourceOption(StorageRpc.Option rpcOption, Long value) {
       super(rpcOption, value);
     }
 
     /**
      * Returns an option for blob's data generation match. If this option is used the request will
-     * fail if blob's generation does not match the provided value.
+     * fail if blob's generation does not match. The generation value to compare with the actual
+     * blob's generation is taken from a source {@link BlobId} object. When this option is passed
+     * to a {@link Storage} method and {@link BlobId#generation()} is {@code null} or no
+     * {@link BlobId} is provided an exception is thrown.
      */
+    public static BlobSourceOption generationMatch() {
+      return new BlobSourceOption(StorageRpc.Option.IF_GENERATION_MATCH, null);
+    }
+
+    /**
+     * Returns an option for blob's data generation mismatch. If this option is used the request
+     * will fail if blob's generation matches. The generation value to compare with the actual
+     * blob's generation is taken from a source {@link BlobId} object. When this option is passed
+     * to a {@link Storage} method and {@link BlobId#generation()} is {@code null} or no
+     * {@link BlobId} is provided an exception is thrown.
+     */
+    public static BlobSourceOption generationNotMatch() {
+      return new BlobSourceOption(StorageRpc.Option.IF_GENERATION_NOT_MATCH, null);
+    }
+
     public static BlobSourceOption generationMatch(long generation) {
       return new BlobSourceOption(StorageRpc.Option.IF_GENERATION_MATCH, generation);
     }
@@ -508,6 +526,26 @@ public static BlobSourceOption metagenerationMatch(long metageneration) {
     public static BlobSourceOption metagenerationNotMatch(long metageneration) {
       return new BlobSourceOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH, metageneration);
     }
+
+    static BlobSourceOption[] setGeneration(BlobId blobId, Iterable options) {
+      return setGeneration(blobId, Iterables.toArray(options, BlobSourceOption.class));
+    }
+
+    static BlobSourceOption[] setGeneration(BlobId blobId, BlobSourceOption... options) {
+      BlobSourceOption[] updatedOptions = new BlobSourceOption[options.length];
+      int index = 0;
+      for (BlobSourceOption option : options) {
+        if ((option.rpcOption() == StorageRpc.Option.IF_GENERATION_MATCH
+            || option.rpcOption() == StorageRpc.Option.IF_GENERATION_NOT_MATCH)
+            && option.value() == null) {
+          updatedOptions[index] = new BlobSourceOption(option.rpcOption(), blobId.generation());
+        } else {
+          updatedOptions[index] = option;
+        }
+        index++;
+      }
+      return updatedOptions;
+    }
   }
 
   /**
@@ -517,7 +555,7 @@ class BlobGetOption extends Option {
 
     private static final long serialVersionUID = 803817709703661480L;
 
-    private BlobGetOption(StorageRpc.Option rpcOption, long value) {
+    private BlobGetOption(StorageRpc.Option rpcOption, Long value) {
       super(rpcOption, value);
     }
 
@@ -527,8 +565,26 @@ private BlobGetOption(StorageRpc.Option rpcOption, String value) {
 
     /**
      * Returns an option for blob's data generation match. If this option is used the request will
-     * fail if blob's generation does not match the provided value.
+     * fail if blob's generation does not match. The generation value to compare with the actual
+     * blob's generation is taken from a source {@link BlobId} object. When this option is passed
+     * to a {@link Storage} method and {@link BlobId#generation()} is {@code null} or no
+     * {@link BlobId} is provided an exception is thrown.
+     */
+    public static BlobGetOption generationMatch() {
+      return new BlobGetOption(StorageRpc.Option.IF_GENERATION_MATCH, (Long) null);
+    }
+
+    /**
+     * Returns an option for blob's data generation mismatch. If this option is used the request
+     * will fail if blob's generation matches. The generation value to compare with the actual
+     * blob's generation is taken from a source {@link BlobId} object. When this option is passed
+     * to a {@link Storage} method and {@link BlobId#generation()} is {@code null} or no
+     * {@link BlobId} is provided an exception is thrown.
      */
+    public static BlobGetOption generationNotMatch() {
+      return new BlobGetOption(StorageRpc.Option.IF_GENERATION_NOT_MATCH, (Long) null);
+    }
+
     public static BlobGetOption generationMatch(long generation) {
       return new BlobGetOption(StorageRpc.Option.IF_GENERATION_MATCH, generation);
     }
@@ -566,6 +622,22 @@ public static BlobGetOption metagenerationNotMatch(long metageneration) {
     public static BlobGetOption fields(BlobField... fields) {
       return new BlobGetOption(StorageRpc.Option.FIELDS, BlobField.selector(fields));
     }
+
+    static BlobGetOption[] setGeneration(BlobId blobId, BlobGetOption... options) {
+      BlobGetOption[] updatedOptions = new BlobGetOption[options.length];
+      int index = 0;
+      for (BlobGetOption option : options) {
+        if ((option.rpcOption() == StorageRpc.Option.IF_GENERATION_MATCH
+            || option.rpcOption() == StorageRpc.Option.IF_GENERATION_NOT_MATCH)
+            && option.value() == null) {
+          updatedOptions[index] = new BlobGetOption(option.rpcOption(), blobId.generation());
+        } else {
+          updatedOptions[index] = option;
+        }
+        index++;
+      }
+      return updatedOptions;
+    }
   }
 
   /**
@@ -1019,7 +1091,8 @@ public CopyRequest build() {
 
     private CopyRequest(Builder builder) {
       source = checkNotNull(builder.source);
-      sourceOptions = ImmutableList.copyOf(builder.sourceOptions);
+      sourceOptions = ImmutableList.copyOf(
+          BlobSourceOption.setGeneration(source, builder.sourceOptions));
       target = checkNotNull(builder.target);
       targetOptions = ImmutableList.copyOf(builder.targetOptions);
       megabytesCopiedPerChunk = builder.megabytesCopiedPerChunk;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 4c85113e940e..b4da9e14fd97 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -199,7 +199,8 @@ public BlobInfo get(String bucket, String blob, BlobGetOption... options) {
   @Override
   public BlobInfo get(BlobId blob, BlobGetOption... options) {
     final StorageObject storedObject = blob.toPb();
-    final Map optionsMap = optionMap(options);
+    final Map optionsMap =
+        optionMap(BlobGetOption.setGeneration(blob, options));
     try {
       StorageObject storageObject = runWithRetries(new Callable() {
         @Override
@@ -405,7 +406,8 @@ public boolean delete(String bucket, String blob, BlobSourceOption... options) {
   @Override
   public boolean delete(BlobId blob, BlobSourceOption... options) {
     final StorageObject storageObject = blob.toPb();
-    final Map optionsMap = optionMap(options);
+    final Map optionsMap =
+        optionMap(BlobSourceOption.setGeneration(blob, options));
     try {
       return runWithRetries(new Callable() {
         @Override
@@ -428,8 +430,9 @@ public BlobInfo compose(final ComposeRequest composeRequest) {
     final List sources =
         Lists.newArrayListWithCapacity(composeRequest.sourceBlobs().size());
     for (ComposeRequest.SourceBlob sourceBlob : composeRequest.sourceBlobs()) {
-      sources.add(BlobInfo.builder(composeRequest.target().bucket(), sourceBlob.name())
-          .generation(sourceBlob.generation()).build().toPb());
+      sources.add(BlobInfo.builder(
+          BlobId.of(composeRequest.target().bucket(), sourceBlob.name(), sourceBlob.generation()))
+              .build().toPb());
     }
     final StorageObject target = composeRequest.target().toPb();
     final Map targetOptions = optionMap(composeRequest.target().generation(),
@@ -476,7 +479,8 @@ public byte[] readAllBytes(String bucket, String blob, BlobSourceOption... optio
   @Override
   public byte[] readAllBytes(BlobId blob, BlobSourceOption... options) {
     final StorageObject storageObject = blob.toPb();
-    final Map optionsMap = optionMap(options);
+    final Map optionsMap =
+        optionMap(BlobSourceOption.setGeneration(blob, options));
     try {
       return runWithRetries(new Callable() {
         @Override
@@ -557,7 +561,8 @@ public BlobReadChannel reader(String bucket, String blob, BlobSourceOption... op
 
   @Override
   public BlobReadChannel reader(BlobId blob, BlobSourceOption... options) {
-    Map optionsMap = optionMap(options);
+    Map optionsMap =
+        optionMap(BlobSourceOption.setGeneration(blob, options));
     return new BlobReadChannelImpl(options(), blob, optionsMap);
   }
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java
index 600c8af0d554..020bdf5ed404 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java
@@ -37,12 +37,12 @@ public class BatchRequestTest {
   @Test
   public void testBatchRequest() {
     BatchRequest request = BatchRequest.builder()
-        .delete("b1", "o1")
+        .delete(BlobId.of("b1", "o1", 1L), BlobSourceOption.generationMatch())
         .delete("b1", "o2", BlobSourceOption.generationMatch(1),
             BlobSourceOption.metagenerationMatch(2))
         .update(BlobInfo.builder("b2", "o1").build(), BlobTargetOption.predefinedAcl(PUBLIC_READ))
         .update(BlobInfo.builder("b2", "o2").build())
-        .get("b3", "o1")
+        .get(BlobId.of("b3", "o1", 1L), BlobGetOption.generationMatch())
         .get("b3", "o2", BlobGetOption.generationMatch(1))
         .get("b3", "o3")
         .build();
@@ -50,11 +50,15 @@ public void testBatchRequest() {
     Iterator>> deletes = request
         .toDelete().entrySet().iterator();
     Entry> delete = deletes.next();
-    assertEquals(BlobId.of("b1", "o1"), delete.getKey());
-    assertTrue(Iterables.isEmpty(delete.getValue()));
+    assertEquals(BlobId.of("b1", "o1", 1L), delete.getKey());
+    assertEquals(1, Iterables.size(delete.getValue()));
+    assertEquals(BlobSourceOption.generationMatch(1L), Iterables.getFirst(delete.getValue(), null));
     delete = deletes.next();
     assertEquals(BlobId.of("b1", "o2"), delete.getKey());
     assertEquals(2, Iterables.size(delete.getValue()));
+    assertEquals(BlobSourceOption.generationMatch(1L), Iterables.getFirst(delete.getValue(), null));
+    assertEquals(BlobSourceOption.metagenerationMatch(2L),
+        Iterables.get(delete.getValue(), 1, null));
     assertFalse(deletes.hasNext());
 
     Iterator>> updates = request
@@ -71,8 +75,9 @@ public void testBatchRequest() {
 
     Iterator>> gets = request.toGet().entrySet().iterator();
     Entry> get = gets.next();
-    assertEquals(BlobId.of("b3", "o1"), get.getKey());
-    assertTrue(Iterables.isEmpty(get.getValue()));
+    assertEquals(BlobId.of("b3", "o1", 1L), get.getKey());
+    assertEquals(1, Iterables.size(get.getValue()));
+    assertEquals(BlobGetOption.generationMatch(1), Iterables.getFirst(get.getValue(), null));
     get = gets.next();
     assertEquals(BlobId.of("b3", "o2"), get.getKey());
     assertEquals(1, Iterables.size(get.getValue()));
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java
index 70560b0c9a9e..7214170afe9a 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java
@@ -55,7 +55,7 @@ public class BlobInfoTest {
   private static final String SELF_LINK = "http://storage/b/n";
   private static final Long SIZE = 1024L;
   private static final Long UPDATE_TIME = DELETE_TIME - 1L;
-  private static final BlobInfo BLOB_INFO = BlobInfo.builder("b", "n")
+  private static final BlobInfo BLOB_INFO = BlobInfo.builder("b", "n", GENERATION)
       .acl(ACL)
       .componentCount(COMPONENT_COUNT)
       .contentType(CONTENT_TYPE)
@@ -66,7 +66,6 @@ public class BlobInfoTest {
       .crc32c(CRC32)
       .deleteTime(DELETE_TIME)
       .etag(ETAG)
-      .generation(GENERATION)
       .id(ID)
       .md5(MD5)
       .mediaLink(MEDIA_LINK)
@@ -85,7 +84,7 @@ public void testToBuilder() {
     assertEquals("n2", blobInfo.name());
     assertEquals("b2", blobInfo.bucket());
     assertEquals(Long.valueOf(200), blobInfo.size());
-    blobInfo = blobInfo.toBuilder().blobId(BlobId.of("b", "n")).size(SIZE).build();
+    blobInfo = blobInfo.toBuilder().blobId(BlobId.of("b", "n", GENERATION)).size(SIZE).build();
     compareBlobs(BLOB_INFO, blobInfo);
   }
 
@@ -150,6 +149,6 @@ public void testToPbAndFromPb() {
 
   @Test
   public void testBlobId() {
-    assertEquals(BlobId.of("b", "n"), BLOB_INFO.blobId());
+    assertEquals(BlobId.of("b", "n", GENERATION), BLOB_INFO.blobId());
   }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 423e972a8de6..a8fb0365e598 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -129,8 +129,8 @@ public void testCreateBlob() {
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     BlobInfo remoteBlob = storage.create(blob, BLOB_BYTE_CONTENT);
     assertNotNull(remoteBlob);
-    assertEquals(blob.blobId(), remoteBlob.blobId());
-    byte[] readBytes = storage.readAllBytes(BUCKET, blobName);
+    assertEquals(blob.bucket(), remoteBlob.bucket());
+    assertEquals(blob.name(), remoteBlob.name());    byte[] readBytes = storage.readAllBytes(BUCKET, blobName);
     assertArrayEquals(BLOB_BYTE_CONTENT, readBytes);
     assertTrue(storage.delete(BUCKET, blobName));
   }
@@ -141,7 +141,8 @@ public void testCreateEmptyBlob() {
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     BlobInfo remoteBlob = storage.create(blob);
     assertNotNull(remoteBlob);
-    assertEquals(blob.blobId(), remoteBlob.blobId());
+    assertEquals(blob.bucket(), remoteBlob.bucket());
+    assertEquals(blob.name(), remoteBlob.name());
     byte[] readBytes = storage.readAllBytes(BUCKET, blobName);
     assertArrayEquals(new byte[0], readBytes);
     assertTrue(storage.delete(BUCKET, blobName));
@@ -154,7 +155,8 @@ public void testCreateBlobStream() throws UnsupportedEncodingException {
     ByteArrayInputStream stream = new ByteArrayInputStream(BLOB_STRING_CONTENT.getBytes(UTF_8));
     BlobInfo remoteBlob = storage.create(blob, stream);
     assertNotNull(remoteBlob);
-    assertEquals(blob.blobId(), remoteBlob.blobId());
+    assertEquals(blob.bucket(), remoteBlob.bucket());
+    assertEquals(blob.name(), remoteBlob.name());
     assertEquals(blob.contentType(), remoteBlob.contentType());
     byte[] readBytes = storage.readAllBytes(BUCKET, blobName);
     assertEquals(BLOB_STRING_CONTENT, new String(readBytes, UTF_8));
@@ -166,8 +168,9 @@ public void testCreateBlobFail() {
     String blobName = "test-create-blob-fail";
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
+    BlobInfo wrongGenerationBlob = BlobInfo.builder(BUCKET, blobName, -1L).build();
     try {
-      storage.create(blob.toBuilder().generation(-1L).build(), BLOB_BYTE_CONTENT,
+      storage.create(wrongGenerationBlob, BLOB_BYTE_CONTENT,
           Storage.BlobTargetOption.generationMatch());
       fail("StorageException was expected");
     } catch (StorageException ex) {
@@ -229,13 +232,29 @@ public void testGetBlobAllSelectedFields() {
     assertNotNull(storage.create(blob));
     BlobInfo remoteBlob = storage.get(blob.blobId(),
         Storage.BlobGetOption.fields(BlobField.values()));
-    assertEquals(blob.blobId(), remoteBlob.blobId());
+    assertEquals(blob.bucket(), remoteBlob.bucket());
+    assertEquals(blob.name(), remoteBlob.name());
     assertEquals(ImmutableMap.of("k", "v"), remoteBlob.metadata());
     assertNotNull(remoteBlob.id());
     assertNotNull(remoteBlob.selfLink());
     assertTrue(storage.delete(BUCKET, blobName));
   }
 
+  @Test
+  public void testGetBlobFail() {
+    String blobName = "test-get-blob-fail";
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
+    assertNotNull(storage.create(blob));
+    BlobId wrongGenerationBlob = BlobId.of(BUCKET, blobName, -1L);
+    try {
+      storage.get(wrongGenerationBlob, Storage.BlobGetOption.generationMatch());
+      fail("StorageException was expected");
+    } catch (StorageException ex) {
+      // expected
+    }
+    assertTrue(storage.delete(BUCKET, blobName));
+  }
+
   @Test
   public void testListBlobsSelectedFields() {
     String[] blobNames = {"test-list-blobs-selected-fields-blob1",
@@ -297,7 +316,8 @@ public void testUpdateBlob() {
     assertNotNull(storage.create(blob));
     BlobInfo updatedBlob = storage.update(blob.toBuilder().contentType(CONTENT_TYPE).build());
     assertNotNull(updatedBlob);
-    assertEquals(blob.blobId(), updatedBlob.blobId());
+    assertEquals(blob.name(), updatedBlob.name());
+    assertEquals(blob.bucket(), updatedBlob.bucket());
     assertEquals(CONTENT_TYPE, updatedBlob.contentType());
     assertTrue(storage.delete(BUCKET, blobName));
   }
@@ -316,7 +336,8 @@ public void testUpdateBlobReplaceMetadata() {
     assertNotNull(updatedBlob);
     assertNull(updatedBlob.metadata());
     updatedBlob = storage.update(blob.toBuilder().metadata(newMetadata).build());
-    assertEquals(blob.blobId(), updatedBlob.blobId());
+    assertEquals(blob.name(), updatedBlob.name());
+    assertEquals(blob.bucket(), updatedBlob.bucket());
     assertEquals(newMetadata, updatedBlob.metadata());
     assertTrue(storage.delete(BUCKET, blobName));
   }
@@ -334,7 +355,8 @@ public void testUpdateBlobMergeMetadata() {
     assertNotNull(storage.create(blob));
     BlobInfo updatedBlob = storage.update(blob.toBuilder().metadata(newMetadata).build());
     assertNotNull(updatedBlob);
-    assertEquals(blob.blobId(), updatedBlob.blobId());
+    assertEquals(blob.name(), updatedBlob.name());
+    assertEquals(blob.bucket(), updatedBlob.bucket());
     assertEquals(expectedMetadata, updatedBlob.metadata());
     assertTrue(storage.delete(BUCKET, blobName));
   }
@@ -354,7 +376,8 @@ public void testUpdateBlobUnsetMetadata() {
     assertNotNull(storage.create(blob));
     BlobInfo updatedBlob = storage.update(blob.toBuilder().metadata(newMetadata).build());
     assertNotNull(updatedBlob);
-    assertEquals(blob.blobId(), updatedBlob.blobId());
+    assertEquals(blob.name(), updatedBlob.name());
+    assertEquals(blob.bucket(), updatedBlob.bucket());
     assertEquals(expectedMetadata, updatedBlob.metadata());
     assertTrue(storage.delete(BUCKET, blobName));
   }
@@ -364,9 +387,11 @@ public void testUpdateBlobFail() {
     String blobName = "test-update-blob-fail";
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
+    BlobInfo wrongGenerationBlob = BlobInfo.builder(BUCKET, blobName, -1L)
+        .contentType(CONTENT_TYPE)
+        .build();
     try {
-      storage.update(blob.toBuilder().contentType(CONTENT_TYPE).generation(-1L).build(),
-          Storage.BlobTargetOption.generationMatch());
+      storage.update(wrongGenerationBlob, Storage.BlobTargetOption.generationMatch());
       fail("StorageException was expected");
     } catch (StorageException ex) {
       // expected
@@ -408,7 +433,8 @@ public void testComposeBlob() {
         Storage.ComposeRequest.of(ImmutableList.of(sourceBlobName1, sourceBlobName2), targetBlob);
     BlobInfo remoteBlob = storage.compose(req);
     assertNotNull(remoteBlob);
-    assertEquals(targetBlob.blobId(), remoteBlob.blobId());
+    assertEquals(targetBlob.name(), remoteBlob.name());
+    assertEquals(targetBlob.bucket(), remoteBlob.bucket());
     byte[] readBytes = storage.readAllBytes(BUCKET, targetBlobName);
     byte[] composedBytes = Arrays.copyOf(BLOB_BYTE_CONTENT, BLOB_BYTE_CONTENT.length * 2);
     System.arraycopy(BLOB_BYTE_CONTENT, 0, composedBytes, BLOB_BYTE_CONTENT.length,
@@ -491,12 +517,12 @@ public void testCopyBlobUpdateMetadata() {
   @Test
   public void testCopyBlobFail() {
     String sourceBlobName = "test-copy-blob-source-fail";
-    BlobId source = BlobId.of(BUCKET, sourceBlobName);
+    BlobId source = BlobId.of(BUCKET, sourceBlobName, -1L);
     assertNotNull(storage.create(BlobInfo.builder(source).build(), BLOB_BYTE_CONTENT));
     String targetBlobName = "test-copy-blob-target-fail";
     BlobInfo target = BlobInfo.builder(BUCKET, targetBlobName).contentType(CONTENT_TYPE).build();
     Storage.CopyRequest req = Storage.CopyRequest.builder()
-        .source(source)
+        .source(BUCKET, sourceBlobName)
         .sourceOptions(Storage.BlobSourceOption.generationMatch(-1L))
         .target(target)
         .build();
@@ -506,6 +532,17 @@ public void testCopyBlobFail() {
     } catch (StorageException ex) {
       // expected
     }
+    Storage.CopyRequest req2 = Storage.CopyRequest.builder()
+        .source(source)
+        .sourceOptions(Storage.BlobSourceOption.generationMatch())
+        .target(target)
+        .build();
+    try {
+      storage.copy(req2);
+      fail("StorageException was expected");
+    } catch (StorageException ex) {
+      // expected
+    }
     assertTrue(storage.delete(BUCKET, sourceBlobName));
   }
 
@@ -531,8 +568,10 @@ public void testBatchRequest() {
     assertEquals(0, updateResponse.gets().size());
     BlobInfo remoteUpdatedBlob1 = updateResponse.updates().get(0).get();
     BlobInfo remoteUpdatedBlob2 = updateResponse.updates().get(1).get();
-    assertEquals(sourceBlob1.blobId(), remoteUpdatedBlob1.blobId());
-    assertEquals(sourceBlob2.blobId(), remoteUpdatedBlob2.blobId());
+    assertEquals(sourceBlob1.bucket(), remoteUpdatedBlob1.bucket());
+    assertEquals(sourceBlob1.name(), remoteUpdatedBlob1.name());
+    assertEquals(sourceBlob2.bucket(), remoteUpdatedBlob2.bucket());
+    assertEquals(sourceBlob2.name(), remoteUpdatedBlob2.name());
     assertEquals(updatedBlob1.contentType(), remoteUpdatedBlob1.contentType());
     assertEquals(updatedBlob2.contentType(), remoteUpdatedBlob2.contentType());
 
@@ -568,19 +607,23 @@ public void testBatchRequestFail() {
     String blobName = "test-batch-request-blob-fail";
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
-    BlobInfo updatedBlob = blob.toBuilder().generation(-1L).build();
+    BlobInfo updatedBlob = BlobInfo.builder(BUCKET, blobName, -1L).build();
     BatchRequest batchRequest = BatchRequest.builder()
         .update(updatedBlob, Storage.BlobTargetOption.generationMatch())
         .delete(BUCKET, blobName, Storage.BlobSourceOption.generationMatch(-1L))
+        .delete(BlobId.of(BUCKET, blobName, -1L), Storage.BlobSourceOption.generationMatch())
         .get(BUCKET, blobName, Storage.BlobGetOption.generationMatch(-1L))
+        .get(BlobId.of(BUCKET, blobName, -1L), Storage.BlobGetOption.generationMatch())
         .build();
     BatchResponse updateResponse = storage.apply(batchRequest);
     assertEquals(1, updateResponse.updates().size());
-    assertEquals(1, updateResponse.deletes().size());
-    assertEquals(1, updateResponse.gets().size());
+    assertEquals(2, updateResponse.deletes().size());
+    assertEquals(2, updateResponse.gets().size());
     assertTrue(updateResponse.updates().get(0).failed());
     assertTrue(updateResponse.gets().get(0).failed());
+    assertTrue(updateResponse.gets().get(1).failed());
     assertTrue(updateResponse.deletes().get(0).failed());
+    assertTrue(updateResponse.deletes().get(1).failed());
     assertTrue(storage.delete(BUCKET, blobName));
   }
 
@@ -648,13 +691,28 @@ public void testReadChannelFail() throws IOException {
     } catch (StorageException ex) {
       // expected
     }
+    try (BlobReadChannel reader =
+             storage.reader(blob.blobId(), Storage.BlobSourceOption.generationMatch(-1L))) {
+      reader.read(ByteBuffer.allocate(42));
+      fail("StorageException was expected");
+    } catch (StorageException ex) {
+      // expected
+    }
+    BlobId blobIdWrongGeneration = BlobId.of(BUCKET, blobName, -1L);
+    try (BlobReadChannel reader =
+             storage.reader(blobIdWrongGeneration, Storage.BlobSourceOption.generationMatch())) {
+      reader.read(ByteBuffer.allocate(42));
+      fail("StorageException was expected");
+    } catch (StorageException ex) {
+      // expected
+    }
     assertTrue(storage.delete(BUCKET, blobName));
   }
 
   @Test
   public void testWriteChannelFail() throws IOException {
     String blobName = "test-write-channel-blob-fail";
-    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).generation(-1L).build();
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName, -1L).build();
     try {
       try (BlobWriteChannel writer =
           storage.writer(blob, Storage.BlobWriteOption.generationMatch())) {
@@ -707,7 +765,8 @@ public void testPostSignedUrl() throws IOException {
     connection.connect();
     BlobInfo remoteBlob = storage.get(BUCKET, blobName);
     assertNotNull(remoteBlob);
-    assertEquals(blob.blobId(), remoteBlob.blobId());
+    assertEquals(blob.bucket(), remoteBlob.bucket());
+    assertEquals(blob.name(), remoteBlob.name());
     assertTrue(storage.delete(BUCKET, blobName));
   }
 
@@ -720,8 +779,10 @@ public void testGetBlobs() {
     assertNotNull(storage.create(sourceBlob1));
     assertNotNull(storage.create(sourceBlob2));
     List remoteBlobs = storage.get(sourceBlob1.blobId(), sourceBlob2.blobId());
-    assertEquals(sourceBlob1.blobId(), remoteBlobs.get(0).blobId());
-    assertEquals(sourceBlob2.blobId(), remoteBlobs.get(1).blobId());
+    assertEquals(sourceBlob1.bucket(), remoteBlobs.get(0).bucket());
+    assertEquals(sourceBlob1.name(), remoteBlobs.get(0).name());
+    assertEquals(sourceBlob2.bucket(), remoteBlobs.get(1).bucket());
+    assertEquals(sourceBlob2.name(), remoteBlobs.get(1).name());
     assertTrue(storage.delete(BUCKET, sourceBlobName1));
     assertTrue(storage.delete(BUCKET, sourceBlobName2));
   }
@@ -734,7 +795,8 @@ public void testGetBlobsFail() {
     BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
     assertNotNull(storage.create(sourceBlob1));
     List remoteBlobs = storage.get(sourceBlob1.blobId(), sourceBlob2.blobId());
-    assertEquals(sourceBlob1.blobId(), remoteBlobs.get(0).blobId());
+    assertEquals(sourceBlob1.bucket(), remoteBlobs.get(0).bucket());
+    assertEquals(sourceBlob1.name(), remoteBlobs.get(0).name());
     assertNull(remoteBlobs.get(1));
     assertTrue(storage.delete(BUCKET, sourceBlobName1));
   }
@@ -777,9 +839,11 @@ public void testUpdateBlobs() {
     List updatedBlobs = storage.update(
         remoteBlob1.toBuilder().contentType(CONTENT_TYPE).build(),
         remoteBlob2.toBuilder().contentType(CONTENT_TYPE).build());
-    assertEquals(sourceBlob1.blobId(), updatedBlobs.get(0).blobId());
+    assertEquals(sourceBlob1.bucket(), updatedBlobs.get(0).bucket());
+    assertEquals(sourceBlob1.name(), updatedBlobs.get(0).name());
     assertEquals(CONTENT_TYPE, updatedBlobs.get(0).contentType());
-    assertEquals(sourceBlob2.blobId(), updatedBlobs.get(1).blobId());
+    assertEquals(sourceBlob2.bucket(), updatedBlobs.get(1).bucket());
+    assertEquals(sourceBlob2.name(), updatedBlobs.get(1).name());
     assertEquals(CONTENT_TYPE, updatedBlobs.get(1).contentType());
     assertTrue(storage.delete(BUCKET, sourceBlobName1));
     assertTrue(storage.delete(BUCKET, sourceBlobName2));
@@ -796,7 +860,8 @@ public void testUpdateBlobsFail() {
     List updatedBlobs = storage.update(
         remoteBlob1.toBuilder().contentType(CONTENT_TYPE).build(),
         sourceBlob2.toBuilder().contentType(CONTENT_TYPE).build());
-    assertEquals(sourceBlob1.blobId(), updatedBlobs.get(0).blobId());
+    assertEquals(sourceBlob1.bucket(), updatedBlobs.get(0).bucket());
+    assertEquals(sourceBlob1.name(), updatedBlobs.get(0).name());
     assertEquals(CONTENT_TYPE, updatedBlobs.get(0).contentType());
     assertNull(updatedBlobs.get(1));
     assertTrue(storage.delete(BUCKET, sourceBlobName1));
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index f07c7000813e..849e2ed14499 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -89,8 +89,8 @@ public class StorageImplTest {
   private static final BucketInfo BUCKET_INFO2 = BucketInfo.builder(BUCKET_NAME2).build();
 
   // BlobInfo objects
-  private static final BlobInfo BLOB_INFO1 = BlobInfo.builder(BUCKET_NAME1, BLOB_NAME1)
-      .metageneration(42L).generation(24L).contentType("application/json").md5("md5string").build();
+  private static final BlobInfo BLOB_INFO1 = BlobInfo.builder(BUCKET_NAME1, BLOB_NAME1, 24L)
+      .metageneration(42L).contentType("application/json").md5("md5string").build();
   private static final BlobInfo BLOB_INFO2 = BlobInfo.builder(BUCKET_NAME1, BLOB_NAME2).build();
   private static final BlobInfo BLOB_INFO3 = BlobInfo.builder(BUCKET_NAME1, BLOB_NAME3).build();
 
@@ -157,6 +157,8 @@ public class StorageImplTest {
       Storage.BlobGetOption.metagenerationMatch(BLOB_INFO1.metageneration());
   private static final Storage.BlobGetOption BLOB_GET_GENERATION =
       Storage.BlobGetOption.generationMatch(BLOB_INFO1.generation());
+  private static final Storage.BlobGetOption BLOB_GET_GENERATION_FROM_BLOB_ID =
+      Storage.BlobGetOption.generationMatch();
   private static final Storage.BlobGetOption BLOB_GET_FIELDS =
       Storage.BlobGetOption.fields(Storage.BlobField.CONTENT_TYPE, Storage.BlobField.CRC32C);
   private static final Storage.BlobGetOption BLOB_GET_EMPTY_FIELDS =
@@ -168,6 +170,8 @@ public class StorageImplTest {
       Storage.BlobSourceOption.metagenerationMatch(BLOB_INFO1.metageneration());
   private static final Storage.BlobSourceOption BLOB_SOURCE_GENERATION =
       Storage.BlobSourceOption.generationMatch(BLOB_INFO1.generation());
+  private static final Storage.BlobSourceOption BLOB_SOURCE_GENERATION_FROM_BLOB_ID =
+      Storage.BlobSourceOption.generationMatch();
   private static final Map BLOB_SOURCE_OPTIONS = ImmutableMap.of(
       StorageRpc.Option.IF_METAGENERATION_MATCH, BLOB_SOURCE_METAGENERATION.value(),
       StorageRpc.Option.IF_GENERATION_MATCH, BLOB_SOURCE_GENERATION.value());
@@ -454,6 +458,18 @@ public void testGetBlobWithOptions() {
     assertEquals(BLOB_INFO1, blob);
   }
 
+  @Test
+  public void testGetBlobWithOptionsFromBlobId() {
+    EasyMock.expect(
+        storageRpcMock.get(BLOB_INFO1.blobId().toPb(), BLOB_GET_OPTIONS))
+        .andReturn(BLOB_INFO1.toPb());
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    BlobInfo blob =
+        storage.get(BLOB_INFO1.blobId(), BLOB_GET_METAGENERATION, BLOB_GET_GENERATION_FROM_BLOB_ID);
+    assertEquals(BLOB_INFO1, blob);
+  }
+
   @Test
   public void testGetBlobWithSelectedFields() {
     Capture> capturedOptions =
@@ -766,6 +782,17 @@ public void testDeleteBlobWithOptions() {
         BLOB_SOURCE_METAGENERATION));
   }
 
+  @Test
+  public void testDeleteBlobWithOptionsFromBlobId() {
+    EasyMock.expect(
+        storageRpcMock.delete(BLOB_INFO1.blobId().toPb(), BLOB_SOURCE_OPTIONS))
+        .andReturn(true);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    assertTrue(storage.delete(BLOB_INFO1.blobId(), BLOB_SOURCE_GENERATION_FROM_BLOB_ID,
+        BLOB_SOURCE_METAGENERATION));
+  }
+
   @Test
   public void testCompose() {
     Storage.ComposeRequest req = Storage.ComposeRequest.builder()
@@ -831,6 +858,26 @@ public void testCopyWithOptions() {
     assertTrue(!writer.isDone());
   }
 
+  @Test
+  public void testCopyWithOptionsFromBlobId() {
+    CopyRequest request = Storage.CopyRequest.builder()
+        .source(BLOB_INFO1.blobId())
+        .sourceOptions(BLOB_SOURCE_GENERATION_FROM_BLOB_ID, BLOB_SOURCE_METAGENERATION)
+        .target(BLOB_INFO1, BLOB_TARGET_GENERATION, BLOB_TARGET_METAGENERATION)
+        .build();
+    StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
+        BLOB_SOURCE_OPTIONS_COPY, request.target().toPb(), BLOB_TARGET_OPTIONS_COMPOSE, null);
+    StorageRpc.RewriteResponse rpcResponse = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
+        false, "token", 21L);
+    EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    CopyWriter writer = storage.copy(request);
+    assertEquals(42L, writer.blobSize());
+    assertEquals(21L, writer.totalBytesCopied());
+    assertTrue(!writer.isDone());
+  }
+
   @Test
   public void testCopyMultipleRequests() {
     CopyRequest request = Storage.CopyRequest.of(BLOB_INFO1.blobId(), BLOB_INFO2.blobId());
@@ -877,6 +924,18 @@ public void testReadAllBytesWithOptions() {
     assertArrayEquals(BLOB_CONTENT, readBytes);
   }
 
+  @Test
+  public void testReadAllBytesWithOptionsFromBlobId() {
+    EasyMock.expect(
+        storageRpcMock.load(BLOB_INFO1.blobId().toPb(), BLOB_SOURCE_OPTIONS))
+        .andReturn(BLOB_CONTENT);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    byte[] readBytes = storage.readAllBytes(BLOB_INFO1.blobId(),
+        BLOB_SOURCE_GENERATION_FROM_BLOB_ID, BLOB_SOURCE_METAGENERATION);
+    assertArrayEquals(BLOB_CONTENT, readBytes);
+  }
+
   @Test
   public void testApply() {
     BatchRequest req = BatchRequest.builder()
@@ -981,6 +1040,21 @@ public void testReaderWithOptions() throws IOException {
     channel.read(ByteBuffer.allocate(42));
   }
 
+  @Test
+  public void testReaderWithOptionsFromBlobId() throws IOException {
+    byte[] result = new byte[DEFAULT_CHUNK_SIZE];
+    EasyMock.expect(
+        storageRpcMock.read(BLOB_INFO1.blobId().toPb(), BLOB_SOURCE_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
+        .andReturn(result);
+    EasyMock.replay(storageRpcMock);
+    storage = options.service();
+    BlobReadChannel channel = storage.reader(BLOB_INFO1.blobId(),
+        BLOB_SOURCE_GENERATION_FROM_BLOB_ID, BLOB_SOURCE_METAGENERATION);
+    assertNotNull(channel);
+    assertTrue(channel.isOpen());
+    channel.read(ByteBuffer.allocate(42));
+  }
+
   @Test
   public void testWriter() {
     BlobInfo.Builder infoBuilder = BLOB_INFO1.toBuilder();

From 6c961b624e8c3612f761b288a0c38b52ce43f97d Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 12 Nov 2015 15:17:53 -0800
Subject: [PATCH 090/322] Create version 0.0.12

---
 gcloud-java-core/pom.xml      | 2 +-
 gcloud-java-datastore/pom.xml | 2 +-
 gcloud-java-examples/pom.xml  | 2 +-
 gcloud-java-storage/pom.xml   | 2 +-
 gcloud-java/pom.xml           | 2 +-
 pom.xml                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index e13933bd2beb..c89347130005 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.12-SNAPSHOT
+    0.0.12
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index b58e9e0ffc74..2e9f48970a68 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.12-SNAPSHOT
+    0.0.12
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index c461846acab2..feac050f49ae 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.12-SNAPSHOT
+    0.0.12
   
   
     gcloud-java-examples
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index ef3ddec79816..bddd11a22037 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.12-SNAPSHOT
+    0.0.12
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index d26c38f517d5..e44704973908 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.12-SNAPSHOT
+    0.0.12
   
   
     
diff --git a/pom.xml b/pom.xml
index 78cbfe11d351..32a73e175b70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.0.12-SNAPSHOT
+  0.0.12
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From 2fd8066e891fb3dfea69b65f6bf6461db79342b9 Mon Sep 17 00:00:00 2001
From: travis-ci 
Date: Thu, 12 Nov 2015 23:43:27 +0000
Subject: [PATCH 091/322] Updating version in README files.

---
 README.md                       | 6 +++---
 gcloud-java-core/README.md      | 6 +++---
 gcloud-java-datastore/README.md | 6 +++---
 gcloud-java-examples/README.md  | 6 +++---
 gcloud-java-storage/README.md   | 6 +++---
 gcloud-java/README.md           | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 5ed44e91adfd..bba06a7e60d4 100644
--- a/README.md
+++ b/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.0.11
+  0.0.12
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:jar:0.0.11'
+compile 'com.google.gcloud:gcloud-java:jar:0.0.12'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.11"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.12"
 ```
 
 Example Applications
diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index f84fb33993e7..714c43f5c63d 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-core
-  0.0.11
+  0.0.12
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-core:jar:0.0.11'
+compile 'com.google.gcloud:gcloud-java-core:jar:0.0.12'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.11"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.12"
 ```
 
 Java Versions
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index 6d9fc0e8c4d6..2525413ecb86 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-datastore
-  0.0.11
+  0.0.12
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-datastore:jar:0.0.11'
+compile 'com.google.gcloud:gcloud-java-datastore:jar:0.0.12'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.11"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.12"
 ```
 
 Example Application
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index bc738de41b51..f381465676f5 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-examples
-  0.0.11
+  0.0.12
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-examples:jar:0.0.11'
+compile 'com.google.gcloud:gcloud-java-examples:jar:0.0.12'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.11"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.12"
 ```
 
 To run examples from your command line:
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index f2b99388ff0f..8b19484dd14d 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-storage
-  0.0.11
+  0.0.12
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-storage:jar:0.0.11'
+compile 'com.google.gcloud:gcloud-java-storage:jar:0.0.12'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.0.11"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.0.12"
 ```
 
 Example Application
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index eaaed21af5fe..9a4ddfe77c83 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.0.11
+  0.0.12
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:jar:0.0.11'
+compile 'com.google.gcloud:gcloud-java:jar:0.0.12'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.11"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.12"
 ```
 
 Java Versions

From af10dbfbc47857d51ae581cbdd583ea98bbbc898 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 12 Nov 2015 16:10:30 -0800
Subject: [PATCH 092/322] Update version to 0.0.13-SNAPSHOT

---
 gcloud-java-core/pom.xml      | 2 +-
 gcloud-java-datastore/pom.xml | 2 +-
 gcloud-java-examples/pom.xml  | 2 +-
 gcloud-java-storage/pom.xml   | 2 +-
 gcloud-java/pom.xml           | 2 +-
 pom.xml                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index c89347130005..7e184db2dbfa 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.12
+    0.0.13-SNAPSHOT
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index 2e9f48970a68..f2743c8e2af1 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.12
+    0.0.13-SNAPSHOT
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index feac050f49ae..2b02be47cc40 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.12
+    0.0.13-SNAPSHOT
   
   
     gcloud-java-examples
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index bddd11a22037..b592200243ef 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.12
+    0.0.13-SNAPSHOT
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index e44704973908..214094dcd104 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.12
+    0.0.13-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 32a73e175b70..234290a6da44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.0.12
+  0.0.13-SNAPSHOT
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From f0ce8972e1a414a620de6d9c83f82cbce7520264 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 13 Nov 2015 10:32:11 +0100
Subject: [PATCH 093/322] Remove Blob(Source/Get)Option.setGeneration method,
 add Storage.optionMap

---
 .../google/gcloud/storage/BatchRequest.java   |  4 +-
 .../com/google/gcloud/storage/Storage.java    | 39 +------------------
 .../google/gcloud/storage/StorageImpl.java    | 22 +++++------
 .../gcloud/storage/BatchRequestTest.java      |  4 +-
 .../gcloud/storage/StorageImplTest.java       |  4 +-
 5 files changed, 18 insertions(+), 55 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java
index ae48c5790a77..bf77c731754e 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java
@@ -58,7 +58,7 @@ public Builder delete(String bucket, String blob, BlobSourceOption... options) {
      * Delete the given blob.
      */
     public Builder delete(BlobId blob, BlobSourceOption... options) {
-      toDelete.put(blob, Lists.newArrayList(BlobSourceOption.setGeneration(blob, options)));
+      toDelete.put(blob, Lists.newArrayList(options));
       return this;
     }
 
@@ -82,7 +82,7 @@ public Builder get(String bucket, String blob, BlobGetOption... options) {
      * Retrieve metadata for the given blob.
      */
     public Builder get(BlobId blob, BlobGetOption... options) {
-      toGet.put(blob, Lists.newArrayList(BlobGetOption.setGeneration(blob, options)));
+      toGet.put(blob, Lists.newArrayList(options));
       return this;
     }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 4210a278c413..b61cfb269c1a 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -526,26 +526,6 @@ public static BlobSourceOption metagenerationMatch(long metageneration) {
     public static BlobSourceOption metagenerationNotMatch(long metageneration) {
       return new BlobSourceOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH, metageneration);
     }
-
-    static BlobSourceOption[] setGeneration(BlobId blobId, Iterable options) {
-      return setGeneration(blobId, Iterables.toArray(options, BlobSourceOption.class));
-    }
-
-    static BlobSourceOption[] setGeneration(BlobId blobId, BlobSourceOption... options) {
-      BlobSourceOption[] updatedOptions = new BlobSourceOption[options.length];
-      int index = 0;
-      for (BlobSourceOption option : options) {
-        if ((option.rpcOption() == StorageRpc.Option.IF_GENERATION_MATCH
-            || option.rpcOption() == StorageRpc.Option.IF_GENERATION_NOT_MATCH)
-            && option.value() == null) {
-          updatedOptions[index] = new BlobSourceOption(option.rpcOption(), blobId.generation());
-        } else {
-          updatedOptions[index] = option;
-        }
-        index++;
-      }
-      return updatedOptions;
-    }
   }
 
   /**
@@ -622,22 +602,6 @@ public static BlobGetOption metagenerationNotMatch(long metageneration) {
     public static BlobGetOption fields(BlobField... fields) {
       return new BlobGetOption(StorageRpc.Option.FIELDS, BlobField.selector(fields));
     }
-
-    static BlobGetOption[] setGeneration(BlobId blobId, BlobGetOption... options) {
-      BlobGetOption[] updatedOptions = new BlobGetOption[options.length];
-      int index = 0;
-      for (BlobGetOption option : options) {
-        if ((option.rpcOption() == StorageRpc.Option.IF_GENERATION_MATCH
-            || option.rpcOption() == StorageRpc.Option.IF_GENERATION_NOT_MATCH)
-            && option.value() == null) {
-          updatedOptions[index] = new BlobGetOption(option.rpcOption(), blobId.generation());
-        } else {
-          updatedOptions[index] = option;
-        }
-        index++;
-      }
-      return updatedOptions;
-    }
   }
 
   /**
@@ -1091,8 +1055,7 @@ public CopyRequest build() {
 
     private CopyRequest(Builder builder) {
       source = checkNotNull(builder.source);
-      sourceOptions = ImmutableList.copyOf(
-          BlobSourceOption.setGeneration(source, builder.sourceOptions));
+      sourceOptions = ImmutableList.copyOf(builder.sourceOptions);
       target = checkNotNull(builder.target);
       targetOptions = ImmutableList.copyOf(builder.targetOptions);
       megabytesCopiedPerChunk = builder.megabytesCopiedPerChunk;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index b4da9e14fd97..fa059254eddb 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -199,8 +199,7 @@ public BlobInfo get(String bucket, String blob, BlobGetOption... options) {
   @Override
   public BlobInfo get(BlobId blob, BlobGetOption... options) {
     final StorageObject storedObject = blob.toPb();
-    final Map optionsMap =
-        optionMap(BlobGetOption.setGeneration(blob, options));
+    final Map optionsMap = optionMap(blob, options);
     try {
       StorageObject storageObject = runWithRetries(new Callable() {
         @Override
@@ -406,8 +405,7 @@ public boolean delete(String bucket, String blob, BlobSourceOption... options) {
   @Override
   public boolean delete(BlobId blob, BlobSourceOption... options) {
     final StorageObject storageObject = blob.toPb();
-    final Map optionsMap =
-        optionMap(BlobSourceOption.setGeneration(blob, options));
+    final Map optionsMap = optionMap(blob, options);
     try {
       return runWithRetries(new Callable() {
         @Override
@@ -453,7 +451,7 @@ public StorageObject call() {
   public CopyWriter copy(final CopyRequest copyRequest) {
     final StorageObject source = copyRequest.source().toPb();
     final Map sourceOptions =
-        optionMap(null, null, copyRequest.sourceOptions(), true);
+        optionMap(copyRequest.source().generation(), null, copyRequest.sourceOptions(), true);
     final StorageObject target = copyRequest.target().toPb();
     final Map targetOptions = optionMap(copyRequest.target().generation(),
         copyRequest.target().metageneration(), copyRequest.targetOptions());
@@ -479,8 +477,7 @@ public byte[] readAllBytes(String bucket, String blob, BlobSourceOption... optio
   @Override
   public byte[] readAllBytes(BlobId blob, BlobSourceOption... options) {
     final StorageObject storageObject = blob.toPb();
-    final Map optionsMap =
-        optionMap(BlobSourceOption.setGeneration(blob, options));
+    final Map optionsMap = optionMap(blob, options);
     try {
       return runWithRetries(new Callable() {
         @Override
@@ -499,7 +496,7 @@ public BatchResponse apply(BatchRequest batchRequest) {
         Lists.newArrayListWithCapacity(batchRequest.toDelete().size());
     for (Map.Entry> entry : batchRequest.toDelete().entrySet()) {
       BlobId blob = entry.getKey();
-      Map optionsMap = optionMap(null, null, entry.getValue());
+      Map optionsMap = optionMap(blob.generation(), null, entry.getValue());
       StorageObject storageObject = blob.toPb();
       toDelete.add(Tuple.>of(storageObject, optionsMap));
     }
@@ -516,7 +513,7 @@ public BatchResponse apply(BatchRequest batchRequest) {
         Lists.newArrayListWithCapacity(batchRequest.toGet().size());
     for (Map.Entry> entry : batchRequest.toGet().entrySet()) {
       BlobId blob = entry.getKey();
-      Map optionsMap = optionMap(null, null, entry.getValue());
+      Map optionsMap = optionMap(blob.generation(), null, entry.getValue());
       toGet.add(Tuple.>of(blob.toPb(), optionsMap));
     }
     StorageRpc.BatchResponse response =
@@ -561,8 +558,7 @@ public BlobReadChannel reader(String bucket, String blob, BlobSourceOption... op
 
   @Override
   public BlobReadChannel reader(BlobId blob, BlobSourceOption... options) {
-    Map optionsMap =
-        optionMap(BlobSourceOption.setGeneration(blob, options));
+    Map optionsMap = optionMap(blob, options);
     return new BlobReadChannelImpl(options(), blob, optionsMap);
   }
 
@@ -746,4 +742,8 @@ private static  void addToOptionMap(StorageRpc.Option getOption, StorageRpc.O
   private Map optionMap(BlobInfo blobInfo, Option... options) {
     return optionMap(blobInfo.generation(), blobInfo.metageneration(), options);
   }
+
+  private Map optionMap(BlobId blobId, Option... options) {
+    return optionMap(blobId.generation(), null, options);
+  }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java
index 020bdf5ed404..63972ff85dfd 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BatchRequestTest.java
@@ -52,7 +52,7 @@ public void testBatchRequest() {
     Entry> delete = deletes.next();
     assertEquals(BlobId.of("b1", "o1", 1L), delete.getKey());
     assertEquals(1, Iterables.size(delete.getValue()));
-    assertEquals(BlobSourceOption.generationMatch(1L), Iterables.getFirst(delete.getValue(), null));
+    assertEquals(BlobSourceOption.generationMatch(), Iterables.getFirst(delete.getValue(), null));
     delete = deletes.next();
     assertEquals(BlobId.of("b1", "o2"), delete.getKey());
     assertEquals(2, Iterables.size(delete.getValue()));
@@ -77,7 +77,7 @@ public void testBatchRequest() {
     Entry> get = gets.next();
     assertEquals(BlobId.of("b3", "o1", 1L), get.getKey());
     assertEquals(1, Iterables.size(get.getValue()));
-    assertEquals(BlobGetOption.generationMatch(1), Iterables.getFirst(get.getValue(), null));
+    assertEquals(BlobGetOption.generationMatch(), Iterables.getFirst(get.getValue(), null));
     get = gets.next();
     assertEquals(BlobId.of("b3", "o2"), get.getKey());
     assertEquals(1, Iterables.size(get.getValue()));
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 849e2ed14499..359920314e82 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -867,8 +867,8 @@ public void testCopyWithOptionsFromBlobId() {
         .build();
     StorageRpc.RewriteRequest rpcRequest = new StorageRpc.RewriteRequest(request.source().toPb(),
         BLOB_SOURCE_OPTIONS_COPY, request.target().toPb(), BLOB_TARGET_OPTIONS_COMPOSE, null);
-    StorageRpc.RewriteResponse rpcResponse = new StorageRpc.RewriteResponse(rpcRequest, null, 42L,
-        false, "token", 21L);
+    StorageRpc.RewriteResponse rpcResponse =
+        new StorageRpc.RewriteResponse(rpcRequest, null, 42L, false, "token", 21L);
     EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse);
     EasyMock.replay(storageRpcMock);
     storage = options.service();

From 33119695a9cc05bc7fa0c46fdc1291b2c1a8baf4 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 13 Nov 2015 10:33:20 +0100
Subject: [PATCH 094/322] Set blob generation before sending requests in
 DefaultStorageRpc

---
 .../google/gcloud/spi/DefaultStorageRpc.java  | 10 +++-
 .../google/gcloud/storage/ITStorageTest.java  | 49 +++++++++++++------
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index b1e188f1d1fb..d215d6b40e61 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -207,6 +207,7 @@ private Storage.Objects.Get getRequest(StorageObject object, Map opti
       throws IOException {
     return storage.objects()
         .get(object.getBucket(), object.getName())
+        .setGeneration(object.getGeneration())
         .setProjection(DEFAULT_PROJECTION)
         .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(options))
         .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(options))
@@ -288,6 +289,7 @@ private Storage.Objects.Delete deleteRequest(StorageObject blob, Map
       throws IOException {
     return storage.objects()
         .delete(blob.getBucket(), blob.getName())
+        .setGeneration(blob.getGeneration())
         .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(options))
         .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(options))
         .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(options))
@@ -332,6 +334,7 @@ public byte[] load(StorageObject from, Map options)
     try {
       Storage.Objects.Get getRequest = storage.objects()
           .get(from.getBucket(), from.getName())
+          .setGeneration(from.getGeneration())
           .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(options))
           .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(options))
           .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(options))
@@ -409,8 +412,10 @@ public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
   public byte[] read(StorageObject from, Map options, long position, int bytes)
       throws StorageException {
     try {
-      Get req = storage.objects().get(from.getBucket(), from.getName());
-      req.setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(options))
+      Get req = storage.objects()
+          .get(from.getBucket(), from.getName())
+          .setGeneration(from.getGeneration())
+          .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(options))
           .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(options))
           .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(options))
           .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(options));
@@ -521,6 +526,7 @@ private RewriteResponse rewrite(RewriteRequest req, String token) throws Storage
       com.google.api.services.storage.model.RewriteResponse rewriteReponse = storage.objects()
           .rewrite(req.source.getBucket(), req.source.getName(), req.target.getBucket(),
               req.target.getName(), req.target.getContentType() != null ? req.target : null)
+          .setSourceGeneration(req.source.getGeneration())
           .setRewriteToken(token)
           .setMaxBytesRewrittenPerCall(maxBytesRewrittenPerCall)
           .setProjection(DEFAULT_PROJECTION)
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index a8fb0365e598..d22bf06c8b16 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -19,6 +19,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -130,7 +131,8 @@ public void testCreateBlob() {
     BlobInfo remoteBlob = storage.create(blob, BLOB_BYTE_CONTENT);
     assertNotNull(remoteBlob);
     assertEquals(blob.bucket(), remoteBlob.bucket());
-    assertEquals(blob.name(), remoteBlob.name());    byte[] readBytes = storage.readAllBytes(BUCKET, blobName);
+    assertEquals(blob.name(), remoteBlob.name());
+    byte[] readBytes = storage.readAllBytes(BUCKET, blobName);
     assertArrayEquals(BLOB_BYTE_CONTENT, readBytes);
     assertTrue(storage.delete(BUCKET, blobName));
   }
@@ -245,9 +247,9 @@ public void testGetBlobFail() {
     String blobName = "test-get-blob-fail";
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
-    BlobId wrongGenerationBlob = BlobId.of(BUCKET, blobName, -1L);
+    BlobId wrongGenerationBlob = BlobId.of(BUCKET, blobName);
     try {
-      storage.get(wrongGenerationBlob, Storage.BlobGetOption.generationMatch());
+      storage.get(wrongGenerationBlob, Storage.BlobGetOption.generationMatch(-1));
       fail("StorageException was expected");
     } catch (StorageException ex) {
       // expected
@@ -255,6 +257,16 @@ public void testGetBlobFail() {
     assertTrue(storage.delete(BUCKET, blobName));
   }
 
+  @Test
+  public void testGetBlobFailNonExistingGeneration() {
+    String blobName = "test-get-blob-fail-non-existing-generation";
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
+    assertNotNull(storage.create(blob));
+    BlobId wrongGenerationBlob = BlobId.of(BUCKET, blobName, -1L);
+    assertNull(storage.get(wrongGenerationBlob));
+    assertTrue(storage.delete(BUCKET, blobName));
+  }
+
   @Test
   public void testListBlobsSelectedFields() {
     String[] blobNames = {"test-list-blobs-selected-fields-blob1",
@@ -405,6 +417,14 @@ public void testDeleteNonExistingBlob() {
     assertTrue(!storage.delete(BUCKET, blobName));
   }
 
+  @Test
+  public void testDeleteBlobNonExistingGeneration() {
+    String blobName = "test-delete-blob-non-existing-generation";
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
+    assertNotNull(storage.create(blob));
+    assertTrue(!storage.delete(BlobId.of(BUCKET, blobName, -1L)));
+  }
+
   @Test
   public void testDeleteBlobFail() {
     String blobName = "test-delete-blob-fail";
@@ -611,19 +631,20 @@ public void testBatchRequestFail() {
     BatchRequest batchRequest = BatchRequest.builder()
         .update(updatedBlob, Storage.BlobTargetOption.generationMatch())
         .delete(BUCKET, blobName, Storage.BlobSourceOption.generationMatch(-1L))
-        .delete(BlobId.of(BUCKET, blobName, -1L), Storage.BlobSourceOption.generationMatch())
+        .delete(BlobId.of(BUCKET, blobName, -1L))
         .get(BUCKET, blobName, Storage.BlobGetOption.generationMatch(-1L))
-        .get(BlobId.of(BUCKET, blobName, -1L), Storage.BlobGetOption.generationMatch())
+        .get(BlobId.of(BUCKET, blobName, -1L))
         .build();
-    BatchResponse updateResponse = storage.apply(batchRequest);
-    assertEquals(1, updateResponse.updates().size());
-    assertEquals(2, updateResponse.deletes().size());
-    assertEquals(2, updateResponse.gets().size());
-    assertTrue(updateResponse.updates().get(0).failed());
-    assertTrue(updateResponse.gets().get(0).failed());
-    assertTrue(updateResponse.gets().get(1).failed());
-    assertTrue(updateResponse.deletes().get(0).failed());
-    assertTrue(updateResponse.deletes().get(1).failed());
+    BatchResponse batchResponse = storage.apply(batchRequest);
+    assertEquals(1, batchResponse.updates().size());
+    assertEquals(2, batchResponse.deletes().size());
+    assertEquals(2, batchResponse.gets().size());
+    assertTrue(batchResponse.updates().get(0).failed());
+    assertTrue(batchResponse.gets().get(0).failed());
+    assertFalse(batchResponse.gets().get(1).failed());
+    assertNull(batchResponse.gets().get(1).get());
+    assertTrue(batchResponse.deletes().get(0).failed());
+    assertTrue(batchResponse.deletes().get(1).failed());
     assertTrue(storage.delete(BUCKET, blobName));
   }
 

From dc71a5605c58d5d25c1c0414848a7fc17035adb4 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 13 Nov 2015 10:28:16 -0800
Subject: [PATCH 095/322] Simplify package-info examples

---
 .../com/google/gcloud/datastore/package-info.java     | 11 ++++++++---
 .../java/com/google/gcloud/storage/package-info.java  | 10 +++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java
index 2135267d9ac4..405157ad55bd 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java
@@ -17,10 +17,9 @@
 /**
  * A client to the Google Cloud Datastore.
  *
- * 
A simple usage example:
+ * 
Here's a simple usage example for using gcloud-java from App/Compute Engine:
  * 
 {@code
- * DatastoreOptions options = DatastoreOptions.builder().projectId(PROJECT_ID).build();
- * Datastore datastore = options.service();
+ * Datastore datastore = DatastoreOptions.defaultInstance().service();
  * KeyFactory keyFactory = datastore.newKeyFactory().kind(kind);
  * Key key = keyFactory.newKey(keyName);
  * Entity entity = datastore.get(key);
@@ -47,6 +46,12 @@
  * }
  * } 

  *
+ * 
When using gcloud-java from outside of App/Compute Engine, you have to specify a
+ * project ID and
+ * provide
+ * authentication.
+ *
  * @see Google Cloud Datastore
  */
 package com.google.gcloud.datastore;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
index 2a09631be40a..71a4e26da4ef 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
@@ -17,10 +17,9 @@
 /**
  * A client to Google Cloud Storage.
  *
- * 
A simple usage example:
+ * 
Here's a simple usage example for when running on App/Compute Engine:
  * 
{@code
- * StorageOptions options = StorageOptions.builder().projectId("project").build();
- * Storage storage = options.service();
+ * Storage storage = StorageOptions.defaultInstance().service();
  * BlobId blobId = BlobId.of("bucket", "blob_name");
  * Blob blob = Blob.load(storage, blobId);
  * if (blob == null) {
@@ -35,6 +34,11 @@
  *   channel.close();
  * }}

  *
+ * When using gcloud-java from outside of App/Compute Engine, you have to specify a
+ * project ID and
+ * provide
+ * authentication.
  * @see Google Cloud Storage
  */
 package com.google.gcloud.storage;

From 22f52aee1eb371759e3b990e5bd70c5c12443621 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 13 Nov 2015 11:12:39 -0800
Subject: [PATCH 096/322] Document that we should wait until artifacts are
 pushed to finish release process

---
 RELEASING.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/RELEASING.md b/RELEASING.md
index 419f723fe328..e9b2d3c2a0f8 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -10,13 +10,15 @@ This script takes an optional argument denoting the new version.  By default, if
 2. Create a PR to update the pom.xml version.
 The PR should look something like [#225](https://github.com/GoogleCloudPlatform/gcloud-java/pull/225).  After this PR is merged into GoogleCloudPlatform/gcloud-java, Travis CI will push a new website to GoogleCloudPlatform/gh-pages, push a new artifact to the Maven Central Repository, and update versions in the README files.
 
-3. Create a release on Github manually.
+3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository.  To do this, we need to check the Travis CI logs since the artifacts take a couple hours to appear on the Maven Central Repository's website.  Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR.  Be sure that you are not opening the "Pull Request" build logs; you should not be under the "Pull Requests" tab.  When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed.  If the deployment didn't succeed because of a flaky test, the artifact may still have been pushed by the next Travis build, "Updating READMEs."  If both builds failed to deploy the artifacts, rerun the build.
+
+4. Create a release on Github manually.
 Go to the [releases page](https://github.com/GoogleCloudPlatform/gcloud-java/releases) and click "Draft a new release."  Use `vX.Y.Z` as the "Tag Version" and `X.Y.Z` as the "Release Title", where `X.Y.Z` is the release version as listed in the `pom.xml` files.
 
-4. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
+5. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
 As mentioned before, there is an optional version argument.  By default, the script will update the version from "X.Y.Z" to "X.Y.Z+1-SNAPSHOT".  Suppose a different version is desired, for example X+1.0.0-SNAPSHOT.  Then the appropriate command to run would be `utilities/update_pom_version.sh X+1.0.0-SNAPSHOT`.
 
-5. Create and merge in another PR to reflect the updated project version.  For an example of what this PR should look like, see [#227](https://github.com/GoogleCloudPlatform/gcloud-java/pull/227).
+6. Create and merge in another PR to reflect the updated project version.  For an example of what this PR should look like, see [#227](https://github.com/GoogleCloudPlatform/gcloud-java/pull/227).
 
 ### To push a snapshot version
 

From f3c82742ebd7c7989aafd06c3158831c6b8ebc80 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 13 Nov 2015 11:33:43 -0800
Subject: [PATCH 097/322] Fix code to get app engine ID

---
 .../src/main/java/com/google/gcloud/ServiceOptions.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 0793470ade83..c76b62780a0e 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -450,9 +450,11 @@ protected static String getAppEngineProjectId() {
     try {
       Class factoryClass =
           Class.forName("com.google.appengine.api.appidentity.AppIdentityServiceFactory");
+      Class serviceClass =
+          Class.forName("com.google.appengine.api.appidentity.AppIdentityService");
       Method method = factoryClass.getMethod("getAppIdentityService");
       Object appIdentityService = method.invoke(null);
-      method = appIdentityService.getClass().getMethod("getServiceAccountName");
+      method = serviceClass.getMethod("getServiceAccountName");
       String serviceAccountName = (String) method.invoke(appIdentityService);
       int indexOfAtSign = serviceAccountName.indexOf('@');
       return serviceAccountName.substring(0, indexOfAtSign);

From 1bcdf4b7ca7798e3d702a28d26d98ac60564b78d Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 13 Nov 2015 13:30:17 -0800
Subject: [PATCH 098/322] Make package info wording clearer

---
 .../main/java/com/google/gcloud/datastore/package-info.java   | 3 +--
 .../src/main/java/com/google/gcloud/storage/package-info.java | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java
index 405157ad55bd..1404b2817802 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/package-info.java
@@ -50,8 +50,7 @@
  * href="https://github.com/GoogleCloudPlatform/gcloud-java#specifying-a-project-id">specify a
  * project ID and
  * provide
- * authentication.
- *
+ * credentials.
  * @see Google Cloud Datastore
  */
 package com.google.gcloud.datastore;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
index 71a4e26da4ef..137afd38b6ae 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
@@ -17,7 +17,7 @@
 /**
  * A client to Google Cloud Storage.
  *
- * 
Here's a simple usage example for when running on App/Compute Engine:
+ * 
Here's a simple usage example for using gcloud-java from App/Compute Engine:
  * 
{@code
  * Storage storage = StorageOptions.defaultInstance().service();
  * BlobId blobId = BlobId.of("bucket", "blob_name");
@@ -38,7 +38,7 @@
  * href="https://github.com/GoogleCloudPlatform/gcloud-java#specifying-a-project-id">specify a
  * project ID and
  * provide
- * authentication.
+ * credentials.
  * @see Google Cloud Storage
  */
 package com.google.gcloud.storage;

From cf777fcaa578ebeace11dff3b75e774c9874c9a9 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 13 Nov 2015 18:50:28 +0100
Subject: [PATCH 099/322] Fix setting ContentRange to inclusive positions

---
 .../src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index b1e188f1d1fb..a033ed635d2d 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -60,6 +60,7 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
+import com.google.common.primitives.Ints;
 import com.google.gcloud.storage.StorageException;
 import com.google.gcloud.storage.StorageOptions;
 
@@ -415,7 +416,7 @@ public byte[] read(StorageObject from, Map options, long position, in
           .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(options))
           .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(options));
       MediaHttpDownloader downloader = req.getMediaHttpDownloader();
-      downloader.setContentRange(position, (int) position + bytes);
+      downloader.setContentRange(position, Ints.checkedCast(position + bytes - 1));
       downloader.setDirectDownloadEnabled(true);
       ByteArrayOutputStream output = new ByteArrayOutputStream();
       req.executeMediaAndDownloadTo(output);

From 77dab2c0e5454a8ee33e1ef0f866dab32cc66a84 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 13 Nov 2015 16:42:44 -0800
Subject: [PATCH 100/322] Remove extra central repository deploy

---
 RELEASING.md                     | 2 +-
 utilities/update_docs_version.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASING.md b/RELEASING.md
index e9b2d3c2a0f8..7de5d599a395 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -10,7 +10,7 @@ This script takes an optional argument denoting the new version.  By default, if
 2. Create a PR to update the pom.xml version.
 The PR should look something like [#225](https://github.com/GoogleCloudPlatform/gcloud-java/pull/225).  After this PR is merged into GoogleCloudPlatform/gcloud-java, Travis CI will push a new website to GoogleCloudPlatform/gh-pages, push a new artifact to the Maven Central Repository, and update versions in the README files.
 
-3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository.  To do this, we need to check the Travis CI logs since the artifacts take a couple hours to appear on the Maven Central Repository's website.  Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR.  Be sure that you are not opening the "Pull Request" build logs; you should not be under the "Pull Requests" tab.  When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed.  If the deployment didn't succeed because of a flaky test, the artifact may still have been pushed by the next Travis build, "Updating READMEs."  If both builds failed to deploy the artifacts, rerun the build.
+3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository.  To do this, we need to check the Travis CI logs since the artifacts take a couple hours to appear on the Maven Central Repository's website.  Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR.  Be sure that you are not opening the "Pull Request" build logs; you should not be under the "Pull Requests" tab.  When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed.  If the deployment didn't succeed because of a flaky test, rerun the build.
 
 4. Create a release on Github manually.
 Go to the [releases page](https://github.com/GoogleCloudPlatform/gcloud-java/releases) and click "Draft a new release."  Use `vX.Y.Z` as the "Tag Version" and `X.Y.Z` as the "Release Title", where `X.Y.Z` is the release version as listed in the `pom.xml` files.
diff --git a/utilities/update_docs_version.sh b/utilities/update_docs_version.sh
index 4b1641a0bd81..4fc0aa772963 100755
--- a/utilities/update_docs_version.sh
+++ b/utilities/update_docs_version.sh
@@ -21,6 +21,6 @@ if [ "${RELEASED_VERSION##*-}" != "SNAPSHOT" ]; then
     git add README.md */README.md
     git config --global user.name "travis-ci"
     git config --global user.email "travis@travis-ci.org"
-    git commit -m "Updating version in README files."
+    git commit -m "Updating version in README files. [ci skip]"
     git push --quiet "https://${CI_DEPLOY_USERNAME}:${CI_DEPLOY_PASSWORD}@github.com/GoogleCloudPlatform/gcloud-java.git" HEAD:master > /dev/null 2>&1
 fi

From 3f6d791ce734a5b2f16064f2f4c07f1ede22fa73 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 13 Nov 2015 17:10:36 -0800
Subject: [PATCH 101/322] Add additional deploy check comment

---
 RELEASING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASING.md b/RELEASING.md
index 7de5d599a395..59b6559b9f95 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -10,7 +10,7 @@ This script takes an optional argument denoting the new version.  By default, if
 2. Create a PR to update the pom.xml version.
 The PR should look something like [#225](https://github.com/GoogleCloudPlatform/gcloud-java/pull/225).  After this PR is merged into GoogleCloudPlatform/gcloud-java, Travis CI will push a new website to GoogleCloudPlatform/gh-pages, push a new artifact to the Maven Central Repository, and update versions in the README files.
 
-3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository.  To do this, we need to check the Travis CI logs since the artifacts take a couple hours to appear on the Maven Central Repository's website.  Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR.  Be sure that you are not opening the "Pull Request" build logs; you should not be under the "Pull Requests" tab.  When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed.  If the deployment didn't succeed because of a flaky test, rerun the build.
+3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository.  Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR.  Be sure that you are not opening the "Pull Request" build logs.  When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed.  You can also search for `gcloud-java` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~gcloud-java) and check the latest version number.  If the deployment didn't succeed because of a flaky test, rerun the build.
 
 4. Create a release on Github manually.
 Go to the [releases page](https://github.com/GoogleCloudPlatform/gcloud-java/releases) and click "Draft a new release."  Use `vX.Y.Z` as the "Tag Version" and `X.Y.Z` as the "Release Title", where `X.Y.Z` is the release version as listed in the `pom.xml` files.

From 76cb620fc814083926e03bd981f7aefbf316f4ff Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 17 Nov 2015 15:30:39 +0100
Subject: [PATCH 102/322] Better document delete methods

---
 .../main/java/com/google/gcloud/storage/Blob.java    |  6 +++---
 .../main/java/com/google/gcloud/storage/Bucket.java  |  2 +-
 .../main/java/com/google/gcloud/storage/Storage.java | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index a8e315be0e45..503cad361e29 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -281,7 +281,7 @@ public CopyWriter copyTo(BlobId targetBlob, BlobSourceOption... options) {
    * Deletes this blob.
    *
    * @param options blob delete options
-   * @return true if blob was deleted
+   * @return {@code true} if blob was deleted, {@code false} if it was not found
    * @throws StorageException upon failure
    */
   public boolean delete(BlobSourceOption... options) {
@@ -422,8 +422,8 @@ public Blob apply(BlobInfo f) {
    * @param storage the storage service used to issue the request
    * @param blobs the blobs to delete
    * @return an immutable list of booleans. If a blob has been deleted the corresponding item in the
-   *     list is {@code true}. If deletion failed or access to the resource was denied the item is
-   *     {@code false}.
+   *     list is {@code true}. If a blob was not found, deletion failed or access to the resource
+   *     was denied the corresponding item is {@code false}.
    * @throws StorageException upon failure
    */
   public static List delete(Storage storage, BlobId... blobs) {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 21aafd92b5d4..54e60cc006dc 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -271,7 +271,7 @@ public Bucket update(BucketInfo bucketInfo, BucketTargetOption... options) {
    * Deletes this bucket.
    *
    * @param options bucket delete options
-   * @return true if bucket was deleted
+   * @return {@code true} if bucket was deleted, {@code false} if it was not found
    * @throws StorageException upon failure
    */
   public boolean delete(BucketSourceOption... options) {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index b61cfb269c1a..1fe096524ab7 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -1316,7 +1316,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Delete the requested bucket.
    *
-   * @return true if bucket was deleted
+   * @return {@code true} if bucket was deleted, {@code false} if it was not found
    * @throws StorageException upon failure
    */
   boolean delete(String bucket, BucketSourceOption... options);
@@ -1324,7 +1324,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Delete the requested blob.
    *
-   * @return true if blob was deleted
+   * @return {@code true} if blob was deleted, {@code false} if it was not found
    * @throws StorageException upon failure
    */
   boolean delete(String bucket, String blob, BlobSourceOption... options);
@@ -1332,7 +1332,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Delete the requested blob.
    *
-   * @return true if blob was deleted
+   * @return {@code true} if blob was deleted, {@code false} if it was not found
    * @throws StorageException upon failure
    */
   boolean delete(BlobId blob, BlobSourceOption... options);
@@ -1340,7 +1340,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Delete the requested blob.
    *
-   * @return true if blob was deleted
+   * @return {@code true} if blob was deleted, {@code false} if it was not found
    * @throws StorageException upon failure
    */
   boolean delete(BlobId blob);
@@ -1478,8 +1478,8 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    *
    * @param blobIds blobs to delete
    * @return an immutable list of booleans. If a blob has been deleted the corresponding item in the
-   *     list is {@code true}. If deletion failed or access to the resource was denied the item is
-   *     {@code false}.
+   *     list is {@code true}. If a blob was not found, deletion failed or access to the resource
+   *     was denied the corresponding item is {@code false}.
    * @throws StorageException upon failure
    */
   List delete(BlobId... blobIds);

From e22e8a3e6d6052c831f9e9f4237f428a7bb7558a Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 17 Nov 2015 16:55:42 +0100
Subject: [PATCH 103/322] Make batch delete return false if not found

---
 .../main/java/com/google/gcloud/spi/DefaultStorageRpc.java  | 6 +++++-
 .../test/java/com/google/gcloud/storage/ITStorageTest.java  | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 55bca2319c2d..1021a58f64fe 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -368,7 +368,11 @@ public void onSuccess(Void ignore, HttpHeaders responseHeaders) {
 
           @Override
           public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
-            deletes.put(tuple.x(), Tuple.of(null, translate(e)));
+            if (e.getCode() == 404) {
+              deletes.put(tuple.x(), Tuple.of(Boolean.FALSE, null));
+            } else {
+              deletes.put(tuple.x(), Tuple.of(null, translate(e)));
+            }
           }
         });
       }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index d22bf06c8b16..0d4e876271e3 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -644,7 +644,8 @@ public void testBatchRequestFail() {
     assertFalse(batchResponse.gets().get(1).failed());
     assertNull(batchResponse.gets().get(1).get());
     assertTrue(batchResponse.deletes().get(0).failed());
-    assertTrue(batchResponse.deletes().get(1).failed());
+    assertFalse(batchResponse.deletes().get(1).failed());
+    assertFalse(batchResponse.deletes().get(1).get());
     assertTrue(storage.delete(BUCKET, blobName));
   }
 

From c3b6616c98982a201c1dcd6a5b1e7d3210d009d6 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 9 Nov 2015 17:04:23 +0100
Subject: [PATCH 104/322] Use GOOGLE_APPLICATION_CREDENTIALS and GCLOUD_PROJECT
 vars in RemoteGcsHelper

---
 .../storage/testing/RemoteGcsHelper.java      | 57 +++++++------------
 utilities/integration_test_env.sh             |  4 +-
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
index b15768cffa98..f5cdae83f999 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
@@ -45,8 +45,6 @@ public class RemoteGcsHelper {
 
   private static final Logger log = Logger.getLogger(RemoteGcsHelper.class.getName());
   private static final String BUCKET_NAME_PREFIX = "gcloud-test-bucket-temp-";
-  private static final String PROJECT_ID_ENV_VAR = "GCLOUD_TESTS_PROJECT_ID";
-  private static final String PRIVATE_KEY_ENV_VAR = "GCLOUD_TESTS_KEY";
   private final StorageOptions options;
 
   private RemoteGcsHelper(StorageOptions options) {
@@ -107,13 +105,7 @@ public static RemoteGcsHelper create(String projectId, InputStream keyStream)
       StorageOptions storageOptions = StorageOptions.builder()
           .authCredentials(AuthCredentials.createForJson(keyStream))
           .projectId(projectId)
-          .retryParams(RetryParams.builder()
-              .retryMaxAttempts(10)
-              .retryMinAttempts(6)
-              .maxRetryDelayMillis(30000)
-              .totalRetryPeriodMillis(120000)
-              .initialRetryDelayMillis(250)
-              .build())
+          .retryParams(retryParams())
           .connectTimeout(60000)
           .readTimeout(60000)
           .build();
@@ -145,41 +137,30 @@ public static RemoteGcsHelper create(String projectId, String keyPath)
         log.log(Level.WARNING, ex.getMessage());
       }
       throw GcsHelperException.translate(ex);
-    } catch (IOException ex) {
-      if (log.isLoggable(Level.WARNING)) {
-        log.log(Level.WARNING, ex.getMessage());
-      }
-      throw GcsHelperException.translate(ex);
     }
   }
 
   /**
-   * Creates a {@code RemoteGcsHelper} object. Project id and path to JSON key are read from two
-   * environment variables: {@code GCLOUD_TESTS_PROJECT_ID} and {@code GCLOUD_TESTS_KEY}.
-   *
-   * @return A {@code RemoteGcsHelper} object for the provided options.
-   * @throws com.google.gcloud.storage.testing.RemoteGcsHelper.GcsHelperException if environment
-   *     variables {@code GCLOUD_TESTS_PROJECT_ID} and {@code GCLOUD_TESTS_KEY} are not set or if
-   *     the file pointed by {@code GCLOUD_TESTS_KEY} does not exist
+   * Creates a {@code RemoteGcsHelper} object using default project id and authentication
+   * credentials.
    */
   public static RemoteGcsHelper create() throws GcsHelperException {
-    String projectId = System.getenv(PROJECT_ID_ENV_VAR);
-    String keyPath = System.getenv(PRIVATE_KEY_ENV_VAR);
-    if (projectId == null) {
-      String message = "Environment variable " + PROJECT_ID_ENV_VAR + " not set";
-      if (log.isLoggable(Level.WARNING)) {
-        log.log(Level.WARNING, message);
-      }
-      throw new GcsHelperException(message);
-    }
-    if (keyPath == null) {
-      String message = "Environment variable " + PRIVATE_KEY_ENV_VAR + " not set";
-      if (log.isLoggable(Level.WARNING)) {
-        log.log(Level.WARNING, message);
-      }
-      throw new GcsHelperException(message);
-    }
-    return create(projectId, keyPath);
+    StorageOptions storageOptions = StorageOptions.builder()
+        .retryParams(retryParams())
+        .connectTimeout(60000)
+        .readTimeout(60000)
+        .build();
+    return new RemoteGcsHelper(storageOptions);
+  }
+
+  private static RetryParams retryParams() {
+    return RetryParams.builder()
+        .retryMaxAttempts(10)
+        .retryMinAttempts(6)
+        .maxRetryDelayMillis(30000)
+        .totalRetryPeriodMillis(120000)
+        .initialRetryDelayMillis(250)
+        .build();
   }
 
   private static class DeleteBucketTask implements Callable {
diff --git a/utilities/integration_test_env.sh b/utilities/integration_test_env.sh
index f7aca1a8a623..a1bebe4dcb69 100755
--- a/utilities/integration_test_env.sh
+++ b/utilities/integration_test_env.sh
@@ -1,3 +1,3 @@
 # Export test env variables
-export GCLOUD_TESTS_PROJECT_ID="gcloud-devel"
-export GCLOUD_TESTS_KEY=$TRAVIS_BUILD_DIR/signing-tools/gcloud-devel-travis.json
+export GCLOUD_PROJECT="gcloud-devel"
+export GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/signing-tools/gcloud-devel-travis.json

From 82ebc7128133d7727eec8e85df927ec9599205f8 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 17 Nov 2015 17:15:27 +0100
Subject: [PATCH 105/322] Add support for signUrl when default credentials are
 used - Add a method to convert ApplicationDefaultCredentials to
 ServiceAccountAuthCredentials - Add type check and conversion to
 Storage.signUrl

---
 .../java/com/google/gcloud/AuthCredentials.java    | 12 +++++++++++-
 .../com/google/gcloud/storage/StorageImpl.java     | 14 +++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
index 800fcf340689..afd785981ab9 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -28,6 +28,7 @@
 import com.google.api.client.json.jackson.JacksonFactory;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auth.oauth2.GoogleCredentials;
+import com.google.auth.oauth2.ServiceAccountCredentials;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -212,7 +213,7 @@ public RestorableState capture() {
     }
   }
 
-  private static class ApplicationDefaultAuthCredentials extends AuthCredentials {
+  public static class ApplicationDefaultAuthCredentials extends AuthCredentials {
 
     private GoogleCredentials googleCredentials;
 
@@ -255,6 +256,15 @@ protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
       return new HttpCredentialsAdapter(googleCredentials.createScoped(scopes));
     }
 
+    public ServiceAccountAuthCredentials toServiceAccountCredentials() {
+      if (googleCredentials instanceof ServiceAccountCredentials) {
+        ServiceAccountCredentials credentials = (ServiceAccountCredentials) googleCredentials;
+        return new ServiceAccountAuthCredentials(credentials.getClientEmail(),
+            credentials.getPrivateKey());
+      }
+      return null;
+    }
+
     @Override
     public RestorableState capture() {
       return STATE;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index fa059254eddb..8ae3948a7576 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -43,6 +43,8 @@
 import com.google.common.hash.Hashing;
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.Ints;
+import com.google.gcloud.AuthCredentials;
+import com.google.gcloud.AuthCredentials.ApplicationDefaultAuthCredentials;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.PageImpl;
 import com.google.gcloud.BaseService;
@@ -584,9 +586,15 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
     ServiceAccountAuthCredentials cred =
         (ServiceAccountAuthCredentials) optionMap.get(SignUrlOption.Option.SERVICE_ACCOUNT_CRED);
     if (cred == null) {
-      checkArgument(options().authCredentials() instanceof ServiceAccountAuthCredentials,
-          "Signing key was not provided and could not be derived");
-      cred = (ServiceAccountAuthCredentials) this.options().authCredentials();
+      AuthCredentials serviceCred = this.options().authCredentials();
+      if (serviceCred instanceof ServiceAccountAuthCredentials) {
+        cred = (ServiceAccountAuthCredentials) serviceCred;
+      } else {
+        if (serviceCred instanceof ApplicationDefaultAuthCredentials) {
+          cred = ((ApplicationDefaultAuthCredentials) serviceCred).toServiceAccountCredentials();
+        }
+      }
+      checkArgument(cred != null, "Signing key was not provided and could not be derived");
     }
     // construct signature - see https://cloud.google.com/storage/docs/access-control#Signed-URLs
     StringBuilder stBuilder = new StringBuilder();

From 93da8a9cde7af69c0ac21694266c5d238cbd6d70 Mon Sep 17 00:00:00 2001
From: Arie Ozarov 
Date: Tue, 17 Nov 2015 19:39:46 -0800
Subject: [PATCH 106/322] fix readmes for storage

---
 README.md                     | 3 +--
 gcloud-java-storage/README.md | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bba06a7e60d4..03bf2e69f915 100644
--- a/README.md
+++ b/README.md
@@ -164,8 +164,7 @@ import com.google.gcloud.storage.StorageOptions;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-StorageOptions options = StorageOptions.builder().projectId("project").build();
-Storage storage = options.service();
+Storage storage = StorageOptions.defaultInstance().service();
 BlobId blobId = BlobId.of("bucket", "blob_name");
 Blob blob = Blob.load(storage, blobId);
 if (blob == null) {
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 8b19484dd14d..0302439a4314 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -68,7 +68,7 @@ import com.google.gcloud.storage.StorageOptions;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-Storage storage = StorageOptions.getDefaultInstance().service();
+Storage storage = StorageOptions.defaultInstance().service();
 Blob blob = new Blob(storage, "bucket", "blob_name");
 if (!blob.exists()) {
   storage2.create(blob.info(), "Hello, Cloud Storage!".getBytes(UTF_8));

From 87e4bac0dff3ef1f36f67e6a119072edd0d3509c Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 18 Nov 2015 11:36:56 +0100
Subject: [PATCH 107/322] Fix BlobWriteChannel and BlobReadChannel javadoc

---
 .../main/java/com/google/gcloud/storage/BlobReadChannel.java | 5 ++---
 .../java/com/google/gcloud/storage/BlobWriteChannel.java     | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
index 205dc4b97309..54d39649cb70 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
@@ -26,9 +26,8 @@
 /**
  * A channel for reading data from a Google Cloud Storage object.
  *
- * Implementations of this class may buffer data internally to reduce remote calls.
- *
- * This class is @{link Serializable}, which allows incremental reads.
+ * Implementations of this class may buffer data internally to reduce remote calls. This interface
+ * implements {@link Restorable} to allow saving the reader's state to continue reading afterwards.
  */
 public interface BlobReadChannel extends ReadableByteChannel, Closeable,
     Restorable {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java
index a6208e5020ae..fe9164532120 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java
@@ -26,8 +26,8 @@
  * A channel for writing data to a Google Cloud Storage object.
  *
  * Implementations of this class may further buffer data internally to reduce remote calls. Written
- * data will only be visible after calling {@link #close()}. This class is serializable, to allow
- * incremental writes.
+ * data will only be visible after calling {@link #close()}. This interface implements
+ * {@link Restorable} to allow saving the writer's state to continue writing afterwards.
  */
 public interface BlobWriteChannel extends WritableByteChannel, Closeable,
     Restorable {

From 65373146e8cd827011631eb111ad4a5b52f5c2a5 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 18 Nov 2015 11:39:08 +0100
Subject: [PATCH 108/322] BlobReadChannel fails if blob is updated while being
 read - Change StorageRpc.read to return a pair (etag, bytes) - Keep track the
 last read etag in BlobReadChannelImpl to detect changes - Throw
 StorageException if new etag does not match the last one - Add unit and
 integration tests - Document this behavior in Storage.reader javadoc

---
 .../google/gcloud/spi/DefaultStorageRpc.java  | 15 +++---
 .../com/google/gcloud/spi/StorageRpc.java     |  2 +-
 .../gcloud/storage/BlobReadChannelImpl.java   | 27 +++++++++--
 .../com/google/gcloud/storage/Storage.java    | 11 ++++-
 .../storage/BlobReadChannelImplTest.java      | 48 ++++++++++++++-----
 .../google/gcloud/storage/ITStorageTest.java  | 34 +++++++++++++
 .../gcloud/storage/StorageImplTest.java       |  4 +-
 7 files changed, 114 insertions(+), 27 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 55bca2319c2d..7a636616d810 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -410,8 +410,8 @@ public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
   }
 
   @Override
-  public byte[] read(StorageObject from, Map options, long position, int bytes)
-      throws StorageException {
+  public Tuple read(StorageObject from, Map options, long position,
+      int bytes) throws StorageException {
     try {
       Get req = storage.objects()
           .get(from.getBucket(), from.getName())
@@ -420,12 +420,13 @@ public byte[] read(StorageObject from, Map options, long position, in
           .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(options))
           .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(options))
           .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(options));
-      MediaHttpDownloader downloader = req.getMediaHttpDownloader();
-      downloader.setContentRange(position, Ints.checkedCast(position + bytes - 1));
-      downloader.setDirectDownloadEnabled(true);
+      StringBuilder range = new StringBuilder();
+      range.append("bytes=").append(position).append("-").append(position + bytes - 1);
+      req.getRequestHeaders().setRange(range.toString());
       ByteArrayOutputStream output = new ByteArrayOutputStream();
-      req.executeMediaAndDownloadTo(output);
-      return output.toByteArray();
+      req.executeMedia().download(output);
+      String etag = req.getLastResponseHeaders().getETag();
+      return Tuple.of(etag, output.toByteArray());
     } catch (IOException ex) {
       throw translate(ex);
     }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
index e4b1be785951..2e85bd72bf05 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
@@ -249,7 +249,7 @@ StorageObject compose(Iterable sources, StorageObject target,
   byte[] load(StorageObject storageObject, Map options)
       throws StorageException;
 
-  byte[] read(StorageObject from, Map options, long position, int bytes)
+  Tuple read(StorageObject from, Map options, long position, int bytes)
       throws StorageException;
 
   String open(StorageObject object, Map options) throws StorageException;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java
index 09047a642218..8fe6eae66d8f 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java
@@ -23,6 +23,7 @@
 import com.google.gcloud.RestorableState;
 import com.google.gcloud.RetryHelper;
 import com.google.gcloud.spi.StorageRpc;
+import com.google.gcloud.spi.StorageRpc.Tuple;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -41,6 +42,7 @@ class BlobReadChannelImpl implements BlobReadChannel {
   private final StorageOptions serviceOptions;
   private final BlobId blob;
   private final Map requestOptions;
+  private String lastEtag;
   private int position;
   private boolean isOpen;
   private boolean endOfStream;
@@ -117,12 +119,19 @@ public int read(ByteBuffer byteBuffer) throws IOException {
       }
       final int toRead = Math.max(byteBuffer.remaining(), chunkSize);
       try {
-        buffer = runWithRetries(new Callable() {
+        Tuple result = runWithRetries(new Callable>() {
           @Override
-          public byte[] call() {
+          public Tuple call() {
             return storageRpc.read(storageObject, requestOptions, position, toRead);
           }
         }, serviceOptions.retryParams(), StorageImpl.EXCEPTION_HANDLER);
+        if (lastEtag != null && !Objects.equals(result.x(), lastEtag)) {
+          StringBuilder messageBuilder = new StringBuilder();
+          messageBuilder.append("Blob ").append(blob).append(" was updated while reading");
+          throw new StorageException(0, messageBuilder.toString(), false);
+        }
+        lastEtag = result.x();
+        buffer = result.y();
       } catch (RetryHelper.RetryHelperException e) {
         throw StorageException.translateAndThrow(e);
       }
@@ -152,6 +161,7 @@ static class StateImpl implements RestorableState, Serializable
     private final StorageOptions serviceOptions;
     private final BlobId blob;
     private final Map requestOptions;
+    private final String lastEtag;
     private final int position;
     private final boolean isOpen;
     private final boolean endOfStream;
@@ -161,6 +171,7 @@ static class StateImpl implements RestorableState, Serializable
       this.serviceOptions = builder.serviceOptions;
       this.blob = builder.blob;
       this.requestOptions = builder.requestOptions;
+      this.lastEtag = builder.lastEtag;
       this.position = builder.position;
       this.isOpen = builder.isOpen;
       this.endOfStream = builder.endOfStream;
@@ -171,6 +182,7 @@ static class Builder {
       private final StorageOptions serviceOptions;
       private final BlobId blob;
       private final Map requestOptions;
+      private String lastEtag;
       private int position;
       private boolean isOpen;
       private boolean endOfStream;
@@ -182,6 +194,11 @@ private Builder(StorageOptions options, BlobId blob, Map r
         this.requestOptions = reqOptions;
       }
 
+      Builder lastEtag(String lastEtag) {
+        this.lastEtag = lastEtag;
+        return this;
+      }
+
       Builder position(int position) {
         this.position = position;
         return this;
@@ -215,6 +232,7 @@ static Builder builder(
     @Override
     public BlobReadChannel restore() {
       BlobReadChannelImpl channel = new BlobReadChannelImpl(serviceOptions, blob, requestOptions);
+      channel.lastEtag = lastEtag;
       channel.position = position;
       channel.isOpen = isOpen;
       channel.endOfStream = endOfStream;
@@ -224,8 +242,8 @@ public BlobReadChannel restore() {
 
     @Override
     public int hashCode() {
-      return Objects.hash(serviceOptions, blob, requestOptions, position, isOpen, endOfStream,
-          chunkSize);
+      return Objects.hash(serviceOptions, blob, requestOptions, lastEtag, position, isOpen,
+          endOfStream, chunkSize);
     }
 
     @Override
@@ -240,6 +258,7 @@ public boolean equals(Object obj) {
       return Objects.equals(this.serviceOptions, other.serviceOptions)
           && Objects.equals(this.blob, other.blob)
           && Objects.equals(this.requestOptions, other.requestOptions)
+          && Objects.equals(this.lastEtag, other.lastEtag)
           && this.position == other.position
           && this.isOpen == other.isOpen
           && this.endOfStream == other.endOfStream
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index b61cfb269c1a..301b71ec5fe9 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -33,6 +33,7 @@
 import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URL;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -1405,14 +1406,20 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   BatchResponse apply(BatchRequest batchRequest);
 
   /**
-   * Return a channel for reading the blob's content.
+   * Return a channel for reading the blob's content. The blob's latest generation is read. If the
+   * blob changes while reading (i.e. {@link BlobInfo#etag()} changes), subsequent calls to
+   * {@link BlobReadChannel#read(ByteBuffer)} may throw {@link StorageException}.
    *
    * @throws StorageException upon failure
    */
   BlobReadChannel reader(String bucket, String blob, BlobSourceOption... options);
 
   /**
-   * Return a channel for reading the blob's content.
+   * Return a channel for reading the blob's content. If {@code blob.generation()} is set
+   * data corresponding to that generation is read. If {@code blob.generation()} is {@code null}
+   * the blob's latest generation is read. If the blob changes while reading (i.e.
+   * {@link BlobInfo#etag()} changes), subsequent calls to {@link BlobReadChannel#read(ByteBuffer)}
+   * may throw {@link StorageException}.
    *
    * @throws StorageException upon failure
    */
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
index e1f904bf72fe..fe0f7a02ae4e 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
@@ -19,7 +19,6 @@
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertArrayEquals;
@@ -46,7 +45,7 @@ public class BlobReadChannelImplTest {
 
   private static final String BUCKET_NAME = "b";
   private static final String BLOB_NAME = "n";
-  private static final BlobId BLOB_ID = BlobId.of(BUCKET_NAME, BLOB_NAME);
+  private static final BlobId BLOB_ID = BlobId.of(BUCKET_NAME, BLOB_NAME, -1L);
   private static final Map EMPTY_RPC_OPTIONS = ImmutableMap.of();
   private static final int DEFAULT_CHUNK_SIZE = 2 * 1024 * 1024;
   private static final int CUSTOM_CHUNK_SIZE = 2 * 1024 * 1024;
@@ -88,7 +87,7 @@ public void testReadBuffered() throws IOException {
     ByteBuffer firstReadBuffer = ByteBuffer.allocate(42);
     ByteBuffer secondReadBuffer = ByteBuffer.allocate(42);
     expect(storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
-        .andReturn(result);
+        .andReturn(StorageRpc.Tuple.of("etag", result));
     replay(storageRpcMock);
     reader.read(firstReadBuffer);
     reader.read(secondReadBuffer);
@@ -107,10 +106,11 @@ public void testReadBig() throws IOException {
     byte[] secondResult = randomByteArray(DEFAULT_CHUNK_SIZE);
     ByteBuffer firstReadBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
     ByteBuffer secondReadBuffer = ByteBuffer.allocate(42);
-    storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, 0, DEFAULT_CHUNK_SIZE);
-    expectLastCall().andReturn(firstResult);
-    storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, DEFAULT_CHUNK_SIZE, CUSTOM_CHUNK_SIZE);
-    expectLastCall().andReturn(secondResult);
+    expect(storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
+        .andReturn(StorageRpc.Tuple.of("etag", firstResult));
+    expect(storageRpcMock.read(
+        BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, DEFAULT_CHUNK_SIZE, CUSTOM_CHUNK_SIZE))
+            .andReturn(StorageRpc.Tuple.of("etag", secondResult));
     replay(storageRpcMock);
     reader.read(firstReadBuffer);
     reader.read(secondReadBuffer);
@@ -125,7 +125,7 @@ public void testReadFinish() throws IOException {
     byte[] result = {};
     ByteBuffer readBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
     expect(storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
-        .andReturn(result);
+        .andReturn(StorageRpc.Tuple.of("etag", result));
     replay(storageRpcMock);
     assertEquals(-1, reader.read(readBuffer));
   }
@@ -137,7 +137,7 @@ public void testSeek() throws IOException {
     byte[] result = randomByteArray(DEFAULT_CHUNK_SIZE);
     ByteBuffer readBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
     expect(storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, 42, DEFAULT_CHUNK_SIZE))
-        .andReturn(result);
+        .andReturn(StorageRpc.Tuple.of("etag", result));
     replay(storageRpcMock);
     reader.read(readBuffer);
     assertArrayEquals(result, readBuffer.array());
@@ -166,6 +166,32 @@ public void testReadClosed() {
     }
   }
 
+  @Test
+  public void testReadGenerationChanged() throws IOException {
+    BlobId blobId = BlobId.of(BUCKET_NAME, BLOB_NAME);
+    reader = new BlobReadChannelImpl(options, blobId, EMPTY_RPC_OPTIONS);
+    byte[] firstResult = randomByteArray(DEFAULT_CHUNK_SIZE);
+    byte[] secondResult = randomByteArray(DEFAULT_CHUNK_SIZE);
+    ByteBuffer firstReadBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
+    ByteBuffer secondReadBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
+    expect(storageRpcMock.read(blobId.toPb(), EMPTY_RPC_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
+        .andReturn(StorageRpc.Tuple.of("etag1", firstResult));
+    expect(storageRpcMock.read(
+        blobId.toPb(), EMPTY_RPC_OPTIONS, DEFAULT_CHUNK_SIZE, DEFAULT_CHUNK_SIZE))
+            .andReturn(StorageRpc.Tuple.of("etag2", firstResult));
+    replay(storageRpcMock);
+    reader.read(firstReadBuffer);
+    try {
+      reader.read(secondReadBuffer);
+      fail("Expected BlobReadChannel read to throw StorageException");
+    } catch (StorageException ex) {
+      StringBuilder messageBuilder = new StringBuilder();
+      messageBuilder.append("Blob ").append(blobId).append(" was updated while reading");
+      assertEquals(messageBuilder.toString(), ex.getMessage());
+      // expected
+    }
+  }
+
   @Test
   public void testSaveAndRestore() throws IOException, ClassNotFoundException {
     byte[] firstResult = randomByteArray(DEFAULT_CHUNK_SIZE);
@@ -173,9 +199,9 @@ public void testSaveAndRestore() throws IOException, ClassNotFoundException {
     ByteBuffer firstReadBuffer = ByteBuffer.allocate(42);
     ByteBuffer secondReadBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
     expect(storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
-        .andReturn(firstResult);
+        .andReturn(StorageRpc.Tuple.of("etag", firstResult));
     expect(storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, 42, DEFAULT_CHUNK_SIZE))
-        .andReturn(secondResult);
+        .andReturn(StorageRpc.Tuple.of("etag", secondResult));
     replay(storageRpcMock);
     reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     reader.read(firstReadBuffer);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index d22bf06c8b16..c5f4fc09bcba 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -49,6 +49,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -730,6 +731,39 @@ public void testReadChannelFail() throws IOException {
     assertTrue(storage.delete(BUCKET, blobName));
   }
 
+  @Test
+  public void testReadChannelFailUpdatedGeneration() throws IOException {
+    String blobName = "test-read-blob-fail-updated-generation";
+    BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
+    Random random = new Random();
+    int chunkSize = 1024;
+    int blobSize = 2 * chunkSize;
+    byte[] content = new byte[blobSize];
+    random.nextBytes(content);
+    BlobInfo remoteBlob = storage.create(blob, content);
+    assertNotNull(remoteBlob);
+    assertEquals(blobSize, (long) remoteBlob.size());
+    try (BlobReadChannel reader = storage.reader(blob.blobId())) {
+      reader.chunkSize(chunkSize);
+      ByteBuffer readBytes = ByteBuffer.allocate(chunkSize);
+      int numReadBytes = reader.read(readBytes);
+      assertEquals(chunkSize, numReadBytes);
+      assertArrayEquals(Arrays.copyOf(content, chunkSize), readBytes.array());
+      try (BlobWriteChannel writer = storage.writer(blob)) {
+        byte[] newContent = new byte[blobSize];
+        random.nextBytes(newContent);
+        int numWrittenBytes = writer.write(ByteBuffer.wrap(newContent));
+        assertEquals(blobSize, numWrittenBytes);
+      }
+      readBytes = ByteBuffer.allocate(chunkSize);
+      reader.read(readBytes);
+      fail("StorageException was expected");
+    } catch(StorageException ex) {
+      // expected
+    }
+    assertTrue(storage.delete(BUCKET, blobName));
+  }
+
   @Test
   public void testWriteChannelFail() throws IOException {
     String blobName = "test-write-channel-blob-fail";
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 359920314e82..32a466a9d551 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -1030,7 +1030,7 @@ public void testReaderWithOptions() throws IOException {
     byte[] result = new byte[DEFAULT_CHUNK_SIZE];
     EasyMock.expect(
         storageRpcMock.read(BLOB_INFO2.toPb(), BLOB_SOURCE_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
-        .andReturn(result);
+        .andReturn(StorageRpc.Tuple.of("etag", result));
     EasyMock.replay(storageRpcMock);
     storage = options.service();
     BlobReadChannel channel = storage.reader(BUCKET_NAME1, BLOB_NAME2, BLOB_SOURCE_GENERATION,
@@ -1045,7 +1045,7 @@ public void testReaderWithOptionsFromBlobId() throws IOException {
     byte[] result = new byte[DEFAULT_CHUNK_SIZE];
     EasyMock.expect(
         storageRpcMock.read(BLOB_INFO1.blobId().toPb(), BLOB_SOURCE_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
-        .andReturn(result);
+        .andReturn(StorageRpc.Tuple.of("etag", result));
     EasyMock.replay(storageRpcMock);
     storage = options.service();
     BlobReadChannel channel = storage.reader(BLOB_INFO1.blobId(),

From 1e7fe54e8cef571608ab4992c2769b5cad5c615b Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 18 Nov 2015 10:16:37 +0100
Subject: [PATCH 109/322] Move all checks for HTTP_NOT_FOUND to
 DefaultStorageRpc

---
 .../google/gcloud/spi/DefaultStorageRpc.java  | 31 ++++++++++----
 .../com/google/gcloud/spi/StorageRpc.java     | 10 +++++
 .../google/gcloud/storage/StorageImpl.java    | 40 +++++--------------
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 1021a58f64fe..0bd80a9c11ce 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -30,6 +30,7 @@
 import static com.google.gcloud.spi.StorageRpc.Option.PREDEFINED_DEFAULT_OBJECT_ACL;
 import static com.google.gcloud.spi.StorageRpc.Option.PREFIX;
 import static com.google.gcloud.spi.StorageRpc.Option.VERSIONS;
+import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 
 import com.google.api.client.googleapis.batch.json.JsonBatchCallback;
 import com.google.api.client.googleapis.json.GoogleJsonError;
@@ -94,7 +95,8 @@ public DefaultStorageRpc(StorageOptions options) {
 
   private static StorageException translate(IOException exception) {
     StorageException translated;
-    if (exception instanceof GoogleJsonResponseException) {
+    if (exception instanceof GoogleJsonResponseException
+        && ((GoogleJsonResponseException) exception).getDetails() != null) {
       translated = translate(((GoogleJsonResponseException) exception).getDetails());
     } else {
       translated = new StorageException(0, exception.getMessage(), false);
@@ -191,7 +193,11 @@ public Bucket get(Bucket bucket, Map options) {
           .setFields(FIELDS.getString(options))
           .execute();
     } catch (IOException ex) {
-      throw translate(ex);
+      StorageException serviceException = translate(ex);
+      if (serviceException.code() == HTTP_NOT_FOUND) {
+        return null;
+      }
+      throw serviceException;
     }
   }
 
@@ -200,7 +206,11 @@ public StorageObject get(StorageObject object, Map options) {
     try {
       return getRequest(object, options).execute();
     } catch (IOException ex) {
-      throw translate(ex);
+      StorageException serviceException = translate(ex);
+      if (serviceException.code() == HTTP_NOT_FOUND) {
+        return null;
+      }
+      throw serviceException;
     }
   }
 
@@ -265,7 +275,7 @@ public boolean delete(Bucket bucket, Map options) {
       return true;
     } catch (IOException ex) {
       StorageException serviceException = translate(ex);
-      if (serviceException.code() == 404) {
+      if (serviceException.code() == HTTP_NOT_FOUND) {
         return false;
       }
       throw serviceException;
@@ -279,7 +289,7 @@ public boolean delete(StorageObject blob, Map options) {
       return true;
     } catch (IOException ex) {
       StorageException serviceException = translate(ex);
-      if (serviceException.code() == 404) {
+      if (serviceException.code() == HTTP_NOT_FOUND) {
         return false;
       }
       throw serviceException;
@@ -368,7 +378,7 @@ public void onSuccess(Void ignore, HttpHeaders responseHeaders) {
 
           @Override
           public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
-            if (e.getCode() == 404) {
+            if (e.getCode() == HTTP_NOT_FOUND) {
               deletes.put(tuple.x(), Tuple.of(Boolean.FALSE, null));
             } else {
               deletes.put(tuple.x(), Tuple.of(null, translate(e)));
@@ -401,8 +411,13 @@ public void onSuccess(StorageObject storageObject, HttpHeaders responseHeaders)
 
           @Override
           public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
-            gets.put(tuple.x(),
-                Tuple.of(null, translate(e)));
+            if (e.getCode() == HTTP_NOT_FOUND) {
+              gets.put(tuple.x(),
+                  Tuple.of(null, null));
+            } else {
+              gets.put(tuple.x(),
+                  Tuple.of(null, translate(e)));
+            }
           }
         });
       }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
index e4b1be785951..1f708c269ad0 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
@@ -227,8 +227,18 @@ StorageObject create(StorageObject object, InputStream content, Map o
   Tuple> list(String bucket, Map options)
       throws StorageException;
 
+  /**
+   * Returns the requested bucket or {@code null} if not found.
+   *
+   * @throws StorageException upon failure
+   */
   Bucket get(Bucket bucket, Map options) throws StorageException;
 
+  /**
+   * Returns the requested storage object or {@code null} if not found.
+   *
+   * @throws StorageException upon failure
+   */
   StorageObject get(StorageObject object, Map options)
       throws StorageException;
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index fa059254eddb..0f8d9124a4cf 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -28,7 +28,6 @@
 import static com.google.gcloud.spi.StorageRpc.Option.IF_SOURCE_GENERATION_NOT_MATCH;
 import static com.google.gcloud.spi.StorageRpc.Option.IF_SOURCE_METAGENERATION_MATCH;
 import static com.google.gcloud.spi.StorageRpc.Option.IF_SOURCE_METAGENERATION_NOT_MATCH;
-import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.services.storage.model.StorageObject;
@@ -175,14 +174,7 @@ public BucketInfo get(String bucket, BucketGetOption... options) {
           new Callable() {
             @Override
             public com.google.api.services.storage.model.Bucket call() {
-              try {
-                return storageRpc.get(bucketPb, optionsMap);
-              } catch (StorageException ex) {
-                if (ex.code() == HTTP_NOT_FOUND) {
-                  return null;
-                }
-                throw ex;
-              }
+              return storageRpc.get(bucketPb, optionsMap);
             }
           }, options().retryParams(), EXCEPTION_HANDLER);
       return answer == null ? null : BucketInfo.fromPb(answer);
@@ -204,14 +196,7 @@ public BlobInfo get(BlobId blob, BlobGetOption... options) {
       StorageObject storageObject = runWithRetries(new Callable() {
         @Override
         public StorageObject call() {
-          try {
-            return storageRpc.get(storedObject, optionsMap);
-          } catch (StorageException ex) {
-            if (ex.code() == HTTP_NOT_FOUND) {
-              return null;
-            }
-            throw ex;
-          }
+          return storageRpc.get(storedObject, optionsMap);
         }
       }, options().retryParams(), EXCEPTION_HANDLER);
       return storageObject == null ? null : BlobInfo.fromPb(storageObject);
@@ -523,28 +508,23 @@ public BatchResponse apply(BatchRequest batchRequest) {
     List> updates = transformBatchResult(
         toUpdate, response.updates, BlobInfo.FROM_PB_FUNCTION);
     List> gets = transformBatchResult(
-        toGet, response.gets, BlobInfo.FROM_PB_FUNCTION, HTTP_NOT_FOUND);
+        toGet, response.gets, BlobInfo.FROM_PB_FUNCTION);
     return new BatchResponse(deletes, updates, gets);
   }
 
   private  List> transformBatchResult(
       Iterable>> request,
-      Map> results, Function transform,
-      int... nullOnErrorCodes) {
-    Set nullOnErrorCodesSet = Sets.newHashSet(Ints.asList(nullOnErrorCodes));
+      Map> results, Function transform) {
     List> response = Lists.newArrayListWithCapacity(results.size());
     for (Tuple tuple : request) {
       Tuple result = results.get(tuple.x());
-      if (result.x() != null) {
-        response.add(BatchResponse.Result.of(transform.apply(result.x())));
+      I object = result.x();
+      StorageException exception = result.y();
+      if (exception != null) {
+        response.add(new BatchResponse.Result(exception));
       } else {
-        StorageException exception = result.y();
-        if (nullOnErrorCodesSet.contains(exception.code())) {
-          //noinspection unchecked
-          response.add(BatchResponse.Result.empty());
-        } else {
-          response.add(new BatchResponse.Result(exception));
-        }
+        response.add(object != null ?
+            BatchResponse.Result.of(transform.apply(object)) : BatchResponse.Result.empty());
       }
     }
     return response;

From a5607774aee109dea6de6202a8f9ffb6652bcb6f Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 18 Nov 2015 15:28:48 -0800
Subject: [PATCH 110/322] Use version auth library verison 0.3.1 to avoid NPE

---
 gcloud-java-core/pom.xml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index e849594226db..ea10f5145800 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -20,12 +20,29 @@
     
       com.google.auth
       google-auth-library-credentials
-      0.1.0
+      0.3.1
     
     
       com.google.auth
       google-auth-library-oauth2-http
-      0.1.0
+      0.3.1
+      
+        
+          com.google.guava
+          guava-jdk5
+        
+      
+    
+    
+      com.google.auth
+      google-auth-library-appengine
+      0.3.1
+      
+        
+          com.google.guava
+          guava-jdk5
+        
+      
     
     
       com.google.http-client

From 02694ca9280c9b0c482afcdd10d98b8afe42d50f Mon Sep 17 00:00:00 2001
From: Arie Ozarov 
Date: Wed, 18 Nov 2015 18:05:05 -0800
Subject: [PATCH 111/322] Update javadoc for FullEntity

---
 .../src/main/java/com/google/gcloud/datastore/FullEntity.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/FullEntity.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/FullEntity.java
index bb08fca12e3c..55c573b9a636 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/FullEntity.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/FullEntity.java
@@ -19,7 +19,8 @@
 import com.google.api.services.datastore.DatastoreV1;
 
 /**
- * A full entity is a {@link BaseEntity} that with a complete set of properties.
+ * A full entity is a {@link BaseEntity} that holds all the properties associated with a
+ * Datastore entity (as opposed to {@link ProjectionEntity}).
  */
 public class FullEntity extends BaseEntity {
 

From bfe892428127615e2d75bcc51378c125e76ab637 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 19 Nov 2015 07:41:53 +0100
Subject: [PATCH 112/322] Add message check to IT tests, better javadoc for
 storage.reader

---
 .../java/com/google/gcloud/storage/Storage.java     | 13 +++++++++++--
 .../gcloud/storage/BlobReadChannelImplTest.java     |  1 -
 .../com/google/gcloud/storage/ITStorageTest.java    |  4 +++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 301b71ec5fe9..68a1c3baa3cf 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -1408,7 +1408,11 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Return a channel for reading the blob's content. The blob's latest generation is read. If the
    * blob changes while reading (i.e. {@link BlobInfo#etag()} changes), subsequent calls to
-   * {@link BlobReadChannel#read(ByteBuffer)} may throw {@link StorageException}.
+   * {@code blobReadChannel.read(ByteBuffer)} may throw {@link StorageException}.
+   *
+   * 
The {@link BlobSourceOption#generationMatch(long)} option can be provided to ensure that
+   * {@code blobReadChannel.read(ByteBuffer)} calls will throw {@link StorageException} if blob`s
+   * generation differs from the expected one.
    *
    * @throws StorageException upon failure
    */
@@ -1418,9 +1422,14 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    * Return a channel for reading the blob's content. If {@code blob.generation()} is set
    * data corresponding to that generation is read. If {@code blob.generation()} is {@code null}
    * the blob's latest generation is read. If the blob changes while reading (i.e.
-   * {@link BlobInfo#etag()} changes), subsequent calls to {@link BlobReadChannel#read(ByteBuffer)}
+   * {@link BlobInfo#etag()} changes), subsequent calls to {@code blobReadChannel.read(ByteBuffer)}
    * may throw {@link StorageException}.
    *
+   * 
The {@link BlobSourceOption#generationMatch()} and
+   * {@link BlobSourceOption#generationMatch(long)} options can be used to ensure that
+   * {@code blobReadChannel.read(ByteBuffer)} calls will throw {@link StorageException} if the
+   * blob`s generation differs from the expected one.
+   *
    * @throws StorageException upon failure
    */
   BlobReadChannel reader(BlobId blob, BlobSourceOption... options);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
index fe0f7a02ae4e..f99fe893d0d9 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
@@ -188,7 +188,6 @@ public void testReadGenerationChanged() throws IOException {
       StringBuilder messageBuilder = new StringBuilder();
       messageBuilder.append("Blob ").append(blobId).append(" was updated while reading");
       assertEquals(messageBuilder.toString(), ex.getMessage());
-      // expected
     }
   }
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index c5f4fc09bcba..e76ebf54eb2d 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -759,7 +759,9 @@ public void testReadChannelFailUpdatedGeneration() throws IOException {
       reader.read(readBytes);
       fail("StorageException was expected");
     } catch(StorageException ex) {
-      // expected
+      StringBuilder messageBuilder = new StringBuilder();
+      messageBuilder.append("Blob ").append(blob.blobId()).append(" was updated while reading");
+      assertEquals(messageBuilder.toString(), ex.getMessage());
     }
     assertTrue(storage.delete(BUCKET, blobName));
   }

From e3a99c2f9314f938bafd9fd5d19a98a43335bd98 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 19 Nov 2015 09:41:42 +0100
Subject: [PATCH 113/322] Add error codes, handle NOT_FOUND in BigQuery RPC,
 add javadoc

---
 .../com/google/gcloud/spi/BigQueryRpc.java    | 44 ++++++++++++++++++
 .../google/gcloud/spi/DefaultBigQueryRpc.java | 45 +++++++++++++------
 2 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
index 7cce35ab3eb9..a16fed1eb1ab 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
@@ -98,23 +98,57 @@ public Y y() {
     }
   }
 
+  /**
+   * Returns the requested dataset or {@code null} if not found.
+   *
+   * @throws BigQueryException upon failure
+   */
   Dataset getDataset(String datasetId, Map options) throws BigQueryException;
 
+  /**
+   * Lists the project's datasets. Partial information is returned on a dataset (datasetReference,
+   * friendlyName and id). To get full information use {@link #getDataset(String, Map)}.
+   *
+   * @throws BigQueryException upon failure
+   */
   Tuple> listDatasets(Map options) throws BigQueryException;
 
   Dataset create(Dataset dataset, Map options) throws BigQueryException;
 
+  /**
+   * Delete the requested dataset.
+   *
+   * @return {@code true} if dataset was deleted, {@code false} if it was not found
+   * @throws BigQueryException upon failure
+   */
   boolean deleteDataset(String datasetId, Map options) throws BigQueryException;
 
   Dataset patch(Dataset dataset, Map options) throws BigQueryException;
 
+  /**
+   * Returns the requested table or {@code null} if not found.
+   *
+   * @throws BigQueryException upon failure
+   */
   Table getTable(String datasetId, String tableId, Map options) throws BigQueryException;
 
+  /**
+   * Lists the dataset's tables. Partial information is returned on a table (tableReference,
+   * friendlyName, id and type). To get full information use {@link #getTable(String, String, Map)}.
+   *
+   * @throws BigQueryException upon failure
+   */
   Tuple> listTables(String dataset, Map options)
       throws BigQueryException;
 
   Table create(Table table, Map options) throws BigQueryException;
 
+  /**
+   * Delete the requested table.
+   *
+   * @return {@code true} if table was deleted, {@code false} if it was not found
+   * @throws BigQueryException upon failure
+   */
   boolean deleteTable(String datasetId, String tableId, Map options)
       throws BigQueryException;
 
@@ -126,8 +160,18 @@ TableDataInsertAllResponse insertAll(TableReference table, TableDataInsertAllReq
   Tuple> listTableData(String datasetId, String tableId,
       Map options) throws BigQueryException;
 
+  /**
+   * Returns the requested job or {@code null} if not found.
+   *
+   * @throws BigQueryException upon failure
+   */
   Job getJob(String jobId, Map options) throws BigQueryException;
 
+  /**
+   * Lists the project's jobs.
+   *
+   * @throws BigQueryException upon failure
+   */
   Tuple> listJobs(Map options) throws BigQueryException;
 
   Job create(Job job, Map options) throws BigQueryException;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
index fc9760bfa794..a77417e27fb9 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -20,6 +20,7 @@
 import static com.google.gcloud.spi.BigQueryRpc.Option.START_INDEX;
 import static com.google.gcloud.spi.BigQueryRpc.Option.TIMEOUT;
 import static com.google.gcloud.spi.BigQueryRpc.Option.USER_IP;
+import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 
 import com.google.api.client.googleapis.json.GoogleJsonError;
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
@@ -64,7 +65,7 @@ public class DefaultBigQueryRpc implements BigQueryRpc {
 
   public static final String DEFAULT_PROJECTION = "full";
   // see: https://cloud.google.com/bigquery/troubleshooting-errors
-  private static final Set RETRYABLE_CODES = ImmutableSet.of(503);
+  private static final Set RETRYABLE_CODES = ImmutableSet.of(500, 502, 503, 504);
   private final BigQueryOptions options;
   private final Bigquery bigquery;
 
@@ -80,7 +81,8 @@ public DefaultBigQueryRpc(BigQueryOptions options) {
 
   private static BigQueryException translate(IOException exception) {
     BigQueryException translated;
-    if (exception instanceof GoogleJsonResponseException) {
+    if (exception instanceof GoogleJsonResponseException
+        && ((GoogleJsonResponseException) exception).getDetails() != null) {
       translated = translate(((GoogleJsonResponseException) exception).getDetails());
     } else {
       translated =
@@ -91,8 +93,7 @@ private static BigQueryException translate(IOException exception) {
   }
 
   private static BigQueryException translate(GoogleJsonError exception) {
-    boolean retryable = RETRYABLE_CODES.contains(exception.getCode())
-        || "InternalError".equals(exception.getMessage());
+    boolean retryable = RETRYABLE_CODES.contains(exception.getCode());
     return new BigQueryException(exception.getCode(), exception.getMessage(), retryable);
   }
 
@@ -105,8 +106,12 @@ public Dataset getDataset(String datasetId, Map options) throws BigQu
           .setQuotaUser(QUOTA_USER.getString(options))
           .setUserIp(USER_IP.getString(options))
           .execute();
-    } catch (IOException ex) {
-      throw translate(ex);
+    } catch(IOException ex) {
+      BigQueryException serviceException = translate(ex);
+      if (serviceException.code() == HTTP_NOT_FOUND) {
+        return null;
+      }
+      throw serviceException;
     }
   }
 
@@ -164,7 +169,7 @@ public boolean deleteDataset(String datasetId, Map options) throws Bi
       return true;
     } catch (IOException ex) {
       BigQueryException serviceException = translate(ex);
-      if (serviceException.code() == 404) {
+      if (serviceException.code() == HTTP_NOT_FOUND) {
         return false;
       }
       throw serviceException;
@@ -195,8 +200,12 @@ public Table getTable(String datasetId, String tableId, Map options)
           .setQuotaUser(QUOTA_USER.getString(options))
           .setUserIp(USER_IP.getString(options))
           .execute();
-    } catch (IOException ex) {
-      throw translate(ex);
+    } catch(IOException ex) {
+      BigQueryException serviceException = translate(ex);
+      if (serviceException.code() == HTTP_NOT_FOUND) {
+        return null;
+      }
+      throw serviceException;
     }
   }
 
@@ -320,8 +329,12 @@ public Job getJob(String jobId, Map options) throws BigQueryException
           .setQuotaUser(QUOTA_USER.getString(options))
           .setUserIp(USER_IP.getString(options))
           .execute();
-    } catch (IOException ex) {
-      throw translate(ex);
+    } catch(IOException ex) {
+      BigQueryException serviceException = translate(ex);
+      if (serviceException.code() == HTTP_NOT_FOUND) {
+        return null;
+      }
+      throw serviceException;
     }
   }
 
@@ -381,7 +394,7 @@ public boolean cancel(String jobId, Map options) throws BigQueryExcep
       return true;
     } catch (IOException ex) {
       BigQueryException serviceException = translate(ex);
-      if (serviceException.code() == 404) {
+      if (serviceException.code() == HTTP_NOT_FOUND) {
         return false;
       }
       throw serviceException;
@@ -401,8 +414,12 @@ public GetQueryResultsResponse getQueryResults(JobReference job, Map
               BigInteger.valueOf(START_INDEX.getLong(options)) : null)
           .setTimeoutMs(TIMEOUT.getLong(options))
           .execute();
-    } catch (IOException ex) {
-      throw translate(ex);
+    } catch(IOException ex) {
+      BigQueryException serviceException = translate(ex);
+      if (serviceException.code() == HTTP_NOT_FOUND) {
+        return null;
+      }
+      throw serviceException;
     }
   }
 

From 12aa55591cde5f0f5b3bbf6e4d29c7d049925c5f Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 19 Nov 2015 19:11:07 +0100
Subject: [PATCH 114/322] Fix empty list bug, handle job state and error in
 listJobs

---
 .../com/google/gcloud/spi/DefaultBigQueryRpc.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
index a77417e27fb9..68607e50685f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -35,6 +35,7 @@
 import com.google.api.services.bigquery.model.Job;
 import com.google.api.services.bigquery.model.JobList;
 import com.google.api.services.bigquery.model.JobReference;
+import com.google.api.services.bigquery.model.JobStatus;
 import com.google.api.services.bigquery.model.QueryRequest;
 import com.google.api.services.bigquery.model.QueryResponse;
 import com.google.api.services.bigquery.model.Table;
@@ -220,8 +221,9 @@ public Tuple> listTables(String datasetId, Map tables = tableList.getTables();
       return Tuple.of(tableList.getNextPageToken(),
-          Iterables.transform(tableList.getTables(),
+          Iterables.transform(tables != null ? tables : ImmutableList.of(),
               new Function() {
                 @Override
                 public Table apply(TableList.Tables f) {
@@ -350,11 +352,19 @@ public Tuple> listJobs(Map options) throws BigQ
           .setPageToken(PAGE_TOKEN.getString(options))
           .setProjection(DEFAULT_PROJECTION)
           .execute();
+      Iterable jobs = jobsList.getJobs();
       return Tuple.of(jobsList.getNextPageToken(),
-          Iterables.transform(jobsList.getJobs(),
+          Iterables.transform(jobs != null ? jobs : ImmutableList.of(),
               new Function() {
                 @Override
                 public Job apply(JobList.Jobs f) {
+                  JobStatus statusPb = f.getStatus() != null ? f.getStatus() : new JobStatus();
+                  if (statusPb.getState() == null) {
+                    statusPb.setState(f.getState());
+                  }
+                  if (statusPb.getErrorResult() == null) {
+                    statusPb.setErrorResult(f.getErrorResult());
+                  }
                   return new Job()
                       .setConfiguration(f.getConfiguration())
                       .setId(f.getId())

From a07fbda2724b3faef46b43a251aea0ac9b42625a Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 19 Nov 2015 14:23:05 -0800
Subject: [PATCH 115/322] Add step-by-step datastore guide

---
 gcloud-java-datastore/README.md | 141 +++++++++++++++++++++++++++-----
 1 file changed, 122 insertions(+), 19 deletions(-)

diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index 2525413ecb86..66cea4ef2037 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -56,33 +56,136 @@ Cloud Datastore for your project.
 See the ``gcloud-java`` API [datastore documentation][datastore-api] to learn how to interact
 with the Cloud Datastore using this Client Library.
 
-Here is a code snippet showing a simple usage example from within Compute/App Engine.  Note that you must [supply credentials](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) and a project ID if running this snippet elsewhere.
+Getting Started
+---------------
+#### Prerequisites
+For this tutorial, you will need a [Google Developers Console](https://console.developers.google.com/) project with the Datastore API enabled. [Follow these instructions](https://cloud.google.com/docs/authentication#preparation) to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
+
+#### Installation and setup
+You'll need to obtain the `gcloud-java-datastore` library.  See the [Quickstart](#quickstart) section to add `gcloud-java-datastore` as a dependency in your code.
+
+#### Creating an authorized service object
+To make authenticated requests to Google Cloud Datastore, you must create a service object with credentials. You can then make API calls by calling methods on the Datastore service object. The simplest way to authenticate is to use [Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials). These credentials are automatically inferred from your environment, so you only need the following code to create your service object:
 
 ```java
 import com.google.gcloud.datastore.Datastore;
 import com.google.gcloud.datastore.DatastoreOptions;
-import com.google.gcloud.datastore.DateTime;
+
+Datastore datastore = DatastoreOptions.defaultInstance().service();
+```
+
+For other authentication options, see the [Authentication](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) page.
+
+#### Storing data
+Objects in Datastore are known as entities. Entities are grouped by "kind" and have keys for easy access. In this code snippet, we will create a new entity representing a person and store that data by the person's name.  First, add the following imports at the top of your file:
+
+```java
 import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
 import com.google.gcloud.datastore.KeyFactory;
+```
 
-Datastore datastore = DatastoreOptions.defaultInstance().service();
-KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
-Key key = keyFactory.newKey(keyName);
-Entity entity = datastore.get(key);
-if (entity == null) {
-  entity = Entity.builder(key)
-      .set("name", "John Do")
-      .set("age", 30)
-      .set("access_time", DateTime.now())
-      .build();
-  datastore.put(entity);
-} else {
-  System.out.println("Updating access_time for " + entity.getString("name"));
-  entity = Entity.builder(entity)
-      .set("access_time", DateTime.now())
-      .build();
-  datastore.update(entity);
+Then add the following code to put an entity in Datastore.
+
+```java
+KeyFactory keyFactory = datastore.newKeyFactory().kind("Person");
+Key key = keyFactory.newKey("John Doe");
+Entity entity = Entity.builder(key)
+    .set("age", 30)
+    .set("favorite_food", "pizza")
+    .build();
+datastore.put(entity);
+```
+
+Later, if you want to get this entity back, add the following to your code:
+
+```java
+Entity johnEntity = datastore.get("John Doe");
+```
+
+#### Running a query
+In addition to retrieving entities by their keys, you can perform queries to retrieve entities by the values of their properties. A typical query includes an entity kind, filters to select entities with matching values, and sort orders to sequence the results. `gcloud-java-datastore` supports two types of queries: `StructuredQuery` (that allows you to construct query elements) and `GqlQuery` (which operates using [GQL syntax](https://cloud.google.com/datastore/docs/apis/gql/gql_reference)) in string format. In this tutorial, we will use a simple `StructuredQuery`.
+
+Suppose that you've added more people to Datastore, and now you want to find all people whose favorite food is pizza. Import the following:
+
+```java
+import com.google.gcloud.datastore.Query;
+import com.google.gcloud.datastore.QueryResults;
+import com.google.gcloud.datastore.StructuredQuery;
+import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
+```
+
+Then add the following code to your program:
+
+```java
+Query query = Query.entityQueryBuilder()
+    .kind("Person")
+    .filter(PropertyFilter.eq("favorite_food", "pizza"))
+    .build();
+QueryResults results = datastore.run(query);
+while (results.hasNext()) {
+  Entity currentEntity = results.next();
+}
+```
+
+#### Complete source code
+
+Here we put together all the code shown above into one program.  This program assumes that you are running on Compute Engine or from your own desktop. To run this example on App Engine, simply move the code from the main method to your application's servlet class.
+
+```java
+import com.google.gcloud.datastore.Datastore;
+import com.google.gcloud.datastore.DatastoreOptions;
+import com.google.gcloud.datastore.Entity;
+import com.google.gcloud.datastore.Key;
+import com.google.gcloud.datastore.KeyFactory;
+import com.google.gcloud.datastore.Query;
+import com.google.gcloud.datastore.QueryResults;
+import com.google.gcloud.datastore.StructuredQuery;
+import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
+
+public class GcloudJavaDatastoreExample {
+
+  public static void main(String[] args) {
+    // Create datastore service object.
+    // By default, credentials are inferred from the runtime environment.
+    Datastore datastore = DatastoreOptions.defaultInstance().service();
+
+    // Add an entity to Datastore
+    KeyFactory keyFactory = datastore.newKeyFactory().kind("Person");
+    Key key = keyFactory.newKey("John Doe");
+    Entity entity = Entity.builder(key)
+        .set("age", 51)
+        .set("favorite_food", "pizza")
+        .build();
+    datastore.put(entity);
+
+    // Get an entity from Datastore
+    Entity johnEntity = datastore.get(key);
+
+    // Add a couple more entities to make the query results more interesting
+    Key janeKey = keyFactory.newKey("Jane Doe");
+    Entity janeEntity = Entity.builder(janeKey)
+        .set("age", 44)
+        .set("favorite_food", "pizza")
+        .build();
+    Key joeKey = keyFactory.newKey("Joe Shmoe");
+    Entity joeEntity = Entity.builder(joeKey)
+        .set("age", 27)
+        .set("favorite_food", "sushi")
+        .build();
+    datastore.put(janeEntity, joeEntity);
+
+    // Run a query
+    Query query = Query.entityQueryBuilder()
+        .kind("Person")
+        .filter(PropertyFilter.eq("favorite_food", "pizza"))
+        .build();
+    QueryResults results = datastore.run(query);
+    while (results.hasNext()) {
+      Entity currentEntity = results.next();
+      // Do something using the entity.  (e.g. send an invite a pizza party)
+    }
+  }
 }
 ```
 

From 424f14450271fc3ffbe8095d791acd33888a8cb5 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 20 Nov 2015 08:35:55 -0800
Subject: [PATCH 116/322] fix snippets to match full code

---
 gcloud-java-datastore/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index 66cea4ef2037..e7a6cdd07781 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -91,7 +91,7 @@ Then add the following code to put an entity in Datastore.
 KeyFactory keyFactory = datastore.newKeyFactory().kind("Person");
 Key key = keyFactory.newKey("John Doe");
 Entity entity = Entity.builder(key)
-    .set("age", 30)
+    .set("age", 51)
     .set("favorite_food", "pizza")
     .build();
 datastore.put(entity);
@@ -100,7 +100,7 @@ datastore.put(entity);
 Later, if you want to get this entity back, add the following to your code:
 
 ```java
-Entity johnEntity = datastore.get("John Doe");
+Entity johnEntity = datastore.get(key);
 ```
 
 #### Running a query

From 791fba190e2d076468451ece01936deea8262236 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 20 Nov 2015 11:18:18 -0800
Subject: [PATCH 117/322] Add links to gcloud-common docs in READMEs

---
 README.md                       | 11 +++++++++--
 gcloud-java-core/README.md      | 10 +++++++++-
 gcloud-java-datastore/README.md | 10 +++++++++-
 gcloud-java-examples/README.md  | 10 +++++++++-
 gcloud-java-storage/README.md   | 10 +++++++++-
 gcloud-java/README.md           | 10 +++++++++-
 6 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 03bf2e69f915..e7bd4e77a002 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,9 @@ Most `gcloud-java` libraries require a project ID.  There are multiple ways to s
 Authentication
 --------------
 
-There are multiple ways to authenticate to use Google Cloud services.
+First, ensure that the necessary Google Cloud APIs are enabled for your project. To do this, follow the instructions on the [authentication document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication) shared by all the gcloud language libraries.
+
+Next, choose a method for authenticating API requests from within your project:
 
 1. When using `gcloud-java` libraries from within Compute/App Engine, no additional authentication steps are necessary.
 2. When using `gcloud-java` libraries elsewhere, there are two options:
@@ -180,6 +182,11 @@ if (blob == null) {
 }
 ```
 
+Troubleshooting
+---------------
+
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+
 Java Versions
 -------------
 
@@ -206,7 +213,7 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See [CONTRIBUTING] for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
 
 Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index 714c43f5c63d..4d6760d6259a 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -29,6 +29,11 @@ If you are using SBT, add this to your dependencies
 libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.12"
 ```
 
+Troubleshooting
+---------------
+
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+
 Java Versions
 -------------
 
@@ -39,7 +44,9 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See [CONTRIBUTING] for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
 Versioning
 ----------
@@ -57,5 +64,6 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [cloud-platform]: https://cloud.google.com/
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index e7a6cdd07781..57158e666769 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -189,6 +189,11 @@ public class GcloudJavaDatastoreExample {
 }
 ```
 
+Troubleshooting
+---------------
+
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+
 Java Versions
 -------------
 
@@ -215,7 +220,9 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See [CONTRIBUTING] for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
 License
 -------
@@ -224,6 +231,7 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [TESTING]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore
 [cloud-platform]: https://cloud.google.com/
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index f381465676f5..05596546b78e 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -58,6 +58,11 @@ To run examples from your command line:
   $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="delete  test.txt"
 ```
 
+Troubleshooting
+---------------
+
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+
 Java Versions
 -------------
 
@@ -77,7 +82,9 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See [CONTRIBUTING] for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
 License
 -------
@@ -86,6 +93,7 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [cloud-platform]: https://cloud.google.com/
 [developers-console]:https://console.developers.google.com/
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 0302439a4314..dbd16b537413 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -82,6 +82,11 @@ if (!blob.exists()) {
 }
 ```
 
+Troubleshooting
+---------------
+
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+
 Java Versions
 -------------
 
@@ -108,7 +113,9 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See [CONTRIBUTING] for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
 License
 -------
@@ -117,6 +124,7 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [TESTING]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/TESTING.md#testing-code-that-uses-storage
 [cloud-platform]: https://cloud.google.com/
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index 9a4ddfe77c83..ca3e8aa3d061 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -37,6 +37,11 @@ If you are using SBT, add this to your dependencies
 libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.12"
 ```
 
+Troubleshooting
+---------------
+
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+
 Java Versions
 -------------
 
@@ -56,7 +61,9 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See [CONTRIBUTING] for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
 License
 -------
@@ -65,6 +72,7 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [cloud-platform]: https://cloud.google.com/
 [cloud-datastore]: https://cloud.google.com/datastore/docs

From 78f8f288f428618d4e5160407681adefd9c077e6 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 20 Nov 2015 09:58:28 +0100
Subject: [PATCH 118/322] Limit batch deletes to 100, issue serveral batch if
 limit's exceeded

---
 .../google/gcloud/spi/DefaultStorageRpc.java  | 24 ++++++++-
 .../google/gcloud/storage/ITStorageTest.java  | 50 +++++++++++++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 4787b0888d7f..1e2549550544 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -35,7 +35,6 @@
 import com.google.api.client.googleapis.batch.json.JsonBatchCallback;
 import com.google.api.client.googleapis.json.GoogleJsonError;
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
-import com.google.api.client.googleapis.media.MediaHttpDownloader;
 import com.google.api.client.http.ByteArrayContent;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpHeaders;
@@ -59,9 +58,10 @@
 import com.google.api.services.storage.model.Objects;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.common.primitives.Ints;
 import com.google.gcloud.storage.StorageException;
 import com.google.gcloud.storage.StorageOptions;
 
@@ -69,6 +69,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -82,6 +83,7 @@ public class DefaultStorageRpc implements StorageRpc {
   // see: https://cloud.google.com/storage/docs/concepts-techniques#practices
   private static final Set RETRYABLE_CODES = ImmutableSet.of(504, 503, 502, 500, 429, 408);
   private static final long MEGABYTE = 1024L * 1024L;
+  private static final int MAX_BATCH_DELETES = 100;
 
   public DefaultStorageRpc(StorageOptions options) {
     HttpTransport transport = options.httpTransportFactory().create();
@@ -361,6 +363,24 @@ public byte[] load(StorageObject from, Map options)
 
   @Override
   public BatchResponse batch(BatchRequest request) throws StorageException {
+    List>>> partitionedToDelete =
+        Lists.partition(request.toDelete, MAX_BATCH_DELETES);
+    Iterator>>> iterator = partitionedToDelete.iterator();
+    BatchRequest chunkRequest = new BatchRequest(iterator.hasNext() ? iterator.next() :
+        ImmutableList.>>of(), request.toUpdate, request.toGet);
+    BatchResponse response = batchChunk(chunkRequest);
+    Map> deletes =
+        Maps.newHashMapWithExpectedSize(request.toDelete.size());
+    deletes.putAll(response.deletes);
+    while (iterator.hasNext()) {
+      chunkRequest = new BatchRequest(iterator.next(), null, null);
+      BatchResponse deleteBatchResponse = batchChunk(chunkRequest);
+      deletes.putAll(deleteBatchResponse.deletes);
+    }
+    return new BatchResponse(deletes, response.updates, response.gets);
+  }
+
+  private BatchResponse batchChunk(BatchRequest request) {
     com.google.api.client.googleapis.batch.BatchRequest batch = storage.batch();
     final Map> deletes =
         Maps.newConcurrentMap();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 8bc3dfd5e207..ed58690efde7 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -25,6 +25,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.google.api.client.util.Lists;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.Page;
@@ -65,6 +66,7 @@ public class ITStorageTest {
   private static final String CONTENT_TYPE = "text/plain";
   private static final byte[] BLOB_BYTE_CONTENT = {0xD, 0xE, 0xA, 0xD};
   private static final String BLOB_STRING_CONTENT = "Hello Google Cloud Storage!";
+  private static final int MAX_BATCH_DELETES = 100;
 
   @BeforeClass
   public static void beforeClass() {
@@ -623,6 +625,54 @@ public void testBatchRequest() {
     assertTrue(deleteResponse.deletes().get(1).get());
   }
 
+  @Test
+  public void testBatchRequestManyDeletes() {
+    List blobsToDelete = Lists.newArrayListWithCapacity(2 * MAX_BATCH_DELETES);
+    for (int i = 0; i < 2 * MAX_BATCH_DELETES; i++) {
+      blobsToDelete.add(BlobId.of(BUCKET, "test-batch-request-many-deletes-blob-" + i));
+    }
+    BatchRequest.Builder builder = BatchRequest.builder();
+    for (BlobId blob : blobsToDelete) {
+      builder.delete(blob);
+    }
+    String sourceBlobName1 = "test-batch-request-many-deletes-source-blob-1";
+    String sourceBlobName2 = "test-batch-request-many-deletes-source-blob-2";
+    BlobInfo sourceBlob1 = BlobInfo.builder(BUCKET, sourceBlobName1).build();
+    BlobInfo sourceBlob2 = BlobInfo.builder(BUCKET, sourceBlobName2).build();
+    assertNotNull(storage.create(sourceBlob1));
+    assertNotNull(storage.create(sourceBlob2));
+    BlobInfo updatedBlob2 = sourceBlob2.toBuilder().contentType(CONTENT_TYPE).build();
+
+    BatchRequest updateRequest = builder
+        .get(BUCKET, sourceBlobName1)
+        .update(updatedBlob2)
+        .build();
+    BatchResponse response = storage.apply(updateRequest);
+    assertEquals(2 * MAX_BATCH_DELETES, response.deletes().size());
+    assertEquals(1, response.updates().size());
+    assertEquals(1, response.gets().size());
+
+    // Check deletes
+    for (BatchResponse.Result deleteResult : response.deletes()) {
+      assertFalse(deleteResult.failed());
+      assertFalse(deleteResult.get());
+    }
+
+    // Check updates
+    BlobInfo remoteUpdatedBlob2 = response.updates().get(0).get();
+    assertEquals(sourceBlob2.bucket(), remoteUpdatedBlob2.bucket());
+    assertEquals(sourceBlob2.name(), remoteUpdatedBlob2.name());
+    assertEquals(updatedBlob2.contentType(), remoteUpdatedBlob2.contentType());
+
+    // Check gets
+    BlobInfo remoteBlob1 = response.gets().get(0).get();
+    assertEquals(sourceBlob1.bucket(), remoteBlob1.bucket());
+    assertEquals(sourceBlob1.name(), remoteBlob1.name());
+
+    assertTrue(storage.delete(BUCKET, sourceBlobName1));
+    assertTrue(storage.delete(BUCKET, sourceBlobName2));
+  }
+
   @Test
   public void testBatchRequestFail() {
     String blobName = "test-batch-request-blob-fail";

From 84c91bc838988fbd75e8dc8a1861f6c0abca542a Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 20 Nov 2015 16:19:59 -0800
Subject: [PATCH 119/322] fix link to auth readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e7bd4e77a002..319f5af161ba 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ Most `gcloud-java` libraries require a project ID.  There are multiple ways to s
 Authentication
 --------------
 
-First, ensure that the necessary Google Cloud APIs are enabled for your project. To do this, follow the instructions on the [authentication document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication) shared by all the gcloud language libraries.
+First, ensure that the necessary Google Cloud APIs are enabled for your project. To do this, follow the instructions on the [authentication document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/authentication/readme.md#authentication) shared by all the gcloud language libraries.
 
 Next, choose a method for authenticating API requests from within your project:
 

From 347d5bea76eb47f7f8233661a7c5f28aec28bd15 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 20 Nov 2015 17:07:29 -0800
Subject: [PATCH 120/322] use anchors in links

---
 README.md                       | 6 +++---
 gcloud-java-core/README.md      | 6 +++---
 gcloud-java-datastore/README.md | 6 +++---
 gcloud-java-examples/README.md  | 6 +++---
 gcloud-java-storage/README.md   | 7 ++++---
 gcloud-java/README.md           | 6 +++---
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 319f5af161ba..d045d292baac 100644
--- a/README.md
+++ b/README.md
@@ -185,7 +185,7 @@ if (blob == null) {
 Troubleshooting
 ---------------
 
-To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting).
 
 Java Versions
 -------------
@@ -213,7 +213,7 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
 
 Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
@@ -224,7 +224,7 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
-[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [TESTING]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/TESTING.md
 [cloud-platform]: https://cloud.google.com/
diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index 4d6760d6259a..96b7a4e82021 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -32,7 +32,7 @@ libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.12"
 Troubleshooting
 ---------------
 
-To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting).
 
 Java Versions
 -------------
@@ -44,7 +44,7 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
 
 Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
@@ -64,6 +64,6 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
-[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [cloud-platform]: https://cloud.google.com/
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index 57158e666769..de025d726721 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -192,7 +192,7 @@ public class GcloudJavaDatastoreExample {
 Troubleshooting
 ---------------
 
-To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting).
 
 Java Versions
 -------------
@@ -220,7 +220,7 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
 
 Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
@@ -231,7 +231,7 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
-[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [TESTING]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore
 [cloud-platform]: https://cloud.google.com/
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index 05596546b78e..2ccec3e81571 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -61,7 +61,7 @@ To run examples from your command line:
 Troubleshooting
 ---------------
 
-To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting).
 
 Java Versions
 -------------
@@ -82,7 +82,7 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
 
 Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
@@ -93,7 +93,7 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
-[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [cloud-platform]: https://cloud.google.com/
 [developers-console]:https://console.developers.google.com/
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index dbd16b537413..ea357fd81eaa 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -85,7 +85,7 @@ if (!blob.exists()) {
 Troubleshooting
 ---------------
 
-To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting).
 
 Java Versions
 -------------
@@ -113,7 +113,7 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
 
 Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
@@ -124,7 +124,7 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
-[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [TESTING]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/TESTING.md#testing-code-that-uses-storage
 [cloud-platform]: https://cloud.google.com/
@@ -133,3 +133,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-storage-docs]: https://cloud.google.com/storage/docs/overview
 [cloud-storage-create-bucket]: https://cloud.google.com/storage/docs/cloud-console#_creatingbuckets
 [storage-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/storage/package-summary.html
+[cloud-storage-activation]:https://cloud.google.com/storage/docs/signup?hl=en
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index ca3e8aa3d061..e381ca80cdaa 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -40,7 +40,7 @@ libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.12"
 Troubleshooting
 ---------------
 
-To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/troubleshooting).
+To get help, follow the `gcloud-java` links in the `gcloud-*` [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting).
 
 Java Versions
 -------------
@@ -61,7 +61,7 @@ Contributing
 
 Contributions to this library are always welcome and highly encouraged.
 
-See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/contributing) for more information on how to get started.
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
 
 Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
 
@@ -72,7 +72,7 @@ Apache 2.0 - See [LICENSE] for more information.
 
 
 [CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
-[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [cloud-platform]: https://cloud.google.com/
 [cloud-datastore]: https://cloud.google.com/datastore/docs

From 08c0f28f6b05b77af79b042a0b56bdb21d2a2286 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 20 Nov 2015 16:18:45 -0800
Subject: [PATCH 121/322] Add step-by-step guide for storage README

---
 gcloud-java-storage/README.md | 163 ++++++++++++++++++++++++++++++----
 1 file changed, 147 insertions(+), 16 deletions(-)

diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 0302439a4314..43aca32fffc5 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -56,29 +56,160 @@ Cloud Storage for your project.
 See the ``gcloud-java`` API [storage documentation][storage-api] to learn how to interact
 with the Cloud Storage using this Client Library.
 
-Here is a code snippet showing a simple usage example from within Compute/App Engine.  Note that you must [supply credentials](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) and a project ID if running this snippet elsewhere.
+Getting Started
+---------------
+#### Prerequisites
+For this tutorial, you will need a [Google Developers Console](https://console.developers.google.com/) project with the Storage JSON API enabled. You will need to [enable billing](https://support.google.com/cloud/answer/6158867?hl=en) to use Google Cloud Storage. [Follow these instructions](https://cloud.google.com/docs/authentication#preparation) to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
+
+#### Installation and setup
+You'll need to obtain the `gcloud-java-storage` library.  See the [Quickstart](#quickstart) section to add `gcloud-java-storage` as a dependency in your code.
+
+#### Creating an authorized service object
+To make authenticated requests to Google Cloud Storage, you must create a service object with credentials. You can then make API calls by calling methods on the Storage service object. The simplest way to authenticate is to use [Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials). These credentials are automatically inferred from your environment, so you only need the following code to create your service object:
+
+```java
+import com.google.gcloud.storage.Storage;
+import com.google.gcloud.storage.StorageOptions;
+
+Storage storage = StorageOptions.defaultInstance().service();
+```
+
+For other authentication options, see the [Authentication](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) page.
+
+#### Storing data
+Stored objects are called "blobs" in `gcloud-java` and are organized into containers called "buckets".  In this code snippet, we will create a new bucket and upload a blob to that bucket.
+
+Add the following imports at the top of your file:
 
 ```java
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import com.google.gcloud.storage.BlobId;
+import com.google.gcloud.storage.BlobInfo;
+import com.google.gcloud.storage.BucketInfo;
+```
+
+Then add the following code to create a bucket and upload a simple blob.
+
+*Important: Bucket names have to be globally unique. If you choose a bucket name that already exists, you'll get a helpful error message telling you to choose another name. In the code below, replace "my_unique_bucket" with a unique bucket name.*
+
+```java
+// Create a bucket
+String bucketName = "my_unique_bucket"; // Remember to change this to something unique
+BucketInfo bucketInfo = storage.create(BucketInfo.builder(bucketName).build());
+
+// Upload a blob to the newly created bucket
+BlobId blobId = BlobId.of(bucketName, "my_blob_name");
+BlobInfo blobInfo = storage.create(BlobInfo.builder(blobId).build(),
+                                   "a simple blob".getBytes(UTF_8));
+```
+
+At this point, you will be able to see your newly created bucket and blob on the Google Developers Console.
+
+#### Retrieving data
+Now that we have content uploaded to the server, we can see how to read data from the server. Add the following import:
+
+```java
 import com.google.gcloud.storage.Blob;
-import com.google.gcloud.storage.Storage;
-import com.google.gcloud.storage.StorageOptions;
+```
 
-import java.nio.ByteBuffer;
-import java.nio.channels.WritableByteChannel;
+Then add the following lines to your program to get back the blob we uploaded.
 
-Storage storage = StorageOptions.defaultInstance().service();
-Blob blob = new Blob(storage, "bucket", "blob_name");
-if (!blob.exists()) {
-  storage2.create(blob.info(), "Hello, Cloud Storage!".getBytes(UTF_8));
-} else {
-  System.out.println("Updating content for " + blob.info().name());
-  byte[] prevContent = blob.content();
-  System.out.println(new String(prevContent, UTF_8));
-  WritableByteChannel channel = blob.writer();
-  channel.write(ByteBuffer.wrap("Updated content".getBytes(UTF_8)));
-  channel.close();
+```java
+Blob blob = Blob.load(storage, blobInfo.blobId());
+String blobContent = new String(blob.content(), UTF_8);
+```
+
+If others have permission to edit the blob, then you may want to call `reload` to get a more up to date copy of the blob later in your program. The following snippet shows how to get a new Blob object containing updated information.
+
+```
+Blob refreshedBlob = blob.reload();
+```
+
+#### Listing buckets and contents of buckets
+Suppose that you've added more buckets and blobs, and now you want to see the names of your buckets and the contents of each one. Add the following imports:
+
+```java
+import com.google.gcloud.storage.Bucket;
+
+import java.util.Iterator;
+```
+
+Then add the following code to list all your buckets and all the blobs inside your newly created bucket.
+
+```java
+// List all your buckets
+Iterator bucketInfoIterator = storage.list().iterateAll();
+System.out.println("My buckets:");
+while (bucketInfoIterator.hasNext()) {
+  System.out.println(bucketInfoIterator.next());
+}
+
+// List the blobs in a particular bucket
+Bucket bucket = Bucket.load(storage, bucketName);
+Iterator blobIterator = bucket.list().iterateAll();
+System.out.println("My blobs:");
+while (blobIterator.hasNext()) {
+  System.out.println(blobIterator.next().info());
+}
+```
+
+#### Complete source code
+
+Here we put together all the code shown above into one program.  This program assumes that you are running on Compute Engine or from your own desktop. To run this example on App Engine, simply move the code from the main method to your application's servlet class and change the print statements to display on your webpage.
+
+```java
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.google.gcloud.storage.Storage;
+import com.google.gcloud.storage.StorageOptions;
+import com.google.gcloud.storage.Blob;
+import com.google.gcloud.storage.BlobId;
+import com.google.gcloud.storage.BlobInfo;
+import com.google.gcloud.storage.Bucket;
+import com.google.gcloud.storage.BucketInfo;
+
+import java.util.Iterator;
+
+public class GcloudStorageExample {
+
+  public static void main(String[] args) {
+    // Create a service object
+    // Credentials are inferred from the environment.
+    Storage storage = StorageOptions.defaultInstance().service();
+
+    // Create a bucket
+    String bucketName = "my_unique_bucket-1323252"; // Remember to change this to something unique
+    BucketInfo bucketInfo = storage.create(BucketInfo.builder(bucketName).build());
+
+    // Upload a blob to the newly created bucket
+    BlobId blobId = BlobId.of(bucketName, "my_blob_name");
+    BlobInfo blobInfo = storage.create(BlobInfo.builder(blobId).build(),
+                                       "a simple blob".getBytes(UTF_8));
+
+    // Retrieve a blob from the server
+    Blob blob = Blob.load(storage, blobInfo.blobId());
+    String blobContent = new String(blob.content(), UTF_8);
+
+    // An example of how to get an updated blob
+    // This is useful in cases where others with access to your blob may have changed it.
+    Blob refreshedBlob = blob.reload();
+
+    // List all your buckets
+    Iterator bucketInfoIterator = storage.list().iterateAll();
+    System.out.println("My buckets:");
+    while (bucketInfoIterator.hasNext()) {
+      System.out.println(bucketInfoIterator.next());
+    }
+
+    // List the blobs in a particular bucket
+    Bucket bucket = Bucket.load(storage, bucketName);
+    Iterator blobIterator = bucket.list().iterateAll();
+    System.out.println("My blobs:");
+    while (blobIterator.hasNext()) {
+      System.out.println(blobIterator.next().info());
+    }
+  }
 }
 ```
 

From 3af2bbabb348c03a10fc643aa1f61b900f8e035b Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 23 Nov 2015 09:30:41 -0800
Subject: [PATCH 122/322] fix storage readme sample

---
 gcloud-java-storage/README.md | 60 +++++++++++------------------------
 1 file changed, 19 insertions(+), 41 deletions(-)

diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 43aca32fffc5..2ef75e9efb71 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -95,43 +95,29 @@ Then add the following code to create a bucket and upload a simple blob.
 
 ```java
 // Create a bucket
-String bucketName = "my_unique_bucket"; // Remember to change this to something unique
-BucketInfo bucketInfo = storage.create(BucketInfo.builder(bucketName).build());
+String bucketName = "my_unique_bucket"; // Change this to something unique
+BucketInfo bucketInfo = storage.create(BucketInfo.of(bucketName));
 
 // Upload a blob to the newly created bucket
 BlobId blobId = BlobId.of(bucketName, "my_blob_name");
-BlobInfo blobInfo = storage.create(BlobInfo.builder(blobId).build(),
-                                   "a simple blob".getBytes(UTF_8));
+BlobInfo blobInfo = storage.create(
+    BlobInfo.builder(blobId).contentType("text/plain").build(),
+    "a simple blob".getBytes(UTF_8));
 ```
 
 At this point, you will be able to see your newly created bucket and blob on the Google Developers Console.
 
 #### Retrieving data
-Now that we have content uploaded to the server, we can see how to read data from the server. Add the following import:
+Now that we have content uploaded to the server, we can see how to read data from the server.  Add the following line to your program to get back the blob we uploaded.
 
 ```java
-import com.google.gcloud.storage.Blob;
-```
-
-Then add the following lines to your program to get back the blob we uploaded.
-
-```java
-Blob blob = Blob.load(storage, blobInfo.blobId());
-String blobContent = new String(blob.content(), UTF_8);
-```
-
-If others have permission to edit the blob, then you may want to call `reload` to get a more up to date copy of the blob later in your program. The following snippet shows how to get a new Blob object containing updated information.
-
-```
-Blob refreshedBlob = blob.reload();
+String blobContent = new String(storage.readAllBytes(blobId), UTF_8);
 ```
 
 #### Listing buckets and contents of buckets
 Suppose that you've added more buckets and blobs, and now you want to see the names of your buckets and the contents of each one. Add the following imports:
 
 ```java
-import com.google.gcloud.storage.Bucket;
-
 import java.util.Iterator;
 ```
 
@@ -146,11 +132,10 @@ while (bucketInfoIterator.hasNext()) {
 }
 
 // List the blobs in a particular bucket
-Bucket bucket = Bucket.load(storage, bucketName);
-Iterator blobIterator = bucket.list().iterateAll();
+Iterator blobIterator = storage.list(bucketName).iterateAll();
 System.out.println("My blobs:");
 while (blobIterator.hasNext()) {
-  System.out.println(blobIterator.next().info());
+  System.out.println(blobIterator.next());
 }
 ```
 
@@ -161,13 +146,11 @@ Here we put together all the code shown above into one program.  This program as
 ```java
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.google.gcloud.storage.Storage;
-import com.google.gcloud.storage.StorageOptions;
-import com.google.gcloud.storage.Blob;
 import com.google.gcloud.storage.BlobId;
 import com.google.gcloud.storage.BlobInfo;
-import com.google.gcloud.storage.Bucket;
 import com.google.gcloud.storage.BucketInfo;
+import com.google.gcloud.storage.Storage;
+import com.google.gcloud.storage.StorageOptions;
 
 import java.util.Iterator;
 
@@ -179,21 +162,17 @@ public class GcloudStorageExample {
     Storage storage = StorageOptions.defaultInstance().service();
 
     // Create a bucket
-    String bucketName = "my_unique_bucket-1323252"; // Remember to change this to something unique
-    BucketInfo bucketInfo = storage.create(BucketInfo.builder(bucketName).build());
+    String bucketName = "my_unique_bucket"; // Change this to something unique
+    BucketInfo bucketInfo = storage.create(BucketInfo.of(bucketName));
 
     // Upload a blob to the newly created bucket
     BlobId blobId = BlobId.of(bucketName, "my_blob_name");
-    BlobInfo blobInfo = storage.create(BlobInfo.builder(blobId).build(),
-                                       "a simple blob".getBytes(UTF_8));
+    BlobInfo blobInfo = storage.create(
+        BlobInfo.builder(blobId).contentType("text/plain").build(),
+        "a simple blob".getBytes(UTF_8));
 
     // Retrieve a blob from the server
-    Blob blob = Blob.load(storage, blobInfo.blobId());
-    String blobContent = new String(blob.content(), UTF_8);
-
-    // An example of how to get an updated blob
-    // This is useful in cases where others with access to your blob may have changed it.
-    Blob refreshedBlob = blob.reload();
+    String blobContent = new String(storage.readAllBytes(blobId), UTF_8);
 
     // List all your buckets
     Iterator bucketInfoIterator = storage.list().iterateAll();
@@ -203,11 +182,10 @@ public class GcloudStorageExample {
     }
 
     // List the blobs in a particular bucket
-    Bucket bucket = Bucket.load(storage, bucketName);
-    Iterator blobIterator = bucket.list().iterateAll();
+    Iterator blobIterator = storage.list(bucketName).iterateAll();
     System.out.println("My blobs:");
     while (blobIterator.hasNext()) {
-      System.out.println(blobIterator.next().info());
+      System.out.println(blobIterator.next());
     }
   }
 }

From 8ebfdf87356e9f0df3921e404b5bcafb7705b5ed Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 23 Nov 2015 11:09:14 -0800
Subject: [PATCH 123/322] add link to bucket naming rules

---
 gcloud-java-storage/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 2ef75e9efb71..1053f096eeb5 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -91,7 +91,7 @@ import com.google.gcloud.storage.BucketInfo;
 
 Then add the following code to create a bucket and upload a simple blob.
 
-*Important: Bucket names have to be globally unique. If you choose a bucket name that already exists, you'll get a helpful error message telling you to choose another name. In the code below, replace "my_unique_bucket" with a unique bucket name.*
+*Important: Bucket names have to be globally unique. If you choose a bucket name that already exists, you'll get a helpful error message telling you to choose another name. In the code below, replace "my_unique_bucket" with a unique bucket name. See more about naming rules [here](https://cloud.google.com/storage/docs/bucket-naming?hl=en#requirements).*
 
 ```java
 // Create a bucket

From 539ac61bfc31a544bb6ebf5a29d680bbaf618110 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 23 Nov 2015 13:09:42 -0800
Subject: [PATCH 124/322] Add back AppEngineCredentials

---
 README.md                                     |  6 +--
 gcloud-java-core/pom.xml                      | 11 -----
 .../com/google/gcloud/AuthCredentials.java    | 46 ++++++++++++++++++-
 .../com/google/gcloud/ServiceOptions.java     |  9 ++++
 .../gcloud/datastore/SerializationTest.java   |  1 +
 .../gcloud/storage/SerializationTest.java     |  1 +
 6 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index ccdd18c31052..c697796f0a4f 100644
--- a/README.md
+++ b/README.md
@@ -96,9 +96,9 @@ There are multiple ways to authenticate to use Google Cloud services.
 `gcloud-java` looks for credentials in the following order, stopping once it finds credentials:
 
 1. Credentials supplied when building the service options
-2. Key file pointed to by the GOOGLE_APPLICATION_CREDENTIALS environment variable
-3. Google Cloud SDK credentials
-4. App Engine credentials
+2. App Engine credentials
+3. Key file pointed to by the GOOGLE_APPLICATION_CREDENTIALS environment variable
+4. Google Cloud SDK credentials
 5. Compute Engine credentials
 
 Google Cloud Datastore
diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index e2ac0ddd81b6..c0248004d335 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -33,17 +33,6 @@
         
       
     
-    
-      com.google.auth
-      google-auth-library-appengine
-      0.3.1
-      
-        
-          com.google.guava
-          guava-jdk5
-        
-      
-    
     
       com.google.http-client
       google-http-client
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
index 09cdcc16f7de..3303e4f8a652 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -19,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.api.client.googleapis.extensions.appengine.auth.oauth2.AppIdentityCredential;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.jackson.JacksonFactory;
@@ -38,6 +39,45 @@
  */
 public abstract class AuthCredentials implements Restorable {
 
+  private static class AppEngineAuthCredentials extends AuthCredentials {
+
+    private static final AuthCredentials INSTANCE = new AppEngineAuthCredentials();
+    private static final AppEngineAuthCredentialsState STATE =
+        new AppEngineAuthCredentialsState();
+
+    private static class AppEngineAuthCredentialsState
+        implements RestorableState, Serializable {
+
+      private static final long serialVersionUID = 3558563960848658928L;
+
+      @Override
+      public AuthCredentials restore() {
+        return INSTANCE;
+      }
+
+      @Override
+      public int hashCode() {
+        return getClass().getName().hashCode();
+      }
+
+      @Override
+      public boolean equals(Object obj) {
+        return obj instanceof AppEngineAuthCredentialsState;
+      }
+    }
+
+    @Override
+    protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
+        Set scopes) {
+      return new AppIdentityCredential(scopes);
+    }
+
+    @Override
+    public RestorableState capture() {
+      return STATE;
+    }
+  }
+
   public static class ServiceAccountAuthCredentials extends AuthCredentials {
 
     private final String account;
@@ -181,12 +221,16 @@ public RestorableState capture() {
   protected abstract HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
       Set scopes);
 
+  public static AuthCredentials createForAppEngine() {
+    return AppEngineAuthCredentials.INSTANCE;
+  }
+
   /**
    * Returns the Application Default Credentials.
    *
    * 
Returns the Application Default Credentials which are credentials that identify and
    * authorize the whole application. This is the built-in service account if running on
-   * Google App/Compute Engine or the credentials file can be read from the path in the environment
+   * Google Compute Engine or the credentials file can be read from the path in the environment
    * variable GOOGLE_APPLICATION_CREDENTIALS.
    * 

    *
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index e5dba231d3ff..a5601e35a6db 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -356,6 +356,15 @@ protected boolean projectIdRequired() {
   }
 
   private static AuthCredentials defaultAuthCredentials() {
+    // Consider App Engine.
+    if (appEngineAppId() != null) {
+      try {
+        return AuthCredentials.createForAppEngine();
+      } catch (Exception ignore) {
+        // Maybe not on App Engine
+      }
+    }
+
     try {
       return AuthCredentials.createApplicationDefaults();
     } catch (Exception ex) {
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
index 8fba8de8866b..32e14fb47ea0 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
@@ -134,6 +134,7 @@ public class SerializationTest {
   @Test
   public void testServiceOptions() throws Exception {
     DatastoreOptions options = DatastoreOptions.builder()
+        .authCredentials(AuthCredentials.createForAppEngine())
         .normalizeDataset(false)
         .projectId("ds1")
         .build();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index a1b647fbba07..2d80191aeb2d 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -75,6 +75,7 @@ public class SerializationTest {
   public void testServiceOptions() throws Exception {
     StorageOptions options = StorageOptions.builder()
         .projectId("p1")
+        .authCredentials(AuthCredentials.createForAppEngine())
         .build();
     StorageOptions serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);

From fc2ab109391b3c3f7fd6caeeed71e27f2c0d4692 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 23 Nov 2015 19:11:08 -0800
Subject: [PATCH 125/322] Avoid throwing exception when checking isLocalHost in
 Datastore

---
 .../main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
index ccb89267a29e..4b39f7a3c4be 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -42,9 +42,7 @@
 import org.json.JSONTokener;
 
 import java.net.InetAddress;
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -95,7 +93,7 @@ private static boolean isLocalHost(String host) {
         }
         InetAddress hostAddr = InetAddress.getByName(new URL(normalizedHost).getHost());
         return hostAddr.isAnyLocalAddress() || hostAddr.isLoopbackAddress();
-      } catch (UnknownHostException | MalformedURLException e) {
+      } catch (Exception e) {
         // ignore
       }
     }

From 8808c54c09a1d80060d8ea804164dc26ee4ce229 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 23 Nov 2015 19:31:43 -0800
Subject: [PATCH 126/322] Add link about datastore indexing in docs

---
 gcloud-java-datastore/README.md                               | 2 ++
 .../src/main/java/com/google/gcloud/datastore/Query.java      | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index de025d726721..aeaae2b621c6 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -128,6 +128,8 @@ while (results.hasNext()) {
 }
 ```
 
+Cloud Datastore relies on indexing to run queries. Indexing is turned on by default for most types of properties. To read more about indexing, see the [Cloud Datastore Index Configuration documentation](https://cloud.google.com/datastore/docs/tools/indexconfig).
+
 #### Complete source code
 
 Here we put together all the code shown above into one program.  This program assumes that you are running on Compute Engine or from your own desktop. To run this example on App Engine, simply move the code from the main method to your application's servlet class.
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java
index 343535d94628..5791d37e9426 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java
@@ -35,6 +35,10 @@
  * A Google Cloud Datastore query.
  * For usage examples see {@link GqlQuery} and {@link StructuredQuery}.
  *
+ * Note that queries require proper indexing. See
+ * 
+ * Cloud Datastore Index Configuration for help configuring indexes.
+ *
  * @param  the type of the values returned by this query.
  * @see Datastore Queries
  */

From 0a05851b3ad9d6138f57c726ea888d4675ef375b Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 24 Nov 2015 15:38:54 +0100
Subject: [PATCH 127/322] Translate SocketTimeoutException to retryable service
 exception

---
 .../com/google/gcloud/spi/DefaultDatastoreRpc.java  | 13 ++++++++++---
 .../com/google/gcloud/spi/DefaultStorageRpc.java    |  7 ++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
index 4b39f7a3c4be..fbe3bff780da 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -42,6 +42,7 @@
 import org.json.JSONTokener;
 
 import java.net.InetAddress;
+import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -121,9 +122,15 @@ private static DatastoreRpcException translate(DatastoreException exception) {
     if (reason == null) {
       reason = HTTP_STATUS_TO_REASON.get(exception.getCode());
     }
-    return reason != null
-        ? new DatastoreRpcException(reason)
-        : new DatastoreRpcException("Unknown", exception.getCode(), false, message);
+    if (reason != null) {
+      return new DatastoreRpcException(reason);
+    } else {
+      boolean retryable = false;
+      if (exception.getCause() instanceof SocketTimeoutException) {
+        retryable = true;
+      }
+      return new DatastoreRpcException("Unknown", exception.getCode(), retryable, message);
+    }
   }
 
   @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 1e2549550544..d874f99ebb4c 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -68,6 +68,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -101,7 +102,11 @@ private static StorageException translate(IOException exception) {
         && ((GoogleJsonResponseException) exception).getDetails() != null) {
       translated = translate(((GoogleJsonResponseException) exception).getDetails());
     } else {
-      translated = new StorageException(0, exception.getMessage(), false);
+      boolean retryable = false;
+      if (exception instanceof SocketTimeoutException) {
+        retryable = true;
+      }
+      translated = new StorageException(0, exception.getMessage(), retryable);
     }
     translated.initCause(exception);
     return translated;

From 120fe1228f8df9e770980be6c576cffab7e48f2f Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 24 Nov 2015 18:47:01 +0100
Subject: [PATCH 128/322] Remove quota options, always use options.projectId()

---
 .../com/google/gcloud/spi/BigQueryRpc.java    |  2 -
 .../google/gcloud/spi/DefaultBigQueryRpc.java | 54 +++----------------
 2 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
index a16fed1eb1ab..c45cb847eecb 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
@@ -35,8 +35,6 @@ public interface BigQueryRpc {
 
   // These options are part of the Google Cloud BigQuery query parameters
   enum Option {
-    QUOTA_USER("quotaUser"),
-    USER_IP("userIp"),
     FIELDS("fields"),
     DELETE_CONTENTS("deleteContents"),
     ALL_DATASETS("all"),
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
index 68607e50685f..d2555d50f478 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -16,10 +16,8 @@
 
 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.QUOTA_USER;
 import static com.google.gcloud.spi.BigQueryRpc.Option.START_INDEX;
 import static com.google.gcloud.spi.BigQueryRpc.Option.TIMEOUT;
-import static com.google.gcloud.spi.BigQueryRpc.Option.USER_IP;
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 
 import com.google.api.client.googleapis.json.GoogleJsonError;
@@ -104,8 +102,6 @@ public Dataset getDataset(String datasetId, Map options) throws BigQu
       return bigquery.datasets()
           .get(this.options.projectId(), datasetId)
           .setFields(FIELDS.getString(options))
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .execute();
     } catch(IOException ex) {
       BigQueryException serviceException = translate(ex);
@@ -122,8 +118,6 @@ public Tuple> listDatasets(Map options)
     try {
       DatasetList datasetsList = bigquery.datasets()
           .list(this.options.projectId())
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .setAll(Option.ALL_DATASETS.getBoolean(options))
           .setMaxResults(MAX_RESULTS.getLong(options))
           .setPageToken(PAGE_TOKEN.getString(options))
@@ -151,8 +145,6 @@ public Dataset create(Dataset dataset, Map options) throws BigQueryEx
     try {
       return bigquery.datasets().insert(this.options.projectId(), dataset)
           .setFields(FIELDS.getString(options))
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .execute();
     } catch (IOException ex) {
       throw translate(ex);
@@ -163,8 +155,6 @@ public Dataset create(Dataset dataset, Map options) throws BigQueryEx
   public boolean deleteDataset(String datasetId, Map options) throws BigQueryException {
     try {
       bigquery.datasets().delete(this.options.projectId(), datasetId)
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .setDeleteContents(DELETE_CONTENTS.getBoolean(options))
           .execute();
       return true;
@@ -181,10 +171,9 @@ public boolean deleteDataset(String datasetId, Map options) throws Bi
   public Dataset patch(Dataset dataset, Map options) throws BigQueryException {
     try {
       DatasetReference reference = dataset.getDatasetReference();
-      return bigquery.datasets().patch(reference.getProjectId(), reference.getDatasetId(), dataset)
+      return bigquery.datasets()
+          .patch(this.options.projectId(), reference.getDatasetId(), dataset)
           .setFields(FIELDS.getString(options))
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .execute();
     } catch (IOException ex) {
       throw translate(ex);
@@ -198,8 +187,6 @@ public Table getTable(String datasetId, String tableId, Map options)
       return bigquery.tables()
           .get(this.options.projectId(), datasetId, tableId)
           .setFields(FIELDS.getString(options))
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .execute();
     } catch(IOException ex) {
       BigQueryException serviceException = translate(ex);
@@ -216,8 +203,6 @@ public Tuple> listTables(String datasetId, Map options)
       return bigquery.tables()
           .insert(this.options.projectId(), table.getTableReference().getDatasetId(), table)
           .setFields(FIELDS.getString(options))
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .execute();
     } catch (IOException ex) {
       throw translate(ex);
@@ -259,14 +242,11 @@ public Table create(Table table, Map options)
   public boolean deleteTable(String datasetId, String tableId, Map options)
       throws BigQueryException {
     try {
-      bigquery.tables().delete(this.options.projectId(), datasetId, tableId)
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
-          .execute();
+      bigquery.tables().delete(this.options.projectId(), datasetId, tableId).execute();
       return true;
     } catch (IOException ex) {
       BigQueryException serviceException = translate(ex);
-      if (serviceException.code() == 404) {
+      if (serviceException.code() == HTTP_NOT_FOUND) {
         return false;
       }
       throw serviceException;
@@ -278,10 +258,8 @@ public Table patch(Table table, Map options) throws BigQueryException
     try {
       TableReference reference = table.getTableReference();
       return bigquery.tables()
-          .patch(reference.getProjectId(), reference.getDatasetId(), reference.getTableId(), table)
+          .patch(this.options.projectId(), reference.getDatasetId(), reference.getTableId(), table)
           .setFields(FIELDS.getString(options))
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .execute();
     } catch (IOException ex) {
       throw translate(ex);
@@ -294,8 +272,6 @@ public TableDataInsertAllResponse insertAll(TableReference table,
     try {
       return bigquery.tabledata()
           .insertAll(this.options.projectId(), table.getDatasetId(), table.getTableId(), request)
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .execute();
     } catch (IOException ex) {
       throw translate(ex);
@@ -308,8 +284,6 @@ public Tuple> listTableData(String datasetId, String
     try {
       TableDataList tableDataList = bigquery.tabledata()
           .list(this.options.projectId(), datasetId, tableId)
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .setMaxResults(MAX_RESULTS.getLong(options))
           .setPageToken(PAGE_TOKEN.getString(options))
           .setStartIndex(START_INDEX.getLong(options) != null ?
@@ -328,8 +302,6 @@ public Job getJob(String jobId, Map options) throws BigQueryException
       return bigquery.jobs()
           .get(this.options.projectId(), jobId)
           .setFields(FIELDS.getString(options))
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .execute();
     } catch(IOException ex) {
       BigQueryException serviceException = translate(ex);
@@ -386,8 +358,6 @@ public Job create(Job job, Map options) throws BigQueryException {
       return bigquery.jobs()
           .insert(this.options.projectId(), job)
           .setFields(FIELDS.getString(options))
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
           .execute();
     } catch (IOException ex) {
       throw translate(ex);
@@ -397,10 +367,7 @@ public Job create(Job job, Map options) throws BigQueryException {
   @Override
   public boolean cancel(String jobId, Map options) throws BigQueryException {
     try {
-      bigquery.jobs().cancel(this.options.projectId(), jobId)
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
-          .execute();
+      bigquery.jobs().cancel(this.options.projectId(), jobId).execute();
       return true;
     } catch (IOException ex) {
       BigQueryException serviceException = translate(ex);
@@ -415,9 +382,7 @@ public boolean cancel(String jobId, Map options) throws BigQueryExcep
   public GetQueryResultsResponse getQueryResults(JobReference job, Map options)
       throws BigQueryException {
     try {
-      return bigquery.jobs().getQueryResults(this.options.projectId(), job.getProjectId())
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
+      return bigquery.jobs().getQueryResults(this.options.projectId(), job.getJobId())
           .setMaxResults(MAX_RESULTS.getLong(options))
           .setPageToken(PAGE_TOKEN.getString(options))
           .setStartIndex(START_INDEX.getLong(options) != null ?
@@ -437,10 +402,7 @@ public GetQueryResultsResponse getQueryResults(JobReference job, Map
   public QueryResponse query(QueryRequest request, Map options)
       throws BigQueryException {
     try {
-      return bigquery.jobs().query(this.options.projectId(), request)
-          .setQuotaUser(QUOTA_USER.getString(options))
-          .setUserIp(USER_IP.getString(options))
-          .execute();
+      return bigquery.jobs().query(this.options.projectId(), request).execute();
     } catch (IOException ex) {
       throw translate(ex);
     }

From a0f2d206477129511fde909ae57a9ce46e8858cf Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 24 Nov 2015 19:01:55 +0100
Subject: [PATCH 129/322] Set special reason for timeout exceptions

---
 .../main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
index fbe3bff780da..028027f4bc33 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -126,10 +126,12 @@ private static DatastoreRpcException translate(DatastoreException exception) {
       return new DatastoreRpcException(reason);
     } else {
       boolean retryable = false;
+      reasonStr = "Unknown";
       if (exception.getCause() instanceof SocketTimeoutException) {
         retryable = true;
+        reasonStr = "Request timeout";
       }
-      return new DatastoreRpcException("Unknown", exception.getCode(), retryable, message);
+      return new DatastoreRpcException(reasonStr, exception.getCode(), retryable, message);
     }
   }
 

From 1a6dcde82e01bc4432e14675b39bffddae97c8b6 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 24 Nov 2015 19:26:48 +0100
Subject: [PATCH 130/322] Fix toBuilder so that
 info.equals(info.toBuilder().build()) is true

---
 .../com/google/gcloud/storage/BlobInfo.java   | 47 ++++++++++---------
 .../com/google/gcloud/storage/BucketInfo.java | 45 +++++++++---------
 .../google/gcloud/storage/BlobInfoTest.java   |  6 +++
 .../google/gcloud/storage/BucketInfoTest.java |  2 +-
 4 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
index 29cf16dcd617..9d1fd4f5e25c 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
@@ -106,7 +106,7 @@ public static final class Builder {
     private String contentLanguage;
     private Integer componentCount;
     private String cacheControl;
-    private ImmutableList acl;
+    private List acl;
     private Acl.Entity owner;
     private Long size;
     private String etag;
@@ -121,6 +121,29 @@ public static final class Builder {
 
     private Builder() {}
 
+    private Builder(BlobInfo blobInfo) {
+      blobId = blobInfo.blobId;
+      id = blobInfo.id;
+      cacheControl = blobInfo.cacheControl;
+      contentEncoding = blobInfo.contentEncoding;
+      contentType = blobInfo.contentType;
+      contentDisposition = blobInfo.contentDisposition;
+      contentLanguage = blobInfo.contentLanguage;
+      componentCount = blobInfo.componentCount;
+      acl = blobInfo.acl;
+      owner = blobInfo.owner;
+      size = blobInfo.size;
+      etag = blobInfo.etag;
+      selfLink = blobInfo.selfLink;
+      md5 = blobInfo.md5;
+      crc32c = blobInfo.crc32c;
+      mediaLink = blobInfo.mediaLink;
+      metadata = blobInfo.metadata;
+      metageneration = blobInfo.metageneration;
+      deleteTime = blobInfo.deleteTime;
+      updateTime = blobInfo.updateTime;
+    }
+
     /**
      * Sets the blob identity.
      */
@@ -503,27 +526,7 @@ public Long updateTime() {
    * Returns a builder for the current blob.
    */
   public Builder toBuilder() {
-    return new Builder()
-        .blobId(blobId)
-        .id(id)
-        .cacheControl(cacheControl)
-        .contentEncoding(contentEncoding)
-        .contentType(contentType)
-        .contentDisposition(contentDisposition)
-        .contentLanguage(contentLanguage)
-        .componentCount(componentCount)
-        .crc32c(crc32c)
-        .md5(md5)
-        .deleteTime(deleteTime)
-        .updateTime(updateTime)
-        .mediaLink(mediaLink)
-        .metadata(metadata)
-        .metageneration(metageneration)
-        .acl(acl)
-        .owner(owner)
-        .size(size)
-        .etag(etag)
-        .selfLink(selfLink);
+    return new Builder(this);
   }
 
   @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
index d5a382446709..a8cc4a0f32d8 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
@@ -325,18 +325,37 @@ public static final class Builder {
     private Boolean versioningEnabled;
     private String indexPage;
     private String notFoundPage;
-    private ImmutableList deleteRules;
+    private List deleteRules;
     private String storageClass;
     private String location;
     private String etag;
     private Long createTime;
     private Long metageneration;
-    private ImmutableList cors;
-    private ImmutableList acl;
-    private ImmutableList defaultAcl;
+    private List cors;
+    private List acl;
+    private List defaultAcl;
 
     private Builder() {}
 
+    private Builder(BucketInfo bucketInfo) {
+      id = bucketInfo.id;
+      name = bucketInfo.name;
+      etag = bucketInfo.etag;
+      createTime = bucketInfo.createTime;
+      metageneration = bucketInfo.metageneration;
+      location = bucketInfo.location;
+      storageClass = bucketInfo.storageClass;
+      cors = bucketInfo.cors;
+      acl = bucketInfo.acl;
+      defaultAcl = bucketInfo.defaultAcl;
+      owner = bucketInfo.owner;
+      selfLink = bucketInfo.selfLink;
+      versioningEnabled = bucketInfo.versioningEnabled;
+      indexPage = bucketInfo.indexPage;
+      notFoundPage = bucketInfo.notFoundPage;
+      deleteRules = bucketInfo.deleteRules;
+    }
+
     /**
      * Sets the bucket's name.
      */
@@ -629,23 +648,7 @@ public List defaultAcl() {
    * Returns a builder for the current bucket.
    */
   public Builder toBuilder() {
-    return new Builder()
-        .name(name)
-        .id(id)
-        .createTime(createTime)
-        .etag(etag)
-        .metageneration(metageneration)
-        .cors(cors)
-        .acl(acl)
-        .defaultAcl(defaultAcl)
-        .location(location)
-        .storageClass(storageClass)
-        .owner(owner)
-        .selfLink(selfLink)
-        .versioningEnabled(versioningEnabled)
-        .indexPage(indexPage)
-        .notFoundPage(notFoundPage)
-        .deleteRules(deleteRules);
+    return new Builder(this);
   }
 
   @Override
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java
index 7214170afe9a..36b027dc7278 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java
@@ -88,6 +88,12 @@ public void testToBuilder() {
     compareBlobs(BLOB_INFO, blobInfo);
   }
 
+  @Test
+  public void testToBuilderIncomplete() {
+    BlobInfo incompleteBlobInfo = BlobInfo.builder(BlobId.of("b2", "n2")).build();
+    compareBlobs(incompleteBlobInfo, incompleteBlobInfo.toBuilder().build());
+  }
+
   @Test
   public void testBuilder() {
     assertEquals("b", BLOB_INFO.bucket());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
index 4fa420b4b6e1..e0de2b77a899 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
@@ -91,7 +91,7 @@ public void testToBuilder() {
   @Test
   public void testToBuilderIncomplete() {
     BucketInfo incompleteBucketInfo = BucketInfo.builder("b").build();
-    assertEquals(incompleteBucketInfo.name(), incompleteBucketInfo.toBuilder().build().name());
+    compareBuckets(incompleteBucketInfo, incompleteBucketInfo.toBuilder().build());
   }
 
   @Test

From 2ef47e869450d14d4a1153bcbff17e1c9c36ea60 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 24 Nov 2015 13:20:16 -0800
Subject: [PATCH 131/322] Use NetHttpTransport when running on Compute

---
 .../com/google/gcloud/ServiceOptions.java     | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index a5601e35a6db..25fda29c363d 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -21,13 +21,10 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.client.extensions.appengine.http.UrlFetchTransport;
-import com.google.api.client.googleapis.compute.ComputeCredential;
-import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.jackson.JacksonFactory;
 import com.google.common.collect.Iterables;
 import com.google.gcloud.spi.ServiceRpcFactory;
 
@@ -44,7 +41,6 @@
 import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.security.GeneralSecurityException;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Objects;
@@ -113,24 +109,8 @@ public HttpTransport create() {
           // Maybe not on App Engine
         }
       }
-      // Consider Compute
-      try {
-        return getComputeHttpTransport();
-      } catch (Exception e) {
-        // Maybe not on GCE
-      }
       return new NetHttpTransport();
     }
-
-    private static HttpTransport getComputeHttpTransport()
-        throws IOException, GeneralSecurityException {
-      NetHttpTransport transport = GoogleNetHttpTransport.newTrustedTransport();
-      // Try to connect using Google Compute Engine service account credentials.
-      ComputeCredential credential = new ComputeCredential(transport, new JacksonFactory());
-      // Force token refresh to detect if we are running on Google Compute Engine.
-      credential.refreshToken();
-      return transport;
-    }
   }
 
   /**

From e4a5e5597b90db73907235abfac3cf123b011c58 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 24 Nov 2015 22:41:10 +0100
Subject: [PATCH 132/322] Add DatasetInfo, DatasetId, TableId and Acl models
 and tests

---
 .../java/com/google/gcloud/bigquery/Acl.java  | 400 +++++++++++++++++
 .../com/google/gcloud/bigquery/DatasetId.java |  92 ++++
 .../google/gcloud/bigquery/DatasetInfo.java   | 409 ++++++++++++++++++
 .../com/google/gcloud/bigquery/TableId.java   | 118 +++++
 .../com/google/gcloud/bigquery/AclTest.java   |  91 ++++
 .../google/gcloud/bigquery/DatasetIdTest.java |  54 +++
 .../gcloud/bigquery/DatasetInfoTest.java      | 123 ++++++
 .../google/gcloud/bigquery/TableIdTest.java   |  56 +++
 8 files changed, 1343 insertions(+)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetIdTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableIdTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
new file mode 100644
index 000000000000..2a5d86933d7c
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
@@ -0,0 +1,400 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.api.services.bigquery.model.Dataset.Access;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Access Control for a BigQuery Dataset.
+ */
+public final class Acl implements Serializable {
+
+  private static final long serialVersionUID = 8357269726277191556L;
+
+  private final Entity entity;
+  private final Role role;
+
+  public enum Role {
+    OWNER, READER, WRITER
+  }
+
+  public static abstract class Entity implements Serializable {
+
+    private static final long serialVersionUID = 8111776788607959944L;
+
+    private final Type type;
+
+    public enum Type {
+      DOMAIN, GROUP, USER, VIEW
+    }
+
+    Entity(Type type) {
+      this.type = type;
+    }
+
+    public Type type() {
+      return type;
+    }
+
+    abstract Access toPb();
+
+    static Entity fromPb(Access access) {
+      if (access.getDomain() != null) {
+        return new Domain(access.getDomain());
+      }
+      if (access.getGroupByEmail() != null) {
+        return new Group(access.getGroupByEmail());
+      }
+      if (access.getSpecialGroup() != null) {
+        return new Group(access.getSpecialGroup());
+      }
+      if (access.getUserByEmail() != null) {
+        return new User(access.getUserByEmail());
+      }
+      if (access.getView() != null) {
+        return new View(TableId.fromPb(access.getView()));
+      }
+      // Unreachable
+      throw new BigQueryException(BigQueryException.UNKNOWN_CODE,
+          "Unrecognized access configuration", false);
+    }
+  }
+
+  /**
+   * Class for a BigQuery Domain entity.
+   */
+  public static final class Domain extends Entity {
+
+    private static final long serialVersionUID = -3033025857280447253L;
+    
+    private final String domain;
+
+    /**
+     * Creates a Domain entity given the domain name.
+     */
+    public Domain(String domain) {
+      super(Type.DOMAIN);
+      this.domain = domain;
+    }
+
+    /**
+     * Returns the domain name.
+     */
+    public String domain() {
+      return domain;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      Domain domainEntity = (Domain) o;
+      return Objects.equals(type(), domainEntity.type())
+          && Objects.equals(domain, domainEntity.domain());
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(type(), domain);
+    }
+
+    @Override
+    public String toString() {
+      return toPb().toString();
+    }
+
+    @Override
+    Access toPb() {
+      return new Access().setDomain(domain);
+    }
+  }
+
+  /**
+   * Class for a BigQuery Group entity.
+   */
+  public static final class Group extends Entity {
+
+    private static final String PROJECT_OWNERS = "projectOwners";
+    private static final String PROJECT_READERS = "projectReaders";
+    private static final String PROJECT_WRITERS = "projectWriters";
+    private static final String ALL_AUTHENTICATED_USERS = "allAuthenticatedUsers";
+    private static final long serialVersionUID = 5146829352398103029L;
+    
+    private final String identifier;
+
+    /**
+     * Creates a Group entity given its identifier. Identifier can be either a special group
+     * identifier ({@code projectOwners}, {@code projectReaders}, {@code projectWriters} and
+     * {@code allAuthenticatedUsers}) or a group email.
+     */
+    public Group(String identifier) {
+      super(Type.GROUP);
+      this.identifier = identifier;
+    }
+
+    /**
+     * Returns group's identifier, can be either a special group identifier ({@code projectOwners},
+     * {@code projectReaders}, {@code projectWriters} and {@code allAuthenticatedUsers}) or a group
+     * email.
+     */
+    public String identifier() {
+      return identifier;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      Group group = (Group) o;
+      return Objects.equals(type(), group.type()) && Objects.equals(identifier, group.identifier);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(type(), identifier);
+    }
+
+    @Override
+    public String toString() {
+      return toPb().toString();
+    }
+
+    @Override
+    Access toPb() {
+      switch (identifier) {
+        case PROJECT_OWNERS:
+          return new Access().setSpecialGroup(PROJECT_OWNERS);
+        case PROJECT_READERS:
+          return new Access().setSpecialGroup(PROJECT_READERS);
+        case PROJECT_WRITERS:
+          return new Access().setSpecialGroup(PROJECT_WRITERS);
+        case ALL_AUTHENTICATED_USERS:
+          return new Access().setSpecialGroup(ALL_AUTHENTICATED_USERS);
+        default:
+          break;
+      }
+      return new Access().setGroupByEmail(identifier);
+    }
+
+    /**
+     * Returns a Group entity representing all project's owners.
+     */
+    public static Group ofProjectOwners() {
+      return new Group(PROJECT_OWNERS);
+    }
+
+    /**
+     * Returns a Group entity representing all project's readers.
+     */
+    public static Group ofProjectReaders() {
+      return new Group(PROJECT_READERS);
+    }
+
+    /**
+     * Returns a Group entity representing all project's writers.
+     */
+    public static Group ofProjectWriters() {
+      return new Group(PROJECT_WRITERS);
+    }
+
+    /**
+     * Returns a Group entity representing all project's users.
+     */
+    public static Group ofAllAuthenticatedUsers() {
+      return new Group(ALL_AUTHENTICATED_USERS);
+    }
+  }
+
+  /**
+   * Class for a BigQuery User entity.
+   */
+  public static final class User extends Entity {
+    
+    private static final long serialVersionUID = -4942821351073996141L;
+    
+    private final String email;
+
+    /**
+     * Creates a User entity given the user's email.
+     */
+    public User(String email) {
+      super(Type.USER);
+      this.email = email;
+    }
+
+    /**
+     * Returns user's email.
+     */
+    public String email() {
+      return email;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      User user = (User) o;
+      return Objects.equals(type(), user.type()) && Objects.equals(email, user.email);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(type(), email);
+    }
+
+    @Override
+    public String toString() {
+      return toPb().toString();
+    }
+
+    @Override
+    Access toPb() {
+      return new Access().setUserByEmail(email);
+    }
+  }
+
+  /**
+   * Class for a BigQuery View entity.
+   */
+  public static final class View extends Entity {
+
+    private final TableId id;
+
+    /**
+     * Creates a View entity given the view's id.
+     */
+    public View(TableId id) {
+      super(Type.VIEW);
+      this.id = id;
+    }
+
+    /**
+     * Returns table's email.
+     */
+    public TableId id() {
+      return id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      View view = (View) o;
+      return Objects.equals(type(), view.type()) && Objects.equals(id, view.id);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(type(), id);
+    }
+
+    @Override
+    public String toString() {
+      return toPb().toString();
+    }
+
+    @Override
+    Access toPb() {
+      return new Access().setView(id.toPb());
+    }
+  }
+
+  /**
+   * Build an ACL for an {@code entity} and a {@code role}.
+   */
+  public Acl(Entity entity, Role role) {
+    this.entity = entity;
+    this.role = role;
+  }
+
+  /**
+   * Build an ACL for a view entity.
+   */
+  public Acl(View view) {
+    this.entity = view;
+    this.role = null;
+  }
+
+  /**
+   * Returns the entity for this ACL.
+   */
+  public Entity entity() {
+    return entity;
+  }
+
+  /**
+   * Returns the role specified by this ACL.
+   */
+  public Role role() {
+    return role;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(entity, role);
+  }
+
+  @Override
+  public String toString() {
+    return toPb().toString();
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    final Acl other = (Acl) obj;
+    return Objects.equals(this.entity, other.entity)
+        && Objects.equals(this.role, other.role);
+  }
+
+  Access toPb() {
+    Access accessPb = entity.toPb();
+    if (role != null) {
+      accessPb.setRole(role.name());
+    }
+    return accessPb;
+  }
+
+  static Acl fromPb(Access access) {
+    Role role = Role.valueOf(access.getRole());
+    return new Acl(Entity.fromPb(access), role);
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
new file mode 100644
index 000000000000..6c70711b24df
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.api.services.bigquery.model.DatasetReference;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Dataset identity.
+ */
+public class DatasetId implements Serializable {
+
+  private static final long serialVersionUID = -6186254820908152300L;
+
+  private final String project;
+  private final String dataset;
+
+  /**
+   * Returns project's user-defined id
+   */
+  public String project() {
+    return project;
+  }
+
+  /**
+   * Returns dataset's user-defined id.
+   */
+  public String dataset() {
+    return dataset;
+  }
+
+  private DatasetId(String project, String dataset) {
+    this.project = project;
+    this.dataset = dataset;
+  }
+
+  /**
+   * Creates a dataset identity given project's and dataset's user-defined ids.
+   */
+  public static DatasetId of(String project, String dataset) {
+    return new DatasetId(checkNotNull(project), checkNotNull(dataset));
+  }
+
+  /**
+   * Creates a dataset identity given only its user-defined id.
+   */
+  public static DatasetId of(String dataset) {
+    return new DatasetId(null, checkNotNull(dataset));
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof DatasetId && Objects.equals(toPb(), ((DatasetId) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(project, dataset);
+  }
+
+  @Override
+  public String toString() {
+    return toPb().toString();
+  }
+
+  public DatasetReference toPb() {
+    return new DatasetReference().setProjectId(project).setDatasetId(dataset);
+  }
+
+  public static DatasetId fromPb(DatasetReference datasetRef) {
+    return new DatasetId(
+        datasetRef.getProjectId(),
+        datasetRef.getDatasetId());
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
new file mode 100644
index 000000000000..cc65361fa8e9
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
@@ -0,0 +1,409 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.client.util.Data;
+import com.google.api.services.bigquery.model.Dataset;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Dataset information.
+ *
+ * @see 
+ * Managing Jobs, Datasets, and Projects
+ */
+public final class DatasetInfo implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public DatasetInfo apply(Dataset pb) {
+          return DatasetInfo.fromPb(pb);
+        }
+      };
+  static final Function TO_PB_FUNCTION =
+      new Function() {
+        @Override
+        public Dataset apply(DatasetInfo datasetInfo) {
+          return datasetInfo.toPb();
+        }
+      };
+
+  private static final long serialVersionUID = -6615133444520365839L;
+
+  private final DatasetId datasetId;
+  private final List acl;
+  private final Long creationTime;
+  private final Long defaultTableLifetime;
+  private final String description;
+  private final String etag;
+  private final String friendlyName;
+  private final String id;
+  private final Long lastModified;
+  private final String location;
+  private final String selfLink;
+
+  public static final class Builder {
+
+    private DatasetId datasetId;
+    private List acl;
+    private Long creationTime;
+    private Long defaultTableLifetime;
+    private String description;
+    private String etag;
+    private String friendlyName;
+    private String id;
+    private Long lastModified;
+    private String location;
+    private String selfLink;
+
+    private Builder() {}
+
+    private Builder(DatasetInfo datasetInfo) {
+      this.datasetId = datasetInfo.datasetId;
+      this.acl = datasetInfo.acl;
+      this.creationTime = datasetInfo.creationTime;
+      this.defaultTableLifetime = datasetInfo.defaultTableLifetime;
+      this.description = datasetInfo.description;
+      this.etag = datasetInfo.etag;
+      this.friendlyName = datasetInfo.friendlyName;
+      this.id = datasetInfo.id;
+      this.lastModified = datasetInfo.lastModified;
+      this.location = datasetInfo.location;
+      this.selfLink = datasetInfo.selfLink;
+    }
+
+    /**
+     * Sets the dataset identity.
+     */
+    public Builder datasetId(DatasetId datasetId) {
+      this.datasetId = checkNotNull(datasetId);
+      return this;
+    }
+
+    /**
+     * Sets the dataset's access control configuration.
+     *
+     * @see Access Control
+     */
+    public Builder acl(List acl) {
+      this.acl = acl != null ? ImmutableList.copyOf(acl) : null;
+      return this;
+    }
+
+    Builder creationTime(Long creationTime) {
+      this.creationTime = creationTime;
+      return this;
+    }
+
+    /**
+     * Sets the default lifetime of all tables in the dataset, in milliseconds. The minimum value is
+     * 3600000 milliseconds (one hour). Once this property is set, all newly-created tables in the
+     * dataset will have an expirationTime property set to the creation time plus the value in this
+     * property, and changing the value will only affect new tables, not existing ones. When the
+     * expirationTime for a given table is reached, that table will be deleted automatically. If a
+     * table's expirationTime is modified or removed before the table expires, or if you provide an
+     * explicit expirationTime when creating a table, that value takes precedence over the default
+     * expiration time indicated by this property.
+     */
+    public Builder defaultTableLifetime(Long defaultTableLifetime) {
+      this.defaultTableLifetime =
+          firstNonNull(defaultTableLifetime, Data.nullOf(Long.class));
+      return this;
+    }
+
+    /**
+     * Sets a user-friendly description for the dataset.
+     */
+    public Builder description(String description) {
+      this.description = firstNonNull(description, Data.nullOf(String.class));
+      return this;
+    }
+
+    Builder etag(String etag) {
+      this.etag = etag;
+      return this;
+    }
+
+    /**
+     * Sets a user-friendly name for the dataset.
+     */
+    public Builder friendlyName(String friendlyName) {
+      this.friendlyName = firstNonNull(friendlyName, Data.nullOf(String.class));
+      return this;
+    }
+
+    Builder id(String id) {
+      this.id = id;
+      return this;
+    }
+
+    Builder lastModified(Long lastModified) {
+      this.lastModified = lastModified;
+      return this;
+    }
+
+    /**
+     * Sets the geographic location where the dataset should reside.
+     *
+     * @see 
+     *     Dataset Location
+     */
+    public Builder location(String location) {
+      this.location = firstNonNull(location, Data.nullOf(String.class));
+      return this;
+    }
+
+    Builder selfLink(String selfLink) {
+      this.selfLink = selfLink;
+      return this;
+    }
+
+    /**
+     * Creates a {@code DatasetInfo} object.
+     */
+    public DatasetInfo build() {
+      return new DatasetInfo(this);
+    }
+  }
+
+  private DatasetInfo(Builder builder) {
+    datasetId = checkNotNull(builder.datasetId);
+    acl = builder.acl;
+    creationTime = builder.creationTime;
+    defaultTableLifetime = builder.defaultTableLifetime;
+    description = builder.description;
+    etag = builder.etag;
+    friendlyName = builder.friendlyName;
+    id = builder.id;
+    lastModified = builder.lastModified;
+    location = builder.location;
+    selfLink = builder.selfLink;
+  }
+
+  /**
+   * Returns the dataset identity.
+   */
+  public DatasetId datasetId() {
+    return datasetId;
+  }
+
+  /**
+   * Returns the dataset's access control configuration.
+   *
+   * @see Access Control
+   */
+  public List acl() {
+    return acl;
+  }
+
+  /**
+   * Returns the time when this dataset was created, in milliseconds since the epoch.
+   */
+  public Long creationTime() {
+    return creationTime;
+  }
+
+  /**
+   * Returns the default lifetime of all tables in the dataset, in milliseconds. Once this property
+   * is set, all newly-created tables in the dataset will have an expirationTime property set to the
+   * creation time plus the value in this property, and changing the value will only affect new
+   * tables, not existing ones. When the expirationTime for a given table is reached, that table
+   * will be deleted automatically. If a table's expirationTime is modified or removed before the
+   * table expires, or if you provide an explicit expirationTime when creating a table, that value
+   * takes precedence over the default expiration time indicated by this property.
+   */
+  public Long defaultTableLifetime() {
+    return defaultTableLifetime;
+  }
+
+  /**
+   * Returns a user-friendly description for the dataset.
+   */
+  public String description() {
+    return description;
+  }
+
+  /**
+   * Returns the hash of the dataset resource.
+   */
+  public String etag() {
+    return etag;
+  }
+
+  /**
+   * Returns a user-friendly name for the dataset.
+   */
+  public String friendlyName() {
+    return friendlyName;
+  }
+
+  /**
+   * Returns an opaque id for the dataset.
+   */
+  public String id() {
+    return id;
+  }
+
+  /**
+   * Returns the time when this dataset or any of its tables was last modified, in milliseconds
+   * since the epoch.
+   */
+  public Long lastModified() {
+    return lastModified;
+  }
+
+  /**
+   * Returns the geographic location where the dataset should reside.
+   *
+   * @see 
+   *     Dataset Location
+   */
+  public String location() {
+    return location;
+  }
+
+  /**
+   * Returns an URL that can be used to access the resource again. The returned URL can be used for
+   * get or update requests.
+   */
+  public String selfLink() {
+    return selfLink;
+  }
+
+  /**
+   * Returns a builder for the {@code DatasetInfo} object.
+   */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("datasetId", datasetId)
+        .add("description", description)
+        .add("acl", acl)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(datasetId);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof DatasetInfo && Objects.equals(toPb(), ((DatasetInfo) obj).toPb());
+  }
+
+  Dataset toPb() {
+    Dataset datasetPb = new Dataset();
+    datasetPb.setDatasetReference(datasetId.toPb());
+    datasetPb.setCreationTime(creationTime);
+    datasetPb.setDefaultTableExpirationMs(defaultTableLifetime);
+    datasetPb.setDescription(description);
+    datasetPb.setEtag(etag);
+    datasetPb.setFriendlyName(friendlyName);
+    datasetPb.setId(id);
+    datasetPb.setLastModifiedTime(lastModified);
+    datasetPb.setLocation(location);
+    datasetPb.setSelfLink(selfLink);
+    if (acl != null) {
+      datasetPb.setAccess(Lists.transform(acl, new Function() {
+        @Override
+        public Dataset.Access apply(Acl acl) {
+          return acl.toPb();
+        }
+      }));
+    }
+    return datasetPb;
+  }
+
+  /**
+   * Returns a builder for the DatasetInfo object given it's user-defined id.
+   */
+  public static Builder builder(String datasetId) {
+    return new Builder().datasetId(DatasetId.of(datasetId));
+  }
+
+  /**
+   * Returns a builder for the DatasetInfo object given it's project and user-defined id.
+   */
+  public static Builder builder(String projectId, String datasetId) {
+    return new Builder().datasetId(DatasetId.of(projectId, datasetId));
+  }
+
+  /**
+   * Returns a builder for the DatasetInfo object given it's identity.
+   */
+  public static Builder builder(DatasetId datasetId) {
+    return new Builder().datasetId(datasetId);
+  }
+
+  static DatasetInfo fromPb(Dataset datasetPb) {
+    Builder builder = builder(datasetPb.getDatasetReference().getProjectId(),
+        datasetPb.getDatasetReference().getDatasetId());
+    if (datasetPb.getAccess() != null) {
+      builder.acl(Lists.transform(datasetPb.getAccess(),
+          new Function() {
+            @Override
+            public Acl apply(Dataset.Access f) {
+              return Acl.fromPb(f);
+            }
+          }));
+    }
+    if (datasetPb.getCreationTime() != null) {
+      builder.creationTime(datasetPb.getCreationTime());
+    }
+    if (datasetPb.getDefaultTableExpirationMs() != null) {
+      builder.defaultTableLifetime(datasetPb.getDefaultTableExpirationMs());
+    }
+    if (datasetPb.getDescription() != null) {
+      builder.description(datasetPb.getDescription());
+    }
+    if (datasetPb.getEtag() != null) {
+      builder.etag(datasetPb.getEtag());
+    }
+    if (datasetPb.getFriendlyName() != null) {
+      builder.friendlyName(datasetPb.getFriendlyName());
+    }
+    if (datasetPb.getId() != null) {
+      builder.id(datasetPb.getId());
+    }
+    if (datasetPb.getLastModifiedTime() != null) {
+      builder.lastModified(datasetPb.getLastModifiedTime());
+    }
+    if (datasetPb.getLocation() != null) {
+      builder.location(datasetPb.getLocation());
+    }
+    if (datasetPb.getSelfLink() != null) {
+      builder.selfLink(datasetPb.getSelfLink());
+    }
+    return builder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
new file mode 100644
index 000000000000..f6720d9ae01d
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.api.services.bigquery.model.TableReference;
+import com.google.common.base.Function;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Table identity.
+ */
+public class TableId implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public TableId apply(TableReference pb) {
+          return TableId.fromPb(pb);
+        }
+      };
+  static final Function TO_PB_FUNCTION =
+      new Function() {
+        @Override
+        public TableReference apply(TableId tableId) {
+          return tableId.toPb();
+        }
+      };
+  private static final long serialVersionUID = -6186254820908152300L;
+
+  private final String project;
+  private final String dataset;
+  private final String table;
+
+  /**
+   * Returns project's user-defined id
+   */
+  public String project() {
+    return project;
+  }
+
+  /**
+   * Returns dataset's user-defined id.
+   */
+  public String dataset() {
+    return dataset;
+  }
+
+  /**
+   * Returns table's user-defined id.
+   */
+  public String table() {
+    return table;
+  }
+
+  private TableId(String project, String dataset, String table) {
+    this.project = project;
+    this.dataset = dataset;
+    this.table = table;
+  }
+
+  /**
+   * Creates a table identity given project's, dataset's and table's user-defined ids.
+   */
+  public static TableId of(String project, String dataset, String table) {
+    return new TableId(checkNotNull(project), checkNotNull(dataset), checkNotNull(table));
+  }
+
+  /**
+   * Creates a table identity given dataset's and table's user-defined ids.
+   */
+  public static TableId of(String dataset, String table) {
+    return new TableId(null, checkNotNull(dataset), checkNotNull(table));
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof TableId && Objects.equals(toPb(), ((TableId) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(project, dataset, table);
+  }
+
+  @Override
+  public String toString() {
+    return toPb().toString();
+  }
+
+  TableReference toPb() {
+    return new TableReference().setProjectId(project).setDatasetId(dataset).setTableId(table);
+  }
+
+  static TableId fromPb(TableReference tableRef) {
+    return new TableId(
+        tableRef.getProjectId(),
+        tableRef.getDatasetId(),
+        tableRef.getTableId());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java
new file mode 100644
index 000000000000..1b55495433c3
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.api.services.bigquery.model.Dataset;
+import com.google.gcloud.bigquery.Acl.Domain;
+import com.google.gcloud.bigquery.Acl.Entity;
+import com.google.gcloud.bigquery.Acl.Entity.Type;
+import com.google.gcloud.bigquery.Acl.Group;
+import com.google.gcloud.bigquery.Acl.Role;
+import com.google.gcloud.bigquery.Acl.User;
+import com.google.gcloud.bigquery.Acl.View;
+
+import org.junit.Test;
+
+public class AclTest {
+
+  @Test
+  public void testDomainEntity() {
+    Domain entity = new Domain("d1");
+    assertEquals("d1", entity.domain());
+    assertEquals(Type.DOMAIN, entity.type());
+    Dataset.Access pb = entity.toPb();
+    assertEquals(entity, Entity.fromPb(pb));
+  }
+
+  @Test
+  public void testGroupEntity() {
+    Group entity = new Group("g1");
+    assertEquals("g1", entity.identifier());
+    assertEquals(Type.GROUP, entity.type());
+    Dataset.Access pb = entity.toPb();
+    assertEquals(entity, Entity.fromPb(pb));
+  }
+
+  @Test
+  public void testSpecialGroupEntity() {
+    Group entity = Group.ofAllAuthenticatedUsers();
+    assertEquals("allAuthenticatedUsers", entity.identifier());
+    entity = Group.ofProjectWriters();
+    assertEquals("projectWriters", entity.identifier());
+    entity = Group.ofProjectReaders();
+    assertEquals("projectReaders", entity.identifier());
+    entity = Group.ofProjectOwners();
+    assertEquals("projectOwners", entity.identifier());
+  }
+
+  @Test
+  public void testUserEntity() {
+    User entity = new User("u1");
+    assertEquals("u1", entity.email());
+    assertEquals(Type.USER, entity.type());
+    Dataset.Access pb = entity.toPb();
+    assertEquals(entity, Entity.fromPb(pb));
+  }
+
+  @Test
+  public void testViewEntity() {
+    TableId viewId = TableId.of("project", "dataset", "view");
+    View entity = new View(viewId);
+    assertEquals(viewId, entity.id());
+    assertEquals(Type.VIEW, entity.type());
+    Dataset.Access pb = entity.toPb();
+    assertEquals(entity, Entity.fromPb(pb));
+  }
+
+  @Test
+  public void testAcl() {
+    Acl acl = new Acl(Group.ofAllAuthenticatedUsers(), Role.READER);
+    assertEquals(Group.ofAllAuthenticatedUsers(), acl.entity());
+    assertEquals(Role.READER, acl.role());
+    Dataset.Access pb = acl.toPb();
+    assertEquals(acl, Acl.fromPb(pb));
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetIdTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetIdTest.java
new file mode 100644
index 000000000000..0af665895d71
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetIdTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class DatasetIdTest {
+
+  private static final DatasetId DATASET = DatasetId.of("dataset");
+  private static final DatasetId DATASET_COMPLETE = DatasetId.of("project", "dataset");
+
+  @Test
+  public void testOf() {
+    assertEquals(null, DATASET.project());
+    assertEquals("dataset", DATASET.dataset());
+    assertEquals("project", DATASET_COMPLETE.project());
+    assertEquals("dataset", DATASET_COMPLETE.dataset());
+  }
+
+  @Test
+  public void testEquals() {
+    compareDatasetIds(DATASET, DatasetId.of("dataset"));
+    compareDatasetIds(DATASET_COMPLETE, DatasetId.of("project", "dataset"));
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    compareDatasetIds(DATASET, DatasetId.fromPb(DATASET.toPb()));
+    compareDatasetIds(DATASET_COMPLETE, DatasetId.fromPb(DATASET_COMPLETE.toPb()));
+  }
+
+  private void compareDatasetIds(DatasetId expected, DatasetId value) {
+    assertEquals(expected, value);
+    assertEquals(expected.project(), value.project());
+    assertEquals(expected.dataset(), value.dataset());
+    assertEquals(expected.hashCode(), value.hashCode());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
new file mode 100644
index 000000000000..c8a4d97487fb
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class DatasetInfoTest {
+
+  private static final List ACCESS_RULES = ImmutableList.of(
+      new Acl(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
+      new Acl(new Acl.View(TableId.of("project", "dataset", "table")), Acl.Role.WRITER));
+  private static final Long CREATION_TIME = System.currentTimeMillis();
+  private static final Long DEFAULT_TABLE_EXPIRATION = CREATION_TIME + 100;
+  private static final String DESCRIPTION = "description";
+  private static final String ETAG = "0xFF00";
+  private static final String FRIENDLY_NAME = "friendlyDataset";
+  private static final String ID = "P/D:1";
+  private static final Long LAST_MODIFIED = CREATION_TIME + 50;
+  private static final String LOCATION = "";
+  private static final String SELF_LINK = "http://bigquery/p/d";
+  private static final DatasetId DATASET_ID = DatasetId.of("dataset");
+  private static final DatasetId DATASET_ID_COMPLETE = DatasetId.of("project", "dataset");
+  private static final DatasetInfo DATASET_INFO = DatasetInfo.builder(DATASET_ID)
+      .acl(ACCESS_RULES)
+      .creationTime(CREATION_TIME)
+      .defaultTableLifetime(DEFAULT_TABLE_EXPIRATION)
+      .description(DESCRIPTION)
+      .etag(ETAG)
+      .friendlyName(FRIENDLY_NAME)
+      .id(ID)
+      .lastModified(LAST_MODIFIED)
+      .location(LOCATION)
+      .selfLink(SELF_LINK)
+      .build();
+  private static final DatasetInfo DATASET_INFO_COMPLETE = DATASET_INFO.toBuilder()
+      .datasetId(DATASET_ID_COMPLETE)
+      .build();
+
+  @Test
+  public void testToBuilder() {
+    compareDatasets(DATASET_INFO, DATASET_INFO.toBuilder().build());
+    DatasetInfo datasetInfo = DATASET_INFO.toBuilder()
+        .datasetId(DatasetId.of("dataset2"))
+        .description("description2")
+        .build();
+    assertEquals(DatasetId.of("dataset2"), datasetInfo.datasetId());
+    assertEquals("description2", datasetInfo.description());
+    datasetInfo = datasetInfo.toBuilder().datasetId(DATASET_ID).description("description").build();
+    compareDatasets(DATASET_INFO, datasetInfo);
+    datasetInfo = DatasetInfo.builder(DATASET_ID).build();
+    assertEquals(datasetInfo, datasetInfo.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertNull(DATASET_INFO.datasetId().project());
+    assertEquals(DATASET_ID, DATASET_INFO.datasetId());
+    assertEquals(ACCESS_RULES, DATASET_INFO.acl());
+    assertEquals(CREATION_TIME, DATASET_INFO.creationTime());
+    assertEquals(DEFAULT_TABLE_EXPIRATION, DATASET_INFO.defaultTableLifetime());
+    assertEquals(DESCRIPTION, DATASET_INFO.description());
+    assertEquals(ETAG, DATASET_INFO.etag());
+    assertEquals(FRIENDLY_NAME, DATASET_INFO.friendlyName());
+    assertEquals(ID, DATASET_INFO.id());
+    assertEquals(LAST_MODIFIED, DATASET_INFO.lastModified());
+    assertEquals(LOCATION, DATASET_INFO.location());
+    assertEquals(SELF_LINK, DATASET_INFO.selfLink());
+    assertEquals(DATASET_ID_COMPLETE, DATASET_INFO_COMPLETE.datasetId());
+    assertEquals(ACCESS_RULES, DATASET_INFO_COMPLETE.acl());
+    assertEquals(CREATION_TIME, DATASET_INFO_COMPLETE.creationTime());
+    assertEquals(DEFAULT_TABLE_EXPIRATION, DATASET_INFO_COMPLETE.defaultTableLifetime());
+    assertEquals(DESCRIPTION, DATASET_INFO_COMPLETE.description());
+    assertEquals(ETAG, DATASET_INFO_COMPLETE.etag());
+    assertEquals(FRIENDLY_NAME, DATASET_INFO_COMPLETE.friendlyName());
+    assertEquals(ID, DATASET_INFO_COMPLETE.id());
+    assertEquals(LAST_MODIFIED, DATASET_INFO_COMPLETE.lastModified());
+    assertEquals(LOCATION, DATASET_INFO_COMPLETE.location());
+    assertEquals(SELF_LINK, DATASET_INFO_COMPLETE.selfLink());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    compareDatasets(DATASET_INFO_COMPLETE, DatasetInfo.fromPb(DATASET_INFO_COMPLETE.toPb()));
+    DatasetInfo datasetInfo = DatasetInfo.builder("project", "dataset").build();
+    compareDatasets(datasetInfo, DatasetInfo.fromPb(datasetInfo.toPb()));
+  }
+
+  private void compareDatasets(DatasetInfo expected, DatasetInfo value) {
+    assertEquals(expected, value);
+    assertEquals(expected.datasetId(), value.datasetId());
+    assertEquals(expected.description(), value.description());
+    assertEquals(expected.etag(), value.etag());
+    assertEquals(expected.friendlyName(), value.friendlyName());
+    assertEquals(expected.id(), value.id());
+    assertEquals(expected.location(), value.location());
+    assertEquals(expected.selfLink(), value.selfLink());
+    assertEquals(expected.acl(), value.acl());
+    assertEquals(expected.creationTime(), value.creationTime());
+    assertEquals(expected.defaultTableLifetime(), value.defaultTableLifetime());
+    assertEquals(expected.lastModified(), value.lastModified());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableIdTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableIdTest.java
new file mode 100644
index 000000000000..9da050bf5951
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableIdTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class TableIdTest {
+
+  private static final TableId TABLE = TableId.of("dataset", "table");
+  private static final TableId TABLE_COMPLETE = TableId.of("project", "dataset", "table");
+
+  @Test
+  public void testOf() {
+    assertEquals(null, TABLE.project());
+    assertEquals("dataset", TABLE.dataset());
+    assertEquals("table", TABLE.table());
+    assertEquals("project", TABLE_COMPLETE.project());
+    assertEquals("dataset", TABLE_COMPLETE.dataset());
+    assertEquals("table", TABLE_COMPLETE.table());
+  }
+
+  @Test
+  public void testEquals() {
+    compareTableIds(TABLE, TableId.of("dataset", "table"));
+    compareTableIds(TABLE_COMPLETE, TableId.of("project", "dataset", "table"));
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    compareTableIds(TABLE, TableId.fromPb(TABLE.toPb()));
+    compareTableIds(TABLE_COMPLETE, TableId.fromPb(TABLE_COMPLETE.toPb()));
+  }
+
+  private void compareTableIds(TableId expected, TableId value) {
+    assertEquals(expected, value);
+    assertEquals(expected.project(), value.project());
+    assertEquals(expected.dataset(), value.dataset());
+    assertEquals(expected.hashCode(), value.hashCode());
+  }
+}

From f87a394379e3ecb662370da5dc5e2b0ddfa4a91f Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 24 Nov 2015 18:40:22 -0800
Subject: [PATCH 133/322] Fix dependency on two different versions of the
 GoogleCredential class

---
 gcloud-java-datastore/pom.xml | 6 ++++++
 gcloud-java-storage/pom.xml   | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index f2743c8e2af1..4bf5caab2ff8 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -27,6 +27,12 @@
       google-api-services-datastore-protobuf
       v1beta2-rev1-2.1.2
       compile
+      
+        
+          com.google.api-client
+          google-api-client
+        
+      
     
     
       junit
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index b592200243ef..3e0b6a9490a8 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -32,6 +32,10 @@
 	  com.google.guava
 	  guava-jdk5
 	
+        
+          com.google.api-client
+          google-api-client
+        
       
     
     

From 3fc189bbad20e177fcdc9592089357c79d25c2d0 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 26 Nov 2015 17:45:00 +0100
Subject: [PATCH 134/322] Better javadoc, move static imports

---
 .../java/com/google/gcloud/bigquery/Acl.java  | 66 ++++++++++++++-----
 .../com/google/gcloud/bigquery/DatasetId.java |  3 +-
 .../google/gcloud/bigquery/DatasetInfo.java   | 22 +++++--
 .../com/google/gcloud/bigquery/TableId.java   |  4 +-
 .../gcloud/bigquery/DatasetInfoTest.java      |  6 +-
 5 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
index 2a5d86933d7c..972c4f0be5f1 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
@@ -22,7 +22,12 @@
 import java.util.Objects;
 
 /**
- * Access Control for a BigQuery Dataset.
+ * Access Control for a BigQuery Dataset. BigQuery uses ACLs to manage permissions on datasets. ACLs
+ * are not directly supported on tables. A table inherits its ACL from the dataset that contains it.
+ * Project roles affect your ability to run jobs or manage the project, while dataset roles affect
+ * how you can access or modify the data inside of a project.
+ *
+ * @see Access Control
  */
 public final class Acl implements Serializable {
 
@@ -31,16 +36,38 @@ public final class Acl implements Serializable {
   private final Entity entity;
   private final Role role;
 
+  /**
+   * Dataset roles supported by BigQuery.
+   *
+   * @see Dataset Roles
+   */
   public enum Role {
-    OWNER, READER, WRITER
+    /**
+     * Can read, query, copy or export tables in the dataset.
+     */
+    READER,
+    /**
+     * Same as {@link #READER} plus can edit or append data in the dataset.
+     */
+    WRITER,
+    /**
+     * Same as {@link #WRITER} plus can update and delete the dataset.
+     */
+    OWNER
   }
 
+  /**
+   * Base class for BigQuery entities that can be grant access to the dataset.
+   */
   public static abstract class Entity implements Serializable {
 
     private static final long serialVersionUID = 8111776788607959944L;
 
     private final Type type;
 
+    /**
+     * Types of BigQuery entities.
+     */
     public enum Type {
       DOMAIN, GROUP, USER, VIEW
     }
@@ -78,7 +105,8 @@ static Entity fromPb(Access access) {
   }
 
   /**
-   * Class for a BigQuery Domain entity.
+   * Class for a BigQuery Domain entity. Objects of this class represent a domain to grant access
+   * to. Any users signed in with the domain specified will be granted the specified access.
    */
   public static final class Domain extends Entity {
 
@@ -131,7 +159,10 @@ Access toPb() {
   }
 
   /**
-   * Class for a BigQuery Group entity.
+   * Class for a BigQuery Group entity. Objects of this class represent a group to grante access to.
+   * A Group entity can be created given the group's email or can be a special group:
+   * {@link #ofProjectOwners()}, {@link #ofProjectReaders()}, {@link #ofProjectWriters()} or
+   * {@link #ofAllAuthenticatedUsers()}.
    */
   public static final class Group extends Entity {
 
@@ -144,9 +175,9 @@ public static final class Group extends Entity {
     private final String identifier;
 
     /**
-     * Creates a Group entity given its identifier. Identifier can be either a special group
-     * identifier ({@code projectOwners}, {@code projectReaders}, {@code projectWriters} and
-     * {@code allAuthenticatedUsers}) or a group email.
+     * Creates a Group entity given its identifier. Identifier can be either a
+     * 
+     *     special group identifier or a group email.
      */
     public Group(String identifier) {
       super(Type.GROUP);
@@ -154,9 +185,9 @@ public Group(String identifier) {
     }
 
     /**
-     * Returns group's identifier, can be either a special group identifier ({@code projectOwners},
-     * {@code projectReaders}, {@code projectWriters} and {@code allAuthenticatedUsers}) or a group
-     * email.
+     * Returns group's identifier, can be either a
+     * 
+     *     special group identifier or a group email.
      */
     public String identifier() {
       return identifier;
@@ -196,9 +227,8 @@ Access toPb() {
         case ALL_AUTHENTICATED_USERS:
           return new Access().setSpecialGroup(ALL_AUTHENTICATED_USERS);
         default:
-          break;
+          return new Access().setGroupByEmail(identifier);
       }
-      return new Access().setGroupByEmail(identifier);
     }
 
     /**
@@ -223,7 +253,7 @@ public static Group ofProjectWriters() {
     }
 
     /**
-     * Returns a Group entity representing all project's users.
+     * Returns a Group entity representing all BigQuery authenticated users.
      */
     public static Group ofAllAuthenticatedUsers() {
       return new Group(ALL_AUTHENTICATED_USERS);
@@ -231,7 +261,8 @@ public static Group ofAllAuthenticatedUsers() {
   }
 
   /**
-   * Class for a BigQuery User entity.
+   * Class for a BigQuery User entity. Objects of this class represent a user to grant access to
+   * given the email address.
    */
   public static final class User extends Entity {
     
@@ -283,7 +314,10 @@ Access toPb() {
   }
 
   /**
-   * Class for a BigQuery View entity.
+   * Class for a BigQuery View entity. Objects of this class represent a view from a different
+   * dataset to grant access to. Queries executed against that view will have read access to tables
+   * in this dataset. The role field is not required when this field is set. If that view is updated
+   * by any user, access to the view needs to be granted again via an update operation.
    */
   public static final class View extends Entity {
 
@@ -298,7 +332,7 @@ public View(TableId id) {
     }
 
     /**
-     * Returns table's email.
+     * Returns table's identity.
      */
     public TableId id() {
       return id;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
index 6c70711b24df..b0da5603d929 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
@@ -16,9 +16,10 @@
 
 package com.google.gcloud.bigquery;
 
-import com.google.api.services.bigquery.model.DatasetReference;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.services.bigquery.model.DatasetReference;
+
 import java.io.Serializable;
 import java.util.Objects;
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
index cc65361fa8e9..773c314f8060 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
@@ -31,7 +31,9 @@
 import java.util.Objects;
 
 /**
- * Google BigQuery Dataset information.
+ * Google BigQuery Dataset information. A dataset is a grouping mechanism that holds zero or more
+ * tables. Datasets are the lowest level unit of access control; you cannot control access at the
+ * table level.
  *
  * @see 
  * Managing Jobs, Datasets, and Projects
@@ -128,7 +130,8 @@ Builder creationTime(Long creationTime) {
      * expirationTime for a given table is reached, that table will be deleted automatically. If a
      * table's expirationTime is modified or removed before the table expires, or if you provide an
      * explicit expirationTime when creating a table, that value takes precedence over the default
-     * expiration time indicated by this property.
+     * expiration time indicated by this property. This property is experimental and might be
+     * subject to change or removed.
      */
     public Builder defaultTableLifetime(Long defaultTableLifetime) {
       this.defaultTableLifetime =
@@ -168,10 +171,11 @@ Builder lastModified(Long lastModified) {
     }
 
     /**
-     * Sets the geographic location where the dataset should reside.
+     * Sets the geographic location where the dataset should reside. This property is experimental
+     * and might be subject to change or removed.
      *
-     * @see 
-     *     Dataset Location
+     * @see Dataset
+     *     Location
      */
     public Builder location(String location) {
       this.location = firstNonNull(location, Data.nullOf(String.class));
@@ -306,7 +310,15 @@ public Builder toBuilder() {
   public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("datasetId", datasetId)
+        .add("creationTime", creationTime)
+        .add("defaultTableLifetime", defaultTableLifetime)
         .add("description", description)
+        .add("etag", etag)
+        .add("friendlyName", friendlyName)
+        .add("id", id)
+        .add("lastModified", lastModified)
+        .add("location", location)
+        .add("selfLink", selfLink)
         .add("acl", acl)
         .toString();
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
index f6720d9ae01d..6747dbf9923f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
@@ -16,11 +16,11 @@
 
 package com.google.gcloud.bigquery;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.api.services.bigquery.model.TableReference;
 import com.google.common.base.Function;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.Serializable;
 import java.util.Objects;
 
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
index c8a4d97487fb..43c80f6afe83 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
@@ -68,7 +68,11 @@ public void testToBuilder() {
     assertEquals("description2", datasetInfo.description());
     datasetInfo = datasetInfo.toBuilder().datasetId(DATASET_ID).description("description").build();
     compareDatasets(DATASET_INFO, datasetInfo);
-    datasetInfo = DatasetInfo.builder(DATASET_ID).build();
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    DatasetInfo datasetInfo = DatasetInfo.builder(DATASET_ID).build();
     assertEquals(datasetInfo, datasetInfo.toBuilder().build());
   }
 

From dea8effe8e4b2011dc87507d4d391081b3d4b37d Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 26 Nov 2015 17:47:52 +0100
Subject: [PATCH 135/322] Add SerializationTest class

---
 .../gcloud/bigquery/SerializationTest.java    | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java

diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
new file mode 100644
index 000000000000..93165724e11f
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.AuthCredentials;
+import com.google.gcloud.RetryParams;
+
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.List;
+
+public class SerializationTest {
+
+  private static final Acl DOMAIN_ACCESS =
+      new Acl(new Acl.Domain("domain"), Acl.Role.WRITER);
+  private static final Acl GROUP_ACCESS =
+      new Acl(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER);
+  private static final Acl USER_ACCESS = new Acl(new Acl.User("user"), Acl.Role.OWNER);
+  private static final Acl VIEW_ACCESS =
+      new Acl(new Acl.View(TableId.of("project", "dataset", "table")), Acl.Role.WRITER);
+  private static final List ACCESS_RULES = ImmutableList.of(DOMAIN_ACCESS, GROUP_ACCESS,
+      VIEW_ACCESS, USER_ACCESS);
+  private static final Long CREATION_TIME = System.currentTimeMillis() - 10;
+  private static final Long DEFAULT_TABLE_EXPIRATION = 100L;
+  private static final String DESCRIPTION = "Description";
+  private static final String ETAG = "0xFF00";
+  private static final String FRIENDLY_NAME = "friendlyDataset";
+  private static final String ID = "P/D:1";
+  private static final Long LAST_MODIFIED = CREATION_TIME + 50;
+  private static final String LOCATION = "";
+  private static final String SELF_LINK = "http://bigquery/p/d";
+  private static final DatasetId DATASET_ID = DatasetId.of("project", "dataset");
+  private static final DatasetInfo DATASET_INFO = DatasetInfo.builder(DATASET_ID)
+      .acl(ACCESS_RULES)
+      .creationTime(CREATION_TIME)
+      .defaultTableLifetime(DEFAULT_TABLE_EXPIRATION)
+      .description(DESCRIPTION)
+      .etag(ETAG)
+      .friendlyName(FRIENDLY_NAME)
+      .id(ID)
+      .lastModified(LAST_MODIFIED)
+      .location(LOCATION)
+      .selfLink(SELF_LINK)
+      .build();
+  private static final TableId TABLE_ID = TableId.of("project", "dataset", "table");
+
+  @Test
+  public void testServiceOptions() throws Exception {
+    BigQueryOptions options = BigQueryOptions.builder()
+        .projectId("p1")
+        .authCredentials(AuthCredentials.createForAppEngine())
+        .build();
+    BigQueryOptions serializedCopy = serializeAndDeserialize(options);
+    assertEquals(options, serializedCopy);
+
+    options = options.toBuilder()
+        .projectId("p2")
+        .retryParams(RetryParams.getDefaultInstance())
+        .authCredentials(AuthCredentials.noCredentials())
+        .build();
+    serializedCopy = serializeAndDeserialize(options);
+    assertEquals(options, serializedCopy);
+  }
+
+  @Test
+  public void testModelAndRequests() throws Exception {
+    Serializable[] objects = {DOMAIN_ACCESS, GROUP_ACCESS, USER_ACCESS, VIEW_ACCESS, DATASET_ID,
+        DATASET_INFO, TABLE_ID};
+    for (Serializable obj : objects) {
+      Object copy = serializeAndDeserialize(obj);
+      assertEquals(obj, obj);
+      assertEquals(obj, copy);
+      assertNotSame(obj, copy);
+      assertEquals(copy, copy);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  private  T serializeAndDeserialize(T obj)
+      throws IOException, ClassNotFoundException {
+    ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+    try (ObjectOutputStream output = new ObjectOutputStream(bytes)) {
+      output.writeObject(obj);
+    }
+    try (ObjectInputStream input =
+        new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
+      return (T) input.readObject();
+    }
+  }
+}

From 3f0d511746b9589de453dfce2a1171ff9ba301ad Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 27 Nov 2015 10:13:31 +0100
Subject: [PATCH 136/322] Handle null role in Acl.fromPb, add test

---
 .../src/main/java/com/google/gcloud/bigquery/Acl.java  | 10 ++++++----
 .../test/java/com/google/gcloud/bigquery/AclTest.java  |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
index 972c4f0be5f1..610f818e6cb9 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
@@ -16,6 +16,8 @@
 
 package com.google.gcloud.bigquery;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.api.services.bigquery.model.Dataset.Access;
 
 import java.io.Serializable;
@@ -370,7 +372,7 @@ Access toPb() {
    * Build an ACL for an {@code entity} and a {@code role}.
    */
   public Acl(Entity entity, Role role) {
-    this.entity = entity;
+    this.entity = checkNotNull(entity);
     this.role = role;
   }
 
@@ -378,7 +380,7 @@ public Acl(Entity entity, Role role) {
    * Build an ACL for a view entity.
    */
   public Acl(View view) {
-    this.entity = view;
+    this.entity = checkNotNull(view);
     this.role = null;
   }
 
@@ -428,7 +430,7 @@ Access toPb() {
   }
 
   static Acl fromPb(Access access) {
-    Role role = Role.valueOf(access.getRole());
-    return new Acl(Entity.fromPb(access), role);
+    return new Acl(Entity.fromPb(access),
+        access.getRole() != null ? Role.valueOf(access.getRole()) : null);
   }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java
index 1b55495433c3..52159b0665ac 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java
@@ -87,5 +87,9 @@ public void testAcl() {
     assertEquals(Role.READER, acl.role());
     Dataset.Access pb = acl.toPb();
     assertEquals(acl, Acl.fromPb(pb));
+    View view = new View(TableId.of("project", "dataset", "view"));
+    acl = new Acl(view);
+    assertEquals(view, acl.entity());
+    assertEquals(null, acl.role());
   }
 }

From 18302758569d6a2a094a5a7986e2b10904f48e7a Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 30 Nov 2015 16:58:33 +0100
Subject: [PATCH 137/322] Enable travis to branches other than master

---
 .travis.yml         | 3 ---
 utilities/verify.sh | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ab421366db6a..c023116917a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,6 @@ before_install:
 install: mvn install -DskipTests=true -Dgpg.skip=true
 script: 
 - utilities/verify.sh
-branches:
-  only:
-  - master
 after_success:
 - utilities/after_success.sh
 env:
diff --git a/utilities/verify.sh b/utilities/verify.sh
index 463180415e98..d98e4ab53513 100755
--- a/utilities/verify.sh
+++ b/utilities/verify.sh
@@ -4,7 +4,7 @@ source ./utilities/integration_test_env.sh
 # This script is used by Travis-CI to run tests.
 # This script is referenced in .travis.yml.
 
-if [ "${TRAVIS_BRANCH}" == "master" -a "${TRAVIS_PULL_REQUEST}" == "false" ]; then
+if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
     # Get signing tools and API keyfile
     openssl aes-256-cbc -K $encrypted_631490ecae8f_key -iv $encrypted_631490ecae8f_iv -in target/travis/signing-tools.tar.enc -out $TRAVIS_BUILD_DIR/signing-tools.tar -d
     mkdir $TRAVIS_BUILD_DIR/signing-tools

From 8d2249e332d6701d02a283e30e64577d4a1e35fa Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 30 Nov 2015 16:31:51 +0100
Subject: [PATCH 138/322] Add TableInfo, CsvOptions, ExternalDataConfiguration
 and UserDefinedFunction models and tests

---
 .../google/gcloud/bigquery/CsvOptions.java    | 267 +++++++
 .../bigquery/ExternalDataConfiguration.java   | 419 ++++++++++
 .../google/gcloud/bigquery/FieldSchema.java   | 287 +++++++
 .../com/google/gcloud/bigquery/TableInfo.java | 743 ++++++++++++++++++
 .../google/gcloud/bigquery/TableSchema.java   | 151 ++++
 .../gcloud/bigquery/UserDefinedFunction.java  | 158 ++++
 .../gcloud/bigquery/CsvOptionsTest.java       |  83 ++
 .../ExternalDataConfigurationTest.java        | 109 +++
 .../gcloud/bigquery/FieldSchemaTest.java      | 105 +++
 .../gcloud/bigquery/SerializationTest.java    |  51 +-
 .../google/gcloud/bigquery/TableInfoTest.java | 229 ++++++
 .../gcloud/bigquery/TableSchemaTest.java      |  77 ++
 .../bigquery/UserDefinedFunctionTest.java     |  56 ++
 13 files changed, 2734 insertions(+), 1 deletion(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldSchema.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableSchema.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CsvOptionsTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldSchemaTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableSchemaTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/UserDefinedFunctionTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
new file mode 100644
index 000000000000..dc9e88e97a15
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.common.base.MoreObjects;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Google BigQuery CSV options. This class wraps some properties of CSV files used by BigQuery to
+ * parse external data.
+ */
+public class CsvOptions implements Serializable {
+
+  private static final long serialVersionUID = 2193570529308612708L;
+
+  private final Boolean allowJaggedRows;
+  private final Boolean allowQuotedNewLines;
+  private final String encoding;
+  private final String fieldDelimiter;
+  private final String quote;
+  private final Integer skipLeadingRows;
+
+  public static final class Builder {
+
+    private Boolean allowJaggedRows;
+    private Boolean allowQuotedNewLines;
+    private String encoding;
+    private String fieldDelimiter;
+    private String quote;
+    private Integer skipLeadingRows;
+
+    private Builder() {}
+
+    /**
+     * Set whether BigQuery should accept rows that are missing trailing optional columns. If
+     * {@code true}, BigQuery treats missing trailing columns as null values. If {@code false},
+     * records with missing trailing columns are treated as bad records, and if there are too many
+     * bad records, an invalid error is returned in the job result. By default, rows with missing
+     * trailing columns are considered bad records.
+     */
+    public Builder allowJaggedRows(Boolean allowJaggedRows) {
+      this.allowJaggedRows = allowJaggedRows;
+      return this;
+    }
+
+    /**
+     * Sets whether BigQuery should allow quoted data sections that contain newline characters in a
+     * CSV file. By default quoted newline are not allowed.
+     */
+    public Builder allowQuotedNewLines(Boolean allowQuotedNewLines) {
+      this.allowQuotedNewLines = allowQuotedNewLines;
+      return this;
+    }
+
+    /**
+     * Sets the character encoding of the data. The supported values are UTF-8 or ISO-8859-1. The
+     * default value is UTF-8. BigQuery decodes the data after the raw, binary data has been split
+     * using the values set in {@link #quote(String)} and {@link #fieldDelimiter(String)}.
+     */
+    public Builder encoding(String encoding) {
+      this.encoding = encoding;
+      return this;
+    }
+
+    /**
+     * Sets the separator for fields in a CSV file. BigQuery converts the string to ISO-8859-1
+     * encoding, and then uses the first byte of the encoded string to split the data in its raw,
+     * binary state. BigQuery also supports the escape sequence "\t" to specify a tab separator.
+     * The default value is a comma (',').
+     */
+    public Builder fieldDelimiter(String fieldDelimiter) {
+      this.fieldDelimiter = fieldDelimiter;
+      return this;
+    }
+
+    /**
+     * Sets the value that is used to quote data sections in a CSV file. BigQuery converts the
+     * string to ISO-8859-1 encoding, and then uses the first byte of the encoded string to split
+     * the data in its raw, binary state. The default value is a double-quote ('"'). If your data
+     * does not contain quoted sections, set the property value to an empty string. If your data
+     * contains quoted newline characters, you must also set {@link #allowQuotedNewLines(Boolean)}
+     * property to {@code true}.
+     */
+    public Builder quote(String quote) {
+      this.quote = quote;
+      return this;
+    }
+
+    /**
+     * Sets the number of rows at the top of a CSV file that BigQuery will skip when reading the
+     * data. The default value is 0. This property is useful if you have header rows in the file
+     * that should be skipped.
+     */
+    public Builder skipLeadingRows(Integer skipLeadingRows) {
+      this.skipLeadingRows = skipLeadingRows;
+      return this;
+    }
+
+    /**
+     * Creates an {@code ExternalDataConfiguration} object.
+     */
+    public CsvOptions build() {
+      return new CsvOptions(this);
+    }
+  }
+
+  private CsvOptions(Builder builder) {
+    this.allowJaggedRows = builder.allowJaggedRows;
+    this.allowQuotedNewLines = builder.allowQuotedNewLines;
+    this.encoding = builder.encoding;
+    this.fieldDelimiter = builder.fieldDelimiter;
+    this.quote = builder.quote;
+    this.skipLeadingRows = builder.skipLeadingRows;
+  }
+
+  /**
+   * Returns whether BigQuery should accept rows that are missing trailing optional columns. If
+   * {@code true}, BigQuery treats missing trailing columns as null values. If {@code false},
+   * records with missing trailing columns are treated as bad records, and if there are too many
+   * bad records, an invalid error is returned in the job result.
+   */
+  public Boolean allowJaggedRows() {
+    return allowJaggedRows;
+  }
+
+  /**
+   * Returns whether BigQuery should allow quoted data sections that contain newline characters in a
+   * CSV file.
+   */
+  public Boolean allowQuotedNewLines() {
+    return allowQuotedNewLines;
+  }
+
+  /**
+   * Returns the character encoding of the data. The supported values are UTF-8 or ISO-8859-1. The
+   * default value is UTF-8. BigQuery decodes the data after the raw, binary data has been split
+   * using the values set in {@link #quote()} and {@link #fieldDelimiter()}.
+   */
+  public String encoding() {
+    return encoding;
+  }
+
+  /**
+   * Returns the separator for fields in a CSV file.
+   */
+  public String fieldDelimiter() {
+    return fieldDelimiter;
+  }
+
+  /**
+   * Returns the value that is used to quote data sections in a CSV file.
+   */
+  public String quote() {
+    return quote;
+  }
+
+  /**
+   * Returns the number of rows at the top of a CSV file that BigQuery will skip when reading the
+   * data.
+   */
+  public Integer skipLeadingRows() {
+    return skipLeadingRows;
+  }
+
+  public Builder toBuilder() {
+    return new Builder()
+        .allowJaggedRows(allowJaggedRows)
+        .allowQuotedNewLines(allowQuotedNewLines)
+        .encoding(encoding)
+        .fieldDelimiter(fieldDelimiter)
+        .quote(quote)
+        .skipLeadingRows(skipLeadingRows);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("allowJaggedRows", allowJaggedRows)
+        .add("allowQuotedNewLines", allowQuotedNewLines)
+        .add("encoding", encoding)
+        .add("fieldDelimiter", fieldDelimiter)
+        .add("quote", quote)
+        .add("skipLeadingRows", skipLeadingRows)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(allowJaggedRows, allowQuotedNewLines, encoding, fieldDelimiter, quote,
+        skipLeadingRows);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof CsvOptions && Objects.equals(toPb(), ((CsvOptions) obj).toPb());
+  }
+
+  com.google.api.services.bigquery.model.CsvOptions toPb() {
+    com.google.api.services.bigquery.model.CsvOptions csvOptions =
+        new com.google.api.services.bigquery.model.CsvOptions();
+    if (allowJaggedRows != null) {
+      csvOptions.setAllowJaggedRows(allowJaggedRows);
+    }
+    if (allowQuotedNewLines != null) {
+      csvOptions.setAllowQuotedNewlines(allowQuotedNewLines);
+    }
+    if (encoding != null) {
+      csvOptions.setEncoding(encoding);
+    }
+    if (fieldDelimiter != null) {
+      csvOptions.setFieldDelimiter(fieldDelimiter);
+    }
+    if (quote != null) {
+      csvOptions.setQuote(quote);
+    }
+    if (skipLeadingRows != null) {
+      csvOptions.setSkipLeadingRows(skipLeadingRows);
+    }
+    return csvOptions;
+  }
+
+  /**
+   * Returns a builder for a CsvOptions object.
+   */
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  static CsvOptions fromPb(com.google.api.services.bigquery.model.CsvOptions csvOptions) {
+    Builder builder = builder();
+    if (csvOptions.getAllowJaggedRows() != null) {
+      builder.allowJaggedRows(csvOptions.getAllowJaggedRows());
+    }
+    if (csvOptions.getAllowQuotedNewlines() != null) {
+      builder.allowQuotedNewLines(csvOptions.getAllowQuotedNewlines());
+    }
+    if (csvOptions.getEncoding() != null) {
+      builder.encoding(csvOptions.getEncoding());
+    }
+    if (csvOptions.getFieldDelimiter() != null) {
+      builder.fieldDelimiter(csvOptions.getFieldDelimiter());
+    }
+    if (csvOptions.getQuote() != null) {
+      builder.quote(csvOptions.getQuote());
+    }
+    if (csvOptions.getSkipLeadingRows() != null) {
+      builder.skipLeadingRows(csvOptions.getSkipLeadingRows());
+    }
+    return builder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
new file mode 100644
index 000000000000..f7eb792c675c
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
@@ -0,0 +1,419 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery configuration for tables backed by external data. Objects of this class describe
+ * the data format, location, and other properties of a table stored outside of BigQuery.
+ * By defining these properties, the data source can then be queried as if it were a standard
+ * BigQuery table. Support for external tables is experimental and might be subject to changes or
+ * removed.
+ *
+ * @see Federated Data Sources
+ *     
+ */
+public class ExternalDataConfiguration implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public ExternalDataConfiguration apply(
+            com.google.api.services.bigquery.model.ExternalDataConfiguration configurationPb) {
+          return ExternalDataConfiguration.fromPb(configurationPb);
+        }
+      };
+  static final Function TO_PB_FUNCTION =
+      new Function() {
+        @Override
+        public com.google.api.services.bigquery.model.ExternalDataConfiguration apply(
+            ExternalDataConfiguration configuration) {
+          return configuration.toPb();
+        }
+      };
+
+  private static final long serialVersionUID = -8004288831035566549L;
+
+  private final List sourceUris;
+  private final TableSchema schema;
+  private final String sourceFormat;
+  private final Integer maxBadRecords;
+  private final Boolean ignoreUnknownValues;
+  private final String compression;
+  private final CsvOptions csvOptions;
+
+  public static final class Builder {
+
+    private List sourceUris;
+    private TableSchema schema;
+    private String sourceFormat;
+    private Integer maxBadRecords;
+    private Boolean ignoreUnknownValues;
+    private String compression;
+    private CsvOptions csvOptions;
+
+    private Builder() {}
+
+    /**
+     * Sets the fully-qualified URIs that point to your data in Google Cloud Storage. Each URI can
+     * contain one '*' wildcard character that must come after the bucket's name. Size limits
+     * related to load jobs apply to external data sources, plus an additional limit of 10 GB
+     * maximum size across all URIs.
+     *
+     * @see Quota
+     */
+    public Builder sourceUris(List sourceUris) {
+      this.sourceUris = ImmutableList.copyOf(checkNotNull(sourceUris));
+      return this;
+    }
+
+    /**
+     * Sets the schema for the external data.
+     */
+    public Builder schema(TableSchema schema) {
+      this.schema = checkNotNull(schema);
+      return this;
+    }
+
+    /**
+     * Sets the source format of the external data.
+     *
+     * 
+     *     Source Format
+     */
+    public Builder sourceFormat(String sourceFormat) {
+      this.sourceFormat = checkNotNull(sourceFormat);
+      return this;
+    }
+
+    /**
+     * Sets the maximum number of bad records that BigQuery can ignore when reading data. If the
+     * number of bad records exceeds this value, an invalid error is returned in the job result.
+     * The default value is 0, which requires that all records are valid.
+     */
+    public Builder maxBadRecords(Integer maxBadRecords) {
+      this.maxBadRecords = maxBadRecords;
+      return this;
+    }
+
+    /**
+     * Sets whether BigQuery should allow extra values that are not represented in the table schema.
+     * If true, the extra values are ignored. If false, records with extra columns are treated as
+     * bad records, and if there are too many bad records, an invalid error is returned in the job
+     * result. The default value is false. The value set with
+     * {@link #sourceFormat(String)} property determines what
+     * BigQuery treats as an extra value.
+     *
+     * @see 
+     *     Ignore Unknown Values
+     */
+    public Builder ignoreUnknownValues(Boolean ignoreUnknownValues) {
+      this.ignoreUnknownValues = ignoreUnknownValues;
+      return this;
+    }
+
+    /**
+     * Sets compression type of the data source. By default no compression is assumed.
+     *
+     * @see 
+     *     Compression
+     */
+    public Builder compression(String compression) {
+      this.compression = compression;
+      return this;
+    }
+
+    /**
+     * Sets additional properties to be used to parse CSV data (used when
+     * {@link #sourceFormat(String)} is set to CSV).
+     */
+    public Builder csvOptions(CsvOptions csvOptions) {
+      this.csvOptions = csvOptions;
+      return this;
+    }
+
+    /**
+     * Creates an {@code ExternalDataConfiguration} object.
+     */
+    public ExternalDataConfiguration build() {
+      return new ExternalDataConfiguration(this);
+    }
+  }
+
+  ExternalDataConfiguration(Builder builder) {
+    this.compression = builder.compression;
+    this.ignoreUnknownValues = builder.ignoreUnknownValues;
+    this.maxBadRecords = builder.maxBadRecords;
+    this.schema = builder.schema;
+    this.sourceFormat = builder.sourceFormat;
+    this.sourceUris = builder.sourceUris;
+    this.csvOptions = builder.csvOptions;
+  }
+
+  /**
+   * Returns the compression type of the data source.
+   *
+   * @see 
+   *     Compression
+   */
+  public String compression() {
+    return compression;
+  }
+
+  /**
+   * Returns whether BigQuery should allow extra values that are not represented in the table
+   * schema. If true, the extra values are ignored. If false, records with extra columns are treated
+   * as bad records, and if there are too many bad records, an invalid error is returned in the job
+   * result. The default value is false. The value of {@link #sourceFormat()} determines what
+   * BigQuery treats as an extra value.
+   *
+   * @see 
+   *     Ignore Unknown Values
+   */
+  public Boolean ignoreUnknownValues() {
+    return ignoreUnknownValues;
+  }
+
+  /**
+   * Returns the maximum number of bad records that BigQuery can ignore when reading data. If the
+   * number of bad records exceeds this value, an invalid error is returned in the job result.
+   */
+  public Integer maxBadRecords() {
+    return maxBadRecords;
+  }
+
+  /**
+   * Returns the schema for the external data.
+   */
+  public TableSchema schema() {
+    return schema;
+  }
+
+  /**
+   * Sets the source format of the external data.
+   *
+   * 
+   *     Source Format
+   */
+  public String sourceFormat() {
+    return sourceFormat;
+  }
+
+  /**
+   * Returns the fully-qualified URIs that point to your data in Google Cloud Storage. Each URI can
+   * contain one '*' wildcard character that must come after the bucket's name. Size limits
+   * related to load jobs apply to external data sources, plus an additional limit of 10 GB
+   * maximum size across all URIs.
+   *
+   * @see Quota
+   */
+  public List sourceUris() {
+    return sourceUris;
+  }
+
+  /**
+   * Returns additional properties used to parse CSV data (used when {@link #sourceFormat()} is set
+   * to CSV).
+   */
+  public CsvOptions csvOptions() {
+    return csvOptions;
+  }
+
+  /**
+   * Returns a builder for the {@code ExternalDataConfiguration} object.
+   */
+  public Builder toBuilder() {
+    return new Builder()
+        .compression(compression)
+        .ignoreUnknownValues(ignoreUnknownValues)
+        .maxBadRecords(maxBadRecords)
+        .schema(schema)
+        .sourceFormat(sourceFormat)
+        .sourceUris(sourceUris)
+        .csvOptions(csvOptions);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("sourceUris", sourceUris)
+        .add("sourceFormat", sourceFormat)
+        .add("schema", schema)
+        .add("compression", compression)
+        .add("ignoreUnknownValues", ignoreUnknownValues)
+        .add("maxBadRecords", maxBadRecords)
+        .add("csvOptions", csvOptions)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(compression, ignoreUnknownValues, maxBadRecords, schema, sourceFormat,
+        sourceUris, csvOptions);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ExternalDataConfiguration
+        && Objects.equals(toPb(), ((ExternalDataConfiguration) obj).toPb());
+  }
+
+  com.google.api.services.bigquery.model.ExternalDataConfiguration toPb() {
+    com.google.api.services.bigquery.model.ExternalDataConfiguration externalConfigurationPb =
+        new com.google.api.services.bigquery.model.ExternalDataConfiguration();
+    if (compression != null) {
+      externalConfigurationPb.setCompression(compression);
+    }
+    if (ignoreUnknownValues != null) {
+      externalConfigurationPb.setIgnoreUnknownValues(ignoreUnknownValues);
+    }
+    if (maxBadRecords != null) {
+      externalConfigurationPb.setMaxBadRecords(maxBadRecords);
+    }
+    if (schema != null) {
+      externalConfigurationPb.setSchema(schema.toPb());
+    }
+    if (sourceFormat != null) {
+      externalConfigurationPb.setSourceFormat(sourceFormat);
+    }
+    if (sourceUris != null) {
+      externalConfigurationPb.setSourceUris(sourceUris);
+    }
+    if (csvOptions != null) {
+      externalConfigurationPb.setCsvOptions(csvOptions.toPb());
+    }
+    return externalConfigurationPb;
+  }
+
+  /**
+   * Creates a builder for an ExternalDataConfiguration object.
+   *
+   * @param sourceUris the fully-qualified URIs that point to your data in Google Cloud Storage.
+   *     Each URI can contain one '*' wildcard character that must come after the bucket's name.
+   *     Size limits related to load jobs apply to external data sources, plus an additional limit
+   *     of 10 GB maximum size across all URIs.
+   * @param schema the schema for the external data
+   * @param format the source format of the external data
+   * @return a builder for an ExternalDataConfiguration object given source URIs, schema and format
+   *
+   * @see Quota
+   * @see 
+   *     Source Format
+   */
+  public static Builder builder(List sourceUris, TableSchema schema, String format) {
+    return new Builder().sourceUris(sourceUris).schema(schema).sourceFormat(format);
+  }
+
+  /**
+   * Creates a builder for an ExternalDataConfiguration object.
+   *
+   * @param sourceUri a fully-qualified URI that points to your data in Google Cloud Storage. The
+   *     URI can contain one '*' wildcard character that must come after the bucket's name. Size
+   *     limits related to load jobs apply to external data sources.
+   * @param schema the schema for the external data
+   * @param format the source format of the external data
+   * @return a builder for an ExternalDataConfiguration object given source URI, schema and format
+   *
+   * @see Quota
+   * @see 
+   *     Source Format
+   */
+  public static Builder builder(String sourceUri, TableSchema schema, String format) {
+    return new Builder()
+        .sourceUris(ImmutableList.of(sourceUri))
+        .schema(schema)
+        .sourceFormat(format);
+  }
+
+  /**
+   * Creates an ExternalDataConfiguration object.
+   *
+   * @param sourceUris the fully-qualified URIs that point to your data in Google Cloud Storage.
+   *     Each URI can contain one '*' wildcard character that must come after the bucket's name.
+   *     Size limits related to load jobs apply to external data sources, plus an additional limit
+   *     of 10 GB maximum size across all URIs.
+   * @param schema the schema for the external data
+   * @param format the source format of the external data
+   * @return an ExternalDataConfiguration object given source URIs, schema and format
+   *
+   * @see Quota
+   * @see 
+   *     Source Format
+   */
+  public static ExternalDataConfiguration of(
+      List sourceUris, TableSchema schema, String format) {
+    return builder(sourceUris, schema, format).build();
+  }
+
+  /**
+   * Creates an ExternalDataConfiguration object.
+   *
+   * @param sourceUri a fully-qualified URI that points to your data in Google Cloud Storage. The
+   *     URI can contain one '*' wildcard character that must come after the bucket's name. Size
+   *     limits related to load jobs apply to external data sources.
+   * @param schema the schema for the external data
+   * @param format the source format of the external data
+   * @return an ExternalDataConfiguration object given source URIs, schema and format
+   *
+   * @see Quota
+   * @see 
+   *     Source Format
+   */
+  public static ExternalDataConfiguration of(String sourceUri, TableSchema schema, String format) {
+    return builder(sourceUri, schema, format).build();
+  }
+
+  static ExternalDataConfiguration fromPb(
+      com.google.api.services.bigquery.model.ExternalDataConfiguration externalDataConfiguration) {
+    Builder builder = new Builder();
+    if (externalDataConfiguration.getSourceUris() != null) {
+      builder.sourceUris(externalDataConfiguration.getSourceUris());
+    }
+    if (externalDataConfiguration.getSchema() != null) {
+      builder.schema(TableSchema.fromPb(externalDataConfiguration.getSchema()));
+    }
+    if (externalDataConfiguration.getSourceFormat() != null) {
+      builder.sourceFormat(externalDataConfiguration.getSourceFormat());
+    }
+    if (externalDataConfiguration.getCompression() != null) {
+      builder.compression(externalDataConfiguration.getCompression());
+    }
+    if (externalDataConfiguration.getIgnoreUnknownValues() != null) {
+      builder.ignoreUnknownValues(externalDataConfiguration.getIgnoreUnknownValues());
+    }
+    if (externalDataConfiguration.getCsvOptions() != null) {
+      builder.csvOptions(CsvOptions.fromPb(externalDataConfiguration.getCsvOptions()));
+    }
+    if (externalDataConfiguration.getMaxBadRecords() != null) {
+      builder.maxBadRecords(externalDataConfiguration.getMaxBadRecords());
+    }
+    return builder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldSchema.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldSchema.java
new file mode 100644
index 000000000000..fa622bf28976
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldSchema.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google Bigquery schema for a Table field. Several data types and modes are supported.
+ */
+public class FieldSchema implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public FieldSchema apply(TableFieldSchema pb) {
+          return FieldSchema.fromPb(pb);
+        }
+      };
+  static final Function TO_PB_FUNCTION =
+      new Function() {
+        @Override
+        public TableFieldSchema apply(FieldSchema fieldSchema) {
+          return fieldSchema.toPb();
+        }
+      };
+
+  private static final long serialVersionUID = -8154262932305199256L;
+
+  /**
+   * Data Types for a BigQuery Table field.
+   *
+   * @see 
+   *     Data Types
+   */
+  public enum Type {
+    STRING, INTEGER, FLOAT, BOOLEAN, TIMESTAMP, RECORD
+  }
+
+  /**
+   * Mode for a BigQuery Table field. {@link Mode#NULLABLE} fields can be set to {@code null},
+   * {@link Mode#REQUIRED} fields must be provided. {@link Mode#REPEATED} fields can contain more
+   * than one value.
+   */
+  public enum Mode {
+    NULLABLE, REQUIRED, REPEATED
+  }
+
+  private final String name;
+  private final Type type;
+  private final Mode mode;
+  private final String description;
+  private final List fields;
+
+  public static final class Builder {
+
+    private String name;
+    private Type type;
+    private Mode mode;
+    private String description;
+    private List fields;
+
+    private Builder() {}
+
+    /**
+     * Sets the field name. The name must contain only letters (a-z, A-Z), numbers (0-9), or
+     * underscores (_), and must start with a letter or underscore. The maximum length is 128
+     * characters.
+     */
+    public Builder name(String name) {
+      this.name = checkNotNull(name);
+      return this;
+    }
+
+    /**
+     * Sets the type of the field.
+     *
+     * @see 
+     *     Data Types
+     */
+    public Builder type(Type type) {
+      this.type = checkNotNull(type);
+      return this;
+    }
+
+    /**
+     * Sets the mode of the field. By default {@link Mode#NULLABLE} is used.
+     */
+    public Builder mode(Mode mode) {
+      this.mode = mode;
+      return this;
+    }
+
+    /**
+     * Sets the field description. The maximum length is 16K characters.
+     */
+    public Builder description(String description) {
+      this.description = description;
+      return this;
+    }
+
+    /**
+     * Sets the nested schema fields if {@link #type(Type)} is set to {@link Type#RECORD}.
+     */
+    Builder fields(Iterable fields) {
+      this.fields = fields != null ? ImmutableList.copyOf(fields) : null;
+      return this;
+    }
+
+    /**
+     * Creates an {@code FieldSchema} object.
+     */
+    public FieldSchema build() {
+      FieldSchema fieldSchema = new FieldSchema(this);
+      checkNotNull(fieldSchema.name);
+      checkNotNull(fieldSchema.type);
+      return fieldSchema;
+    }
+  }
+
+  private FieldSchema(Builder builder) {
+    this.name = builder.name;
+    this.type = builder.type;
+    this.mode = builder.mode;
+    this.description = builder.description;
+    this.fields = builder.fields;
+  }
+
+  /**
+   * Returns the field name.
+   */
+  public String name() {
+    return name;
+  }
+
+  /**
+   * Returns the field type.
+   *
+   * @see 
+   *     Data Types
+   */
+  public Type type() {
+    return type;
+  }
+
+  /**
+   * Returns the field mode. By default {@link Mode#NULLABLE} is used.
+   */
+  public Mode mode() {
+    return mode;
+  }
+
+  /**
+   * Returns the field description.
+   */
+  public String description() {
+    return description;
+  }
+
+  /**
+   * Returns the nested schema fields if {@link #type()} is set to {@link Type#RECORD}. Returns
+   * {@code null} otherwise.
+   */
+  public List fields() {
+    return fields;
+  }
+
+  /**
+   * Returns a builder for the {@code FieldSchema} object.
+   */
+  public Builder toBuilder() {
+    return new Builder()
+        .name(this.name)
+        .type(this.type)
+        .mode(this.mode)
+        .description(this.description)
+        .fields(this.fields);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("name", name)
+        .add("type", type)
+        .add("mode", mode)
+        .add("description", description)
+        .add("fields", fields)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, type, mode, description, fields);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof FieldSchema && Objects.equals(toPb(), ((FieldSchema) obj).toPb());
+  }
+
+  TableFieldSchema toPb() {
+    TableFieldSchema fieldSchemaPb = new TableFieldSchema();
+    fieldSchemaPb.setName(name);
+    fieldSchemaPb.setType(type.name());
+    if (mode != null) {
+      fieldSchemaPb.setMode(mode.name());
+    }
+    if (description != null) {
+      fieldSchemaPb.setDescription(description);
+    }
+    if (fields != null) {
+      List fieldsPb = Lists.transform(fields, TO_PB_FUNCTION);
+      fieldSchemaPb.setFields(fieldsPb);
+    }
+    return fieldSchemaPb;
+  }
+
+  /**
+   * Returns a FieldSchema object with given name and type.  This method should only be used to
+   * create fields with primitive types (i.e. {@link Type#FLOAT}, {@link Type#BOOLEAN},
+   * {@link Type#INTEGER}, {@link Type#STRING} and {@link Type#TIMESTAMP}).
+   */
+  public static FieldSchema of(String name, Type type) {
+    return builder(name, type).build();
+  }
+
+  /**
+   * Returns a FieldSchema object of type {@link Type#RECORD} for the provided name and subfields.
+   */
+  public static FieldSchema of(String name, List fields) {
+    return builder(name, fields).type(Type.RECORD).build();
+  }
+
+  /**
+   * Returns a builder for a FieldSchema object with given name and type.
+   */
+  public static Builder builder(String name, Type type) {
+    return new Builder().name(name).type(type);
+  }
+
+  /**
+   * Returns a builder for a FieldSchema object with given name and list of subfields. Type is set
+   * to {@link Type#RECORD}.
+   */
+  public static Builder builder(String name, List fields) {
+    return new Builder().name(name).type(Type.RECORD).fields(fields);
+  }
+
+  static FieldSchema fromPb(TableFieldSchema fieldSchemaPb) {
+    Builder fieldBuilder = new Builder();
+    fieldBuilder.name(fieldSchemaPb.getName());
+    fieldBuilder.type(Type.valueOf(fieldSchemaPb.getType()));
+    if (fieldSchemaPb.getMode() != null) {
+      fieldBuilder.mode(Mode.valueOf(fieldSchemaPb.getMode()));
+    }
+    if (fieldSchemaPb.getDescription() != null) {
+      fieldBuilder.description(fieldSchemaPb.getDescription());
+    }
+    if (fieldSchemaPb.getFields() != null) {
+      fieldBuilder.fields(Lists.transform(fieldSchemaPb.getFields(), FROM_PB_FUNCTION));
+    }
+    return fieldBuilder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
new file mode 100644
index 000000000000..df08025517f6
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -0,0 +1,743 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.client.util.Data;
+import com.google.api.services.bigquery.model.Streamingbuffer;
+import com.google.api.services.bigquery.model.Table;
+import com.google.api.services.bigquery.model.ViewDefinition;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.Lists;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Table information. A BigQuery table is a standard, two-dimensional table with
+ * individual records organized in rows, and a data type assigned to each column
+ * (also called a field). Individual fields within a record may contain nested and repeated children
+ * fields. Every table is described by a schema that describes field names, types, and other
+ * information.
+ *
+ * @see Managing Tables
+ */
+public class TableInfo implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public TableInfo apply(Table pb) {
+          return TableInfo.fromPb(pb);
+        }
+      };
+  static final Function TO_PB_FUNCTION =
+      new Function() {
+        @Override
+        public Table apply(TableInfo tableInfo) {
+          return tableInfo.toPb();
+        }
+      };
+
+  private static final long serialVersionUID = -7679032506430816205L;
+
+  /**
+   * The table type.
+   */
+  public enum Type {
+    /**
+     * A normal BigQuery table.
+     */
+    TABLE,
+    /**
+     * A virtual table defined by a SQL query.
+     *
+     * @see Views
+     */
+    VIEW,
+    /**
+     * A BigQuery table backed by external data.
+     *
+     * @see Federated Data
+     *     Sources
+     */
+    EXTERNAL
+  }
+
+  /**
+   * Google BigQuery Table's Streaming Buffer information. This class contains information on a
+   * table's streaming buffer as the estimated size in number of rows/bytes.
+   */
+  public static class StreamingBuffer implements Serializable {
+
+    private static final long serialVersionUID = -6713971364725267597L;
+    private final long estimatedRows;
+    private final long estimatedBytes;
+    private final long oldestEntryTime;
+
+    StreamingBuffer(long estimatedRows, long estimatedBytes, long oldestEntryTime) {
+      this.estimatedRows = estimatedRows;
+      this.estimatedBytes = estimatedBytes;
+      this.oldestEntryTime = oldestEntryTime;
+    }
+
+    /**
+     * Returns a lower-bound estimate of the number of rows currently in the streaming buffer.
+     */
+    public long estimatedRows() {
+      return estimatedRows;
+    }
+
+    /**
+     * Returns a lower-bound estimate of the number of bytes currently in the streaming buffer.
+     */
+    public long estimatedBytes() {
+      return estimatedBytes;
+    }
+
+    /**
+     * Returns the timestamp of the oldest entry in the streaming buffer, in milliseconds since
+     * epoch.
+     */
+    public long oldestEntryTime() {
+      return oldestEntryTime;
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("estimatedRows", estimatedRows)
+          .add("estimatedBytes", estimatedBytes)
+          .add("oldestEntryTime", oldestEntryTime)
+          .toString();
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(estimatedRows, estimatedBytes, oldestEntryTime);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj instanceof StreamingBuffer
+          && Objects.equals(toPb(), ((StreamingBuffer) obj).toPb());
+    }
+
+    public Streamingbuffer toPb() {
+      return new Streamingbuffer()
+          .setEstimatedBytes(BigInteger.valueOf(estimatedBytes))
+          .setEstimatedRows(BigInteger.valueOf(estimatedRows))
+          .setOldestEntryTime(BigInteger.valueOf(oldestEntryTime));
+    }
+
+    static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
+      return new StreamingBuffer(streamingBufferPb.getEstimatedRows().longValue(),
+          streamingBufferPb.getEstimatedBytes().longValue(),
+          streamingBufferPb.getOldestEntryTime().longValue());
+    }
+  }
+
+  private final String etag;
+  private final String id;
+  private final String selfLink;
+  private final TableId tableId;
+  private final String friendlyName;
+  private final String description;
+  private final TableSchema schema;
+  private final Long numBytes;
+  private final Long numRows;
+  private final Long creationTime;
+  private final Long expirationTime;
+  private final Long lastModifiedTime;
+  private final String viewQuery;
+  private final List userDefinedFunctions;
+  private final Type type;
+  private final ExternalDataConfiguration externalConfiguration;
+  private final String location;
+  private final StreamingBuffer streamingBuffer;
+
+  public static final class Builder {
+
+    private String etag;
+    private String id;
+    private String selfLink;
+    private TableId tableId;
+    private String friendlyName;
+    private String description;
+    private TableSchema schema;
+    private Long numBytes;
+    private Long numRows;
+    private Long creationTime;
+    private Long expirationTime;
+    private Long lastModifiedTime;
+    private String viewQuery;
+    private List userDefinedFunctions;
+    private Type type;
+    private ExternalDataConfiguration externalConfiguration;
+    private String location;
+    private StreamingBuffer streamingBuffer;
+
+    private Builder() {}
+
+    private Builder(TableInfo tableInfo) {
+      this.etag = tableInfo.etag;
+      this.id = tableInfo.id;
+      this.selfLink = tableInfo.selfLink;
+      this.tableId = tableInfo.tableId;
+      this.friendlyName = tableInfo.friendlyName;
+      this.description = tableInfo.description;
+      this.schema = tableInfo.schema;
+      this.numBytes = tableInfo.numBytes;
+      this.numRows = tableInfo.numRows;
+      this.creationTime = tableInfo.creationTime;
+      this.expirationTime = tableInfo.expirationTime;
+      this.lastModifiedTime = tableInfo.lastModifiedTime;
+      this.viewQuery = tableInfo.viewQuery;
+      this.userDefinedFunctions = tableInfo.userDefinedFunctions;
+      this.type = tableInfo.type;
+      this.externalConfiguration = tableInfo.externalConfiguration;
+      this.location = tableInfo.location;
+      this.streamingBuffer = tableInfo.streamingBuffer;
+    }
+
+    Builder creationTime(Long creationTime) {
+      this.creationTime = creationTime;
+      return this;
+    }
+
+    /**
+     * Sets a user-friendly description for the table.
+     */
+    public Builder description(String description) {
+      this.description = firstNonNull(description, Data.nullOf(String.class));
+      return this;
+    }
+
+    Builder etag(String etag) {
+      this.etag = etag;
+      return this;
+    }
+
+    /**
+     * Sets the time when this table expires, in milliseconds since the epoch. If not present, the
+     * table will persist indefinitely. Expired tables will be deleted and their storage reclaimed.
+     */
+    public Builder expirationTime(Long expirationTime) {
+      this.expirationTime = firstNonNull(expirationTime, Data.nullOf(Long.class));
+      return this;
+    }
+
+    /**
+     * Sets the data format, location, and other properties of a table stored outside of BigQuery.
+     * This property is experimental and might be subject to change or removed.
+     *
+     * @see Federated Data
+     *     Sources
+     */
+    public Builder externalConfiguration(ExternalDataConfiguration externalConfiguration) {
+      this.externalConfiguration = externalConfiguration;
+      return this;
+    }
+
+    /**
+     * Sets a user-friendly name for the dataset.
+     */
+    public Builder friendlyName(String friendlyName) {
+      this.friendlyName = firstNonNull(friendlyName, Data.nullOf(String.class));
+      return this;
+    }
+
+    Builder id(String id) {
+      this.id = id;
+      return this;
+    }
+
+    Builder lastModifiedTime(Long lastModifiedTime) {
+      this.lastModifiedTime = lastModifiedTime;
+      return this;
+    }
+
+    Builder location(String location) {
+      this.location = location;
+      return this;
+    }
+
+    Builder numBytes(Long numBytes) {
+      this.numBytes = numBytes;
+      return this;
+    }
+
+    Builder numRows(Long numRows) {
+      this.numRows = numRows;
+      return this;
+    }
+
+    /**
+     * Sets the table's schema. Providing a schema is not necessary when {@link #viewQuery} is
+     * provided.
+     */
+    public Builder schema(TableSchema schema) {
+      this.schema = schema;
+      return this;
+    }
+
+    Builder selfLink(String selfLink) {
+      this.selfLink = selfLink;
+      return this;
+    }
+
+    Builder streamingBuffer(StreamingBuffer streamingBuffer) {
+      this.streamingBuffer = streamingBuffer;
+      return this;
+    }
+
+    /**
+     * Sets the table identity.
+     */
+    public Builder tableId(TableId tableId) {
+      this.tableId = tableId;
+      return this;
+    }
+
+    Builder type(Type type) {
+      this.type = type;
+      return this;
+    }
+
+    /**
+     * Sets the query used to create a table of {@link Type#VIEW} type.
+     */
+    public Builder viewQuery(String viewQuery) {
+      this.viewQuery = viewQuery;
+      return this;
+    }
+
+    /**
+     * Sets user-defined functions to be used by the view's query. User defined functions are only
+     * used when {@link #type(TableInfo.Type)} is set to {@link Type#VIEW} and a query is provided via
+     * {@link #viewQuery(String)}.
+     *
+     * @see User-Defined
+     *     Functions
+     */
+    public Builder userDefinedFunctions(List userDefinedFunctions) {
+      this.userDefinedFunctions = userDefinedFunctions;
+      return this;
+    }
+
+    /**
+     * Creates a {@code TableInfo} object.
+     */
+    public TableInfo build() {
+      checkNotNull(tableId);
+      return new TableInfo(this);
+    }
+  }
+
+  private TableInfo(Builder builder) {
+    this.etag = builder.etag;
+    this.id = builder.id;
+    this.selfLink = builder.selfLink;
+    this.tableId = builder.tableId;
+    this.friendlyName = builder.friendlyName;
+    this.description = builder.description;
+    this.schema = builder.schema;
+    this.numBytes = builder.numBytes;
+    this.numRows = builder.numRows;
+    this.creationTime = builder.creationTime;
+    this.expirationTime = builder.expirationTime;
+    this.lastModifiedTime = builder.lastModifiedTime;
+    this.viewQuery = builder.viewQuery;
+    this.userDefinedFunctions = builder.userDefinedFunctions;
+    this.type = builder.type;
+    this.externalConfiguration = builder.externalConfiguration;
+    this.location = builder.location;
+    this.streamingBuffer = builder.streamingBuffer;
+  }
+
+  /**
+   * Returns the hash of the table resource.
+   */
+  public String etag() {
+    return etag;
+  }
+
+  /**
+   * Returns an opaque id for the dataset.
+   */
+  public String id() {
+    return id;
+  }
+
+  /**
+   * Returns an URL that can be used to access the resource again. The returned URL can be used for
+   * get or update requests.
+   */
+  public String selfLink() {
+    return selfLink;
+  }
+
+  /**
+   * Returns the table identity.
+   */
+  public TableId tableId() {
+    return tableId;
+  }
+
+  /**
+   * Returns a user-friendly name for the table.
+   */
+  public String friendlyName() {
+    return friendlyName;
+  }
+
+  /**
+   * Returns a user-friendly description for the table.
+   */
+  public String description() {
+    return description;
+  }
+
+  /**
+   * Returns the table's schema.
+   */
+  public TableSchema schema() {
+    return schema;
+  }
+
+  /**
+   * Returns the size of this table in bytes, excluding any data in the streaming buffer.
+   */
+  public Long numBytes() {
+    return numBytes;
+  }
+
+  /**
+   * Returns the number of rows in this table, excluding any data in the streaming buffer.
+   */
+  public Long numRows() {
+    return numRows;
+  }
+
+  /**
+   * Returns the time when this table was created, in milliseconds since the epoch.
+   */
+  public Long creationTime() {
+    return creationTime;
+  }
+
+  /**
+   * Returns the time when this table expires, in milliseconds since the epoch. If not present, the
+   * table will persist indefinitely. Expired tables will be deleted and their storage reclaimed.
+   */
+  public Long expirationTime() {
+    return expirationTime;
+  }
+
+  /**
+   * Returns the time when this table was last modified, in milliseconds since the epoch.
+   */
+  public Long lastModifiedTime() {
+    return lastModifiedTime;
+  }
+
+  /**
+   * If this table is a view ({@link #type()} returns {@link Type#VIEW}) this method returns the
+   * query used to create the view. Returns {@code null} otherwise.
+   */
+  public String viewQuery() {
+    return viewQuery;
+  }
+
+  /**
+   * If this table is a view ({@link #type()} returns {@link Type#VIEW} this method returns user
+   * defined functions that can be used by {@link #viewQuery}.
+   *
+   * @see User-Defined Functions
+   *     
+   */
+  public List userDefinedFunctions() {
+    return userDefinedFunctions;
+  }
+
+  /**
+   * Returns the type of the table.
+   */
+  public Type type() {
+    return type;
+  }
+
+  /**
+   * If this table is external ({@link #type()} returns {@link Type#EXTERNAL}) this method returns
+   * the data format, location, and other properties of a table stored outside of BigQuery.
+   * If the table is not {@link Type#EXTERNAL} this method returns {@code null}. This property
+   * is experimental and might be subject to change or removed.
+   *
+   * @see Federated Data Sources
+   *     
+   */
+  public ExternalDataConfiguration externalConfiguration() {
+    return externalConfiguration;
+  }
+
+  /**
+   * Returns the geographic location where the table should reside. This value is inherited from the
+   * dataset.
+   *
+   * @see 
+   *     Dataset Location
+   */
+  public String location() {
+    return location;
+  }
+
+  /**
+   * Returns information on the table's streaming buffer if any exists. Returns {@code null} if no
+   * streaming buffer exists.
+   */
+  public StreamingBuffer streamingBuffer() {
+    return streamingBuffer;
+  }
+
+  /**
+   * Returns a builder for the {@code TableInfo} object.
+   */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("tableId", tableId)
+        .add("schema", schema)
+        .add("externalDataConfiguration", externalConfiguration)
+        .add("query", viewQuery)
+        .add("userDefinedFunctions", userDefinedFunctions)
+        .add("type", type)
+        .add("location", location)
+        .add("streamingBuffer", streamingBuffer)
+        .add("etag", etag)
+        .add("id", id)
+        .add("selfLink", selfLink)
+        .add("friendlyName", friendlyName)
+        .add("description", description)
+        .add("numBytes", numBytes)
+        .add("numRows", numRows)
+        .add("expirationTime", expirationTime)
+        .add("creationTime", creationTime)
+        .add("lastModifiedTime", lastModifiedTime)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(tableId);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof TableInfo && Objects.equals(toPb(), ((TableInfo) obj).toPb());
+  }
+
+  Table toPb() {
+    Table tablePb = new Table();
+    tablePb.setTableReference(tableId.toPb());
+    if (externalConfiguration != null) {
+      tablePb.setExternalDataConfiguration(externalConfiguration.toPb());
+    }
+    if (lastModifiedTime != null) {
+      tablePb.setLastModifiedTime(BigInteger.valueOf(lastModifiedTime));
+    }
+    if (numRows != null) {
+      tablePb.setNumRows(BigInteger.valueOf(numRows));
+    }
+    if (schema != null) {
+      tablePb.setSchema(schema.toPb());
+    }
+    if (streamingBuffer != null) {
+      tablePb.setStreamingBuffer(streamingBuffer.toPb());
+    }
+    if (viewQuery != null) {
+      ViewDefinition viewDefinition = new ViewDefinition().setQuery(viewQuery);
+      if (userDefinedFunctions != null) {
+        viewDefinition.setUserDefinedFunctionResources(
+            Lists.transform(userDefinedFunctions, UserDefinedFunction.TO_PB_FUNCTION));
+      }
+      tablePb.setView(new ViewDefinition().setQuery(viewQuery));
+    }
+    if (type != null) {
+      tablePb.setType(type.name());
+    }
+    tablePb.setCreationTime(creationTime);
+    tablePb.setDescription(description);
+    tablePb.setEtag(etag);
+    tablePb.setExpirationTime(expirationTime);
+    tablePb.setFriendlyName(friendlyName);
+    tablePb.setId(id);
+    tablePb.setLocation(location);
+    tablePb.setNumBytes(numBytes);
+    tablePb.setSelfLink(selfLink);
+    return tablePb;
+  }
+
+  /**
+   * Returns a builder for a BigQuery table backed by external data. External tables are
+   * experimental and might be subject to change or removed.
+   *
+   * @param tableId table id
+   * @param configuration configuration for external data source
+   */
+  public static Builder builder(TableId tableId, ExternalDataConfiguration configuration) {
+    return new Builder().tableId(tableId).externalConfiguration(configuration);
+  }
+
+  /**
+   * Returns a builder for a BigQuery view.
+   *
+   * @param tableId table id
+   * @param query query used to create the view
+   */
+  public static Builder builder(TableId tableId, String query) {
+    return new Builder().tableId(tableId).viewQuery(query);
+  }
+
+  /**
+   * Returns a builder for a BigQuery view.
+   *
+   * @param tableId table id
+   * @param query query used to create the view
+   */
+  public static Builder builder(TableId tableId, String query, List functions) {
+    return new Builder().tableId(tableId).viewQuery(query).userDefinedFunctions(functions);
+  }
+
+  /**
+   * Returns a builder for a BigQuery table.
+   *
+   * @param tableId table id
+   * @param schema table's schema definition
+   */
+  public static Builder builder(TableId tableId, TableSchema schema) {
+    return new Builder().tableId(tableId).schema(schema);
+  }
+
+  /**
+   * Creates BigQuery table backed by external data.
+   *
+   * @param tableId table id
+   * @param configuration configuration for external data source
+   */
+  public static TableInfo of(TableId tableId, ExternalDataConfiguration configuration) {
+    return builder(tableId, configuration).build();
+  }
+
+  /**
+   * Creates a BigQuery view.
+   *
+   * @param tableId table id
+   * @param query query used to create the view
+   */
+  public static TableInfo of(TableId tableId, String query) {
+    return builder(tableId, query).build();
+  }
+
+  /**
+   * Creates a BigQuery view.
+   *
+   * @param tableId table id
+   * @param query query used to create the view
+   * @param functions user defined funtions that can be used in {@code query}
+   */
+  public static TableInfo of(TableId tableId, String query, List functions) {
+    return builder(tableId, query, functions).build();
+  }
+
+  /**
+   * Creates a BigQuery table.
+   *
+   * @param tableId table id
+   * @param schema table's schema definition
+   */
+  public static TableInfo of(TableId tableId, TableSchema schema) {
+    return builder(tableId, schema).build();
+  }
+
+  static TableInfo fromPb(Table tablePb) {
+    Builder builder = new Builder().tableId(TableId.fromPb(tablePb.getTableReference()));
+    if (tablePb.getDescription() != null) {
+      builder.description(tablePb.getDescription());
+    }
+    if (tablePb.getExpirationTime() != null) {
+      builder.expirationTime(tablePb.getExpirationTime());
+    }
+    if (tablePb.getExternalDataConfiguration() != null) {
+      builder.externalConfiguration(
+          ExternalDataConfiguration.fromPb(tablePb.getExternalDataConfiguration()));
+    }
+    if (tablePb.getFriendlyName() != null) {
+      builder.friendlyName(tablePb.getFriendlyName());
+    }
+    if (tablePb.getLastModifiedTime() != null) {
+      builder.lastModifiedTime(tablePb.getLastModifiedTime().longValue());
+    }
+    if (tablePb.getLocation() != null) {
+      builder.location(tablePb.getLocation());
+    }
+    if (tablePb.getNumRows() != null) {
+      builder.numRows(tablePb.getNumRows().longValue());
+    }
+    if (tablePb.getSchema() != null) {
+      builder.schema(TableSchema.fromPb(tablePb.getSchema()));
+    }
+    if (tablePb.getStreamingBuffer() != null) {
+      builder.streamingBuffer(StreamingBuffer.fromPb(tablePb.getStreamingBuffer()));
+    }
+    if (tablePb.getType() != null) {
+      builder.type(Type.valueOf(tablePb.getType()));
+    }
+    if (tablePb.getView() != null) {
+      builder.viewQuery(tablePb.getView().getQuery());
+      if (tablePb.getView().getUserDefinedFunctionResources() != null) {
+        builder.userDefinedFunctions(
+            Lists.transform(tablePb.getView().getUserDefinedFunctionResources(),
+                UserDefinedFunction.FROM_PB_FUNCTION));
+      }
+    }
+    if (tablePb.getCreationTime() != null) {
+      builder.creationTime(tablePb.getCreationTime());
+    }
+    if (tablePb.getEtag() != null) {
+      builder.etag(tablePb.getEtag());
+    }
+    if (tablePb.getId() != null) {
+      builder.id(tablePb.getId());
+    }
+    if (tablePb.getNumBytes() != null) {
+      builder.numBytes(tablePb.getNumBytes());
+    }
+    if (tablePb.getSelfLink() != null) {
+      builder.selfLink(tablePb.getSelfLink());
+    }
+    return builder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableSchema.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableSchema.java
new file mode 100644
index 000000000000..987d838db36c
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableSchema.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * This class represents the schema for a Google BigQuery Table or data source.
+ */
+public class TableSchema implements Serializable {
+
+  static final Function
+      FROM_PB_FUNCTION = new Function() {
+            @Override
+            public TableSchema apply(com.google.api.services.bigquery.model.TableSchema pb) {
+              return TableSchema.fromPb(pb);
+            }
+          };
+  static final Function
+      TO_PB_FUNCTION = new Function() {
+            @Override
+            public com.google.api.services.bigquery.model.TableSchema apply(TableSchema schema) {
+              return schema.toPb();
+            }
+          };
+
+  private static final long serialVersionUID = 2007400596384553696L;
+
+  private final List fields;
+
+  public static final class Builder {
+
+    private List fields;
+
+    private Builder() {}
+
+    /**
+     * Adds a field's schema to the table's schema.
+     */
+    public Builder addField(FieldSchema field) {
+      if (fields == null) {
+        fields = Lists.newArrayList();
+      }
+      fields.add(checkNotNull(field));
+      return this;
+    }
+
+    /**
+     * Sets table's schema fields.
+     */
+    public Builder fields(Iterable fields) {
+      this.fields = Lists.newArrayList(checkNotNull(fields));
+      return this;
+    }
+
+    /**
+     * Creates an {@code TableSchema} object.
+     */
+    public TableSchema build() {
+      return new TableSchema(this);
+    }
+  }
+
+  private TableSchema(Builder builder) {
+    this.fields = builder.fields != null ? ImmutableList.copyOf(builder.fields) :
+        ImmutableList.of();
+  }
+
+  /**
+   * Returns the fields in the current table schema.
+   */
+  public List fields() {
+    return fields;
+  }
+
+  /**
+   * Returns a builder for the {@code TableSchema} object.
+   */
+  public Builder toBuilder() {
+    Builder builder = new Builder();
+    builder.fields(fields);
+    return builder;
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("fields", fields)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(fields);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof TableSchema && Objects.equals(toPb(), ((TableSchema) obj).toPb());
+  }
+
+  com.google.api.services.bigquery.model.TableSchema toPb() {
+    com.google.api.services.bigquery.model.TableSchema tableSchemaPb =
+        new com.google.api.services.bigquery.model.TableSchema();
+    if (fields != null) {
+      List fieldsPb = Lists.transform(fields, FieldSchema.TO_PB_FUNCTION);
+      tableSchemaPb.setFields(fieldsPb);
+    }
+    return tableSchemaPb;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public static TableSchema of(Iterable fields) {
+    checkNotNull(fields);
+    return builder().fields(fields).build();
+  }
+
+  static TableSchema fromPb(com.google.api.services.bigquery.model.TableSchema tableSchemaPb) {
+    Builder schemaBuilder = new Builder();
+    return TableSchema.of(Lists.transform(tableSchemaPb.getFields(), FieldSchema.FROM_PB_FUNCTION));
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java
new file mode 100644
index 000000000000..a7874a738126
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java
@@ -0,0 +1,158 @@
+package com.google.gcloud.bigquery;
+
+import com.google.api.services.bigquery.model.UserDefinedFunctionResource;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Google BigQuery User Defined Function. BigQuery supports user-defined functions (UDFs) written in
+ * JavaScript. A UDF is similar to the "Map" function in a MapReduce: it takes a single row as input
+ * and produces zero or more rows as output. The output can potentially have a different schema than
+ * the input.
+ *
+ * @see User-Defined Functions
+ */
+public abstract class UserDefinedFunction implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public UserDefinedFunction apply(UserDefinedFunctionResource userDefinedFunctionPb) {
+          return UserDefinedFunction.fromPb(userDefinedFunctionPb);
+        }
+      };
+  static final Function TO_PB_FUNCTION =
+      new Function() {
+        @Override
+        public UserDefinedFunctionResource apply(UserDefinedFunction userDefinedFunction) {
+          return userDefinedFunction.toPb();
+        }
+      };
+
+  private static final long serialVersionUID = 8704260561787440287L;
+
+  /**
+   * Type of user-defined function. User defined functions can be provided inline as code blobs
+   * ({@link #INLINE}) or as a Google Cloud Storage URI ({@link #FROM_URI}).
+   */
+  public enum Type {
+    INLINE,
+    FROM_URI
+  }
+
+  private final Type type;
+  private final String functionDefinition;
+
+  UserDefinedFunction(Type type, String functionDefinition) {
+    this.type = type;
+    this.functionDefinition = functionDefinition;
+  }
+
+  public Type type() {
+    return type;
+  }
+
+  /**
+   * Returns function's definition. If {@link #type()} is {@link Type#INLINE} this method returns
+   * a code blob. If {@link #type()} is {@link Type#FROM_URI} this method returns a Google Cloud
+   * Storage URI (e.g. gs://bucket/path).
+   */
+  public String functionDefinition() {
+    return functionDefinition;
+  }
+
+  /**
+   * A Google Cloud BigQuery user-defined function, as a code blob.
+   */
+  public static final class InlineFunction extends UserDefinedFunction {
+
+    private static final long serialVersionUID = 1083672109192091686L;
+
+    /**
+     * Creates a Google Cloud BigQuery user-defined function given a code blob.
+     */
+    public InlineFunction(String inlineCode) {
+      super(Type.INLINE, inlineCode);
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this).add("inlineCode", functionDefinition()).toString();
+    }
+
+    @Override
+    public com.google.api.services.bigquery.model.UserDefinedFunctionResource toPb() {
+      return new com.google.api.services.bigquery.model.UserDefinedFunctionResource()
+          .setInlineCode(functionDefinition());
+    }
+  }
+
+  /**
+   * A Google Cloud BigQuery user-defined function, as an URI to Google Cloud Storage.
+   */
+  public static final class UriFunction extends UserDefinedFunction {
+
+    private static final long serialVersionUID = 4660331691852223839L;
+
+    /**
+     * Creates a Google Cloud BigQuery user-defined function given a Google Cloud Storage URI (e.g.
+     * gs://bucket/path).
+     */
+    public UriFunction(String functionUri) {
+      super(Type.FROM_URI, functionUri);
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this).add("functionUri", functionDefinition()).toString();
+    }
+
+    @Override
+    public com.google.api.services.bigquery.model.UserDefinedFunctionResource toPb() {
+      return new com.google.api.services.bigquery.model.UserDefinedFunctionResource()
+          .setResourceUri(functionDefinition());
+    }
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(type, functionDefinition);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof UserDefinedFunction
+        && Objects.equals(toPb(), ((UserDefinedFunction) obj).toPb());
+  }
+
+  public abstract com.google.api.services.bigquery.model.UserDefinedFunctionResource toPb();
+
+  /**
+   * Creates a Google Cloud BigQuery user-defined function given a code blob.
+   */
+  public static UserDefinedFunction inline(String functionDefinition) {
+    return new InlineFunction(functionDefinition);
+  }
+
+  /**
+   * Creates a Google Cloud BigQuery user-defined function given a Google Cloud Storage URI (e.g.
+   * gs://bucket/path).
+   */
+  public static UserDefinedFunction fromUri(String functionDefinition) {
+    return new UriFunction(functionDefinition);
+  }
+
+  public static UserDefinedFunction fromPb(
+      com.google.api.services.bigquery.model.UserDefinedFunctionResource pb) {
+    if (pb.getInlineCode() != null) {
+      return new InlineFunction(pb.getInlineCode());
+    }
+    if (pb.getResourceUri() != null) {
+      return new UriFunction(pb.getResourceUri());
+    }
+    throw new IllegalArgumentException("Invalid user-defined function");
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CsvOptionsTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CsvOptionsTest.java
new file mode 100644
index 000000000000..ac797ae88171
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CsvOptionsTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class CsvOptionsTest {
+
+  private static final Boolean ALLOW_JAGGED_ROWS = true;
+  private static final Boolean ALLOW_QUOTED_NEWLINE = true;
+  private static final String ENCODING = "UTF_8";
+  private static final String FIELD_DELIMITER = ",";
+  private static final String QUOTE = "\"";
+  private static final Integer SKIP_LEADING_ROWS = 42;
+  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder()
+      .allowJaggedRows(ALLOW_JAGGED_ROWS)
+      .allowQuotedNewLines(ALLOW_QUOTED_NEWLINE)
+      .encoding(ENCODING)
+      .fieldDelimiter(FIELD_DELIMITER)
+      .quote(QUOTE)
+      .skipLeadingRows(SKIP_LEADING_ROWS)
+      .build();
+
+  @Test
+  public void testToBuilder() {
+    compareCsvOptions(CSV_OPTIONS, CSV_OPTIONS.toBuilder().build());
+    CsvOptions csvOptions = CSV_OPTIONS.toBuilder()
+        .fieldDelimiter(";")
+        .build();
+    assertEquals(";", csvOptions.fieldDelimiter());
+    csvOptions = csvOptions.toBuilder().fieldDelimiter(",").build();
+    compareCsvOptions(CSV_OPTIONS, csvOptions);
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    CsvOptions csvOptions = CsvOptions.builder().fieldDelimiter("|").build();
+    assertEquals(csvOptions, csvOptions.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(ALLOW_JAGGED_ROWS, CSV_OPTIONS.allowJaggedRows());
+    assertEquals(ALLOW_QUOTED_NEWLINE, CSV_OPTIONS.allowQuotedNewLines());
+    assertEquals(ENCODING, CSV_OPTIONS.encoding());
+    assertEquals(FIELD_DELIMITER, CSV_OPTIONS.fieldDelimiter());
+    assertEquals(QUOTE, CSV_OPTIONS.quote());
+    assertEquals(SKIP_LEADING_ROWS, CSV_OPTIONS.skipLeadingRows());
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    compareCsvOptions(CSV_OPTIONS, CsvOptions.fromPb(CSV_OPTIONS.toPb()));
+    CsvOptions csvOptions = CsvOptions.builder().allowJaggedRows(ALLOW_JAGGED_ROWS).build();
+    compareCsvOptions(csvOptions, CsvOptions.fromPb(csvOptions.toPb()));
+  }
+
+  private void compareCsvOptions(CsvOptions expected, CsvOptions value) {
+    assertEquals(expected, value);
+    assertEquals(expected.allowJaggedRows(), value.allowJaggedRows());
+    assertEquals(expected.allowQuotedNewLines(), value.allowQuotedNewLines());
+    assertEquals(expected.encoding(), value.encoding());
+    assertEquals(expected.fieldDelimiter(), value.fieldDelimiter());
+    assertEquals(expected.quote(), value.quote());
+    assertEquals(expected.skipLeadingRows(), value.skipLeadingRows());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java
new file mode 100644
index 000000000000..7f23d3b5501a
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class ExternalDataConfigurationTest {
+
+  private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
+  private static final FieldSchema FIELD_SCHEMA1 =
+      FieldSchema.builder("StringField", FieldSchema.Type.STRING)
+          .mode(FieldSchema.Mode.NULLABLE)
+          .description("FieldDescription1")
+          .build();
+  private static final FieldSchema FIELD_SCHEMA2 =
+      FieldSchema.builder("IntegerField", FieldSchema.Type.INTEGER)
+          .mode(FieldSchema.Mode.REPEATED)
+          .description("FieldDescription2")
+          .build();
+  private static final FieldSchema FIELD_SCHEMA3 =
+      FieldSchema.builder("RecordField", ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(FieldSchema.Mode.REQUIRED)
+          .description("FieldDescription3")
+          .build();
+  private static final List FIELDS = ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2,
+      FIELD_SCHEMA3);
+  private static final TableSchema TABLE_SCHEMA = TableSchema.of(FIELDS);
+  private static final String SOURCE_FORMAT = "CSV";
+  private static final Integer MAX_BAD_RECORDS = 42;
+  private static final Boolean IGNORE_UNKNOWN_VALUES = true;
+  private static final String COMPRESSION = "GZIP";
+  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder().build();
+  private static final ExternalDataConfiguration CONFIGURATION = ExternalDataConfiguration
+      .builder(SOURCE_URIS, TABLE_SCHEMA, SOURCE_FORMAT)
+      .compression(COMPRESSION)
+      .csvOptions(CSV_OPTIONS)
+      .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+      .maxBadRecords(MAX_BAD_RECORDS)
+      .build();
+
+  @Test
+  public void testToBuilder() {
+    compareConfiguration(CONFIGURATION, CONFIGURATION.toBuilder().build());
+    ExternalDataConfiguration configuration = CONFIGURATION.toBuilder().compression("NONE").build();
+    assertEquals("NONE", configuration.compression());
+    configuration = configuration.toBuilder()
+        .compression(COMPRESSION)
+        .build();
+    compareConfiguration(CONFIGURATION, configuration);
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    ExternalDataConfiguration configuration =
+        ExternalDataConfiguration.of(SOURCE_URIS, TABLE_SCHEMA, SOURCE_FORMAT);
+    assertEquals(configuration, configuration.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(COMPRESSION, CONFIGURATION.compression());
+    assertEquals(CSV_OPTIONS, CONFIGURATION.csvOptions());
+    assertEquals(IGNORE_UNKNOWN_VALUES, CONFIGURATION.ignoreUnknownValues());
+    assertEquals(MAX_BAD_RECORDS, CONFIGURATION.maxBadRecords());
+    assertEquals(TABLE_SCHEMA, CONFIGURATION.schema());
+    assertEquals(SOURCE_FORMAT, CONFIGURATION.sourceFormat());
+    assertEquals(SOURCE_URIS, CONFIGURATION.sourceUris());
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    compareConfiguration(CONFIGURATION, ExternalDataConfiguration.fromPb(CONFIGURATION.toPb()));
+    ExternalDataConfiguration configuration =
+        ExternalDataConfiguration.builder(SOURCE_URIS, TABLE_SCHEMA, SOURCE_FORMAT).build();
+    compareConfiguration(configuration, ExternalDataConfiguration.fromPb(configuration.toPb()));
+  }
+
+  private void compareConfiguration(ExternalDataConfiguration expected,
+      ExternalDataConfiguration value) {
+    assertEquals(expected, value);
+    assertEquals(expected.compression(), value.compression());
+    assertEquals(expected.csvOptions(), value.csvOptions());
+    assertEquals(expected.ignoreUnknownValues(), value.ignoreUnknownValues());
+    assertEquals(expected.maxBadRecords(), value.maxBadRecords());
+    assertEquals(expected.schema(), value.schema());
+    assertEquals(expected.sourceFormat(), value.sourceFormat());
+    assertEquals(expected.sourceUris(), value.sourceUris());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldSchemaTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldSchemaTest.java
new file mode 100644
index 000000000000..fa26419abbba
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldSchemaTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Test;
+
+public class FieldSchemaTest {
+
+  private static final String FIELD_NAME1 = "StringField";
+  private static final String FIELD_NAME2 = "IntegerField";
+  private static final String FIELD_NAME3 = "RecordField";
+  private static final FieldSchema.Type FIELD_TYPE1 = FieldSchema.Type.STRING;
+  private static final FieldSchema.Type FIELD_TYPE2 = FieldSchema.Type.INTEGER;
+  private static final FieldSchema.Type FIELD_TYPE3 = FieldSchema.Type.RECORD;
+  private static final FieldSchema.Mode FIELD_MODE1 = FieldSchema.Mode.NULLABLE;
+  private static final FieldSchema.Mode FIELD_MODE2 = FieldSchema.Mode.REPEATED;
+  private static final FieldSchema.Mode FIELD_MODE3 = FieldSchema.Mode.REQUIRED;
+  private static final String FIELD_DESCRIPTION1 = "FieldDescription1";
+  private static final String FIELD_DESCRIPTION2 = "FieldDescription2";
+  private static final String FIELD_DESCRIPTION3 = "FieldDescription3";
+  private static final FieldSchema FIELD_SCHEMA1 = FieldSchema.builder(FIELD_NAME1, FIELD_TYPE1)
+      .mode(FIELD_MODE1)
+      .description(FIELD_DESCRIPTION1)
+      .build();
+  private static final FieldSchema FIELD_SCHEMA2 = FieldSchema.builder(FIELD_NAME2, FIELD_TYPE2)
+      .mode(FIELD_MODE2)
+      .description(FIELD_DESCRIPTION2)
+      .build();
+  private static final FieldSchema FIELD_SCHEMA3 = FieldSchema
+      .builder(FIELD_NAME3, ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
+      .mode(FIELD_MODE3)
+      .description(FIELD_DESCRIPTION3)
+      .build();
+
+  @Test
+  public void testToBuilder() {
+    compareFieldSchemas(FIELD_SCHEMA1, FIELD_SCHEMA1.toBuilder().build());
+    compareFieldSchemas(FIELD_SCHEMA2, FIELD_SCHEMA2.toBuilder().build());
+    compareFieldSchemas(FIELD_SCHEMA3, FIELD_SCHEMA3.toBuilder().build());
+    FieldSchema fieldSchema = FIELD_SCHEMA1.toBuilder()
+        .description("New Description")
+        .build();
+    assertEquals("New Description", fieldSchema.description());
+    fieldSchema = fieldSchema.toBuilder().description(FIELD_DESCRIPTION1).build();
+    compareFieldSchemas(FIELD_SCHEMA1, fieldSchema);
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    FieldSchema fieldSchema = FieldSchema.of(FIELD_NAME1, FIELD_TYPE1);
+    compareFieldSchemas(fieldSchema, fieldSchema.toBuilder().build());
+    fieldSchema = FieldSchema.of(FIELD_NAME2, ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2));
+    compareFieldSchemas(fieldSchema, fieldSchema.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(FIELD_NAME1, FIELD_SCHEMA1.name());
+    assertEquals(FIELD_TYPE1, FIELD_SCHEMA1.type());
+    assertEquals(FIELD_MODE1, FIELD_SCHEMA1.mode());
+    assertEquals(FIELD_DESCRIPTION1, FIELD_SCHEMA1.description());
+    assertEquals(null, FIELD_SCHEMA1.fields());
+    assertEquals(FIELD_NAME3, FIELD_SCHEMA3.name());
+    assertEquals(FIELD_TYPE3, FIELD_SCHEMA3.type());
+    assertEquals(FIELD_MODE3, FIELD_SCHEMA3.mode());
+    assertEquals(FIELD_DESCRIPTION3, FIELD_SCHEMA3.description());
+    assertEquals(ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2), FIELD_SCHEMA3.fields());
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    compareFieldSchemas(FIELD_SCHEMA1, FieldSchema.fromPb(FIELD_SCHEMA1.toPb()));
+    compareFieldSchemas(FIELD_SCHEMA2, FieldSchema.fromPb(FIELD_SCHEMA2.toPb()));
+    compareFieldSchemas(FIELD_SCHEMA3, FieldSchema.fromPb(FIELD_SCHEMA3.toPb()));
+    FieldSchema fieldSchema = FieldSchema.builder(FIELD_NAME1, FIELD_TYPE1).build();
+    compareFieldSchemas(fieldSchema, FieldSchema.fromPb(fieldSchema.toPb()));
+  }
+
+  private void compareFieldSchemas(FieldSchema expected, FieldSchema value) {
+    assertEquals(expected, value);
+    assertEquals(expected.name(), value.name());
+    assertEquals(expected.type(), value.type());
+    assertEquals(expected.mode(), value.mode());
+    assertEquals(expected.description(), value.description());
+    assertEquals(expected.fields(), value.fields());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 93165724e11f..8001dffb1cf9 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -67,6 +67,54 @@ public class SerializationTest {
       .selfLink(SELF_LINK)
       .build();
   private static final TableId TABLE_ID = TableId.of("project", "dataset", "table");
+  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder()
+      .allowJaggedRows(true)
+      .allowQuotedNewLines(false)
+      .encoding("CSV")
+      .fieldDelimiter(",")
+      .quote("\"")
+      .skipLeadingRows(42)
+      .build();
+  private static final FieldSchema FIELD_SCHEMA1 =
+      FieldSchema.builder("StringField", FieldSchema.Type.STRING)
+          .mode(FieldSchema.Mode.NULLABLE)
+          .description("FieldDescription1")
+          .build();
+  private static final FieldSchema FIELD_SCHEMA2 =
+      FieldSchema.builder("IntegerField", FieldSchema.Type.INTEGER)
+          .mode(FieldSchema.Mode.REPEATED)
+          .description("FieldDescription2")
+          .build();
+  private static final FieldSchema FIELD_SCHEMA3 =
+      FieldSchema.builder("RecordField", ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(FieldSchema.Mode.REQUIRED)
+          .description("FieldDescription3")
+          .build();
+  private static final List FIELDS = ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2,
+      FIELD_SCHEMA3);
+  private static final TableSchema TABLE_SCHEMA = TableSchema.of(FIELDS);
+  private static final TableInfo.StreamingBuffer STREAMING_BUFFER =
+      new TableInfo.StreamingBuffer(1L, 2L, 3L);
+  private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
+  private static final ExternalDataConfiguration EXTERNAL_DATA_CONFIGURATION =
+      ExternalDataConfiguration.builder(SOURCE_URIS, TABLE_SCHEMA, "CSV")
+      .csvOptions(CSV_OPTIONS)
+      .ignoreUnknownValues(true)
+      .maxBadRecords(42)
+      .build();
+  private static final UserDefinedFunction INLINE_FUNCTION =
+      new UserDefinedFunction.InlineFunction("inline");
+  private static final UserDefinedFunction URI_FUNCTION =
+      new UserDefinedFunction.UriFunction("URI");
+  private static final TableInfo TABLE_INFO = TableInfo.builder(TABLE_ID, TABLE_SCHEMA)
+      .creationTime(CREATION_TIME)
+      .description(DESCRIPTION)
+      .etag(ETAG)
+      .id(ID)
+      .location(LOCATION)
+      .type(TableInfo.Type.TABLE)
+      .streamingBuffer(STREAMING_BUFFER)
+      .build();
 
   @Test
   public void testServiceOptions() throws Exception {
@@ -89,7 +137,8 @@ public void testServiceOptions() throws Exception {
   @Test
   public void testModelAndRequests() throws Exception {
     Serializable[] objects = {DOMAIN_ACCESS, GROUP_ACCESS, USER_ACCESS, VIEW_ACCESS, DATASET_ID,
-        DATASET_INFO, TABLE_ID};
+        DATASET_INFO, TABLE_ID, CSV_OPTIONS, STREAMING_BUFFER, EXTERNAL_DATA_CONFIGURATION,
+        TABLE_SCHEMA, TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
new file mode 100644
index 000000000000..5e4d7c220197
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.TableInfo.StreamingBuffer;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class TableInfoTest {
+
+  private static final FieldSchema FIELD_SCHEMA1 =
+      FieldSchema.builder("StringField", FieldSchema.Type.STRING)
+          .mode(FieldSchema.Mode.NULLABLE)
+          .description("FieldDescription1")
+          .build();
+  private static final FieldSchema FIELD_SCHEMA2 =
+      FieldSchema.builder("IntegerField", FieldSchema.Type.INTEGER)
+          .mode(FieldSchema.Mode.REPEATED)
+          .description("FieldDescription2")
+          .build();
+  private static final FieldSchema FIELD_SCHEMA3 =
+      FieldSchema.builder("RecordField", ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(FieldSchema.Mode.REQUIRED)
+          .description("FieldDescription3")
+          .build();
+  private static final List FIELDS = ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2,
+      FIELD_SCHEMA3);
+  private static final TableSchema TABLE_SCHEMA = TableSchema.of(FIELDS);
+  private static final String VIEW_QUERY = "VIEW QUERY";
+  private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
+  private static final String SOURCE_FORMAT = "CSV";
+  private static final Integer MAX_BAD_RECORDS = 42;
+  private static final Boolean IGNORE_UNKNOWN_VALUES = true;
+  private static final String COMPRESSION = "GZIP";
+  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder().build();
+  private static final ExternalDataConfiguration CONFIGURATION = ExternalDataConfiguration
+      .builder(SOURCE_URIS, TABLE_SCHEMA, SOURCE_FORMAT)
+      .compression(COMPRESSION)
+      .csvOptions(CSV_OPTIONS)
+      .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+      .maxBadRecords(MAX_BAD_RECORDS)
+      .build();
+  private static final String ETAG = "etag";
+  private static final String ID = "project:dataset:table";
+  private static final String SELF_LINK = "selfLink";
+  private static final TableId TABLE_ID = TableId.of("dataset", "table");
+  private static final String FRIENDLY_NAME = "friendlyName";
+  private static final String DESCRIPTION = "description";
+  private static final Long NUM_BYTES = 42L;
+  private static final Long NUM_ROWS = 43L;
+  private static final Long CREATION_TIME = 10L;
+  private static final Long EXPIRATION_TIME = 100L;
+  private static final Long LAST_MODIFIED_TIME = 20L;
+  private static final String LOCATION = "US";
+  private static final StreamingBuffer STREAMING_BUFFER = new StreamingBuffer(1L, 2L, 3L);
+  private static List USER_DEFINED_FUNCTIONS = ImmutableList.of(
+      UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
+  private static final TableInfo TABLE_INFO = TableInfo.builder(TABLE_ID, TABLE_SCHEMA)
+      .creationTime(CREATION_TIME)
+      .description(DESCRIPTION)
+      .etag(ETAG)
+      .expirationTime(EXPIRATION_TIME)
+      .friendlyName(FRIENDLY_NAME)
+      .id(ID)
+      .lastModifiedTime(LAST_MODIFIED_TIME)
+      .location(LOCATION)
+      .numBytes(NUM_BYTES)
+      .numRows(NUM_ROWS)
+      .selfLink(SELF_LINK)
+      .streamingBuffer(STREAMING_BUFFER)
+      .type(TableInfo.Type.TABLE)
+      .build();
+  private static final TableInfo EXTERNAL_TABLE_INFO = TableInfo.builder(TABLE_ID, CONFIGURATION)
+      .creationTime(CREATION_TIME)
+      .description(DESCRIPTION)
+      .etag(ETAG)
+      .expirationTime(EXPIRATION_TIME)
+      .friendlyName(FRIENDLY_NAME)
+      .id(ID)
+      .lastModifiedTime(LAST_MODIFIED_TIME)
+      .location(LOCATION)
+      .numBytes(NUM_BYTES)
+      .numRows(NUM_ROWS)
+      .selfLink(SELF_LINK)
+      .streamingBuffer(STREAMING_BUFFER)
+      .type(TableInfo.Type.TABLE)
+      .build();
+  private static final TableInfo VIEW_INFO =
+      TableInfo.builder(TABLE_ID, VIEW_QUERY, USER_DEFINED_FUNCTIONS)
+          .creationTime(CREATION_TIME)
+          .description(DESCRIPTION)
+          .etag(ETAG)
+          .expirationTime(EXPIRATION_TIME)
+          .friendlyName(FRIENDLY_NAME)
+          .id(ID)
+          .lastModifiedTime(LAST_MODIFIED_TIME)
+          .location(LOCATION)
+          .numBytes(NUM_BYTES)
+          .numRows(NUM_ROWS)
+          .selfLink(SELF_LINK)
+          .streamingBuffer(STREAMING_BUFFER)
+          .type(TableInfo.Type.VIEW)
+          .build();
+
+  @Test
+  public void testToBuilder() {
+    compareTableInfo(TABLE_INFO, TABLE_INFO.toBuilder().build());
+    compareTableInfo(VIEW_INFO, VIEW_INFO.toBuilder().build());
+    compareTableInfo(EXTERNAL_TABLE_INFO, EXTERNAL_TABLE_INFO.toBuilder().build());
+    TableInfo tableInfo = TABLE_INFO.toBuilder()
+        .type(TableInfo.Type.VIEW)
+        .description("newDescription")
+        .build();
+    assertEquals(TableInfo.Type.VIEW, tableInfo.type());
+    assertEquals("newDescription", tableInfo.description());
+    tableInfo = tableInfo.toBuilder()
+        .type(TableInfo.Type.TABLE)
+        .description("description")
+        .build();
+    compareTableInfo(TABLE_INFO, tableInfo);
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    TableInfo tableInfo = TableInfo.of(TABLE_ID, VIEW_QUERY);
+    assertEquals(tableInfo, tableInfo.toBuilder().build());
+  }
+  @Test
+  public void testBuilder() {
+    assertEquals(TABLE_ID, TABLE_INFO.tableId());
+    assertEquals(TABLE_SCHEMA, TABLE_INFO.schema());
+    assertEquals(null, TABLE_INFO.viewQuery());
+    assertEquals(null, TABLE_INFO.externalConfiguration());
+    assertEquals(CREATION_TIME, TABLE_INFO.creationTime());
+    assertEquals(DESCRIPTION, TABLE_INFO.description());
+    assertEquals(ETAG, TABLE_INFO.etag());
+    assertEquals(EXPIRATION_TIME, TABLE_INFO.expirationTime());
+    assertEquals(FRIENDLY_NAME, TABLE_INFO.friendlyName());
+    assertEquals(ID, TABLE_INFO.id());
+    assertEquals(LAST_MODIFIED_TIME, TABLE_INFO.lastModifiedTime());
+    assertEquals(LOCATION, TABLE_INFO.location());
+    assertEquals(NUM_BYTES, TABLE_INFO.numBytes());
+    assertEquals(NUM_ROWS, TABLE_INFO.numRows());
+    assertEquals(SELF_LINK, TABLE_INFO.selfLink());
+    assertEquals(STREAMING_BUFFER, TABLE_INFO.streamingBuffer());
+    assertEquals(TableInfo.Type.TABLE, TABLE_INFO.type());
+    assertEquals(TABLE_ID, VIEW_INFO.tableId());
+    assertEquals(null, VIEW_INFO.schema());
+    assertEquals(VIEW_QUERY, VIEW_INFO.viewQuery());
+    assertEquals(null, VIEW_INFO.externalConfiguration());
+    assertEquals(CREATION_TIME, VIEW_INFO.creationTime());
+    assertEquals(DESCRIPTION, VIEW_INFO.description());
+    assertEquals(ETAG, VIEW_INFO.etag());
+    assertEquals(EXPIRATION_TIME, VIEW_INFO.expirationTime());
+    assertEquals(FRIENDLY_NAME, VIEW_INFO.friendlyName());
+    assertEquals(ID, VIEW_INFO.id());
+    assertEquals(LAST_MODIFIED_TIME, VIEW_INFO.lastModifiedTime());
+    assertEquals(LOCATION, VIEW_INFO.location());
+    assertEquals(NUM_BYTES, VIEW_INFO.numBytes());
+    assertEquals(NUM_ROWS, VIEW_INFO.numRows());
+    assertEquals(SELF_LINK, VIEW_INFO.selfLink());
+    assertEquals(STREAMING_BUFFER, VIEW_INFO.streamingBuffer());
+    assertEquals(TableInfo.Type.VIEW, VIEW_INFO.type());
+    assertEquals(TABLE_ID, EXTERNAL_TABLE_INFO.tableId());
+    assertEquals(null, EXTERNAL_TABLE_INFO.schema());
+    assertEquals(null, EXTERNAL_TABLE_INFO.viewQuery());
+    assertEquals(CONFIGURATION, EXTERNAL_TABLE_INFO.externalConfiguration());
+    assertEquals(CREATION_TIME, EXTERNAL_TABLE_INFO.creationTime());
+    assertEquals(DESCRIPTION, EXTERNAL_TABLE_INFO.description());
+    assertEquals(ETAG, EXTERNAL_TABLE_INFO.etag());
+    assertEquals(EXPIRATION_TIME, EXTERNAL_TABLE_INFO.expirationTime());
+    assertEquals(FRIENDLY_NAME, EXTERNAL_TABLE_INFO.friendlyName());
+    assertEquals(ID, EXTERNAL_TABLE_INFO.id());
+    assertEquals(LAST_MODIFIED_TIME, EXTERNAL_TABLE_INFO.lastModifiedTime());
+    assertEquals(LOCATION, EXTERNAL_TABLE_INFO.location());
+    assertEquals(NUM_BYTES, EXTERNAL_TABLE_INFO.numBytes());
+    assertEquals(NUM_ROWS, EXTERNAL_TABLE_INFO.numRows());
+    assertEquals(SELF_LINK, EXTERNAL_TABLE_INFO.selfLink());
+    assertEquals(STREAMING_BUFFER, EXTERNAL_TABLE_INFO.streamingBuffer());
+    assertEquals(TableInfo.Type.TABLE, EXTERNAL_TABLE_INFO.type());
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    compareTableInfo(TABLE_INFO, TableInfo.fromPb(TABLE_INFO.toPb()));
+    compareTableInfo(VIEW_INFO, TableInfo.fromPb(VIEW_INFO.toPb()));
+    compareTableInfo(EXTERNAL_TABLE_INFO, TableInfo.fromPb(EXTERNAL_TABLE_INFO.toPb()));
+  }
+
+  private void compareTableInfo(TableInfo expected, TableInfo value) {
+    assertEquals(expected, value);
+    assertEquals(expected.tableId(), value.tableId());
+    assertEquals(expected.schema(), value.schema());
+    assertEquals(expected.viewQuery(), value.viewQuery());
+    assertEquals(expected.externalConfiguration(), value.externalConfiguration());
+    assertEquals(expected.creationTime(), value.creationTime());
+    assertEquals(expected.description(), value.description());
+    assertEquals(expected.etag(), value.etag());
+    assertEquals(expected.expirationTime(), value.expirationTime());
+    assertEquals(expected.friendlyName(), value.friendlyName());
+    assertEquals(expected.id(), value.id());
+    assertEquals(expected.lastModifiedTime(), value.lastModifiedTime());
+    assertEquals(expected.location(), value.location());
+    assertEquals(expected.numBytes(), value.numBytes());
+    assertEquals(expected.numRows(), value.numRows());
+    assertEquals(expected.selfLink(), value.selfLink());
+    assertEquals(expected.streamingBuffer(), value.streamingBuffer());
+    assertEquals(expected.type(), value.type());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableSchemaTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableSchemaTest.java
new file mode 100644
index 000000000000..8237d94cf7a8
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableSchemaTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class TableSchemaTest {
+
+  private static final FieldSchema FIELD_SCHEMA1 =
+      FieldSchema.builder("StringField", FieldSchema.Type.STRING)
+      .mode(FieldSchema.Mode.NULLABLE)
+      .description("FieldDescription1")
+      .build();
+  private static final FieldSchema FIELD_SCHEMA2 =
+      FieldSchema.builder("IntegerField", FieldSchema.Type.INTEGER)
+      .mode(FieldSchema.Mode.REPEATED)
+      .description("FieldDescription2")
+      .build();
+  private static final FieldSchema FIELD_SCHEMA3 =
+      FieldSchema.builder("RecordField", ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
+      .mode(FieldSchema.Mode.REQUIRED)
+      .description("FieldDescription3")
+      .build();
+  private static final List FIELDS = ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2,
+      FIELD_SCHEMA3);
+  private static final TableSchema TABLE_SCHEMA = TableSchema.builder().fields(FIELDS).build();
+
+  @Test
+  public void testToBuilder() {
+    compareTableSchema(TABLE_SCHEMA, TABLE_SCHEMA.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(FIELDS, TABLE_SCHEMA.fields());
+    TableSchema tableSchema = TABLE_SCHEMA.toBuilder()
+        .fields(ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
+        .addField(FIELD_SCHEMA3)
+        .build();
+    compareTableSchema(TABLE_SCHEMA, tableSchema);
+  }
+
+  @Test
+  public void testOf() {
+    compareTableSchema(TABLE_SCHEMA, TableSchema.of(FIELDS));
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    compareTableSchema(TABLE_SCHEMA, TableSchema.fromPb(TABLE_SCHEMA.toPb()));
+  }
+
+  private void compareTableSchema(TableSchema expected, TableSchema value) {
+    assertEquals(expected, value);
+    assertEquals(expected.fields(), value.fields());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/UserDefinedFunctionTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/UserDefinedFunctionTest.java
new file mode 100644
index 000000000000..f2640f240a62
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/UserDefinedFunctionTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class UserDefinedFunctionTest {
+
+  private static final String INLINE = "inline";
+  private static final String URI = "uri";
+  private static final UserDefinedFunction INLINE_FUNCTION =
+      new UserDefinedFunction.InlineFunction(INLINE);
+  private static final UserDefinedFunction URI_FUNCTION = new UserDefinedFunction.UriFunction(URI);
+
+  @Test
+  public void testConstructor() {
+    assertEquals(INLINE, INLINE_FUNCTION.functionDefinition());
+    assertEquals(UserDefinedFunction.Type.INLINE, INLINE_FUNCTION.type());
+    assertEquals(URI, URI_FUNCTION.functionDefinition());
+    assertEquals(UserDefinedFunction.Type.FROM_URI, URI_FUNCTION.type());
+  }
+
+  @Test
+  public void testFactoryMethod() {
+    compareUserDefinedFunction(INLINE_FUNCTION, UserDefinedFunction.inline(INLINE));
+    compareUserDefinedFunction(URI_FUNCTION, UserDefinedFunction.fromUri(URI));
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    compareUserDefinedFunction(INLINE_FUNCTION, UserDefinedFunction.fromPb(INLINE_FUNCTION.toPb()));
+    compareUserDefinedFunction(URI_FUNCTION, UserDefinedFunction.fromPb(URI_FUNCTION.toPb()));
+  }
+
+  private void compareUserDefinedFunction(UserDefinedFunction expected, UserDefinedFunction value) {
+    assertEquals(expected, value);
+    assertEquals(expected.type(), value.type());
+    assertEquals(expected.functionDefinition(), value.functionDefinition());
+  }
+}

From b18666b4abd2dfdab3d772ebf7c731632733c990 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 1 Dec 2015 11:28:05 +0100
Subject: [PATCH 139/322] Refactor TableInfo and related classes - TableSchema
 renamed to Schema - FieldSchema renamed to Field - Add class Type to Field to
 represent the field's type (and wrap record subfields) - Add factory method
 and setter from varargs for Schema - Better javadoc for CsvOptions and Field
 - Update tests according to changes

---
 .../google/gcloud/bigquery/CsvOptions.java    |  22 +-
 .../bigquery/ExternalDataConfiguration.java   |  22 +-
 .../com/google/gcloud/bigquery/Field.java     | 370 ++++++++++++++++++
 .../google/gcloud/bigquery/FieldSchema.java   | 287 --------------
 .../{TableSchema.java => Schema.java}         |  65 +--
 .../com/google/gcloud/bigquery/TableInfo.java |  24 +-
 .../gcloud/bigquery/UserDefinedFunction.java  |  11 +-
 .../gcloud/bigquery/CsvOptionsTest.java       |   7 +-
 .../ExternalDataConfigurationTest.java        |  22 +-
 .../{FieldSchemaTest.java => FieldTest.java}  |  51 +--
 .../google/gcloud/bigquery/SchemaTest.java    |  77 ++++
 .../gcloud/bigquery/SerializationTest.java    |  25 +-
 .../google/gcloud/bigquery/TableInfoTest.java |  26 +-
 .../gcloud/bigquery/TableSchemaTest.java      |  77 ----
 14 files changed, 591 insertions(+), 495 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
 delete mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldSchema.java
 rename gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/{TableSchema.java => Schema.java} (68%)
 rename gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/{FieldSchemaTest.java => FieldTest.java} (59%)
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SchemaTest.java
 delete mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableSchemaTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
index dc9e88e97a15..48fe50b7c540 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
@@ -19,6 +19,7 @@
 import com.google.common.base.MoreObjects;
 
 import java.io.Serializable;
+import java.nio.charset.Charset;
 import java.util.Objects;
 
 /**
@@ -78,6 +79,16 @@ public Builder encoding(String encoding) {
       return this;
     }
 
+    /**
+     * Sets the character encoding of the data. The supported values are UTF-8 or ISO-8859-1. The
+     * default value is UTF-8. BigQuery decodes the data after the raw, binary data has been split
+     * using the values set in {@link #quote(String)} and {@link #fieldDelimiter(String)}.
+     */
+    public Builder encoding(Charset encoding) {
+      this.encoding = encoding.name();
+      return this;
+    }
+
     /**
      * Sets the separator for fields in a CSV file. BigQuery converts the string to ISO-8859-1
      * encoding, and then uses the first byte of the encoded string to split the data in its raw,
@@ -113,7 +124,7 @@ public Builder skipLeadingRows(Integer skipLeadingRows) {
     }
 
     /**
-     * Creates an {@code ExternalDataConfiguration} object.
+     * Creates a {@code CsvOptions} object.
      */
     public CsvOptions build() {
       return new CsvOptions(this);
@@ -132,8 +143,9 @@ private CsvOptions(Builder builder) {
   /**
    * Returns whether BigQuery should accept rows that are missing trailing optional columns. If
    * {@code true}, BigQuery treats missing trailing columns as null values. If {@code false},
-   * records with missing trailing columns are treated as bad records, and if there are too many
-   * bad records, an invalid error is returned in the job result.
+   * records with missing trailing columns are treated as bad records, and if the number of bad
+   * records exceeds {@link ExternalDataConfiguration#maxBadRecords()}, an invalid error is returned
+   * in the job result.
    */
   public Boolean allowJaggedRows() {
     return allowJaggedRows;
@@ -148,8 +160,8 @@ public Boolean allowQuotedNewLines() {
   }
 
   /**
-   * Returns the character encoding of the data. The supported values are UTF-8 or ISO-8859-1. The
-   * default value is UTF-8. BigQuery decodes the data after the raw, binary data has been split
+   * Returns the character encoding of the data. The supported values are UTF-8 or ISO-8859-1. If
+   * not set, UTF-8 is used. BigQuery decodes the data after the raw, binary data has been split
    * using the values set in {@link #quote()} and {@link #fieldDelimiter()}.
    */
   public String encoding() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
index f7eb792c675c..9425ca980ebb 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
@@ -62,7 +62,7 @@ public com.google.api.services.bigquery.model.ExternalDataConfiguration apply(
   private static final long serialVersionUID = -8004288831035566549L;
 
   private final List sourceUris;
-  private final TableSchema schema;
+  private final Schema schema;
   private final String sourceFormat;
   private final Integer maxBadRecords;
   private final Boolean ignoreUnknownValues;
@@ -72,7 +72,7 @@ public com.google.api.services.bigquery.model.ExternalDataConfiguration apply(
   public static final class Builder {
 
     private List sourceUris;
-    private TableSchema schema;
+    private Schema schema;
     private String sourceFormat;
     private Integer maxBadRecords;
     private Boolean ignoreUnknownValues;
@@ -97,13 +97,15 @@ public Builder sourceUris(List sourceUris) {
     /**
      * Sets the schema for the external data.
      */
-    public Builder schema(TableSchema schema) {
+    public Builder schema(Schema schema) {
       this.schema = checkNotNull(schema);
       return this;
     }
 
     /**
-     * Sets the source format of the external data.
+     * Sets the source format of the external data. Supported values are {@code CSV} for CSV files,
+     * and {@code NEWLINE_DELIMITED_JSON} for newline-delimited JSON. If not set, files are assumed
+     * to be in CSV format.
      *
      * 
      *     Source Format
@@ -212,7 +214,7 @@ public Integer maxBadRecords() {
   /**
    * Returns the schema for the external data.
    */
-  public TableSchema schema() {
+  public Schema schema() {
     return schema;
   }
 
@@ -327,7 +329,7 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toPb() {
    * @see 
    *     Source Format
    */
-  public static Builder builder(List sourceUris, TableSchema schema, String format) {
+  public static Builder builder(List sourceUris, Schema schema, String format) {
     return new Builder().sourceUris(sourceUris).schema(schema).sourceFormat(format);
   }
 
@@ -345,7 +347,7 @@ public static Builder builder(List sourceUris, TableSchema schema, Strin
    * @see 
    *     Source Format
    */
-  public static Builder builder(String sourceUri, TableSchema schema, String format) {
+  public static Builder builder(String sourceUri, Schema schema, String format) {
     return new Builder()
         .sourceUris(ImmutableList.of(sourceUri))
         .schema(schema)
@@ -368,7 +370,7 @@ public static Builder builder(String sourceUri, TableSchema schema, String forma
    *     Source Format
    */
   public static ExternalDataConfiguration of(
-      List sourceUris, TableSchema schema, String format) {
+      List sourceUris, Schema schema, String format) {
     return builder(sourceUris, schema, format).build();
   }
 
@@ -386,7 +388,7 @@ public static ExternalDataConfiguration of(
    * @see 
    *     Source Format
    */
-  public static ExternalDataConfiguration of(String sourceUri, TableSchema schema, String format) {
+  public static ExternalDataConfiguration of(String sourceUri, Schema schema, String format) {
     return builder(sourceUri, schema, format).build();
   }
 
@@ -397,7 +399,7 @@ static ExternalDataConfiguration fromPb(
       builder.sourceUris(externalDataConfiguration.getSourceUris());
     }
     if (externalDataConfiguration.getSchema() != null) {
-      builder.schema(TableSchema.fromPb(externalDataConfiguration.getSchema()));
+      builder.schema(Schema.fromPb(externalDataConfiguration.getSchema()));
     }
     if (externalDataConfiguration.getSourceFormat() != null) {
       builder.sourceFormat(externalDataConfiguration.getSourceFormat());
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
new file mode 100644
index 000000000000..3139431b3545
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
@@ -0,0 +1,370 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Table field. A table field has a name, a value, a mode and possibly a description.
+ * Supported types are: {@link Type#integer()}, {@link Type#bool()}, {@link Type#string()},
+ * {@link Type#floatingPoint()}, {@link Type#timestamp()} and {@link Type#record(Field...)}. One or
+ * more fields form a table's schema.
+ */
+public class Field implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public Field apply(TableFieldSchema pb) {
+          return Field.fromPb(pb);
+        }
+      };
+  static final Function TO_PB_FUNCTION =
+      new Function() {
+        @Override
+        public TableFieldSchema apply(Field field) {
+          return field.toPb();
+        }
+      };
+
+  private static final long serialVersionUID = -8154262932305199256L;
+
+  /**
+   * Data Types for a BigQuery Table field. This class provides factory methods for all BigQuery
+   * field types. To instantiate a RECORD value the list of sub-fields must be provided.
+   *
+   * @see 
+   *     Data Types
+   */
+  public static class Type implements Serializable {
+
+    private static final long serialVersionUID = 2841484762609576959L;
+
+    public enum Value {
+      STRING, INTEGER, FLOAT, BOOLEAN, TIMESTAMP, RECORD
+    }
+
+    private final Value value;
+    private final List fields;
+
+    private Type(Value value) {
+      this.value = checkNotNull(value);
+      this.fields = null;
+    }
+
+    private Type(Value value, List fields) {
+      checkArgument(fields.size() > 0, "Record must have at least one field");
+      this.value = value;
+      this.fields = fields;
+    }
+
+    /**
+     * Returns the value identifier.
+     *
+     * @see 
+     *     Data Types
+     */
+    public Value value() {
+      return value;
+    }
+
+    /**
+     * Returns the list of sub-fields if {@link #value()} is set to {@link Value#RECORD}. Returns
+     * {@code null} otherwise.
+     */
+    public List fields() {
+      return fields;
+    }
+
+    /**
+     * Returns a {@link Value#STRING} field value.
+     */
+    public static Type string() {
+      return new Type(Value.STRING);
+    }
+
+    /**
+     * Returns an {@link Value#INTEGER} field value.
+     */
+    public static Type integer() {
+      return new Type(Value.INTEGER);
+    }
+
+    /**
+     * Returns a {@link Value#FLOAT} field value.
+     */
+    public static Type floatingPoint() {
+      return new Type(Value.FLOAT);
+    }
+
+    /**
+     * Returns a {@link Value#BOOLEAN} field value.
+     */
+    public static Type bool() {
+      return new Type(Value.BOOLEAN);
+    }
+
+    /**
+     * Returns a {@link Value#TIMESTAMP} field value.
+     */
+    public static Type timestamp() {
+      return new Type(Value.TIMESTAMP);
+    }
+
+    /**
+     * Returns a {@link Value#RECORD} field value with associated list of sub-fields.
+     */
+    public static Type record(Field... fields) {
+      return new Type(Value.RECORD, ImmutableList.copyOf(fields));
+    }
+
+    /**
+     * Returns a {@link Value#RECORD} field value with associated list of sub-fields.
+     */
+    public static Type record(List fields) {
+      return new Type(Value.RECORD, ImmutableList.copyOf(checkNotNull(fields)));
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("value", value)
+          .add("fields", fields)
+          .toString();
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(value, fields);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (!(obj instanceof Type)) {
+        return false;
+      }
+      Type other = (Type) obj;
+      return Objects.equals(value, other.value)
+          && Objects.equals(fields, other.fields);
+    }
+  }
+
+  /**
+   * Mode for a BigQuery Table field. {@link Mode#NULLABLE} fields can be set to {@code null},
+   * {@link Mode#REQUIRED} fields must be provided. {@link Mode#REPEATED} fields can contain more
+   * than one value.
+   */
+  public enum Mode {
+    NULLABLE, REQUIRED, REPEATED
+  }
+
+  private final String name;
+  private final Type type;
+  private final Mode mode;
+  private final String description;
+
+  public static final class Builder {
+
+    private String name;
+    private Type type;
+    private Mode mode;
+    private String description;
+
+    private Builder() {}
+
+    /**
+     * Sets the field name. The name must contain only letters (a-z, A-Z), numbers (0-9), or
+     * underscores (_), and must start with a letter or underscore. The maximum length is 128
+     * characters.
+     */
+    public Builder name(String name) {
+      this.name = checkNotNull(name);
+      return this;
+    }
+
+    /**
+     * Sets the value of the field.
+     *
+     * @see 
+     *     Data Types
+     */
+    public Builder type(Type type) {
+      this.type = checkNotNull(type);
+      return this;
+    }
+
+    /**
+     * Sets the mode of the field. By default {@link Mode#NULLABLE} is used.
+     */
+    public Builder mode(Mode mode) {
+      this.mode = mode;
+      return this;
+    }
+
+    /**
+     * Sets the field description. The maximum length is 16K characters.
+     */
+    public Builder description(String description) {
+      this.description = description;
+      return this;
+    }
+
+    /**
+     * Creates an {@code Field} object.
+     */
+    public Field build() {
+      return new Field(this);
+    }
+  }
+
+  private Field(Builder builder) {
+    this.name = checkNotNull(builder.name);
+    this.type = checkNotNull(builder.type);
+    this.mode = builder.mode;
+    this.description = builder.description;
+  }
+
+  /**
+   * Returns the field name.
+   */
+  public String name() {
+    return name;
+  }
+
+  /**
+   * Returns the field value.
+   *
+   * @see 
+   *     Data Types
+   */
+  public Type type() {
+    return type;
+  }
+
+  /**
+   * Returns the field mode. By default {@link Mode#NULLABLE} is used.
+   */
+  public Mode mode() {
+    return mode;
+  }
+
+  /**
+   * Returns the field description.
+   */
+  public String description() {
+    return description;
+  }
+
+  /**
+   * Returns the list of sub-fields if {@link #type()} is a {@link Type.Value#RECORD}. Returns
+   * {@code null} otherwise.
+   */
+  public List fields() {
+    return type.fields();
+  }
+
+  /**
+   * Returns a builder for the {@code Field} object.
+   */
+  public Builder toBuilder() {
+    return new Builder()
+        .name(this.name)
+        .type(this.type)
+        .mode(this.mode)
+        .description(this.description);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("name", name)
+        .add("value", type)
+        .add("mode", mode)
+        .add("description", description)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, type, mode, description);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof Field && Objects.equals(toPb(), ((Field) obj).toPb());
+  }
+
+  TableFieldSchema toPb() {
+    TableFieldSchema fieldSchemaPb = new TableFieldSchema();
+    fieldSchemaPb.setName(name);
+    fieldSchemaPb.setType(type.value().name());
+    if (mode != null) {
+      fieldSchemaPb.setMode(mode.name());
+    }
+    if (description != null) {
+      fieldSchemaPb.setDescription(description);
+    }
+    if (fields() != null) {
+      List fieldsPb = Lists.transform(fields(), TO_PB_FUNCTION);
+      fieldSchemaPb.setFields(fieldsPb);
+    }
+    return fieldSchemaPb;
+  }
+
+  /**
+   * Returns a Field object with given name and value.
+   */
+  public static Field of(String name, Type type) {
+    return builder(name, type).build();
+  }
+
+  /**
+   * Returns a builder for a Field object with given name and value.
+   */
+  public static Builder builder(String name, Type type) {
+    return new Builder().name(name).type(type);
+  }
+
+  static Field fromPb(TableFieldSchema fieldSchemaPb) {
+    Builder fieldBuilder = new Builder();
+    fieldBuilder.name(fieldSchemaPb.getName());
+    Type.Value enumValue = Type.Value.valueOf(fieldSchemaPb.getType());
+    if (fieldSchemaPb.getMode() != null) {
+      fieldBuilder.mode(Mode.valueOf(fieldSchemaPb.getMode()));
+    }
+    if (fieldSchemaPb.getDescription() != null) {
+      fieldBuilder.description(fieldSchemaPb.getDescription());
+    }
+    if (fieldSchemaPb.getFields() != null) {
+      fieldBuilder.type(Type.record(Lists.transform(fieldSchemaPb.getFields(), FROM_PB_FUNCTION)));
+    } else {
+      fieldBuilder.type(new Type(enumValue));
+    }
+    return fieldBuilder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldSchema.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldSchema.java
deleted file mode 100644
index fa622bf28976..000000000000
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldSchema.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Google Bigquery schema for a Table field. Several data types and modes are supported.
- */
-public class FieldSchema implements Serializable {
-
-  static final Function FROM_PB_FUNCTION =
-      new Function() {
-        @Override
-        public FieldSchema apply(TableFieldSchema pb) {
-          return FieldSchema.fromPb(pb);
-        }
-      };
-  static final Function TO_PB_FUNCTION =
-      new Function() {
-        @Override
-        public TableFieldSchema apply(FieldSchema fieldSchema) {
-          return fieldSchema.toPb();
-        }
-      };
-
-  private static final long serialVersionUID = -8154262932305199256L;
-
-  /**
-   * Data Types for a BigQuery Table field.
-   *
-   * @see 
-   *     Data Types
-   */
-  public enum Type {
-    STRING, INTEGER, FLOAT, BOOLEAN, TIMESTAMP, RECORD
-  }
-
-  /**
-   * Mode for a BigQuery Table field. {@link Mode#NULLABLE} fields can be set to {@code null},
-   * {@link Mode#REQUIRED} fields must be provided. {@link Mode#REPEATED} fields can contain more
-   * than one value.
-   */
-  public enum Mode {
-    NULLABLE, REQUIRED, REPEATED
-  }
-
-  private final String name;
-  private final Type type;
-  private final Mode mode;
-  private final String description;
-  private final List fields;
-
-  public static final class Builder {
-
-    private String name;
-    private Type type;
-    private Mode mode;
-    private String description;
-    private List fields;
-
-    private Builder() {}
-
-    /**
-     * Sets the field name. The name must contain only letters (a-z, A-Z), numbers (0-9), or
-     * underscores (_), and must start with a letter or underscore. The maximum length is 128
-     * characters.
-     */
-    public Builder name(String name) {
-      this.name = checkNotNull(name);
-      return this;
-    }
-
-    /**
-     * Sets the type of the field.
-     *
-     * @see 
-     *     Data Types
-     */
-    public Builder type(Type type) {
-      this.type = checkNotNull(type);
-      return this;
-    }
-
-    /**
-     * Sets the mode of the field. By default {@link Mode#NULLABLE} is used.
-     */
-    public Builder mode(Mode mode) {
-      this.mode = mode;
-      return this;
-    }
-
-    /**
-     * Sets the field description. The maximum length is 16K characters.
-     */
-    public Builder description(String description) {
-      this.description = description;
-      return this;
-    }
-
-    /**
-     * Sets the nested schema fields if {@link #type(Type)} is set to {@link Type#RECORD}.
-     */
-    Builder fields(Iterable fields) {
-      this.fields = fields != null ? ImmutableList.copyOf(fields) : null;
-      return this;
-    }
-
-    /**
-     * Creates an {@code FieldSchema} object.
-     */
-    public FieldSchema build() {
-      FieldSchema fieldSchema = new FieldSchema(this);
-      checkNotNull(fieldSchema.name);
-      checkNotNull(fieldSchema.type);
-      return fieldSchema;
-    }
-  }
-
-  private FieldSchema(Builder builder) {
-    this.name = builder.name;
-    this.type = builder.type;
-    this.mode = builder.mode;
-    this.description = builder.description;
-    this.fields = builder.fields;
-  }
-
-  /**
-   * Returns the field name.
-   */
-  public String name() {
-    return name;
-  }
-
-  /**
-   * Returns the field type.
-   *
-   * @see 
-   *     Data Types
-   */
-  public Type type() {
-    return type;
-  }
-
-  /**
-   * Returns the field mode. By default {@link Mode#NULLABLE} is used.
-   */
-  public Mode mode() {
-    return mode;
-  }
-
-  /**
-   * Returns the field description.
-   */
-  public String description() {
-    return description;
-  }
-
-  /**
-   * Returns the nested schema fields if {@link #type()} is set to {@link Type#RECORD}. Returns
-   * {@code null} otherwise.
-   */
-  public List fields() {
-    return fields;
-  }
-
-  /**
-   * Returns a builder for the {@code FieldSchema} object.
-   */
-  public Builder toBuilder() {
-    return new Builder()
-        .name(this.name)
-        .type(this.type)
-        .mode(this.mode)
-        .description(this.description)
-        .fields(this.fields);
-  }
-
-  @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("name", name)
-        .add("type", type)
-        .add("mode", mode)
-        .add("description", description)
-        .add("fields", fields)
-        .toString();
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, type, mode, description, fields);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof FieldSchema && Objects.equals(toPb(), ((FieldSchema) obj).toPb());
-  }
-
-  TableFieldSchema toPb() {
-    TableFieldSchema fieldSchemaPb = new TableFieldSchema();
-    fieldSchemaPb.setName(name);
-    fieldSchemaPb.setType(type.name());
-    if (mode != null) {
-      fieldSchemaPb.setMode(mode.name());
-    }
-    if (description != null) {
-      fieldSchemaPb.setDescription(description);
-    }
-    if (fields != null) {
-      List fieldsPb = Lists.transform(fields, TO_PB_FUNCTION);
-      fieldSchemaPb.setFields(fieldsPb);
-    }
-    return fieldSchemaPb;
-  }
-
-  /**
-   * Returns a FieldSchema object with given name and type.  This method should only be used to
-   * create fields with primitive types (i.e. {@link Type#FLOAT}, {@link Type#BOOLEAN},
-   * {@link Type#INTEGER}, {@link Type#STRING} and {@link Type#TIMESTAMP}).
-   */
-  public static FieldSchema of(String name, Type type) {
-    return builder(name, type).build();
-  }
-
-  /**
-   * Returns a FieldSchema object of type {@link Type#RECORD} for the provided name and subfields.
-   */
-  public static FieldSchema of(String name, List fields) {
-    return builder(name, fields).type(Type.RECORD).build();
-  }
-
-  /**
-   * Returns a builder for a FieldSchema object with given name and type.
-   */
-  public static Builder builder(String name, Type type) {
-    return new Builder().name(name).type(type);
-  }
-
-  /**
-   * Returns a builder for a FieldSchema object with given name and list of subfields. Type is set
-   * to {@link Type#RECORD}.
-   */
-  public static Builder builder(String name, List fields) {
-    return new Builder().name(name).type(Type.RECORD).fields(fields);
-  }
-
-  static FieldSchema fromPb(TableFieldSchema fieldSchemaPb) {
-    Builder fieldBuilder = new Builder();
-    fieldBuilder.name(fieldSchemaPb.getName());
-    fieldBuilder.type(Type.valueOf(fieldSchemaPb.getType()));
-    if (fieldSchemaPb.getMode() != null) {
-      fieldBuilder.mode(Mode.valueOf(fieldSchemaPb.getMode()));
-    }
-    if (fieldSchemaPb.getDescription() != null) {
-      fieldBuilder.description(fieldSchemaPb.getDescription());
-    }
-    if (fieldSchemaPb.getFields() != null) {
-      fieldBuilder.fields(Lists.transform(fieldSchemaPb.getFields(), FROM_PB_FUNCTION));
-    }
-    return fieldBuilder.build();
-  }
-}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableSchema.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
similarity index 68%
rename from gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableSchema.java
rename to gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
index 987d838db36c..68959928984d 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableSchema.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
@@ -31,39 +31,39 @@
 /**
  * This class represents the schema for a Google BigQuery Table or data source.
  */
-public class TableSchema implements Serializable {
+public class Schema implements Serializable {
 
-  static final Function
+  static final Function
       FROM_PB_FUNCTION = new Function() {
+          Schema>() {
             @Override
-            public TableSchema apply(com.google.api.services.bigquery.model.TableSchema pb) {
-              return TableSchema.fromPb(pb);
+            public Schema apply(com.google.api.services.bigquery.model.TableSchema pb) {
+              return Schema.fromPb(pb);
             }
           };
-  static final Function
-      TO_PB_FUNCTION = new Function
+      TO_PB_FUNCTION = new Function() {
             @Override
-            public com.google.api.services.bigquery.model.TableSchema apply(TableSchema schema) {
+            public com.google.api.services.bigquery.model.TableSchema apply(Schema schema) {
               return schema.toPb();
             }
           };
 
   private static final long serialVersionUID = 2007400596384553696L;
 
-  private final List fields;
+  private final List fields;
 
   public static final class Builder {
 
-    private List fields;
+    private List fields;
 
     private Builder() {}
 
     /**
      * Adds a field's schema to the table's schema.
      */
-    public Builder addField(FieldSchema field) {
+    public Builder addField(Field field) {
       if (fields == null) {
         fields = Lists.newArrayList();
       }
@@ -74,38 +74,44 @@ public Builder addField(FieldSchema field) {
     /**
      * Sets table's schema fields.
      */
-    public Builder fields(Iterable fields) {
+    public Builder fields(Iterable fields) {
       this.fields = Lists.newArrayList(checkNotNull(fields));
       return this;
     }
 
     /**
-     * Creates an {@code TableSchema} object.
+     * Sets table's schema fields.
      */
-    public TableSchema build() {
-      return new TableSchema(this);
+    public Builder fields(Field... fields) {
+      this.fields = Lists.newArrayList(fields);
+      return this;
+    }
+
+    /**
+     * Creates an {@code Schema} object.
+     */
+    public Schema build() {
+      return new Schema(this);
     }
   }
 
-  private TableSchema(Builder builder) {
+  private Schema(Builder builder) {
     this.fields = builder.fields != null ? ImmutableList.copyOf(builder.fields) :
-        ImmutableList.of();
+        ImmutableList.of();
   }
 
   /**
    * Returns the fields in the current table schema.
    */
-  public List fields() {
+  public List fields() {
     return fields;
   }
 
   /**
-   * Returns a builder for the {@code TableSchema} object.
+   * Returns a builder for the {@code Schema} object.
    */
   public Builder toBuilder() {
-    Builder builder = new Builder();
-    builder.fields(fields);
-    return builder;
+    return builder().fields(fields);
   }
 
   @Override
@@ -122,14 +128,14 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof TableSchema && Objects.equals(toPb(), ((TableSchema) obj).toPb());
+    return obj instanceof Schema && Objects.equals(toPb(), ((Schema) obj).toPb());
   }
 
   com.google.api.services.bigquery.model.TableSchema toPb() {
     com.google.api.services.bigquery.model.TableSchema tableSchemaPb =
         new com.google.api.services.bigquery.model.TableSchema();
     if (fields != null) {
-      List fieldsPb = Lists.transform(fields, FieldSchema.TO_PB_FUNCTION);
+      List fieldsPb = Lists.transform(fields, Field.TO_PB_FUNCTION);
       tableSchemaPb.setFields(fieldsPb);
     }
     return tableSchemaPb;
@@ -139,13 +145,16 @@ public static Builder builder() {
     return new Builder();
   }
 
-  public static TableSchema of(Iterable fields) {
+  public static Schema of(Iterable fields) {
     checkNotNull(fields);
     return builder().fields(fields).build();
   }
 
-  static TableSchema fromPb(com.google.api.services.bigquery.model.TableSchema tableSchemaPb) {
-    Builder schemaBuilder = new Builder();
-    return TableSchema.of(Lists.transform(tableSchemaPb.getFields(), FieldSchema.FROM_PB_FUNCTION));
+  public static Schema of(Field... fields) {
+    return builder().fields(fields).build();
+  }
+
+  static Schema fromPb(com.google.api.services.bigquery.model.TableSchema tableSchemaPb) {
+    return Schema.of(Lists.transform(tableSchemaPb.getFields(), Field.FROM_PB_FUNCTION));
   }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index df08025517f6..756b94f6d9ac 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -34,10 +34,9 @@
 
 /**
  * Google BigQuery Table information. A BigQuery table is a standard, two-dimensional table with
- * individual records organized in rows, and a data type assigned to each column
- * (also called a field). Individual fields within a record may contain nested and repeated children
- * fields. Every table is described by a schema that describes field names, types, and other
- * information.
+ * individual records organized in rows, and a data type assigned to each column (also called a
+ * field). Individual fields within a record may contain nested and repeated children fields. Every
+ * table is described by a schema that describes field names, types, and other information.
  *
  * @see Managing Tables
  */
@@ -162,7 +161,7 @@ static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
   private final TableId tableId;
   private final String friendlyName;
   private final String description;
-  private final TableSchema schema;
+  private final Schema schema;
   private final Long numBytes;
   private final Long numRows;
   private final Long creationTime;
@@ -183,7 +182,7 @@ public static final class Builder {
     private TableId tableId;
     private String friendlyName;
     private String description;
-    private TableSchema schema;
+    private Schema schema;
     private Long numBytes;
     private Long numRows;
     private Long creationTime;
@@ -295,7 +294,7 @@ Builder numRows(Long numRows) {
      * Sets the table's schema. Providing a schema is not necessary when {@link #viewQuery} is
      * provided.
      */
-    public Builder schema(TableSchema schema) {
+    public Builder schema(Schema schema) {
       this.schema = schema;
       return this;
     }
@@ -348,16 +347,15 @@ public Builder userDefinedFunctions(List userDefinedFunctio
      * Creates a {@code TableInfo} object.
      */
     public TableInfo build() {
-      checkNotNull(tableId);
       return new TableInfo(this);
     }
   }
 
   private TableInfo(Builder builder) {
+    this.tableId = checkNotNull(builder.tableId);
     this.etag = builder.etag;
     this.id = builder.id;
     this.selfLink = builder.selfLink;
-    this.tableId = builder.tableId;
     this.friendlyName = builder.friendlyName;
     this.description = builder.description;
     this.schema = builder.schema;
@@ -420,7 +418,7 @@ public String description() {
   /**
    * Returns the table's schema.
    */
-  public TableSchema schema() {
+  public Schema schema() {
     return schema;
   }
 
@@ -637,7 +635,7 @@ public static Builder builder(TableId tableId, String query, List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
-  private static final FieldSchema FIELD_SCHEMA1 =
-      FieldSchema.builder("StringField", FieldSchema.Type.STRING)
-          .mode(FieldSchema.Mode.NULLABLE)
+  private static final Field FIELD_SCHEMA1 =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
           .description("FieldDescription1")
           .build();
-  private static final FieldSchema FIELD_SCHEMA2 =
-      FieldSchema.builder("IntegerField", FieldSchema.Type.INTEGER)
-          .mode(FieldSchema.Mode.REPEATED)
+  private static final Field FIELD_SCHEMA2 =
+      Field.builder("IntegerField", Field.Type.integer())
+          .mode(Field.Mode.REPEATED)
           .description("FieldDescription2")
           .build();
-  private static final FieldSchema FIELD_SCHEMA3 =
-      FieldSchema.builder("RecordField", ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
-          .mode(FieldSchema.Mode.REQUIRED)
+  private static final Field FIELD_SCHEMA3 =
+      Field.builder("RecordField", Field.Type.record(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(Field.Mode.REQUIRED)
           .description("FieldDescription3")
           .build();
-  private static final List FIELDS = ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2,
-      FIELD_SCHEMA3);
-  private static final TableSchema TABLE_SCHEMA = TableSchema.of(FIELDS);
+  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
   private static final String SOURCE_FORMAT = "CSV";
   private static final Integer MAX_BAD_RECORDS = 42;
   private static final Boolean IGNORE_UNKNOWN_VALUES = true;
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldSchemaTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldTest.java
similarity index 59%
rename from gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldSchemaTest.java
rename to gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldTest.java
index fa26419abbba..5f039eaed206 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldSchemaTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldTest.java
@@ -22,30 +22,31 @@
 
 import org.junit.Test;
 
-public class FieldSchemaTest {
+public class FieldTest {
 
   private static final String FIELD_NAME1 = "StringField";
   private static final String FIELD_NAME2 = "IntegerField";
   private static final String FIELD_NAME3 = "RecordField";
-  private static final FieldSchema.Type FIELD_TYPE1 = FieldSchema.Type.STRING;
-  private static final FieldSchema.Type FIELD_TYPE2 = FieldSchema.Type.INTEGER;
-  private static final FieldSchema.Type FIELD_TYPE3 = FieldSchema.Type.RECORD;
-  private static final FieldSchema.Mode FIELD_MODE1 = FieldSchema.Mode.NULLABLE;
-  private static final FieldSchema.Mode FIELD_MODE2 = FieldSchema.Mode.REPEATED;
-  private static final FieldSchema.Mode FIELD_MODE3 = FieldSchema.Mode.REQUIRED;
+  private static final Field.Type FIELD_TYPE1 = Field.Type.string();
+  private static final Field.Type FIELD_TYPE2 = Field.Type.integer();
+  private static final Field.Mode FIELD_MODE1 = Field.Mode.NULLABLE;
+  private static final Field.Mode FIELD_MODE2 = Field.Mode.REPEATED;
+  private static final Field.Mode FIELD_MODE3 = Field.Mode.REQUIRED;
   private static final String FIELD_DESCRIPTION1 = "FieldDescription1";
   private static final String FIELD_DESCRIPTION2 = "FieldDescription2";
   private static final String FIELD_DESCRIPTION3 = "FieldDescription3";
-  private static final FieldSchema FIELD_SCHEMA1 = FieldSchema.builder(FIELD_NAME1, FIELD_TYPE1)
+  private static final Field FIELD_SCHEMA1 = Field.builder(FIELD_NAME1, FIELD_TYPE1)
       .mode(FIELD_MODE1)
       .description(FIELD_DESCRIPTION1)
       .build();
-  private static final FieldSchema FIELD_SCHEMA2 = FieldSchema.builder(FIELD_NAME2, FIELD_TYPE2)
+  private static final Field FIELD_SCHEMA2 = Field.builder(FIELD_NAME2, FIELD_TYPE2)
       .mode(FIELD_MODE2)
       .description(FIELD_DESCRIPTION2)
       .build();
-  private static final FieldSchema FIELD_SCHEMA3 = FieldSchema
-      .builder(FIELD_NAME3, ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
+  private static final Field.Type FIELD_TYPE3 =
+      Field.Type.record(ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2));
+  private static final Field FIELD_SCHEMA3 = Field
+      .builder(FIELD_NAME3, FIELD_TYPE3)
       .mode(FIELD_MODE3)
       .description(FIELD_DESCRIPTION3)
       .build();
@@ -55,20 +56,20 @@ public void testToBuilder() {
     compareFieldSchemas(FIELD_SCHEMA1, FIELD_SCHEMA1.toBuilder().build());
     compareFieldSchemas(FIELD_SCHEMA2, FIELD_SCHEMA2.toBuilder().build());
     compareFieldSchemas(FIELD_SCHEMA3, FIELD_SCHEMA3.toBuilder().build());
-    FieldSchema fieldSchema = FIELD_SCHEMA1.toBuilder()
+    Field field = FIELD_SCHEMA1.toBuilder()
         .description("New Description")
         .build();
-    assertEquals("New Description", fieldSchema.description());
-    fieldSchema = fieldSchema.toBuilder().description(FIELD_DESCRIPTION1).build();
-    compareFieldSchemas(FIELD_SCHEMA1, fieldSchema);
+    assertEquals("New Description", field.description());
+    field = field.toBuilder().description(FIELD_DESCRIPTION1).build();
+    compareFieldSchemas(FIELD_SCHEMA1, field);
   }
 
   @Test
   public void testToBuilderIncomplete() {
-    FieldSchema fieldSchema = FieldSchema.of(FIELD_NAME1, FIELD_TYPE1);
-    compareFieldSchemas(fieldSchema, fieldSchema.toBuilder().build());
-    fieldSchema = FieldSchema.of(FIELD_NAME2, ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2));
-    compareFieldSchemas(fieldSchema, fieldSchema.toBuilder().build());
+    Field field = Field.of(FIELD_NAME1, FIELD_TYPE1);
+    compareFieldSchemas(field, field.toBuilder().build());
+    field = Field.of(FIELD_NAME2, FIELD_TYPE3);
+    compareFieldSchemas(field, field.toBuilder().build());
   }
 
   @Test
@@ -87,14 +88,14 @@ public void testBuilder() {
 
   @Test
   public void testToAndFromPb() {
-    compareFieldSchemas(FIELD_SCHEMA1, FieldSchema.fromPb(FIELD_SCHEMA1.toPb()));
-    compareFieldSchemas(FIELD_SCHEMA2, FieldSchema.fromPb(FIELD_SCHEMA2.toPb()));
-    compareFieldSchemas(FIELD_SCHEMA3, FieldSchema.fromPb(FIELD_SCHEMA3.toPb()));
-    FieldSchema fieldSchema = FieldSchema.builder(FIELD_NAME1, FIELD_TYPE1).build();
-    compareFieldSchemas(fieldSchema, FieldSchema.fromPb(fieldSchema.toPb()));
+    compareFieldSchemas(FIELD_SCHEMA1, Field.fromPb(FIELD_SCHEMA1.toPb()));
+    compareFieldSchemas(FIELD_SCHEMA2, Field.fromPb(FIELD_SCHEMA2.toPb()));
+    compareFieldSchemas(FIELD_SCHEMA3, Field.fromPb(FIELD_SCHEMA3.toPb()));
+    Field field = Field.builder(FIELD_NAME1, FIELD_TYPE1).build();
+    compareFieldSchemas(field, Field.fromPb(field.toPb()));
   }
 
-  private void compareFieldSchemas(FieldSchema expected, FieldSchema value) {
+  private void compareFieldSchemas(Field expected, Field value) {
     assertEquals(expected, value);
     assertEquals(expected.name(), value.name());
     assertEquals(expected.type(), value.type());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SchemaTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SchemaTest.java
new file mode 100644
index 000000000000..d24268d2e7cd
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SchemaTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class SchemaTest {
+
+  private static final Field FIELD_SCHEMA1 =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
+          .description("FieldDescription1")
+          .build();
+  private static final Field FIELD_SCHEMA2 =
+      Field.builder("IntegerField", Field.Type.integer())
+          .mode(Field.Mode.REPEATED)
+          .description("FieldDescription2")
+          .build();
+  private static final Field FIELD_SCHEMA3 =
+      Field.builder("RecordField", Field.Type.record(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(Field.Mode.REQUIRED)
+          .description("FieldDescription3")
+          .build();
+  private static final List FIELDS = ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2,
+      FIELD_SCHEMA3);
+  private static final Schema TABLE_SCHEMA = Schema.builder().fields(FIELDS).build();
+
+  @Test
+  public void testToBuilder() {
+    compareTableSchema(TABLE_SCHEMA, TABLE_SCHEMA.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(FIELDS, TABLE_SCHEMA.fields());
+    Schema schema = TABLE_SCHEMA.toBuilder()
+        .fields(FIELD_SCHEMA1, FIELD_SCHEMA2)
+        .addField(FIELD_SCHEMA3)
+        .build();
+    compareTableSchema(TABLE_SCHEMA, schema);
+  }
+
+  @Test
+  public void testOf() {
+    compareTableSchema(TABLE_SCHEMA, Schema.of(FIELDS));
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    compareTableSchema(TABLE_SCHEMA, Schema.fromPb(TABLE_SCHEMA.toPb()));
+  }
+
+  private void compareTableSchema(Schema expected, Schema value) {
+    assertEquals(expected, value);
+    assertEquals(expected.fields(), value.fields());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 8001dffb1cf9..f80dbf1d5225 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -31,6 +31,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 public class SerializationTest {
@@ -70,29 +71,27 @@ public class SerializationTest {
   private static final CsvOptions CSV_OPTIONS = CsvOptions.builder()
       .allowJaggedRows(true)
       .allowQuotedNewLines(false)
-      .encoding("CSV")
+      .encoding(StandardCharsets.ISO_8859_1)
       .fieldDelimiter(",")
       .quote("\"")
       .skipLeadingRows(42)
       .build();
-  private static final FieldSchema FIELD_SCHEMA1 =
-      FieldSchema.builder("StringField", FieldSchema.Type.STRING)
-          .mode(FieldSchema.Mode.NULLABLE)
+  private static final Field FIELD_SCHEMA1 =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
           .description("FieldDescription1")
           .build();
-  private static final FieldSchema FIELD_SCHEMA2 =
-      FieldSchema.builder("IntegerField", FieldSchema.Type.INTEGER)
-          .mode(FieldSchema.Mode.REPEATED)
+  private static final Field FIELD_SCHEMA2 =
+      Field.builder("IntegerField", Field.Type.integer())
+          .mode(Field.Mode.REPEATED)
           .description("FieldDescription2")
           .build();
-  private static final FieldSchema FIELD_SCHEMA3 =
-      FieldSchema.builder("RecordField", ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
-          .mode(FieldSchema.Mode.REQUIRED)
+  private static final Field FIELD_SCHEMA3 =
+      Field.builder("RecordField", Field.Type.record(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(Field.Mode.REQUIRED)
           .description("FieldDescription3")
           .build();
-  private static final List FIELDS = ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2,
-      FIELD_SCHEMA3);
-  private static final TableSchema TABLE_SCHEMA = TableSchema.of(FIELDS);
+  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
   private static final TableInfo.StreamingBuffer STREAMING_BUFFER =
       new TableInfo.StreamingBuffer(1L, 2L, 3L);
   private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
index 5e4d7c220197..b29ddef665d5 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
@@ -27,24 +27,22 @@
 
 public class TableInfoTest {
 
-  private static final FieldSchema FIELD_SCHEMA1 =
-      FieldSchema.builder("StringField", FieldSchema.Type.STRING)
-          .mode(FieldSchema.Mode.NULLABLE)
+  private static final Field FIELD_SCHEMA1 =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
           .description("FieldDescription1")
           .build();
-  private static final FieldSchema FIELD_SCHEMA2 =
-      FieldSchema.builder("IntegerField", FieldSchema.Type.INTEGER)
-          .mode(FieldSchema.Mode.REPEATED)
+  private static final Field FIELD_SCHEMA2 =
+      Field.builder("IntegerField", Field.Type.integer())
+          .mode(Field.Mode.REPEATED)
           .description("FieldDescription2")
           .build();
-  private static final FieldSchema FIELD_SCHEMA3 =
-      FieldSchema.builder("RecordField", ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
-          .mode(FieldSchema.Mode.REQUIRED)
+  private static final Field FIELD_SCHEMA3 =
+      Field.builder("RecordField", Field.Type.record(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(Field.Mode.REQUIRED)
           .description("FieldDescription3")
           .build();
-  private static final List FIELDS = ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2,
-      FIELD_SCHEMA3);
-  private static final TableSchema TABLE_SCHEMA = TableSchema.of(FIELDS);
+  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
   private static final String VIEW_QUERY = "VIEW QUERY";
   private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
   private static final String SOURCE_FORMAT = "CSV";
@@ -72,8 +70,6 @@ public class TableInfoTest {
   private static final Long LAST_MODIFIED_TIME = 20L;
   private static final String LOCATION = "US";
   private static final StreamingBuffer STREAMING_BUFFER = new StreamingBuffer(1L, 2L, 3L);
-  private static List USER_DEFINED_FUNCTIONS = ImmutableList.of(
-      UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
   private static final TableInfo TABLE_INFO = TableInfo.builder(TABLE_ID, TABLE_SCHEMA)
       .creationTime(CREATION_TIME)
       .description(DESCRIPTION)
@@ -104,6 +100,8 @@ public class TableInfoTest {
       .streamingBuffer(STREAMING_BUFFER)
       .type(TableInfo.Type.TABLE)
       .build();
+  private static List USER_DEFINED_FUNCTIONS = ImmutableList.of(
+      UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
   private static final TableInfo VIEW_INFO =
       TableInfo.builder(TABLE_ID, VIEW_QUERY, USER_DEFINED_FUNCTIONS)
           .creationTime(CREATION_TIME)
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableSchemaTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableSchemaTest.java
deleted file mode 100644
index 8237d94cf7a8..000000000000
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableSchemaTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import static org.junit.Assert.assertEquals;
-
-import com.google.common.collect.ImmutableList;
-
-import org.junit.Test;
-
-import java.util.List;
-
-public class TableSchemaTest {
-
-  private static final FieldSchema FIELD_SCHEMA1 =
-      FieldSchema.builder("StringField", FieldSchema.Type.STRING)
-      .mode(FieldSchema.Mode.NULLABLE)
-      .description("FieldDescription1")
-      .build();
-  private static final FieldSchema FIELD_SCHEMA2 =
-      FieldSchema.builder("IntegerField", FieldSchema.Type.INTEGER)
-      .mode(FieldSchema.Mode.REPEATED)
-      .description("FieldDescription2")
-      .build();
-  private static final FieldSchema FIELD_SCHEMA3 =
-      FieldSchema.builder("RecordField", ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
-      .mode(FieldSchema.Mode.REQUIRED)
-      .description("FieldDescription3")
-      .build();
-  private static final List FIELDS = ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2,
-      FIELD_SCHEMA3);
-  private static final TableSchema TABLE_SCHEMA = TableSchema.builder().fields(FIELDS).build();
-
-  @Test
-  public void testToBuilder() {
-    compareTableSchema(TABLE_SCHEMA, TABLE_SCHEMA.toBuilder().build());
-  }
-
-  @Test
-  public void testBuilder() {
-    assertEquals(FIELDS, TABLE_SCHEMA.fields());
-    TableSchema tableSchema = TABLE_SCHEMA.toBuilder()
-        .fields(ImmutableList.of(FIELD_SCHEMA1, FIELD_SCHEMA2))
-        .addField(FIELD_SCHEMA3)
-        .build();
-    compareTableSchema(TABLE_SCHEMA, tableSchema);
-  }
-
-  @Test
-  public void testOf() {
-    compareTableSchema(TABLE_SCHEMA, TableSchema.of(FIELDS));
-  }
-
-  @Test
-  public void testToAndFromPb() {
-    compareTableSchema(TABLE_SCHEMA, TableSchema.fromPb(TABLE_SCHEMA.toPb()));
-  }
-
-  private void compareTableSchema(TableSchema expected, TableSchema value) {
-    assertEquals(expected, value);
-    assertEquals(expected.fields(), value.fields());
-  }
-}

From 57d6e3f6eac16397fdef7ffc30b022b4faaf2a24 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 30 Nov 2015 20:29:57 -0800
Subject: [PATCH 140/322] Remove dependency on http initializer in
 AuthCredentials and remove dependency on
 com.google.api.client.googleapis.auth.oauth2.GoogleCredential

---
 .../com/google/gcloud/AuthCredentials.java    | 114 +++++++++++++-----
 .../com/google/gcloud/ServiceOptions.java     |   4 +-
 2 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
index 3303e4f8a652..779a60fb8a1b 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -18,21 +18,17 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.googleapis.extensions.appengine.auth.oauth2.AppIdentityCredential;
-import com.google.api.client.http.HttpRequestInitializer;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.json.jackson.JacksonFactory;
-import com.google.auth.http.HttpCredentialsAdapter;
+import com.google.auth.oauth2.AccessToken;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.auth.oauth2.ServiceAccountCredentials;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
+import java.lang.reflect.Method;
 import java.security.PrivateKey;
+import java.util.Collection;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * Credentials for accessing Google Cloud services.
@@ -42,8 +38,66 @@ public abstract class AuthCredentials implements Restorable {
   private static class AppEngineAuthCredentials extends AuthCredentials {
 
     private static final AuthCredentials INSTANCE = new AppEngineAuthCredentials();
-    private static final AppEngineAuthCredentialsState STATE =
-        new AppEngineAuthCredentialsState();
+    private static final AppEngineAuthCredentialsState STATE = new AppEngineAuthCredentialsState();
+
+    private static class AppEngineCredentials extends GoogleCredentials {
+
+      private final Object appIdentityService;
+      private final Collection scopes;
+      private final boolean scopesRequired;
+
+      AppEngineCredentials() {
+        try {
+          Class factoryClass =
+              Class.forName("com.google.appengine.api.appidentity.AppIdentityServiceFactory");
+          Method method = factoryClass.getMethod("getAppIdentityService");
+          this.appIdentityService = method.invoke(null);
+          this.scopes = null;
+          this.scopesRequired = true;
+        } catch (Exception e) {
+          throw new RuntimeException("Could not create AppEngineCredentials using reflection.");
+        }
+      }
+
+      AppEngineCredentials(Collection scopes, Object appIdentityService) {
+          this.appIdentityService = appIdentityService;
+          this.scopes = scopes;
+          this.scopesRequired = (scopes == null || scopes.isEmpty());
+      }
+
+      /**
+       * Refresh the access token by getting it from the App Identity service
+       */
+      @Override
+      public AccessToken refreshAccessToken() throws IOException {
+        if (createScopedRequired()) {
+          throw new IOException("AppEngineCredentials requires createScoped call before use.");
+        }
+        try {
+          Class serviceClass =
+              Class.forName("com.google.appengine.api.appidentity.AppIdentityService");
+          Class tokenResultClass = Class.forName(
+              "com.google.appengine.api.appidentity.AppIdentityService$GetAccessTokenResult");
+          Method getAccessTokenResult = serviceClass.getMethod("getAccessToken", Iterable.class);
+          Object accessTokenResult = getAccessTokenResult.invoke(appIdentityService, scopes);
+          Method getAccessToken = tokenResultClass.getMethod("getAccessToken");
+          String accessToken = (String) getAccessToken.invoke(accessTokenResult);
+          return new AccessToken(accessToken, null);
+        } catch (Exception e) {
+          throw new RuntimeException("Could not get the access token using reflection.");
+        }
+      }
+
+      @Override
+      public boolean createScopedRequired() {
+        return scopesRequired;
+      }
+
+      @Override
+      public GoogleCredentials createScoped(Collection scopes) {
+        return new AppEngineCredentials(scopes, appIdentityService);
+      }
+    }
 
     private static class AppEngineAuthCredentialsState
         implements RestorableState, Serializable {
@@ -67,9 +121,8 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
-        Set scopes) {
-      return new AppIdentityCredential(scopes);
+    protected GoogleCredentials credentials() {
+      return new AppEngineCredentials();
     }
 
     @Override
@@ -133,17 +186,10 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    protected HttpRequestInitializer httpRequestInitializer(
-        HttpTransport transport, Set scopes) {
-      GoogleCredential.Builder builder = new GoogleCredential.Builder()
-          .setTransport(transport)
-          .setJsonFactory(new JacksonFactory());
-      if (privateKey != null) {
-        builder.setServiceAccountPrivateKey(privateKey);
-        builder.setServiceAccountId(account);
-        builder.setServiceAccountScopes(scopes);
-      }
-      return builder.build();
+    protected GoogleCredentials credentials() {
+      return (privateKey == null)
+          ? new GoogleCredentials(null)
+          : new ServiceAccountCredentials(null, account, privateKey, null, null);
     }
 
     public String account() {
@@ -198,9 +244,8 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    protected HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
-        Set scopes) {
-      return new HttpCredentialsAdapter(googleCredentials.createScoped(scopes));
+    protected GoogleCredentials credentials() {
+      return googleCredentials;
     }
 
     public ServiceAccountAuthCredentials toServiceAccountCredentials() {
@@ -218,8 +263,7 @@ public RestorableState capture() {
     }
   }
 
-  protected abstract HttpRequestInitializer httpRequestInitializer(HttpTransport transport,
-      Set scopes);
+  protected abstract GoogleCredentials credentials();
 
   public static AuthCredentials createForAppEngine() {
     return AppEngineAuthCredentials.INSTANCE;
@@ -271,9 +315,17 @@ public static ServiceAccountAuthCredentials createFor(String account, PrivateKey
    */
   public static ServiceAccountAuthCredentials createForJson(InputStream jsonCredentialStream)
       throws IOException {
-    GoogleCredential tempCredentials = GoogleCredential.fromStream(jsonCredentialStream);
-    return new ServiceAccountAuthCredentials(tempCredentials.getServiceAccountId(),
-        tempCredentials.getServiceAccountPrivateKey());
+    GoogleCredentials tempCredentials = GoogleCredentials.fromStream(jsonCredentialStream);
+    if (tempCredentials instanceof ServiceAccountCredentials) {
+      ServiceAccountCredentials tempServiceAccountCredentials =
+          (ServiceAccountCredentials) tempCredentials;
+      return new ServiceAccountAuthCredentials(
+          tempServiceAccountCredentials.getClientEmail(),
+          tempServiceAccountCredentials.getPrivateKey());
+    } else {
+      throw new IOException(
+          "The given JSON Credentials Stream is not a service account credential.");
+    }
   }
 
   public static AuthCredentials noCredentials() {
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 25fda29c363d..bc0e91d0a694 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -25,6 +25,7 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.common.collect.Iterables;
 import com.google.gcloud.spi.ServiceRpcFactory;
 
@@ -508,9 +509,8 @@ public RetryParams retryParams() {
    * options.
    */
   public HttpRequestInitializer httpRequestInitializer() {
-    HttpTransport httpTransport = httpTransportFactory.create();
     final HttpRequestInitializer baseRequestInitializer =
-        authCredentials().httpRequestInitializer(httpTransport, scopes());
+        new HttpCredentialsAdapter(authCredentials().credentials().createScoped(scopes()));
     return new HttpRequestInitializer() {
       @Override
       public void initialize(HttpRequest httpRequest) throws IOException {

From b5c1caec2a3d1cfe5a0b7a118154b3e333471b6f Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 1 Dec 2015 09:40:28 -0800
Subject: [PATCH 141/322] Use null instead of NO_CREDENTIALS

---
 .../com/google/gcloud/AuthCredentials.java     | 18 +-----------------
 .../java/com/google/gcloud/ServiceOptions.java | 18 +++++++++++-------
 .../gcloud/datastore/SerializationTest.java    |  2 +-
 .../gcloud/storage/SerializationTest.java      |  4 +---
 .../google/gcloud/storage/StorageImplTest.java |  4 +---
 5 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
index 779a60fb8a1b..9aaee77ea243 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -136,8 +136,6 @@ public static class ServiceAccountAuthCredentials extends AuthCredentials {
     private final String account;
     private final PrivateKey privateKey;
 
-    private static final AuthCredentials NO_CREDENTIALS = new ServiceAccountAuthCredentials();
-
     private static class ServiceAccountAuthCredentialsState
         implements RestorableState, Serializable {
 
@@ -153,9 +151,6 @@ private ServiceAccountAuthCredentialsState(String account, PrivateKey privateKey
 
       @Override
       public AuthCredentials restore() {
-        if (account == null && privateKey == null) {
-          return NO_CREDENTIALS;
-        }
         return new ServiceAccountAuthCredentials(account, privateKey);
       }
 
@@ -180,16 +175,9 @@ public boolean equals(Object obj) {
       this.privateKey = checkNotNull(privateKey);
     }
 
-    ServiceAccountAuthCredentials() {
-      account = null;
-      privateKey = null;
-    }
-
     @Override
     protected GoogleCredentials credentials() {
-      return (privateKey == null)
-          ? new GoogleCredentials(null)
-          : new ServiceAccountCredentials(null, account, privateKey, null, null);
+      return new ServiceAccountCredentials(null, account, privateKey, null, null);
     }
 
     public String account() {
@@ -327,8 +315,4 @@ public static ServiceAccountAuthCredentials createForJson(InputStream jsonCreden
           "The given JSON Credentials Stream is not a service account credential.");
     }
   }
-
-  public static AuthCredentials noCredentials() {
-    return ServiceAccountAuthCredentials.NO_CREDENTIALS;
-  }
 }
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index bc0e91d0a694..715b0b92ca98 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -312,8 +312,9 @@ protected ServiceOptions(Class> ser
     httpTransportFactory = firstNonNull(builder.httpTransportFactory,
         getFromServiceLoader(HttpTransportFactory.class, DefaultHttpTransportFactory.INSTANCE));
     httpTransportFactoryClassName = httpTransportFactory.getClass().getName();
-    authCredentials = firstNonNull(builder.authCredentials, defaultAuthCredentials());
-    authCredentialsState = authCredentials.capture();
+    authCredentials =
+        builder.authCredentials != null ? builder.authCredentials : defaultAuthCredentials();
+    authCredentialsState = authCredentials != null ? authCredentials.capture() : null;
     retryParams = builder.retryParams;
     serviceFactory = firstNonNull(builder.serviceFactory,
         getFromServiceLoader(serviceFactoryClass, defaultServiceFactory()));
@@ -349,7 +350,7 @@ private static AuthCredentials defaultAuthCredentials() {
     try {
       return AuthCredentials.createApplicationDefaults();
     } catch (Exception ex) {
-      return AuthCredentials.noCredentials();
+      return null;
     }
   }
 
@@ -509,12 +510,15 @@ public RetryParams retryParams() {
    * options.
    */
   public HttpRequestInitializer httpRequestInitializer() {
-    final HttpRequestInitializer baseRequestInitializer =
-        new HttpCredentialsAdapter(authCredentials().credentials().createScoped(scopes()));
+    final HttpRequestInitializer delegate = authCredentials() != null
+        ? new HttpCredentialsAdapter(authCredentials().credentials().createScoped(scopes()))
+        : null;
     return new HttpRequestInitializer() {
       @Override
       public void initialize(HttpRequest httpRequest) throws IOException {
-        baseRequestInitializer.initialize(httpRequest);
+        if (delegate != null) {
+          delegate.initialize(httpRequest);
+        }
         if (connectTimeout >= 0) {
           httpRequest.setConnectTimeout(connectTimeout);
         }
@@ -580,7 +584,7 @@ private void readObject(ObjectInputStream input) throws IOException, ClassNotFou
     httpTransportFactory = newInstance(httpTransportFactoryClassName);
     serviceFactory = newInstance(serviceFactoryClassName);
     serviceRpcFactory = newInstance(serviceRpcFactoryClassName);
-    authCredentials = authCredentialsState.restore();
+    authCredentials = authCredentialsState != null ? authCredentialsState.restore() : null;
   }
 
   private static  T newInstance(String className) throws IOException, ClassNotFoundException {
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
index 32e14fb47ea0..3976be2cc383 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java
@@ -144,7 +144,7 @@ public void testServiceOptions() throws Exception {
     options = options.toBuilder()
         .namespace("ns1")
         .retryParams(RetryParams.defaultInstance())
-        .authCredentials(AuthCredentials.noCredentials())
+        .authCredentials(null)
         .force(true)
         .build();
     serializedCopy = serializeAndDeserialize(options);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index 2d80191aeb2d..256f5fc23f9a 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -83,7 +83,7 @@ public void testServiceOptions() throws Exception {
     options = options.toBuilder()
         .projectId("p2")
         .retryParams(RetryParams.defaultInstance())
-        .authCredentials(AuthCredentials.noCredentials())
+        .authCredentials(null)
         .pathDelimiter(":")
         .build();
     serializedCopy = serializeAndDeserialize(options);
@@ -111,7 +111,6 @@ public void testReadChannelState() throws IOException, ClassNotFoundException {
     StorageOptions options = StorageOptions.builder()
         .projectId("p2")
         .retryParams(RetryParams.defaultInstance())
-        .authCredentials(AuthCredentials.noCredentials())
         .build();
     BlobReadChannel reader =
         new BlobReadChannelImpl(options, BlobId.of("b", "n"), EMPTY_RPC_OPTIONS);
@@ -127,7 +126,6 @@ public void testWriteChannelState() throws IOException, ClassNotFoundException {
     StorageOptions options = StorageOptions.builder()
         .projectId("p2")
         .retryParams(RetryParams.defaultInstance())
-        .authCredentials(AuthCredentials.noCredentials())
         .build();
     BlobWriteChannelImpl writer = new BlobWriteChannelImpl(
         options, BlobInfo.builder(BlobId.of("b", "n")).build(), "upload-id");
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 32a466a9d551..42671d37c60c 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -31,11 +31,10 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.google.common.io.BaseEncoding;
-import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
+import com.google.gcloud.Page;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.ServiceOptions;
-import com.google.gcloud.Page;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 import com.google.gcloud.spi.StorageRpcFactory;
@@ -260,7 +259,6 @@ public void setUp() throws IOException, InterruptedException {
     EasyMock.replay(rpcFactoryMock);
     options = StorageOptions.builder()
         .projectId("projectId")
-        .authCredentials(AuthCredentials.noCredentials())
         .clock(TIME_SOURCE)
         .serviceRpcFactory(rpcFactoryMock)
         .build();

From 12078e04dabf1790f02ea17888bde24a7515d8bf Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 1 Dec 2015 14:07:31 -0800
Subject: [PATCH 142/322] Make AppEngineAuthCredentials Restorable

---
 .../com/google/gcloud/AuthCredentials.java    | 49 +++++++++----------
 .../google/gcloud/storage/StorageImpl.java    | 25 +++++-----
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
index 9aaee77ea243..7f5d7a8ab89b 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -43,6 +43,8 @@ private static class AppEngineAuthCredentials extends AuthCredentials {
     private static class AppEngineCredentials extends GoogleCredentials {
 
       private final Object appIdentityService;
+      private final Method getAccessToken;
+      private final Method getAccessTokenResult;
       private final Collection scopes;
       private final boolean scopesRequired;
 
@@ -52,6 +54,12 @@ private static class AppEngineCredentials extends GoogleCredentials {
               Class.forName("com.google.appengine.api.appidentity.AppIdentityServiceFactory");
           Method method = factoryClass.getMethod("getAppIdentityService");
           this.appIdentityService = method.invoke(null);
+          Class serviceClass =
+              Class.forName("com.google.appengine.api.appidentity.AppIdentityService");
+          Class tokenResultClass = Class.forName(
+              "com.google.appengine.api.appidentity.AppIdentityService$GetAccessTokenResult");
+          this.getAccessTokenResult = serviceClass.getMethod("getAccessToken", Iterable.class);
+          this.getAccessToken = tokenResultClass.getMethod("getAccessToken");
           this.scopes = null;
           this.scopesRequired = true;
         } catch (Exception e) {
@@ -59,10 +67,13 @@ private static class AppEngineCredentials extends GoogleCredentials {
         }
       }
 
-      AppEngineCredentials(Collection scopes, Object appIdentityService) {
-          this.appIdentityService = appIdentityService;
-          this.scopes = scopes;
-          this.scopesRequired = (scopes == null || scopes.isEmpty());
+      AppEngineCredentials(Collection scopes, Object appIdentityService,
+          Method getAccessToken, Method getAccessTokenResult) {
+        this.appIdentityService = appIdentityService;
+        this.getAccessToken = getAccessToken;
+        this.getAccessTokenResult = getAccessTokenResult;
+        this.scopes = scopes;
+        this.scopesRequired = (scopes == null || scopes.isEmpty());
       }
 
       /**
@@ -74,13 +85,7 @@ public AccessToken refreshAccessToken() throws IOException {
           throw new IOException("AppEngineCredentials requires createScoped call before use.");
         }
         try {
-          Class serviceClass =
-              Class.forName("com.google.appengine.api.appidentity.AppIdentityService");
-          Class tokenResultClass = Class.forName(
-              "com.google.appengine.api.appidentity.AppIdentityService$GetAccessTokenResult");
-          Method getAccessTokenResult = serviceClass.getMethod("getAccessToken", Iterable.class);
           Object accessTokenResult = getAccessTokenResult.invoke(appIdentityService, scopes);
-          Method getAccessToken = tokenResultClass.getMethod("getAccessToken");
           String accessToken = (String) getAccessToken.invoke(accessTokenResult);
           return new AccessToken(accessToken, null);
         } catch (Exception e) {
@@ -95,7 +100,8 @@ public boolean createScopedRequired() {
 
       @Override
       public GoogleCredentials createScoped(Collection scopes) {
-        return new AppEngineCredentials(scopes, appIdentityService);
+        return new AppEngineCredentials(
+            scopes, appIdentityService, getAccessToken, getAccessTokenResult);
       }
     }
 
@@ -121,7 +127,7 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    protected GoogleCredentials credentials() {
+    public GoogleCredentials credentials() {
       return new AppEngineCredentials();
     }
 
@@ -176,7 +182,7 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    protected GoogleCredentials credentials() {
+    public GoogleCredentials credentials() {
       return new ServiceAccountCredentials(null, account, privateKey, null, null);
     }
 
@@ -232,26 +238,17 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    protected GoogleCredentials credentials() {
+    public GoogleCredentials credentials() {
       return googleCredentials;
     }
 
-    public ServiceAccountAuthCredentials toServiceAccountCredentials() {
-      if (googleCredentials instanceof ServiceAccountCredentials) {
-        ServiceAccountCredentials credentials = (ServiceAccountCredentials) googleCredentials;
-        return new ServiceAccountAuthCredentials(credentials.getClientEmail(),
-            credentials.getPrivateKey());
-      }
-      return null;
-    }
-
     @Override
     public RestorableState capture() {
       return STATE;
     }
   }
 
-  protected abstract GoogleCredentials credentials();
+  public abstract GoogleCredentials credentials();
 
   public static AuthCredentials createForAppEngine() {
     return AppEngineAuthCredentials.INSTANCE;
@@ -310,9 +307,7 @@ public static ServiceAccountAuthCredentials createForJson(InputStream jsonCreden
       return new ServiceAccountAuthCredentials(
           tempServiceAccountCredentials.getClientEmail(),
           tempServiceAccountCredentials.getPrivateKey());
-    } else {
-      throw new IOException(
-          "The given JSON Credentials Stream is not a service account credential.");
     }
+    throw new IOException("The given JSON Credentials Stream is not a service account credential.");
   }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 91a408657847..fdb643c725ac 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -31,6 +31,8 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.services.storage.model.StorageObject;
+import com.google.auth.oauth2.GoogleCredentials;
+import com.google.auth.oauth2.ServiceAccountCredentials;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.collect.ImmutableList;
@@ -38,19 +40,17 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import com.google.common.hash.Hashing;
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.Ints;
 import com.google.gcloud.AuthCredentials;
-import com.google.gcloud.AuthCredentials.ApplicationDefaultAuthCredentials;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
-import com.google.gcloud.PageImpl;
 import com.google.gcloud.BaseService;
 import com.google.gcloud.ExceptionHandler;
 import com.google.gcloud.ExceptionHandler.Interceptor;
-import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.Page;
+import com.google.gcloud.PageImpl;
+import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.RewriteResponse;
 import com.google.gcloud.spi.StorageRpc.Tuple;
@@ -71,7 +71,6 @@
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
@@ -566,15 +565,13 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
     ServiceAccountAuthCredentials cred =
         (ServiceAccountAuthCredentials) optionMap.get(SignUrlOption.Option.SERVICE_ACCOUNT_CRED);
     if (cred == null) {
-      AuthCredentials serviceCred = this.options().authCredentials();
-      if (serviceCred instanceof ServiceAccountAuthCredentials) {
-        cred = (ServiceAccountAuthCredentials) serviceCred;
-      } else {
-        if (serviceCred instanceof ApplicationDefaultAuthCredentials) {
-          cred = ((ApplicationDefaultAuthCredentials) serviceCred).toServiceAccountCredentials();
-        }
-      }
-      checkArgument(cred != null, "Signing key was not provided and could not be derived");
+      AuthCredentials authCredentials = this.options().authCredentials();
+      GoogleCredentials serviceCred =
+          authCredentials != null ? authCredentials.credentials() : null;
+      checkArgument(
+          serviceCred instanceof ServiceAccountCredentials,
+          "Signing key was not provided and could not be derived");
+      cred = (ServiceAccountAuthCredentials) authCredentials;
     }
     // construct signature - see https://cloud.google.com/storage/docs/access-control#Signed-URLs
     StringBuilder stBuilder = new StringBuilder();

From af94b5312daa978b693ce38b5f2314a335f3d531 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 1 Dec 2015 15:33:03 -0800
Subject: [PATCH 143/322] cleanup + cast fix

---
 .../com/google/gcloud/AuthCredentials.java    | 24 ++++++++-----------
 .../google/gcloud/storage/StorageImpl.java    | 16 +++++++------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
index 7f5d7a8ab89b..f3a0024129d7 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -46,7 +46,6 @@ private static class AppEngineCredentials extends GoogleCredentials {
       private final Method getAccessToken;
       private final Method getAccessTokenResult;
       private final Collection scopes;
-      private final boolean scopesRequired;
 
       AppEngineCredentials() {
         try {
@@ -61,19 +60,16 @@ private static class AppEngineCredentials extends GoogleCredentials {
           this.getAccessTokenResult = serviceClass.getMethod("getAccessToken", Iterable.class);
           this.getAccessToken = tokenResultClass.getMethod("getAccessToken");
           this.scopes = null;
-          this.scopesRequired = true;
         } catch (Exception e) {
-          throw new RuntimeException("Could not create AppEngineCredentials using reflection.");
+          throw new RuntimeException("Could not create AppEngineCredentials.", e);
         }
       }
 
-      AppEngineCredentials(Collection scopes, Object appIdentityService,
-          Method getAccessToken, Method getAccessTokenResult) {
-        this.appIdentityService = appIdentityService;
-        this.getAccessToken = getAccessToken;
-        this.getAccessTokenResult = getAccessTokenResult;
+      AppEngineCredentials(Collection scopes, AppEngineCredentials unscoped) {
+        this.appIdentityService = unscoped.appIdentityService;
+        this.getAccessToken = unscoped.getAccessToken;
+        this.getAccessTokenResult = unscoped.getAccessTokenResult;
         this.scopes = scopes;
-        this.scopesRequired = (scopes == null || scopes.isEmpty());
       }
 
       /**
@@ -89,19 +85,18 @@ public AccessToken refreshAccessToken() throws IOException {
           String accessToken = (String) getAccessToken.invoke(accessTokenResult);
           return new AccessToken(accessToken, null);
         } catch (Exception e) {
-          throw new RuntimeException("Could not get the access token using reflection.");
+          throw new IOException("Could not get the access token.", e);
         }
       }
 
       @Override
       public boolean createScopedRequired() {
-        return scopesRequired;
+        return scopes == null || scopes.isEmpty();
       }
 
       @Override
       public GoogleCredentials createScoped(Collection scopes) {
-        return new AppEngineCredentials(
-            scopes, appIdentityService, getAccessToken, getAccessTokenResult);
+        return new AppEngineCredentials(scopes, this);
       }
     }
 
@@ -308,6 +303,7 @@ public static ServiceAccountAuthCredentials createForJson(InputStream jsonCreden
           tempServiceAccountCredentials.getClientEmail(),
           tempServiceAccountCredentials.getPrivateKey());
     }
-    throw new IOException("The given JSON Credentials Stream is not a service account credential.");
+    throw new IOException(
+        "The given JSON Credentials Stream is not for a service account credential.");
   }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index fdb643c725ac..9207e4905c54 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -562,16 +562,18 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
     for (SignUrlOption option : options) {
       optionMap.put(option.option(), option.value());
     }
-    ServiceAccountAuthCredentials cred =
+    ServiceAccountAuthCredentials serviceAccountAuthCred =
         (ServiceAccountAuthCredentials) optionMap.get(SignUrlOption.Option.SERVICE_ACCOUNT_CRED);
-    if (cred == null) {
-      AuthCredentials authCredentials = this.options().authCredentials();
+    ServiceAccountCredentials cred = (ServiceAccountCredentials) (serviceAccountAuthCred != null
+        ? serviceAccountAuthCred.credentials() : null);
+    if (serviceAccountAuthCred == null) {
+      AuthCredentials authCred = this.options().authCredentials();
       GoogleCredentials serviceCred =
-          authCredentials != null ? authCredentials.credentials() : null;
+          authCred != null ? authCred.credentials() : null;
       checkArgument(
           serviceCred instanceof ServiceAccountCredentials,
           "Signing key was not provided and could not be derived");
-      cred = (ServiceAccountAuthCredentials) authCredentials;
+      cred = (ServiceAccountCredentials) serviceCred;
     }
     // construct signature - see https://cloud.google.com/storage/docs/access-control#Signed-URLs
     StringBuilder stBuilder = new StringBuilder();
@@ -607,12 +609,12 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
     stBuilder.append(path);
     try {
       Signature signer = Signature.getInstance("SHA256withRSA");
-      signer.initSign(cred.privateKey());
+      signer.initSign(cred.getPrivateKey());
       signer.update(stBuilder.toString().getBytes(UTF_8));
       String signature =
           URLEncoder.encode(BaseEncoding.base64().encode(signer.sign()), UTF_8.name());
       stBuilder = new StringBuilder("https://storage.googleapis.com").append(path);
-      stBuilder.append("?GoogleAccessId=").append(cred.account());
+      stBuilder.append("?GoogleAccessId=").append(cred.getClientEmail());
       stBuilder.append("&Expires=").append(expiration);
       stBuilder.append("&Signature=").append(signature);
       return new URL(stBuilder.toString());

From 18cbb774258a77172a988d7a84c5e559d57b0c95 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 1 Dec 2015 15:54:32 -0800
Subject: [PATCH 144/322] style fix

---
 .../com/google/gcloud/storage/StorageImpl.java | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 9207e4905c54..7ff8ccd4d68d 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -31,7 +31,6 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.services.storage.model.StorageObject;
-import com.google.auth.oauth2.GoogleCredentials;
 import com.google.auth.oauth2.ServiceAccountCredentials;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
@@ -43,7 +42,6 @@
 import com.google.common.hash.Hashing;
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.Ints;
-import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.BaseService;
 import com.google.gcloud.ExceptionHandler;
@@ -562,18 +560,16 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
     for (SignUrlOption option : options) {
       optionMap.put(option.option(), option.value());
     }
-    ServiceAccountAuthCredentials serviceAccountAuthCred =
+    ServiceAccountAuthCredentials authCred =
         (ServiceAccountAuthCredentials) optionMap.get(SignUrlOption.Option.SERVICE_ACCOUNT_CRED);
-    ServiceAccountCredentials cred = (ServiceAccountCredentials) (serviceAccountAuthCred != null
-        ? serviceAccountAuthCred.credentials() : null);
-    if (serviceAccountAuthCred == null) {
-      AuthCredentials authCred = this.options().authCredentials();
-      GoogleCredentials serviceCred =
-          authCred != null ? authCred.credentials() : null;
+    ServiceAccountCredentials cred =
+        (ServiceAccountCredentials) (authCred != null ? authCred.credentials() : null);
+    if (authCred == null) {
       checkArgument(
-          serviceCred instanceof ServiceAccountCredentials,
+          this.options().authCredentials() != null
+          && this.options().authCredentials().credentials() instanceof ServiceAccountCredentials,
           "Signing key was not provided and could not be derived");
-      cred = (ServiceAccountCredentials) serviceCred;
+      cred = (ServiceAccountCredentials) this.options().authCredentials().credentials();
     }
     // construct signature - see https://cloud.google.com/storage/docs/access-control#Signed-URLs
     StringBuilder stBuilder = new StringBuilder();

From 942ceb40e3281593afb8da78ced1a9e476284c9c Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 1 Dec 2015 16:04:32 -0800
Subject: [PATCH 145/322] more style fixes

---
 .../src/main/java/com/google/gcloud/AuthCredentials.java       | 2 +-
 .../src/main/java/com/google/gcloud/storage/StorageImpl.java   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
index f3a0024129d7..dab6b928374a 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -177,7 +177,7 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    public GoogleCredentials credentials() {
+    public ServiceAccountCredentials credentials() {
       return new ServiceAccountCredentials(null, account, privateKey, null, null);
     }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 7ff8ccd4d68d..e31c4073548e 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -562,8 +562,7 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
     }
     ServiceAccountAuthCredentials authCred =
         (ServiceAccountAuthCredentials) optionMap.get(SignUrlOption.Option.SERVICE_ACCOUNT_CRED);
-    ServiceAccountCredentials cred =
-        (ServiceAccountCredentials) (authCred != null ? authCred.credentials() : null);
+    ServiceAccountCredentials cred = authCred != null ? authCred.credentials() : null;
     if (authCred == null) {
       checkArgument(
           this.options().authCredentials() != null

From 3980ba7167961e92c954744f4de6822eeae5b5f6 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 1 Dec 2015 17:07:46 -0800
Subject: [PATCH 146/322] update version to 0.1.0

---
 gcloud-java-core/pom.xml      | 2 +-
 gcloud-java-datastore/pom.xml | 2 +-
 gcloud-java-examples/pom.xml  | 2 +-
 gcloud-java-storage/pom.xml   | 2 +-
 gcloud-java/pom.xml           | 2 +-
 pom.xml                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index c0248004d335..4fcb0b27659a 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.13-SNAPSHOT
+    0.1.0
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index 4bf5caab2ff8..426978b67404 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.13-SNAPSHOT
+    0.1.0
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index 2b02be47cc40..d3ae0fadc731 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.13-SNAPSHOT
+    0.1.0
   
   
     gcloud-java-examples
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 3e0b6a9490a8..1521b0846684 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.13-SNAPSHOT
+    0.1.0
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 214094dcd104..a44297fd3b7d 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.13-SNAPSHOT
+    0.1.0
   
   
     
diff --git a/pom.xml b/pom.xml
index 234290a6da44..ba33bc5ce5de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.0.13-SNAPSHOT
+  0.1.0
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8 Mon Sep 17 00:00:00 2001
From: travis-ci 
Date: Wed, 2 Dec 2015 01:19:11 +0000
Subject: [PATCH 147/322] Updating version in README files. [ci skip]

---
 README.md                       | 6 +++---
 gcloud-java-core/README.md      | 6 +++---
 gcloud-java-datastore/README.md | 6 +++---
 gcloud-java-examples/README.md  | 6 +++---
 gcloud-java-storage/README.md   | 6 +++---
 gcloud-java/README.md           | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index f6104e64a9d3..123e4cf76bb3 100644
--- a/README.md
+++ b/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.0.12
+  0.1.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:jar:0.0.12'
+compile 'com.google.gcloud:gcloud-java:jar:0.1.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.12"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.0"
 ```
 
 Example Applications
diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index 96b7a4e82021..3aea0f16efc5 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-core
-  0.0.12
+  0.1.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-core:jar:0.0.12'
+compile 'com.google.gcloud:gcloud-java-core:jar:0.1.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.12"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.1.0"
 ```
 
 Troubleshooting
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index aeaae2b621c6..9777668f8d0e 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-datastore
-  0.0.12
+  0.1.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-datastore:jar:0.0.12'
+compile 'com.google.gcloud:gcloud-java-datastore:jar:0.1.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.12"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.1.0"
 ```
 
 Example Application
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index 2ccec3e81571..2a451db33036 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-examples
-  0.0.12
+  0.1.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-examples:jar:0.0.12'
+compile 'com.google.gcloud:gcloud-java-examples:jar:0.1.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.12"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.1.0"
 ```
 
 To run examples from your command line:
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index d679d3da9bc1..01d34f318a42 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-storage
-  0.0.12
+  0.1.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-storage:jar:0.0.12'
+compile 'com.google.gcloud:gcloud-java-storage:jar:0.1.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.0.12"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.1.0"
 ```
 
 Example Application
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index e381ca80cdaa..98cd7a8f6e85 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.0.12
+  0.1.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:jar:0.0.12'
+compile 'com.google.gcloud:gcloud-java:jar:0.1.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.12"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.0"
 ```
 
 Troubleshooting

From e1c770e95465cae6baec0c0f2be6f7734d0f77fe Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 1 Dec 2015 17:25:56 -0800
Subject: [PATCH 148/322] Update version to snapshot

---
 gcloud-java-core/pom.xml      | 2 +-
 gcloud-java-datastore/pom.xml | 2 +-
 gcloud-java-examples/pom.xml  | 2 +-
 gcloud-java-storage/pom.xml   | 2 +-
 gcloud-java/pom.xml           | 2 +-
 pom.xml                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index 4fcb0b27659a..83c8dbb00e71 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.0
+    0.1.1-SNAPSHOT
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index 426978b67404..163fd8accf7a 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.0
+    0.1.1-SNAPSHOT
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index d3ae0fadc731..4f113dd78ec0 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.0
+    0.1.1-SNAPSHOT
   
   
     gcloud-java-examples
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 1521b0846684..907ec66d7214 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.0
+    0.1.1-SNAPSHOT
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index a44297fd3b7d..7d8e251b54fb 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.0
+    0.1.1-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index ba33bc5ce5de..5b11a09fb382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.1.0
+  0.1.1-SNAPSHOT
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From 5f6357eaf4c35342f43add62f11c4cc384465ee6 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 2 Dec 2015 11:43:40 +0100
Subject: [PATCH 149/322] Minor javadoc updates, rename functionDefinition to
 content

---
 .../com/google/gcloud/bigquery/Field.java     |  4 +--
 .../com/google/gcloud/bigquery/Schema.java    |  1 -
 .../com/google/gcloud/bigquery/TableInfo.java |  8 ++---
 .../gcloud/bigquery/UserDefinedFunction.java  | 29 +++++++++----------
 .../bigquery/UserDefinedFunctionTest.java     |  6 ++--
 5 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
index 3139431b3545..73ca87640ff8 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
@@ -219,7 +219,7 @@ public Builder type(Type type) {
     }
 
     /**
-     * Sets the mode of the field. By default {@link Mode#NULLABLE} is used.
+     * Sets the mode of the field. When not specified {@link Mode#NULLABLE} is used.
      */
     public Builder mode(Mode mode) {
       this.mode = mode;
@@ -235,7 +235,7 @@ public Builder description(String description) {
     }
 
     /**
-     * Creates an {@code Field} object.
+     * Creates a {@code Field} object.
      */
     public Field build() {
       return new Field(this);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
index 68959928984d..0ac6e1b84ade 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
@@ -146,7 +146,6 @@ public static Builder builder() {
   }
 
   public static Schema of(Iterable fields) {
-    checkNotNull(fields);
     return builder().fields(fields).build();
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index 756b94f6d9ac..9ca74eb3c1f7 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -258,7 +258,7 @@ public Builder externalConfiguration(ExternalDataConfiguration externalConfigura
     }
 
     /**
-     * Sets a user-friendly name for the dataset.
+     * Sets a user-friendly name for the table.
      */
     public Builder friendlyName(String friendlyName) {
       this.friendlyName = firstNonNull(friendlyName, Data.nullOf(String.class));
@@ -291,8 +291,8 @@ Builder numRows(Long numRows) {
     }
 
     /**
-     * Sets the table's schema. Providing a schema is not necessary when {@link #viewQuery} is
-     * provided.
+     * Sets the table's schema. Providing a schema is not necessary when {@link #viewQuery(String)}
+     * or {@link #externalConfiguration(ExternalDataConfiguration)} are provided.
      */
     public Builder schema(Schema schema) {
       this.schema = schema;
@@ -380,7 +380,7 @@ public String etag() {
   }
 
   /**
-   * Returns an opaque id for the dataset.
+   * Returns an opaque id for the table.
    */
   public String id() {
     return id;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java
index c9ef65f10d98..931c1eaf024a 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java
@@ -44,11 +44,11 @@ public enum Type {
   }
 
   private final Type type;
-  private final String functionDefinition;
+  private final String content;
 
-  UserDefinedFunction(Type type, String functionDefinition) {
+  UserDefinedFunction(Type type, String content) {
     this.type = type;
-    this.functionDefinition = functionDefinition;
+    this.content = content;
   }
 
   public Type type() {
@@ -56,18 +56,17 @@ public Type type() {
   }
 
   /**
-   * Returns function's definition. If {@link #type()} is {@link Type#INLINE} this method returns
-   * a code blob. If {@link #type()} is {@link Type#FROM_URI} this method returns a Google Cloud
-   * Storage URI (e.g. gs://bucket/path).
+   * If {@link #type()} is {@link Type#INLINE} this method returns a code blob. If {@link #type()}
+   * is {@link Type#FROM_URI} the method returns a Google Cloud Storage URI (e.g. gs://bucket/path).
    */
-  public String functionDefinition() {
-    return functionDefinition;
+  public String content() {
+    return content;
   }
 
   /**
    * A Google Cloud BigQuery user-defined function, as a code blob.
    */
-  public static final class InlineFunction extends UserDefinedFunction {
+  static final class InlineFunction extends UserDefinedFunction {
 
     private static final long serialVersionUID = 1083672109192091686L;
 
@@ -77,20 +76,20 @@ public static final class InlineFunction extends UserDefinedFunction {
 
     @Override
     public String toString() {
-      return MoreObjects.toStringHelper(this).add("inlineCode", functionDefinition()).toString();
+      return MoreObjects.toStringHelper(this).add("inlineCode", content()).toString();
     }
 
     @Override
     public com.google.api.services.bigquery.model.UserDefinedFunctionResource toPb() {
       return new com.google.api.services.bigquery.model.UserDefinedFunctionResource()
-          .setInlineCode(functionDefinition());
+          .setInlineCode(content());
     }
   }
 
   /**
    * A Google Cloud BigQuery user-defined function, as an URI to Google Cloud Storage.
    */
-  public static final class UriFunction extends UserDefinedFunction {
+  static final class UriFunction extends UserDefinedFunction {
 
     private static final long serialVersionUID = 4660331691852223839L;
 
@@ -100,19 +99,19 @@ public static final class UriFunction extends UserDefinedFunction {
 
     @Override
     public String toString() {
-      return MoreObjects.toStringHelper(this).add("functionUri", functionDefinition()).toString();
+      return MoreObjects.toStringHelper(this).add("functionUri", content()).toString();
     }
 
     @Override
     public com.google.api.services.bigquery.model.UserDefinedFunctionResource toPb() {
       return new com.google.api.services.bigquery.model.UserDefinedFunctionResource()
-          .setResourceUri(functionDefinition());
+          .setResourceUri(content());
     }
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(type, functionDefinition);
+    return Objects.hash(type, content);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/UserDefinedFunctionTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/UserDefinedFunctionTest.java
index f2640f240a62..2741aaed89a5 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/UserDefinedFunctionTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/UserDefinedFunctionTest.java
@@ -30,9 +30,9 @@ public class UserDefinedFunctionTest {
 
   @Test
   public void testConstructor() {
-    assertEquals(INLINE, INLINE_FUNCTION.functionDefinition());
+    assertEquals(INLINE, INLINE_FUNCTION.content());
     assertEquals(UserDefinedFunction.Type.INLINE, INLINE_FUNCTION.type());
-    assertEquals(URI, URI_FUNCTION.functionDefinition());
+    assertEquals(URI, URI_FUNCTION.content());
     assertEquals(UserDefinedFunction.Type.FROM_URI, URI_FUNCTION.type());
   }
 
@@ -51,6 +51,6 @@ public void testToAndFromPb() {
   private void compareUserDefinedFunction(UserDefinedFunction expected, UserDefinedFunction value) {
     assertEquals(expected, value);
     assertEquals(expected.type(), value.type());
-    assertEquals(expected.functionDefinition(), value.functionDefinition());
+    assertEquals(expected.content(), value.content());
   }
 }

From 79001cf046ca1f33427231655dd457cd41015e09 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 2 Dec 2015 11:48:17 +0100
Subject: [PATCH 150/322] Replace format with FormatOptions in
 ExternalDataConfiguration

---
 .../google/gcloud/bigquery/CsvOptions.java    | 32 ++-----
 .../bigquery/ExternalDataConfiguration.java   | 95 ++++++++-----------
 .../google/gcloud/bigquery/FormatOptions.java | 90 ++++++++++++++++++
 .../gcloud/bigquery/CsvOptionsTest.java       |  1 +
 .../ExternalDataConfigurationTest.java        | 11 +--
 .../gcloud/bigquery/FormatOptionsTest.java    | 52 ++++++++++
 .../gcloud/bigquery/SerializationTest.java    |  3 +-
 .../google/gcloud/bigquery/TableInfoTest.java |  4 +-
 8 files changed, 200 insertions(+), 88 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FormatOptionsTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
index 48fe50b7c540..5c52cd78cc8f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
@@ -18,15 +18,14 @@
 
 import com.google.common.base.MoreObjects;
 
-import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.util.Objects;
 
 /**
- * Google BigQuery CSV options. This class wraps some properties of CSV files used by BigQuery to
- * parse external data.
+ * Google BigQuery options for CSV format. This class wraps some properties of CSV files used by
+ * BigQuery to parse external data.
  */
-public class CsvOptions implements Serializable {
+public class CsvOptions extends FormatOptions {
 
   private static final long serialVersionUID = 2193570529308612708L;
 
@@ -132,6 +131,7 @@ public CsvOptions build() {
   }
 
   private CsvOptions(Builder builder) {
+    super(FormatOptions.CSV);
     this.allowJaggedRows = builder.allowJaggedRows;
     this.allowQuotedNewLines = builder.allowQuotedNewLines;
     this.encoding = builder.encoding;
@@ -226,24 +226,12 @@ public boolean equals(Object obj) {
   com.google.api.services.bigquery.model.CsvOptions toPb() {
     com.google.api.services.bigquery.model.CsvOptions csvOptions =
         new com.google.api.services.bigquery.model.CsvOptions();
-    if (allowJaggedRows != null) {
-      csvOptions.setAllowJaggedRows(allowJaggedRows);
-    }
-    if (allowQuotedNewLines != null) {
-      csvOptions.setAllowQuotedNewlines(allowQuotedNewLines);
-    }
-    if (encoding != null) {
-      csvOptions.setEncoding(encoding);
-    }
-    if (fieldDelimiter != null) {
-      csvOptions.setFieldDelimiter(fieldDelimiter);
-    }
-    if (quote != null) {
-      csvOptions.setQuote(quote);
-    }
-    if (skipLeadingRows != null) {
-      csvOptions.setSkipLeadingRows(skipLeadingRows);
-    }
+    csvOptions.setAllowJaggedRows(allowJaggedRows);
+    csvOptions.setAllowQuotedNewlines(allowQuotedNewLines);
+    csvOptions.setEncoding(encoding);
+    csvOptions.setFieldDelimiter(fieldDelimiter);
+    csvOptions.setQuote(quote);
+    csvOptions.setSkipLeadingRows(skipLeadingRows);
     return csvOptions;
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
index 9425ca980ebb..5d55080a88d5 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
@@ -63,29 +63,27 @@ public com.google.api.services.bigquery.model.ExternalDataConfiguration apply(
 
   private final List sourceUris;
   private final Schema schema;
-  private final String sourceFormat;
+  private final FormatOptions formatOptions;
   private final Integer maxBadRecords;
   private final Boolean ignoreUnknownValues;
   private final String compression;
-  private final CsvOptions csvOptions;
 
   public static final class Builder {
 
     private List sourceUris;
     private Schema schema;
-    private String sourceFormat;
+    private FormatOptions formatOptions;
     private Integer maxBadRecords;
     private Boolean ignoreUnknownValues;
     private String compression;
-    private CsvOptions csvOptions;
 
     private Builder() {}
 
     /**
-     * Sets the fully-qualified URIs that point to your data in Google Cloud Storage. Each URI can
-     * contain one '*' wildcard character that must come after the bucket's name. Size limits
-     * related to load jobs apply to external data sources, plus an additional limit of 10 GB
-     * maximum size across all URIs.
+     * Sets the fully-qualified URIs that point to your data in Google Cloud Storage (e.g.
+     * gs://bucket/path). Each URI can contain one '*' wildcard character that must come after the
+     * bucket's name. Size limits related to load jobs apply to external data sources, plus an
+     * additional limit of 10 GB maximum size across all URIs.
      *
      * @see Quota
      */
@@ -103,15 +101,14 @@ public Builder schema(Schema schema) {
     }
 
     /**
-     * Sets the source format of the external data. Supported values are {@code CSV} for CSV files,
-     * and {@code NEWLINE_DELIMITED_JSON} for newline-delimited JSON. If not set, files are assumed
-     * to be in CSV format.
+     * Sets the source format, and possibly some parsing options, of the external data. Supported
+     * formats are {@code CSV} and {@code NEWLINE_DELIMITED_JSON}.
      *
      * 
      *     Source Format
      */
-    public Builder sourceFormat(String sourceFormat) {
-      this.sourceFormat = checkNotNull(sourceFormat);
+    public Builder formatOptions(FormatOptions formatOptions) {
+      this.formatOptions = checkNotNull(formatOptions);
       return this;
     }
 
@@ -129,9 +126,8 @@ public Builder maxBadRecords(Integer maxBadRecords) {
      * Sets whether BigQuery should allow extra values that are not represented in the table schema.
      * If true, the extra values are ignored. If false, records with extra columns are treated as
      * bad records, and if there are too many bad records, an invalid error is returned in the job
-     * result. The default value is false. The value set with
-     * {@link #sourceFormat(String)} property determines what
-     * BigQuery treats as an extra value.
+     * result. The default value is false. The value set with {@link #formatOptions(FormatOptions)}
+     * property determines what BigQuery treats as an extra value.
      *
      * @see 
      *     Ignore Unknown Values
@@ -152,15 +148,6 @@ public Builder compression(String compression) {
       return this;
     }
 
-    /**
-     * Sets additional properties to be used to parse CSV data (used when
-     * {@link #sourceFormat(String)} is set to CSV).
-     */
-    public Builder csvOptions(CsvOptions csvOptions) {
-      this.csvOptions = csvOptions;
-      return this;
-    }
-
     /**
      * Creates an {@code ExternalDataConfiguration} object.
      */
@@ -174,9 +161,8 @@ public ExternalDataConfiguration build() {
     this.ignoreUnknownValues = builder.ignoreUnknownValues;
     this.maxBadRecords = builder.maxBadRecords;
     this.schema = builder.schema;
-    this.sourceFormat = builder.sourceFormat;
+    this.formatOptions = builder.formatOptions;
     this.sourceUris = builder.sourceUris;
-    this.csvOptions = builder.csvOptions;
   }
 
   /**
@@ -193,8 +179,8 @@ public String compression() {
    * Returns whether BigQuery should allow extra values that are not represented in the table
    * schema. If true, the extra values are ignored. If false, records with extra columns are treated
    * as bad records, and if there are too many bad records, an invalid error is returned in the job
-   * result. The default value is false. The value of {@link #sourceFormat()} determines what
-   * BigQuery treats as an extra value.
+   * result. The default value is false. The value of {@link #format()} determines what BigQuery
+   * treats as an extra value.
    *
    * @see 
    *     Ignore Unknown Values
@@ -219,13 +205,13 @@ public Schema schema() {
   }
 
   /**
-   * Sets the source format of the external data.
+   * Returns the source format of the external data.
    *
    * 
    *     Source Format
    */
-  public String sourceFormat() {
-    return sourceFormat;
+  public String format() {
+    return formatOptions.type();
   }
 
   /**
@@ -241,11 +227,11 @@ public List sourceUris() {
   }
 
   /**
-   * Returns additional properties used to parse CSV data (used when {@link #sourceFormat()} is set
-   * to CSV).
+   * Returns additional properties used to parse CSV data (used when {@link #format()} is set to
+   * CSV). Returns {@code null} if not set.
    */
   public CsvOptions csvOptions() {
-    return csvOptions;
+    return formatOptions instanceof CsvOptions ? (CsvOptions) formatOptions : null;
   }
 
   /**
@@ -257,28 +243,26 @@ public Builder toBuilder() {
         .ignoreUnknownValues(ignoreUnknownValues)
         .maxBadRecords(maxBadRecords)
         .schema(schema)
-        .sourceFormat(sourceFormat)
-        .sourceUris(sourceUris)
-        .csvOptions(csvOptions);
+        .formatOptions(formatOptions)
+        .sourceUris(sourceUris);
   }
 
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("sourceUris", sourceUris)
-        .add("sourceFormat", sourceFormat)
+        .add("formatOptions", formatOptions)
         .add("schema", schema)
         .add("compression", compression)
         .add("ignoreUnknownValues", ignoreUnknownValues)
         .add("maxBadRecords", maxBadRecords)
-        .add("csvOptions", csvOptions)
         .toString();
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(compression, ignoreUnknownValues, maxBadRecords, schema, sourceFormat,
-        sourceUris, csvOptions);
+    return Objects.hash(compression, ignoreUnknownValues, maxBadRecords, schema, formatOptions,
+        sourceUris);
   }
 
   @Override
@@ -302,14 +286,14 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toPb() {
     if (schema != null) {
       externalConfigurationPb.setSchema(schema.toPb());
     }
-    if (sourceFormat != null) {
-      externalConfigurationPb.setSourceFormat(sourceFormat);
+    if (formatOptions != null) {
+      externalConfigurationPb.setSourceFormat(formatOptions.type());
     }
     if (sourceUris != null) {
       externalConfigurationPb.setSourceUris(sourceUris);
     }
-    if (csvOptions != null) {
-      externalConfigurationPb.setCsvOptions(csvOptions.toPb());
+    if (csvOptions() != null) {
+      externalConfigurationPb.setCsvOptions(csvOptions().toPb());
     }
     return externalConfigurationPb;
   }
@@ -329,8 +313,8 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toPb() {
    * @see 
    *     Source Format
    */
-  public static Builder builder(List sourceUris, Schema schema, String format) {
-    return new Builder().sourceUris(sourceUris).schema(schema).sourceFormat(format);
+  public static Builder builder(List sourceUris, Schema schema, FormatOptions format) {
+    return new Builder().sourceUris(sourceUris).schema(schema).formatOptions(format);
   }
 
   /**
@@ -347,11 +331,11 @@ public static Builder builder(List sourceUris, Schema schema, String for
    * @see 
    *     Source Format
    */
-  public static Builder builder(String sourceUri, Schema schema, String format) {
+  public static Builder builder(String sourceUri, Schema schema, FormatOptions format) {
     return new Builder()
         .sourceUris(ImmutableList.of(sourceUri))
         .schema(schema)
-        .sourceFormat(format);
+        .formatOptions(format);
   }
 
   /**
@@ -369,8 +353,8 @@ public static Builder builder(String sourceUri, Schema schema, String format) {
    * @see 
    *     Source Format
    */
-  public static ExternalDataConfiguration of(
-      List sourceUris, Schema schema, String format) {
+  public static ExternalDataConfiguration of(List sourceUris, Schema schema,
+      FormatOptions format) {
     return builder(sourceUris, schema, format).build();
   }
 
@@ -388,7 +372,8 @@ public static ExternalDataConfiguration of(
    * @see 
    *     Source Format
    */
-  public static ExternalDataConfiguration of(String sourceUri, Schema schema, String format) {
+  public static ExternalDataConfiguration of(String sourceUri, Schema schema,
+      FormatOptions format) {
     return builder(sourceUri, schema, format).build();
   }
 
@@ -402,7 +387,7 @@ static ExternalDataConfiguration fromPb(
       builder.schema(Schema.fromPb(externalDataConfiguration.getSchema()));
     }
     if (externalDataConfiguration.getSourceFormat() != null) {
-      builder.sourceFormat(externalDataConfiguration.getSourceFormat());
+      builder.formatOptions(FormatOptions.of(externalDataConfiguration.getSourceFormat()));
     }
     if (externalDataConfiguration.getCompression() != null) {
       builder.compression(externalDataConfiguration.getCompression());
@@ -411,7 +396,7 @@ static ExternalDataConfiguration fromPb(
       builder.ignoreUnknownValues(externalDataConfiguration.getIgnoreUnknownValues());
     }
     if (externalDataConfiguration.getCsvOptions() != null) {
-      builder.csvOptions(CsvOptions.fromPb(externalDataConfiguration.getCsvOptions()));
+      builder.formatOptions(CsvOptions.fromPb(externalDataConfiguration.getCsvOptions()));
     }
     if (externalDataConfiguration.getMaxBadRecords() != null) {
       builder.maxBadRecords(externalDataConfiguration.getMaxBadRecords());
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
new file mode 100644
index 000000000000..8a6884daf65d
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.common.base.MoreObjects;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Base class for Google BigQuery format options. These class define the format of external data
+ * used by BigQuery, for either federated tables or load jobs.
+ */
+public class FormatOptions implements Serializable {
+
+  static final String CSV = "CSV";
+  static final String JSON = "NEWLINE_DELIMITED_JSON";
+  static final String DATASTORE_BACKUP = "DATASTORE_BACKUP";
+  private static final long serialVersionUID = -443376052020423691L;
+
+  private final String type;
+
+  FormatOptions(String type) {
+    this.type = type;
+  }
+
+  /**
+   * Returns the external data format, as a string.
+   */
+  public String type() {
+    return type;
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this).add("format", type).toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(type);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof FormatOptions && Objects.equals(type, ((FormatOptions) obj).type());
+  }
+
+  /**
+   * Default options for CSV format.
+   */
+  public static FormatOptions csv() {
+    return new FormatOptions(CSV);
+  }
+
+  /**
+   * Default options for NEWLINE_DELIMITED_JSON format.
+   */
+  public static FormatOptions json() {
+    return new FormatOptions(JSON);
+  }
+
+  /**
+   * Default options for DATASTORE_BACKUP format.
+   */
+  public static FormatOptions datastoreBackup() {
+    return new FormatOptions(DATASTORE_BACKUP);
+  }
+
+  /**
+   * Default options for the provided format.
+   */
+  public static FormatOptions of(String format) {
+    return new FormatOptions(format);
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CsvOptionsTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CsvOptionsTest.java
index bfa99957cdbd..371202174431 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CsvOptionsTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CsvOptionsTest.java
@@ -59,6 +59,7 @@ public void testToBuilderIncomplete() {
 
   @Test
   public void testBuilder() {
+    assertEquals(FormatOptions.CSV, CSV_OPTIONS.type());
     assertEquals(ALLOW_JAGGED_ROWS, CSV_OPTIONS.allowJaggedRows());
     assertEquals(ALLOW_QUOTED_NEWLINE, CSV_OPTIONS.allowQuotedNewLines());
     assertEquals(ENCODING.name(), CSV_OPTIONS.encoding());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java
index 4c7f5d37dda8..cba03317ccb9 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java
@@ -49,9 +49,8 @@ public class ExternalDataConfigurationTest {
   private static final String COMPRESSION = "GZIP";
   private static final CsvOptions CSV_OPTIONS = CsvOptions.builder().build();
   private static final ExternalDataConfiguration CONFIGURATION = ExternalDataConfiguration
-      .builder(SOURCE_URIS, TABLE_SCHEMA, SOURCE_FORMAT)
+      .builder(SOURCE_URIS, TABLE_SCHEMA, CSV_OPTIONS)
       .compression(COMPRESSION)
-      .csvOptions(CSV_OPTIONS)
       .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
       .maxBadRecords(MAX_BAD_RECORDS)
       .build();
@@ -70,7 +69,7 @@ public void testToBuilder() {
   @Test
   public void testToBuilderIncomplete() {
     ExternalDataConfiguration configuration =
-        ExternalDataConfiguration.of(SOURCE_URIS, TABLE_SCHEMA, SOURCE_FORMAT);
+        ExternalDataConfiguration.of(SOURCE_URIS, TABLE_SCHEMA, FormatOptions.json());
     assertEquals(configuration, configuration.toBuilder().build());
   }
 
@@ -81,7 +80,7 @@ public void testBuilder() {
     assertEquals(IGNORE_UNKNOWN_VALUES, CONFIGURATION.ignoreUnknownValues());
     assertEquals(MAX_BAD_RECORDS, CONFIGURATION.maxBadRecords());
     assertEquals(TABLE_SCHEMA, CONFIGURATION.schema());
-    assertEquals(SOURCE_FORMAT, CONFIGURATION.sourceFormat());
+    assertEquals(SOURCE_FORMAT, CONFIGURATION.format());
     assertEquals(SOURCE_URIS, CONFIGURATION.sourceUris());
   }
 
@@ -89,7 +88,7 @@ public void testBuilder() {
   public void testToAndFromPb() {
     compareConfiguration(CONFIGURATION, ExternalDataConfiguration.fromPb(CONFIGURATION.toPb()));
     ExternalDataConfiguration configuration =
-        ExternalDataConfiguration.builder(SOURCE_URIS, TABLE_SCHEMA, SOURCE_FORMAT).build();
+        ExternalDataConfiguration.builder(SOURCE_URIS, TABLE_SCHEMA, CSV_OPTIONS).build();
     compareConfiguration(configuration, ExternalDataConfiguration.fromPb(configuration.toPb()));
   }
 
@@ -101,7 +100,7 @@ private void compareConfiguration(ExternalDataConfiguration expected,
     assertEquals(expected.ignoreUnknownValues(), value.ignoreUnknownValues());
     assertEquals(expected.maxBadRecords(), value.maxBadRecords());
     assertEquals(expected.schema(), value.schema());
-    assertEquals(expected.sourceFormat(), value.sourceFormat());
+    assertEquals(expected.format(), value.format());
     assertEquals(expected.sourceUris(), value.sourceUris());
   }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FormatOptionsTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FormatOptionsTest.java
new file mode 100644
index 000000000000..df939143156b
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FormatOptionsTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class FormatOptionsTest {
+
+  @Test
+  public void testConstructor() {
+    FormatOptions options = new FormatOptions(FormatOptions.CSV);
+    assertEquals(FormatOptions.CSV, options.type());
+    options = new FormatOptions(FormatOptions.JSON);
+    assertEquals(FormatOptions.JSON, options.type());
+    options = new FormatOptions(FormatOptions.DATASTORE_BACKUP);
+    assertEquals(FormatOptions.DATASTORE_BACKUP, options.type());
+  }
+
+  @Test
+  public void testFactoryMethods() {
+    assertEquals(FormatOptions.CSV, FormatOptions.csv().type());
+    assertEquals(FormatOptions.JSON, FormatOptions.json().type());
+    assertEquals(FormatOptions.DATASTORE_BACKUP, FormatOptions.datastoreBackup().type());
+  }
+
+  @Test
+  public void testEquals() {
+    assertEquals(FormatOptions.csv(), FormatOptions.csv());
+    assertEquals(FormatOptions.csv().hashCode(), FormatOptions.csv().hashCode());
+    assertEquals(FormatOptions.json(), FormatOptions.json());
+    assertEquals(FormatOptions.json().hashCode(), FormatOptions.json().hashCode());
+    assertEquals(FormatOptions.datastoreBackup(), FormatOptions.datastoreBackup());
+    assertEquals(FormatOptions.datastoreBackup().hashCode(),
+        FormatOptions.datastoreBackup().hashCode());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index f80dbf1d5225..b3bdbd3eda57 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -96,8 +96,7 @@ public class SerializationTest {
       new TableInfo.StreamingBuffer(1L, 2L, 3L);
   private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
   private static final ExternalDataConfiguration EXTERNAL_DATA_CONFIGURATION =
-      ExternalDataConfiguration.builder(SOURCE_URIS, TABLE_SCHEMA, "CSV")
-      .csvOptions(CSV_OPTIONS)
+      ExternalDataConfiguration.builder(SOURCE_URIS, TABLE_SCHEMA, CSV_OPTIONS)
       .ignoreUnknownValues(true)
       .maxBadRecords(42)
       .build();
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
index b29ddef665d5..8fa84f766d17 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
@@ -49,11 +49,9 @@ public class TableInfoTest {
   private static final Integer MAX_BAD_RECORDS = 42;
   private static final Boolean IGNORE_UNKNOWN_VALUES = true;
   private static final String COMPRESSION = "GZIP";
-  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder().build();
   private static final ExternalDataConfiguration CONFIGURATION = ExternalDataConfiguration
-      .builder(SOURCE_URIS, TABLE_SCHEMA, SOURCE_FORMAT)
+      .builder(SOURCE_URIS, TABLE_SCHEMA, FormatOptions.datastoreBackup())
       .compression(COMPRESSION)
-      .csvOptions(CSV_OPTIONS)
       .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
       .maxBadRecords(MAX_BAD_RECORDS)
       .build();

From 6c472d5d8b83575174e3efc83fb24c72e95c3694 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 2 Dec 2015 12:48:33 -0800
Subject: [PATCH 151/322] Add release notes to RELEASING

---
 RELEASING.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/RELEASING.md b/RELEASING.md
index 59b6559b9f95..dd319b7d0dc7 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -13,7 +13,11 @@ The PR should look something like [#225](https://github.com/GoogleCloudPlatform/
 3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository.  Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR.  Be sure that you are not opening the "Pull Request" build logs.  When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed.  You can also search for `gcloud-java` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~gcloud-java) and check the latest version number.  If the deployment didn't succeed because of a flaky test, rerun the build.
 
 4. Create a release on Github manually.
-Go to the [releases page](https://github.com/GoogleCloudPlatform/gcloud-java/releases) and click "Draft a new release."  Use `vX.Y.Z` as the "Tag Version" and `X.Y.Z` as the "Release Title", where `X.Y.Z` is the release version as listed in the `pom.xml` files.
+Go to the [releases page](https://github.com/GoogleCloudPlatform/gcloud-java/releases) and click "Draft a new release."  Use `vX.Y.Z` as the "Tag Version" and `X.Y.Z` as the "Release Title", where `X.Y.Z` is the release version as listed in the `pom.xml` files.  In the description section, write brief notes on what has changed.  For an example, see the [0.1.0 release](https://github.com/GoogleCloudPlatform/gcloud-java/releases/tag/v0.1.0).  You can see what has changed by looking through the merged master branch pull requests or by using the `git log` command.  Here is an example of the log command to get non-merge commits between v0.0.12 and v0.1.0:
+
+  ```
+  git --no-pager log v0.0.12..v0.1.0 --pretty=oneline --abbrev-commit | grep -v " Merge pull request"
+  ```
 
 5. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
 As mentioned before, there is an optional version argument.  By default, the script will update the version from "X.Y.Z" to "X.Y.Z+1-SNAPSHOT".  Suppose a different version is desired, for example X+1.0.0-SNAPSHOT.  Then the appropriate command to run would be `utilities/update_pom_version.sh X+1.0.0-SNAPSHOT`.

From 231b84a6ab5ed55eb6cda9ee9a07b3cbacc99763 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 2 Dec 2015 14:48:35 -0800
Subject: [PATCH 152/322] Update release notes procedure

---
 RELEASING.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/RELEASING.md b/RELEASING.md
index dd319b7d0dc7..142dd377a642 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -12,13 +12,15 @@ The PR should look something like [#225](https://github.com/GoogleCloudPlatform/
 
 3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository.  Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR.  Be sure that you are not opening the "Pull Request" build logs.  When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed.  You can also search for `gcloud-java` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~gcloud-java) and check the latest version number.  If the deployment didn't succeed because of a flaky test, rerun the build.
 
-4. Create a release on Github manually.
-Go to the [releases page](https://github.com/GoogleCloudPlatform/gcloud-java/releases) and click "Draft a new release."  Use `vX.Y.Z` as the "Tag Version" and `X.Y.Z` as the "Release Title", where `X.Y.Z` is the release version as listed in the `pom.xml` files.  In the description section, write brief notes on what has changed.  For an example, see the [0.1.0 release](https://github.com/GoogleCloudPlatform/gcloud-java/releases/tag/v0.1.0).  You can see what has changed by looking through the merged master branch pull requests or by using the `git log` command.  Here is an example of the log command to get non-merge commits between v0.0.12 and v0.1.0:
+4. Publish a release on Github manually.
+Go to the [releases page](https://github.com/GoogleCloudPlatform/gcloud-java/releases) and open the appropriate release draft. Make sure the "Tag Version" is `vX.Y.Z` and the "Release Title" is `X.Y.Z`, where `X.Y.Z` is the release version as listed in the `pom.xml` files.  The draft should already have all changes that impact users since the previous release.  To double check this, you can use the `git log` command and look through the merged master branch pull requests.  Here is an example of the log command to get non-merge commits between v0.0.12 and v0.1.0:
 
   ```
-  git --no-pager log v0.0.12..v0.1.0 --pretty=oneline --abbrev-commit | grep -v " Merge pull request"
+  git --no-pager log v0.0.12..v0.1.0 --pretty=oneline --abbrev-commit --no-merges
   ```
 
+  Ensure that the format is consistent with previous releases (for an example, see the [0.1.0 release](https://github.com/GoogleCloudPlatform/gcloud-java/releases/tag/v0.1.0)).  After adding any missing updates and reformatting as necessary, publish the "draft".
+
 5. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
 As mentioned before, there is an optional version argument.  By default, the script will update the version from "X.Y.Z" to "X.Y.Z+1-SNAPSHOT".  Suppose a different version is desired, for example X+1.0.0-SNAPSHOT.  Then the appropriate command to run would be `utilities/update_pom_version.sh X+1.0.0-SNAPSHOT`.
 

From abf6b0640e78128dffb5729e8803be372259db6d Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 2 Dec 2015 15:09:30 -0800
Subject: [PATCH 153/322] add note about creating new draft

---
 RELEASING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASING.md b/RELEASING.md
index 142dd377a642..586ebeb9b53b 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -19,7 +19,7 @@ Go to the [releases page](https://github.com/GoogleCloudPlatform/gcloud-java/rel
   git --no-pager log v0.0.12..v0.1.0 --pretty=oneline --abbrev-commit --no-merges
   ```
 
-  Ensure that the format is consistent with previous releases (for an example, see the [0.1.0 release](https://github.com/GoogleCloudPlatform/gcloud-java/releases/tag/v0.1.0)).  After adding any missing updates and reformatting as necessary, publish the "draft".
+  Ensure that the format is consistent with previous releases (for an example, see the [0.1.0 release](https://github.com/GoogleCloudPlatform/gcloud-java/releases/tag/v0.1.0)).  After adding any missing updates and reformatting as necessary, publish the draft.  Finally, create a new draft for the next release.
 
 5. Run `utilities/update_pom_version.sh` again (to include "-SNAPSHOT" in the project version).
 As mentioned before, there is an optional version argument.  By default, the script will update the version from "X.Y.Z" to "X.Y.Z+1-SNAPSHOT".  Suppose a different version is desired, for example X+1.0.0-SNAPSHOT.  Then the appropriate command to run would be `utilities/update_pom_version.sh X+1.0.0-SNAPSHOT`.

From ba9059c7cfdcc32256511dde2bc27a5e74f54a61 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 3 Dec 2015 18:15:01 +0100
Subject: [PATCH 154/322] Fix gradle dependency in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 123e4cf76bb3..0fb8d82623b5 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ If you are using Maven, add this to your pom.xml file
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:jar:0.1.0'
+compile 'com.google.gcloud:gcloud-java:0.1.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala

From f84a3b115196ca702d3c4a420870edcbb3f86596 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 3 Dec 2015 22:31:58 +0100
Subject: [PATCH 155/322] Handle unset of Field's mode and description

---
 .../com/google/gcloud/bigquery/Field.java     | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
index 73ca87640ff8..d28e5eb9fed7 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
@@ -16,9 +16,11 @@
 
 package com.google.gcloud.bigquery;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.client.util.Data;
 import com.google.api.services.bigquery.model.TableFieldSchema;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
@@ -180,7 +182,7 @@ public boolean equals(Object obj) {
    * than one value.
    */
   public enum Mode {
-    NULLABLE, REQUIRED, REPEATED
+    NULLABLE, REQUIRED, REPEATED, NOT_SET
   }
 
   private final String name;
@@ -197,6 +199,13 @@ public static final class Builder {
 
     private Builder() {}
 
+    private Builder(Field field) {
+      this.name = field.name;
+      this.type = field.type;
+      this.mode = field.mode;
+      this.description = field.description;
+    }
+
     /**
      * Sets the field name. The name must contain only letters (a-z, A-Z), numbers (0-9), or
      * underscores (_), and must start with a letter or underscore. The maximum length is 128
@@ -222,7 +231,7 @@ public Builder type(Type type) {
      * Sets the mode of the field. When not specified {@link Mode#NULLABLE} is used.
      */
     public Builder mode(Mode mode) {
-      this.mode = mode;
+      this.mode = firstNonNull(mode, Mode.NOT_SET);
       return this;
     }
 
@@ -230,7 +239,7 @@ public Builder mode(Mode mode) {
      * Sets the field description. The maximum length is 16K characters.
      */
     public Builder description(String description) {
-      this.description = description;
+      this.description = firstNonNull(description, Data.nullOf(String.class));
       return this;
     }
 
@@ -270,14 +279,14 @@ public Type type() {
    * Returns the field mode. By default {@link Mode#NULLABLE} is used.
    */
   public Mode mode() {
-    return mode;
+    return mode == Mode.NOT_SET ? null : mode;
   }
 
   /**
    * Returns the field description.
    */
   public String description() {
-    return description;
+    return Data.isNull(description) ? null : description;
   }
 
   /**
@@ -292,11 +301,7 @@ public List fields() {
    * Returns a builder for the {@code Field} object.
    */
   public Builder toBuilder() {
-    return new Builder()
-        .name(this.name)
-        .type(this.type)
-        .mode(this.mode)
-        .description(this.description);
+    return new Builder(this);
   }
 
   @Override
@@ -324,7 +329,7 @@ TableFieldSchema toPb() {
     fieldSchemaPb.setName(name);
     fieldSchemaPb.setType(type.value().name());
     if (mode != null) {
-      fieldSchemaPb.setMode(mode.name());
+      fieldSchemaPb.setMode(mode == Mode.NOT_SET ? Data.nullOf(String.class) : mode.name());
     }
     if (description != null) {
       fieldSchemaPb.setDescription(description);

From bd58ee509d5663189d74485e92d70d70d44da43b Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 3 Dec 2015 22:35:36 +0100
Subject: [PATCH 156/322] Make FormatOptions.csv return CsvOptions, remove
 getters from ExternalDataConfiguration

---
 .../google/gcloud/bigquery/CsvOptions.java    |  5 ++--
 .../bigquery/ExternalDataConfiguration.java   | 27 +++++++------------
 .../google/gcloud/bigquery/FormatOptions.java |  4 +--
 .../ExternalDataConfigurationTest.java        |  7 ++---
 4 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
index 5c52cd78cc8f..40655e2c0c36 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
@@ -203,6 +203,7 @@ public Builder toBuilder() {
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
+        .add("type", type())
         .add("allowJaggedRows", allowJaggedRows)
         .add("allowQuotedNewLines", allowQuotedNewLines)
         .add("encoding", encoding)
@@ -214,8 +215,8 @@ public String toString() {
 
   @Override
   public int hashCode() {
-    return Objects.hash(allowJaggedRows, allowQuotedNewLines, encoding, fieldDelimiter, quote,
-        skipLeadingRows);
+    return Objects.hash(type(), allowJaggedRows, allowQuotedNewLines, encoding, fieldDelimiter,
+        quote, skipLeadingRows);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
index 5d55080a88d5..9e049c4f13d6 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
@@ -179,8 +179,8 @@ public String compression() {
    * Returns whether BigQuery should allow extra values that are not represented in the table
    * schema. If true, the extra values are ignored. If false, records with extra columns are treated
    * as bad records, and if there are too many bad records, an invalid error is returned in the job
-   * result. The default value is false. The value of {@link #format()} determines what BigQuery
-   * treats as an extra value.
+   * result. The default value is false. The value of {@link #formatOptions()} determines what
+   * BigQuery treats as an extra value.
    *
    * @see 
    *     Ignore Unknown Values
@@ -204,16 +204,6 @@ public Schema schema() {
     return schema;
   }
 
-  /**
-   * Returns the source format of the external data.
-   *
-   * 
-   *     Source Format
-   */
-  public String format() {
-    return formatOptions.type();
-  }
-
   /**
    * Returns the fully-qualified URIs that point to your data in Google Cloud Storage. Each URI can
    * contain one '*' wildcard character that must come after the bucket's name. Size limits
@@ -227,11 +217,12 @@ public List sourceUris() {
   }
 
   /**
-   * Returns additional properties used to parse CSV data (used when {@link #format()} is set to
-   * CSV). Returns {@code null} if not set.
+   * Returns the source format, and possibly some parsing options, of the external data. Supported
+   * formats are {@code CSV} and {@code NEWLINE_DELIMITED_JSON}.
    */
-  public CsvOptions csvOptions() {
-    return formatOptions instanceof CsvOptions ? (CsvOptions) formatOptions : null;
+  @SuppressWarnings("unchecked")
+  public  F formatOptions() {
+    return (F) formatOptions;
   }
 
   /**
@@ -292,8 +283,8 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toPb() {
     if (sourceUris != null) {
       externalConfigurationPb.setSourceUris(sourceUris);
     }
-    if (csvOptions() != null) {
-      externalConfigurationPb.setCsvOptions(csvOptions().toPb());
+    if (formatOptions instanceof CsvOptions) {
+      externalConfigurationPb.setCsvOptions(((CsvOptions) formatOptions).toPb());
     }
     return externalConfigurationPb;
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
index 8a6884daf65d..e1f9d5aeb545 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
@@ -63,8 +63,8 @@ public boolean equals(Object obj) {
   /**
    * Default options for CSV format.
    */
-  public static FormatOptions csv() {
-    return new FormatOptions(CSV);
+  public static CsvOptions csv() {
+    return CsvOptions.builder().build();
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java
index cba03317ccb9..f9b7c31e1071 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExternalDataConfigurationTest.java
@@ -43,7 +43,6 @@ public class ExternalDataConfigurationTest {
           .description("FieldDescription3")
           .build();
   private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
-  private static final String SOURCE_FORMAT = "CSV";
   private static final Integer MAX_BAD_RECORDS = 42;
   private static final Boolean IGNORE_UNKNOWN_VALUES = true;
   private static final String COMPRESSION = "GZIP";
@@ -76,11 +75,10 @@ public void testToBuilderIncomplete() {
   @Test
   public void testBuilder() {
     assertEquals(COMPRESSION, CONFIGURATION.compression());
-    assertEquals(CSV_OPTIONS, CONFIGURATION.csvOptions());
+    assertEquals(CSV_OPTIONS, CONFIGURATION.formatOptions());
     assertEquals(IGNORE_UNKNOWN_VALUES, CONFIGURATION.ignoreUnknownValues());
     assertEquals(MAX_BAD_RECORDS, CONFIGURATION.maxBadRecords());
     assertEquals(TABLE_SCHEMA, CONFIGURATION.schema());
-    assertEquals(SOURCE_FORMAT, CONFIGURATION.format());
     assertEquals(SOURCE_URIS, CONFIGURATION.sourceUris());
   }
 
@@ -96,11 +94,10 @@ private void compareConfiguration(ExternalDataConfiguration expected,
       ExternalDataConfiguration value) {
     assertEquals(expected, value);
     assertEquals(expected.compression(), value.compression());
-    assertEquals(expected.csvOptions(), value.csvOptions());
+    assertEquals(expected.formatOptions(), value.formatOptions());
     assertEquals(expected.ignoreUnknownValues(), value.ignoreUnknownValues());
     assertEquals(expected.maxBadRecords(), value.maxBadRecords());
     assertEquals(expected.schema(), value.schema());
-    assertEquals(expected.format(), value.format());
     assertEquals(expected.sourceUris(), value.sourceUris());
   }
 }

From 66972df7c2eb649a3d6da8df5903607d4028a973 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 3 Dec 2015 22:38:12 +0100
Subject: [PATCH 157/322] Add TableType hierarcy to wrap different types of
 tables - Move schema from TableInfo to TableType - Add TableType.View class
 with attributes: view, userDefinedFunctions - Add TableType.ExternalTable
 class with attributes: ExternalDataConfiguration - Fix return null in
 TableInfo.description/friendlyName/expirationTime

---
 .../com/google/gcloud/bigquery/TableInfo.java | 284 ++++--------------
 .../com/google/gcloud/bigquery/TableType.java | 260 ++++++++++++++++
 .../gcloud/bigquery/SerializationTest.java    |  18 +-
 .../google/gcloud/bigquery/TableInfoTest.java |  90 +++---
 .../google/gcloud/bigquery/TableTypeTest.java | 126 ++++++++
 5 files changed, 494 insertions(+), 284 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableType.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTypeTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index 9ca74eb3c1f7..c899ac53da94 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -59,29 +59,6 @@ public Table apply(TableInfo tableInfo) {
 
   private static final long serialVersionUID = -7679032506430816205L;
 
-  /**
-   * The table type.
-   */
-  public enum Type {
-    /**
-     * A normal BigQuery table.
-     */
-    TABLE,
-    /**
-     * A virtual table defined by a SQL query.
-     *
-     * @see Views
-     */
-    VIEW,
-    /**
-     * A BigQuery table backed by external data.
-     *
-     * @see Federated Data
-     *     Sources
-     */
-    EXTERNAL
-  }
-
   /**
    * Google BigQuery Table's Streaming Buffer information. This class contains information on a
    * table's streaming buffer as the estimated size in number of rows/bytes.
@@ -159,18 +136,14 @@ static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
   private final String id;
   private final String selfLink;
   private final TableId tableId;
+  private final TableType type;
   private final String friendlyName;
   private final String description;
-  private final Schema schema;
   private final Long numBytes;
   private final Long numRows;
   private final Long creationTime;
   private final Long expirationTime;
   private final Long lastModifiedTime;
-  private final String viewQuery;
-  private final List userDefinedFunctions;
-  private final Type type;
-  private final ExternalDataConfiguration externalConfiguration;
   private final String location;
   private final StreamingBuffer streamingBuffer;
 
@@ -180,18 +153,14 @@ public static final class Builder {
     private String id;
     private String selfLink;
     private TableId tableId;
+    private TableType type;
     private String friendlyName;
     private String description;
-    private Schema schema;
     private Long numBytes;
     private Long numRows;
     private Long creationTime;
     private Long expirationTime;
     private Long lastModifiedTime;
-    private String viewQuery;
-    private List userDefinedFunctions;
-    private Type type;
-    private ExternalDataConfiguration externalConfiguration;
     private String location;
     private StreamingBuffer streamingBuffer;
 
@@ -202,18 +171,14 @@ private Builder(TableInfo tableInfo) {
       this.id = tableInfo.id;
       this.selfLink = tableInfo.selfLink;
       this.tableId = tableInfo.tableId;
+      this.type = tableInfo.type;
       this.friendlyName = tableInfo.friendlyName;
       this.description = tableInfo.description;
-      this.schema = tableInfo.schema;
       this.numBytes = tableInfo.numBytes;
       this.numRows = tableInfo.numRows;
       this.creationTime = tableInfo.creationTime;
       this.expirationTime = tableInfo.expirationTime;
       this.lastModifiedTime = tableInfo.lastModifiedTime;
-      this.viewQuery = tableInfo.viewQuery;
-      this.userDefinedFunctions = tableInfo.userDefinedFunctions;
-      this.type = tableInfo.type;
-      this.externalConfiguration = tableInfo.externalConfiguration;
       this.location = tableInfo.location;
       this.streamingBuffer = tableInfo.streamingBuffer;
     }
@@ -245,18 +210,6 @@ public Builder expirationTime(Long expirationTime) {
       return this;
     }
 
-    /**
-     * Sets the data format, location, and other properties of a table stored outside of BigQuery.
-     * This property is experimental and might be subject to change or removed.
-     *
-     * @see Federated Data
-     *     Sources
-     */
-    public Builder externalConfiguration(ExternalDataConfiguration externalConfiguration) {
-      this.externalConfiguration = externalConfiguration;
-      return this;
-    }
-
     /**
      * Sets a user-friendly name for the table.
      */
@@ -290,15 +243,6 @@ Builder numRows(Long numRows) {
       return this;
     }
 
-    /**
-     * Sets the table's schema. Providing a schema is not necessary when {@link #viewQuery(String)}
-     * or {@link #externalConfiguration(ExternalDataConfiguration)} are provided.
-     */
-    public Builder schema(Schema schema) {
-      this.schema = schema;
-      return this;
-    }
-
     Builder selfLink(String selfLink) {
       this.selfLink = selfLink;
       return this;
@@ -317,29 +261,11 @@ public Builder tableId(TableId tableId) {
       return this;
     }
 
-    Builder type(Type type) {
-      this.type = type;
-      return this;
-    }
-
     /**
-     * Sets the query used to create a table of {@link Type#VIEW} type.
+     * Sets the table type.
      */
-    public Builder viewQuery(String viewQuery) {
-      this.viewQuery = viewQuery;
-      return this;
-    }
-
-    /**
-     * Sets user-defined functions to be used by the view's query. User defined functions are only
-     * used when {@link #type(TableInfo.Type)} is set to {@link Type#VIEW} and a query is provided via
-     * {@link #viewQuery(String)}.
-     *
-     * @see User-Defined
-     *     Functions
-     */
-    public Builder userDefinedFunctions(List userDefinedFunctions) {
-      this.userDefinedFunctions = userDefinedFunctions;
+    public Builder type(TableType type) {
+      this.type = type;
       return this;
     }
 
@@ -358,16 +284,12 @@ private TableInfo(Builder builder) {
     this.selfLink = builder.selfLink;
     this.friendlyName = builder.friendlyName;
     this.description = builder.description;
-    this.schema = builder.schema;
+    this.type = builder.type;
     this.numBytes = builder.numBytes;
     this.numRows = builder.numRows;
     this.creationTime = builder.creationTime;
     this.expirationTime = builder.expirationTime;
     this.lastModifiedTime = builder.lastModifiedTime;
-    this.viewQuery = builder.viewQuery;
-    this.userDefinedFunctions = builder.userDefinedFunctions;
-    this.type = builder.type;
-    this.externalConfiguration = builder.externalConfiguration;
     this.location = builder.location;
     this.streamingBuffer = builder.streamingBuffer;
   }
@@ -405,21 +327,14 @@ public TableId tableId() {
    * Returns a user-friendly name for the table.
    */
   public String friendlyName() {
-    return friendlyName;
+    return Data.isNull(friendlyName) ? null : friendlyName;
   }
 
   /**
    * Returns a user-friendly description for the table.
    */
   public String description() {
-    return description;
-  }
-
-  /**
-   * Returns the table's schema.
-   */
-  public Schema schema() {
-    return schema;
+    return Data.isNull(description) ? null : description;
   }
 
   /**
@@ -448,7 +363,7 @@ public Long creationTime() {
    * table will persist indefinitely. Expired tables will be deleted and their storage reclaimed.
    */
   public Long expirationTime() {
-    return expirationTime;
+    return Data.isNull(expirationTime) ? null : expirationTime;
   }
 
   /**
@@ -458,43 +373,22 @@ public Long lastModifiedTime() {
     return lastModifiedTime;
   }
 
-  /**
-   * If this table is a view ({@link #type()} returns {@link Type#VIEW}) this method returns the
-   * query used to create the view. Returns {@code null} otherwise.
-   */
-  public String viewQuery() {
-    return viewQuery;
-  }
-
-  /**
-   * If this table is a view ({@link #type()} returns {@link Type#VIEW} this method returns user
-   * defined functions that can be used by {@link #viewQuery}.
-   *
-   * @see User-Defined Functions
-   *     
-   */
-  public List userDefinedFunctions() {
-    return userDefinedFunctions;
-  }
-
   /**
    * Returns the type of the table.
    */
-  public Type type() {
-    return type;
+  public Schema schema() {
+    return type.schema();
   }
 
   /**
-   * If this table is external ({@link #type()} returns {@link Type#EXTERNAL}) this method returns
-   * the data format, location, and other properties of a table stored outside of BigQuery.
-   * If the table is not {@link Type#EXTERNAL} this method returns {@code null}. This property
-   * is experimental and might be subject to change or removed.
-   *
-   * @see Federated Data Sources
-   *     
+   * Returns the table's type. If this table is simple table the method returns an instance of
+   * {@link TableType}. If this table is an external table this method returns an instance of
+   * {@link com.google.gcloud.bigquery.TableType.ExternalTable}. If this table is a view table this
+   * method returns an instance of {@link com.google.gcloud.bigquery.TableType.View}.
    */
-  public ExternalDataConfiguration externalConfiguration() {
-    return externalConfiguration;
+  @SuppressWarnings("unchecked")
+  public  T type() {
+    return (T) type;
   }
 
   /**
@@ -527,10 +421,6 @@ public Builder toBuilder() {
   public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("tableId", tableId)
-        .add("schema", schema)
-        .add("externalDataConfiguration", externalConfiguration)
-        .add("query", viewQuery)
-        .add("userDefinedFunctions", userDefinedFunctions)
         .add("type", type)
         .add("location", location)
         .add("streamingBuffer", streamingBuffer)
@@ -560,31 +450,30 @@ public boolean equals(Object obj) {
   Table toPb() {
     Table tablePb = new Table();
     tablePb.setTableReference(tableId.toPb());
-    if (externalConfiguration != null) {
-      tablePb.setExternalDataConfiguration(externalConfiguration.toPb());
-    }
     if (lastModifiedTime != null) {
       tablePb.setLastModifiedTime(BigInteger.valueOf(lastModifiedTime));
     }
     if (numRows != null) {
       tablePb.setNumRows(BigInteger.valueOf(numRows));
     }
-    if (schema != null) {
-      tablePb.setSchema(schema.toPb());
+    if (schema() != null) {
+      tablePb.setSchema(schema().toPb());
     }
-    if (streamingBuffer != null) {
-      tablePb.setStreamingBuffer(streamingBuffer.toPb());
-    }
-    if (viewQuery != null) {
-      ViewDefinition viewDefinition = new ViewDefinition().setQuery(viewQuery);
-      if (userDefinedFunctions != null) {
+    if (type instanceof TableType.View) {
+      TableType.View viewType = (TableType.View) type;
+      ViewDefinition viewDefinition = new ViewDefinition().setQuery(viewType.query());
+      if (viewType.userDefinedFunctions() != null) {
         viewDefinition.setUserDefinedFunctionResources(
-            Lists.transform(userDefinedFunctions, UserDefinedFunction.TO_PB_FUNCTION));
+            Lists.transform(viewType.userDefinedFunctions(), UserDefinedFunction.TO_PB_FUNCTION));
       }
-      tablePb.setView(new ViewDefinition().setQuery(viewQuery));
+      tablePb.setView(viewDefinition);
     }
-    if (type != null) {
-      tablePb.setType(type.name());
+    if (type instanceof TableType.ExternalTable) {
+      tablePb.setExternalDataConfiguration(
+          ((TableType.ExternalTable) type).configuration().toPb());
+    }
+    if (streamingBuffer != null) {
+      tablePb.setStreamingBuffer(streamingBuffer.toPb());
     }
     tablePb.setCreationTime(creationTime);
     tablePb.setDescription(description);
@@ -599,99 +488,38 @@ Table toPb() {
   }
 
   /**
-   * Returns a builder for a BigQuery table backed by external data. External tables are
-   * experimental and might be subject to change or removed.
-   *
-   * @param tableId table id
-   * @param configuration configuration for external data source
-   */
-  public static Builder builder(TableId tableId, ExternalDataConfiguration configuration) {
-    return new Builder().tableId(tableId).externalConfiguration(configuration);
-  }
-
-  /**
-   * Returns a builder for a BigQuery view.
-   *
-   * @param tableId table id
-   * @param query query used to create the view
-   */
-  public static Builder builder(TableId tableId, String query) {
-    return new Builder().tableId(tableId).viewQuery(query);
-  }
-
-  /**
-   * Returns a builder for a BigQuery view.
+   * Returns a builder for a BigQuery table given its type.
    *
    * @param tableId table id
-   * @param query query used to create the view
+   * @param type the type of the table
    */
-  public static Builder builder(TableId tableId, String query, List functions) {
-    return new Builder().tableId(tableId).viewQuery(query).userDefinedFunctions(functions);
+  public static Builder builder(TableId tableId, TableType type) {
+    return new Builder().tableId(tableId).type(type);
   }
 
   /**
-   * Returns a builder for a BigQuery table.
+   * Creates BigQuery table given its type
    *
    * @param tableId table id
-   * @param schema table's schema definition
+   * @param type the type of the table
    */
-  public static Builder builder(TableId tableId, Schema schema) {
-    return new Builder().tableId(tableId).schema(schema);
-  }
-
-  /**
-   * Creates BigQuery table backed by external data.
-   *
-   * @param tableId table id
-   * @param configuration configuration for external data source
-   */
-  public static TableInfo of(TableId tableId, ExternalDataConfiguration configuration) {
-    return builder(tableId, configuration).build();
-  }
-
-  /**
-   * Creates a BigQuery view.
-   *
-   * @param tableId table id
-   * @param query query used to create the view
-   */
-  public static TableInfo of(TableId tableId, String query) {
-    return builder(tableId, query).build();
-  }
-
-  /**
-   * Creates a BigQuery view.
-   *
-   * @param tableId table id
-   * @param query query used to create the view
-   * @param functions user defined funtions that can be used in {@code query}
-   */
-  public static TableInfo of(TableId tableId, String query, List functions) {
-    return builder(tableId, query, functions).build();
-  }
-
-  /**
-   * Creates a BigQuery table.
-   *
-   * @param tableId table id
-   * @param schema table's schema definition
-   */
-  public static TableInfo of(TableId tableId, Schema schema) {
-    return builder(tableId, schema).build();
+  public static TableInfo of(TableId tableId, TableType type) {
+    return builder(tableId, type).build();
   }
 
   static TableInfo fromPb(Table tablePb) {
     Builder builder = new Builder().tableId(TableId.fromPb(tablePb.getTableReference()));
+    Schema schema = null;
+    if (tablePb.getSchema() != null) {
+      schema = Schema.fromPb(tablePb.getSchema());
+      builder.type(TableType.table(schema));
+    }
     if (tablePb.getDescription() != null) {
       builder.description(tablePb.getDescription());
     }
     if (tablePb.getExpirationTime() != null) {
       builder.expirationTime(tablePb.getExpirationTime());
     }
-    if (tablePb.getExternalDataConfiguration() != null) {
-      builder.externalConfiguration(
-          ExternalDataConfiguration.fromPb(tablePb.getExternalDataConfiguration()));
-    }
     if (tablePb.getFriendlyName() != null) {
       builder.friendlyName(tablePb.getFriendlyName());
     }
@@ -704,22 +532,22 @@ static TableInfo fromPb(Table tablePb) {
     if (tablePb.getNumRows() != null) {
       builder.numRows(tablePb.getNumRows().longValue());
     }
-    if (tablePb.getSchema() != null) {
-      builder.schema(Schema.fromPb(tablePb.getSchema()));
-    }
     if (tablePb.getStreamingBuffer() != null) {
       builder.streamingBuffer(StreamingBuffer.fromPb(tablePb.getStreamingBuffer()));
     }
-    if (tablePb.getType() != null) {
-      builder.type(Type.valueOf(tablePb.getType()));
-    }
     if (tablePb.getView() != null) {
-      builder.viewQuery(tablePb.getView().getQuery());
+      String query = tablePb.getView().getQuery();
+      List functions = null;
       if (tablePb.getView().getUserDefinedFunctionResources() != null) {
-        builder.userDefinedFunctions(
-            Lists.transform(tablePb.getView().getUserDefinedFunctionResources(),
-                UserDefinedFunction.FROM_PB_FUNCTION));
+        functions = Lists.transform(tablePb.getView().getUserDefinedFunctionResources(),
+                UserDefinedFunction.FROM_PB_FUNCTION);
       }
+      builder.type(new TableType.View(schema, query, functions));
+    }
+    if (tablePb.getExternalDataConfiguration() != null) {
+      ExternalDataConfiguration configuration =
+          ExternalDataConfiguration.fromPb(tablePb.getExternalDataConfiguration());
+      builder.type(new TableType.ExternalTable(schema, configuration));
     }
     if (tablePb.getCreationTime() != null) {
       builder.creationTime(tablePb.getCreationTime());
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableType.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableType.java
new file mode 100644
index 000000000000..9a74d55e8bbb
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableType.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Table type. A BigQuery table can be of three types. {@link Type#TABLE} is a
+ * normal BigQuery table. {@link Type#VIEW} is a view table, created from a query.
+ * {@link Type#EXTERNAL} is an external table, backed by Google Cloud Storage data.
+ */
+public class TableType implements Serializable {
+
+  /**
+   * The table type.
+   */
+  public enum Type {
+    /**
+     * A normal BigQuery table.
+     */
+    TABLE,
+    /**
+     * A virtual table defined by a SQL query.
+     *
+     * @see Views
+     */
+    VIEW,
+    /**
+     * A BigQuery table backed by external data.
+     *
+     * @see Federated Data
+     *     Sources
+     */
+    EXTERNAL
+  }
+
+  private final Type type;
+  private final Schema schema;
+
+  TableType(Type type, Schema schema) {
+    this.type = type;
+    this.schema = schema;
+  }
+
+  /**
+   * Returns the type of the table.
+   */
+  public Type type() {
+    return type;
+  }
+
+  /**
+   * Returns the table's schema.
+   */
+  public Schema schema() {
+    return schema;
+  }
+
+  /**
+   * Google BigQuery View type.
+   */
+  public static class View extends TableType {
+
+    private static final long serialVersionUID = 8275064752050652381L;
+
+    private final String query;
+    private final List userDefinedFunctions;
+
+    View(String query) {
+      this(null, query, null);
+    }
+
+    View(String query, List userDefinedFunctions) {
+      this(null, query, userDefinedFunctions);
+    }
+
+    View(Schema schema, String query, List userDefinedFunctions) {
+      super(Type.VIEW, schema);
+      this.query = query;
+      this.userDefinedFunctions = userDefinedFunctions;
+    }
+
+    /**
+     * Returns the query used to create the view.
+     */
+    public String query() {
+      return query;
+    };
+
+    /**
+     * Returns user defined functions that can be used by {@link #query()}. Returns {@code null} if
+     * not set.
+     *
+     * @see User-Defined Functions
+     *     
+     */
+    public List userDefinedFunctions() {
+      return userDefinedFunctions;
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("type", type())
+          .add("query", query)
+          .add("userDefinedFunctions", userDefinedFunctions)
+          .toString();
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(schema(), query, userDefinedFunctions);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (!(obj instanceof View)) {
+        return false;
+      }
+      View other = (View) obj;
+      return Objects.equals(type(), other.type())
+          && Objects.equals(query, other.query)
+          && Objects.equals(userDefinedFunctions, other.userDefinedFunctions);
+    }
+  }
+
+  /**
+   * Google BigQuery External Table type.
+   */
+  public static class ExternalTable extends TableType {
+
+    private static final long serialVersionUID = -6912214693318638552L;
+
+    private final ExternalDataConfiguration configuration;
+
+    ExternalTable(ExternalDataConfiguration configuration) {
+      this(null, configuration);
+    }
+
+    ExternalTable(Schema schema, ExternalDataConfiguration configuration) {
+      super(Type.EXTERNAL, schema);
+      this.configuration = configuration;
+    }
+
+    /**
+     * Returns the data format, location and other properties of a table stored outside of BigQuery.
+     * This property is experimental and might be subject to change or removed.
+     *
+     * @see Federated Data
+     *     Sources
+     */
+    public ExternalDataConfiguration configuration() {
+      return configuration;
+    };
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("type", type())
+          .add("configuration", configuration)
+          .toString();
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(schema(), configuration);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (!(obj instanceof ExternalTable)) {
+        return false;
+      }
+      ExternalTable other = (ExternalTable) obj;
+      return Objects.equals(type(), other.type())
+          && Objects.equals(configuration, other.configuration);
+    }
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("type", type)
+        .add("schema", schema)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(type, schema);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (!(obj instanceof TableType)) {
+      return false;
+    }
+    TableType other = (TableType) obj;
+    return Objects.equals(type, other.type)
+        && Objects.equals(schema, other.schema);
+  }
+
+  /**
+   * Returns a simple BigQuery Table type.
+   */
+  public static TableType table(Schema schema) {
+    return new TableType(Type.TABLE, checkNotNull(schema));
+  }
+
+  /**
+   * Returns a BigQuery View type given the query needed to create the view.
+   */
+  public static View view(String query) {
+    return new View(checkNotNull(query));
+  }
+
+  /**
+   * Returns a BigQuery View type given the query needed to create the view and a list of user
+   * defined functions that can be used by the query.
+   */
+  public static View view(String query, List userDefinedFunctions) {
+    return new View(checkNotNull(query), checkNotNull(userDefinedFunctions));
+  }
+
+  /**
+   * Returns a BigQuery View type given the query needed to create the view and a list of user
+   * defined functions that can be used by the query.
+   */
+  public static View view(String query, UserDefinedFunction... userDefinedFunctions) {
+    return new View(checkNotNull(query), ImmutableList.copyOf(userDefinedFunctions));
+  }
+
+  /**
+   * Returns a BigQuery External Table type given the external data configuration.
+   */
+  public static ExternalTable externalTable(ExternalDataConfiguration configuration) {
+    return new ExternalTable(checkNotNull(configuration));
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index b3bdbd3eda57..86e18ac74c97 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -104,15 +104,15 @@ public class SerializationTest {
       new UserDefinedFunction.InlineFunction("inline");
   private static final UserDefinedFunction URI_FUNCTION =
       new UserDefinedFunction.UriFunction("URI");
-  private static final TableInfo TABLE_INFO = TableInfo.builder(TABLE_ID, TABLE_SCHEMA)
-      .creationTime(CREATION_TIME)
-      .description(DESCRIPTION)
-      .etag(ETAG)
-      .id(ID)
-      .location(LOCATION)
-      .type(TableInfo.Type.TABLE)
-      .streamingBuffer(STREAMING_BUFFER)
-      .build();
+  private static final TableInfo TABLE_INFO =
+      TableInfo.builder(TABLE_ID, TableType.table(TABLE_SCHEMA))
+          .creationTime(CREATION_TIME)
+          .description(DESCRIPTION)
+          .etag(ETAG)
+          .id(ID)
+          .location(LOCATION)
+          .streamingBuffer(STREAMING_BUFFER)
+          .build();
 
   @Test
   public void testServiceOptions() throws Exception {
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
index 8fa84f766d17..ecde5f2c907c 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
@@ -17,6 +17,7 @@
 package com.google.gcloud.bigquery;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
 import com.google.gcloud.bigquery.TableInfo.StreamingBuffer;
@@ -68,40 +69,40 @@ public class TableInfoTest {
   private static final Long LAST_MODIFIED_TIME = 20L;
   private static final String LOCATION = "US";
   private static final StreamingBuffer STREAMING_BUFFER = new StreamingBuffer(1L, 2L, 3L);
-  private static final TableInfo TABLE_INFO = TableInfo.builder(TABLE_ID, TABLE_SCHEMA)
-      .creationTime(CREATION_TIME)
-      .description(DESCRIPTION)
-      .etag(ETAG)
-      .expirationTime(EXPIRATION_TIME)
-      .friendlyName(FRIENDLY_NAME)
-      .id(ID)
-      .lastModifiedTime(LAST_MODIFIED_TIME)
-      .location(LOCATION)
-      .numBytes(NUM_BYTES)
-      .numRows(NUM_ROWS)
-      .selfLink(SELF_LINK)
-      .streamingBuffer(STREAMING_BUFFER)
-      .type(TableInfo.Type.TABLE)
-      .build();
-  private static final TableInfo EXTERNAL_TABLE_INFO = TableInfo.builder(TABLE_ID, CONFIGURATION)
-      .creationTime(CREATION_TIME)
-      .description(DESCRIPTION)
-      .etag(ETAG)
-      .expirationTime(EXPIRATION_TIME)
-      .friendlyName(FRIENDLY_NAME)
-      .id(ID)
-      .lastModifiedTime(LAST_MODIFIED_TIME)
-      .location(LOCATION)
-      .numBytes(NUM_BYTES)
-      .numRows(NUM_ROWS)
-      .selfLink(SELF_LINK)
-      .streamingBuffer(STREAMING_BUFFER)
-      .type(TableInfo.Type.TABLE)
-      .build();
+  private static final TableInfo TABLE_INFO =
+      TableInfo.builder(TABLE_ID, TableType.table(TABLE_SCHEMA))
+          .creationTime(CREATION_TIME)
+          .description(DESCRIPTION)
+          .etag(ETAG)
+          .expirationTime(EXPIRATION_TIME)
+          .friendlyName(FRIENDLY_NAME)
+          .id(ID)
+          .lastModifiedTime(LAST_MODIFIED_TIME)
+          .location(LOCATION)
+          .numBytes(NUM_BYTES)
+          .numRows(NUM_ROWS)
+          .selfLink(SELF_LINK)
+          .streamingBuffer(STREAMING_BUFFER)
+          .build();
+  private static final TableInfo EXTERNAL_TABLE_INFO =
+      TableInfo.builder(TABLE_ID, TableType.externalTable(CONFIGURATION))
+          .creationTime(CREATION_TIME)
+          .description(DESCRIPTION)
+          .etag(ETAG)
+          .expirationTime(EXPIRATION_TIME)
+          .friendlyName(FRIENDLY_NAME)
+          .id(ID)
+          .lastModifiedTime(LAST_MODIFIED_TIME)
+          .location(LOCATION)
+          .numBytes(NUM_BYTES)
+          .numRows(NUM_ROWS)
+          .selfLink(SELF_LINK)
+          .streamingBuffer(STREAMING_BUFFER)
+          .build();
   private static List USER_DEFINED_FUNCTIONS = ImmutableList.of(
       UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
   private static final TableInfo VIEW_INFO =
-      TableInfo.builder(TABLE_ID, VIEW_QUERY, USER_DEFINED_FUNCTIONS)
+      TableInfo.builder(TABLE_ID, TableType.view(VIEW_QUERY, USER_DEFINED_FUNCTIONS))
           .creationTime(CREATION_TIME)
           .description(DESCRIPTION)
           .etag(ETAG)
@@ -114,7 +115,6 @@ public class TableInfoTest {
           .numRows(NUM_ROWS)
           .selfLink(SELF_LINK)
           .streamingBuffer(STREAMING_BUFFER)
-          .type(TableInfo.Type.VIEW)
           .build();
 
   @Test
@@ -123,13 +123,10 @@ public void testToBuilder() {
     compareTableInfo(VIEW_INFO, VIEW_INFO.toBuilder().build());
     compareTableInfo(EXTERNAL_TABLE_INFO, EXTERNAL_TABLE_INFO.toBuilder().build());
     TableInfo tableInfo = TABLE_INFO.toBuilder()
-        .type(TableInfo.Type.VIEW)
         .description("newDescription")
         .build();
-    assertEquals(TableInfo.Type.VIEW, tableInfo.type());
     assertEquals("newDescription", tableInfo.description());
     tableInfo = tableInfo.toBuilder()
-        .type(TableInfo.Type.TABLE)
         .description("description")
         .build();
     compareTableInfo(TABLE_INFO, tableInfo);
@@ -137,15 +134,14 @@ public void testToBuilder() {
 
   @Test
   public void testToBuilderIncomplete() {
-    TableInfo tableInfo = TableInfo.of(TABLE_ID, VIEW_QUERY);
+    TableInfo tableInfo = TableInfo.of(TABLE_ID, TableType.view(VIEW_QUERY));
     assertEquals(tableInfo, tableInfo.toBuilder().build());
   }
   @Test
   public void testBuilder() {
     assertEquals(TABLE_ID, TABLE_INFO.tableId());
+    assertTrue(VIEW_INFO.type() instanceof TableType);
     assertEquals(TABLE_SCHEMA, TABLE_INFO.schema());
-    assertEquals(null, TABLE_INFO.viewQuery());
-    assertEquals(null, TABLE_INFO.externalConfiguration());
     assertEquals(CREATION_TIME, TABLE_INFO.creationTime());
     assertEquals(DESCRIPTION, TABLE_INFO.description());
     assertEquals(ETAG, TABLE_INFO.etag());
@@ -158,11 +154,11 @@ public void testBuilder() {
     assertEquals(NUM_ROWS, TABLE_INFO.numRows());
     assertEquals(SELF_LINK, TABLE_INFO.selfLink());
     assertEquals(STREAMING_BUFFER, TABLE_INFO.streamingBuffer());
-    assertEquals(TableInfo.Type.TABLE, TABLE_INFO.type());
+    assertEquals(TableType.Type.TABLE, TABLE_INFO.type().type());
     assertEquals(TABLE_ID, VIEW_INFO.tableId());
     assertEquals(null, VIEW_INFO.schema());
-    assertEquals(VIEW_QUERY, VIEW_INFO.viewQuery());
-    assertEquals(null, VIEW_INFO.externalConfiguration());
+    assertTrue(VIEW_INFO.type() instanceof TableType.View);
+    assertEquals(VIEW_QUERY, ((TableType.View) VIEW_INFO.type()).query());
     assertEquals(CREATION_TIME, VIEW_INFO.creationTime());
     assertEquals(DESCRIPTION, VIEW_INFO.description());
     assertEquals(ETAG, VIEW_INFO.etag());
@@ -175,11 +171,12 @@ public void testBuilder() {
     assertEquals(NUM_ROWS, VIEW_INFO.numRows());
     assertEquals(SELF_LINK, VIEW_INFO.selfLink());
     assertEquals(STREAMING_BUFFER, VIEW_INFO.streamingBuffer());
-    assertEquals(TableInfo.Type.VIEW, VIEW_INFO.type());
+    assertEquals(TableType.Type.VIEW, VIEW_INFO.type().type());
     assertEquals(TABLE_ID, EXTERNAL_TABLE_INFO.tableId());
     assertEquals(null, EXTERNAL_TABLE_INFO.schema());
-    assertEquals(null, EXTERNAL_TABLE_INFO.viewQuery());
-    assertEquals(CONFIGURATION, EXTERNAL_TABLE_INFO.externalConfiguration());
+    assertTrue(EXTERNAL_TABLE_INFO.type() instanceof TableType.ExternalTable);
+    assertEquals(CONFIGURATION,
+        ((TableType.ExternalTable) EXTERNAL_TABLE_INFO.type()).configuration());
     assertEquals(CREATION_TIME, EXTERNAL_TABLE_INFO.creationTime());
     assertEquals(DESCRIPTION, EXTERNAL_TABLE_INFO.description());
     assertEquals(ETAG, EXTERNAL_TABLE_INFO.etag());
@@ -192,7 +189,7 @@ public void testBuilder() {
     assertEquals(NUM_ROWS, EXTERNAL_TABLE_INFO.numRows());
     assertEquals(SELF_LINK, EXTERNAL_TABLE_INFO.selfLink());
     assertEquals(STREAMING_BUFFER, EXTERNAL_TABLE_INFO.streamingBuffer());
-    assertEquals(TableInfo.Type.TABLE, EXTERNAL_TABLE_INFO.type());
+    assertEquals(TableType.Type.EXTERNAL, EXTERNAL_TABLE_INFO.type().type());
   }
 
   @Test
@@ -206,8 +203,7 @@ private void compareTableInfo(TableInfo expected, TableInfo value) {
     assertEquals(expected, value);
     assertEquals(expected.tableId(), value.tableId());
     assertEquals(expected.schema(), value.schema());
-    assertEquals(expected.viewQuery(), value.viewQuery());
-    assertEquals(expected.externalConfiguration(), value.externalConfiguration());
+    assertEquals(expected.type(), value.type());
     assertEquals(expected.creationTime(), value.creationTime());
     assertEquals(expected.description(), value.description());
     assertEquals(expected.etag(), value.etag());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTypeTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTypeTest.java
new file mode 100644
index 000000000000..6b67e8968e03
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTypeTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class TableTypeTest {
+
+  private static final Field FIELD_SCHEMA1 =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
+          .description("FieldDescription1")
+          .build();
+  private static final Field FIELD_SCHEMA2 =
+      Field.builder("IntegerField", Field.Type.integer())
+          .mode(Field.Mode.REPEATED)
+          .description("FieldDescription2")
+          .build();
+  private static final Field FIELD_SCHEMA3 =
+      Field.builder("RecordField", Field.Type.record(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(Field.Mode.REQUIRED)
+          .description("FieldDescription3")
+          .build();
+  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
+  private static final String VIEW_QUERY = "VIEW QUERY";
+  private static final ExternalDataConfiguration CONFIGURATION = ExternalDataConfiguration
+      .builder(ImmutableList.of("URI"), TABLE_SCHEMA, FormatOptions.datastoreBackup())
+      .compression("ZIP")
+      .ignoreUnknownValues(true)
+      .maxBadRecords(42)
+      .build();
+  private static List FUNCTIONS = ImmutableList.of(
+      UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
+  private static final TableType TABLE = TableType.table(TABLE_SCHEMA);
+  private static final TableType.View VIEW = TableType.view(VIEW_QUERY);
+  private static final TableType.View VIEW_WITH_FUNCTIONS = TableType.view(VIEW_QUERY, FUNCTIONS);
+  private static final TableType.ExternalTable EXTERNAL = TableType.externalTable(CONFIGURATION);
+
+  @Test
+  public void testConstructor() {
+    TableType table = new TableType(TableType.Type.TABLE, TABLE_SCHEMA);
+    assertEquals(TableType.Type.TABLE, table.type());
+    assertEquals(TABLE_SCHEMA, table.schema());
+    TableType.View view = new TableType.View(VIEW_QUERY);
+    assertEquals(TableType.Type.VIEW, view.type());
+    assertEquals(null, view.schema());
+    assertEquals(VIEW_QUERY, view.query());
+    assertEquals(null, view.userDefinedFunctions());
+    view = new TableType.View(VIEW_QUERY, FUNCTIONS);
+    assertEquals(TableType.Type.VIEW, view.type());
+    assertEquals(null, view.schema());
+    assertEquals(VIEW_QUERY, view.query());
+    assertEquals(FUNCTIONS, view.userDefinedFunctions());
+    view = new TableType.View(TABLE_SCHEMA, VIEW_QUERY, FUNCTIONS);
+    assertEquals(TableType.Type.VIEW, view.type());
+    assertEquals(TABLE_SCHEMA, view.schema());
+    assertEquals(VIEW_QUERY, view.query());
+    assertEquals(FUNCTIONS, view.userDefinedFunctions());
+    TableType.ExternalTable extern = new TableType.ExternalTable(CONFIGURATION);
+    assertEquals(TableType.Type.EXTERNAL, extern.type());
+    assertEquals(null, extern.schema());
+    assertEquals(CONFIGURATION, extern.configuration());
+    extern = new TableType.ExternalTable(TABLE_SCHEMA, CONFIGURATION);
+    assertEquals(TableType.Type.EXTERNAL, extern.type());
+    assertEquals(TABLE_SCHEMA, extern.schema());
+    assertEquals(CONFIGURATION, extern.configuration());
+  }
+
+  @Test
+  public void testFactoryMethods() {
+    TableType table = TableType.table(TABLE_SCHEMA);
+    assertEquals(TableType.Type.TABLE, table.type());
+    assertEquals(TABLE_SCHEMA, table.schema());
+    TableType.View view = TableType.view(VIEW_QUERY);
+    assertEquals(TableType.Type.VIEW, view.type());
+    assertEquals(null, view.schema());
+    assertEquals(VIEW_QUERY, view.query());
+    assertEquals(null, view.userDefinedFunctions());
+    view = TableType.view(VIEW_QUERY, FUNCTIONS);
+    assertEquals(TableType.Type.VIEW, view.type());
+    assertEquals(null, view.schema());
+    assertEquals(VIEW_QUERY, view.query());
+    assertEquals(FUNCTIONS, view.userDefinedFunctions());
+    TableType.ExternalTable extern = TableType.externalTable(CONFIGURATION);
+    assertEquals(TableType.Type.EXTERNAL, extern.type());
+    assertEquals(null, extern.schema());
+    assertEquals(CONFIGURATION, extern.configuration());
+  }
+
+  @Test
+  public void testEquals() {
+    assertEquals(new TableType(TableType.Type.TABLE, TABLE_SCHEMA), TableType.table(TABLE_SCHEMA));
+    assertEquals(new TableType.View(VIEW_QUERY), TableType.view(VIEW_QUERY));
+    assertEquals(new TableType.View(VIEW_QUERY, FUNCTIONS), TableType.view(VIEW_QUERY, FUNCTIONS));
+    assertEquals(new TableType.ExternalTable(CONFIGURATION),
+        TableType.externalTable(CONFIGURATION));
+    assertEquals(new TableType(TableType.Type.TABLE, TABLE_SCHEMA).hashCode(),
+        TableType.table(TABLE_SCHEMA).hashCode());
+    assertEquals(new TableType.View(VIEW_QUERY).hashCode(),
+        TableType.view(VIEW_QUERY).hashCode());
+    assertEquals(new TableType.View(VIEW_QUERY, FUNCTIONS).hashCode(),
+        TableType.view(VIEW_QUERY, FUNCTIONS).hashCode());
+    assertEquals(new TableType.ExternalTable(CONFIGURATION).hashCode(),
+        TableType.externalTable(CONFIGURATION).hashCode());
+  }
+}

From ae2a484006337782084ee62096a6b7114051d836 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 4 Dec 2015 14:54:22 +0100
Subject: [PATCH 158/322] Remove TableType, add TableInfo, ViewInfo
 ExternalTableInfo hierarcy

---
 .../google/gcloud/bigquery/BaseTableInfo.java | 541 ++++++++++++++++++
 .../gcloud/bigquery/ExternalTableInfo.java    | 159 +++++
 .../com/google/gcloud/bigquery/TableInfo.java | 500 ++--------------
 .../com/google/gcloud/bigquery/TableType.java | 260 ---------
 .../com/google/gcloud/bigquery/ViewInfo.java  | 229 ++++++++
 .../gcloud/bigquery/SerializationTest.java    |  25 +-
 .../google/gcloud/bigquery/TableInfoTest.java |  83 +--
 .../google/gcloud/bigquery/TableTypeTest.java | 126 ----
 8 files changed, 1041 insertions(+), 882 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
 delete mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableType.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
 delete mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTypeTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
new file mode 100644
index 000000000000..d409e440aabd
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
@@ -0,0 +1,541 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.client.util.Data;
+import com.google.api.services.bigquery.model.Streamingbuffer;
+import com.google.api.services.bigquery.model.Table;
+import com.google.api.services.bigquery.model.ViewDefinition;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.Lists;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Objects;
+
+/**
+ * Base class for Google BigQuery table information. Use {@link TableInfo} for a simple BigQuery
+ * Table. Use {@link ViewInfo} for a BigQuery View Table. Use {@link ExternalTableInfo} for a
+ * BigQuery Table backed by external data.
+ *
+ * @see Managing Tables
+ */
+public class BaseTableInfo implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public BaseTableInfo apply(Table pb) {
+          return BaseTableInfo.fromPb(pb);
+        }
+      };
+  static final Function TO_PB_FUNCTION =
+      new Function() {
+        @Override
+        public Table apply(BaseTableInfo tableInfo) {
+          return tableInfo.toPb();
+        }
+      };
+
+  private static final long serialVersionUID = -7679032506430816205L;
+
+  /**
+   * The table type.
+   */
+  public enum Type {
+    /**
+     * A normal BigQuery table.
+     */
+    TABLE,
+    /**
+     * A virtual table defined by a SQL query.
+     *
+     * @see Views
+     */
+    VIEW,
+    /**
+     * A BigQuery table backed by external data.
+     *
+     * @see Federated Data
+     *     Sources
+     */
+    EXTERNAL
+  }
+
+  /**
+   * Google BigQuery Table's Streaming Buffer information. This class contains information on a
+   * table's streaming buffer as the estimated size in number of rows/bytes.
+   */
+  public static class StreamingBuffer implements Serializable {
+
+    private static final long serialVersionUID = -6713971364725267597L;
+    private final long estimatedRows;
+    private final long estimatedBytes;
+    private final long oldestEntryTime;
+
+    StreamingBuffer(long estimatedRows, long estimatedBytes, long oldestEntryTime) {
+      this.estimatedRows = estimatedRows;
+      this.estimatedBytes = estimatedBytes;
+      this.oldestEntryTime = oldestEntryTime;
+    }
+
+    /**
+     * Returns a lower-bound estimate of the number of rows currently in the streaming buffer.
+     */
+    public long estimatedRows() {
+      return estimatedRows;
+    }
+
+    /**
+     * Returns a lower-bound estimate of the number of bytes currently in the streaming buffer.
+     */
+    public long estimatedBytes() {
+      return estimatedBytes;
+    }
+
+    /**
+     * Returns the timestamp of the oldest entry in the streaming buffer, in milliseconds since
+     * epoch.
+     */
+    public long oldestEntryTime() {
+      return oldestEntryTime;
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("estimatedRows", estimatedRows)
+          .add("estimatedBytes", estimatedBytes)
+          .add("oldestEntryTime", oldestEntryTime)
+          .toString();
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(estimatedRows, estimatedBytes, oldestEntryTime);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj instanceof StreamingBuffer
+          && Objects.equals(toPb(), ((StreamingBuffer) obj).toPb());
+    }
+
+    public Streamingbuffer toPb() {
+      return new Streamingbuffer()
+          .setEstimatedBytes(BigInteger.valueOf(estimatedBytes))
+          .setEstimatedRows(BigInteger.valueOf(estimatedRows))
+          .setOldestEntryTime(BigInteger.valueOf(oldestEntryTime));
+    }
+
+    static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
+      return new StreamingBuffer(streamingBufferPb.getEstimatedRows().longValue(),
+          streamingBufferPb.getEstimatedBytes().longValue(),
+          streamingBufferPb.getOldestEntryTime().longValue());
+    }
+  }
+
+  private final String etag;
+  private final String id;
+  private final String selfLink;
+  private final TableId tableId;
+  private final Type type;
+  private final Schema schema;
+  private final String friendlyName;
+  private final String description;
+  private final Long numBytes;
+  private final Long numRows;
+  private final Long creationTime;
+  private final Long expirationTime;
+  private final Long lastModifiedTime;
+
+  public static class Builder> {
+
+    private String etag;
+    private String id;
+    private String selfLink;
+    private TableId tableId;
+    private Type type;
+    private Schema schema;
+    private String friendlyName;
+    private String description;
+    private Long numBytes;
+    private Long numRows;
+    private Long creationTime;
+    private Long expirationTime;
+    private Long lastModifiedTime;
+
+    protected Builder() {}
+
+    protected Builder(BaseTableInfo tableInfo) {
+      this.etag = tableInfo.etag;
+      this.id = tableInfo.id;
+      this.selfLink = tableInfo.selfLink;
+      this.tableId = tableInfo.tableId;
+      this.type = tableInfo.type;
+      this.schema = tableInfo.schema;
+      this.friendlyName = tableInfo.friendlyName;
+      this.description = tableInfo.description;
+      this.numBytes = tableInfo.numBytes;
+      this.numRows = tableInfo.numRows;
+      this.creationTime = tableInfo.creationTime;
+      this.expirationTime = tableInfo.expirationTime;
+      this.lastModifiedTime = tableInfo.lastModifiedTime;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected B self() {
+      return (B) this;
+    }
+
+    B creationTime(Long creationTime) {
+      this.creationTime = creationTime;
+      return self();
+    }
+
+    /**
+     * Sets a user-friendly description for the table.
+     */
+    public B description(String description) {
+      this.description = firstNonNull(description, Data.nullOf(String.class));
+      return self();
+    }
+
+    B etag(String etag) {
+      this.etag = etag;
+      return self();
+    }
+
+    /**
+     * Sets the time when this table expires, in milliseconds since the epoch. If not present, the
+     * table will persist indefinitely. Expired tables will be deleted and their storage reclaimed.
+     */
+    public B expirationTime(Long expirationTime) {
+      this.expirationTime = firstNonNull(expirationTime, Data.nullOf(Long.class));
+      return self();
+    }
+
+    /**
+     * Sets a user-friendly name for the table.
+     */
+    public B friendlyName(String friendlyName) {
+      this.friendlyName = firstNonNull(friendlyName, Data.nullOf(String.class));
+      return self();
+    }
+
+    B id(String id) {
+      this.id = id;
+      return self();
+    }
+
+    B lastModifiedTime(Long lastModifiedTime) {
+      this.lastModifiedTime = lastModifiedTime;
+      return self();
+    }
+
+    B numBytes(Long numBytes) {
+      this.numBytes = numBytes;
+      return self();
+    }
+
+    B numRows(Long numRows) {
+      this.numRows = numRows;
+      return self();
+    }
+
+    B selfLink(String selfLink) {
+      this.selfLink = selfLink;
+      return self();
+    }
+
+    /**
+     * Sets the table identity.
+     */
+    public B tableId(TableId tableId) {
+      this.tableId = checkNotNull(tableId);
+      return self();
+    }
+
+    B type(Type type) {
+      this.type = type;
+      return self();
+    }
+
+    /**
+     * Sets the table schema.
+     */
+    public B schema(Schema schema) {
+      this.schema = checkNotNull(schema);
+      return self();
+    }
+
+    /**
+     * Creates a {@code BaseTableInfo} object.
+     */
+    @SuppressWarnings("unchecked")
+    public T build() {
+      return (T) new BaseTableInfo(this);
+    }
+  }
+
+  protected BaseTableInfo(Builder builder) {
+    this.tableId = checkNotNull(builder.tableId);
+    this.etag = builder.etag;
+    this.id = builder.id;
+    this.selfLink = builder.selfLink;
+    this.friendlyName = builder.friendlyName;
+    this.description = builder.description;
+    this.type = builder.type;
+    this.schema = builder.schema;
+    this.numBytes = builder.numBytes;
+    this.numRows = builder.numRows;
+    this.creationTime = builder.creationTime;
+    this.expirationTime = builder.expirationTime;
+    this.lastModifiedTime = builder.lastModifiedTime;
+  }
+
+  /**
+   * Returns the hash of the table resource.
+   */
+  public String etag() {
+    return etag;
+  }
+
+  /**
+   * Returns an opaque id for the table.
+   */
+  public String id() {
+    return id;
+  }
+
+  /**
+   * Returns the table's type. If this table is simple table the method returns {@link Type#TABLE}.
+   * If this table is an external table this method returns {@link Type#EXTERNAL}. If this table is
+   * a view table this method returns {@link Type#VIEW}.
+   */
+  public Type type() {
+    return type;
+  }
+
+  /**
+   * Returns the table's schema.
+   */
+  public Schema schema() {
+    return schema;
+  }
+
+  /**
+   * Returns an URL that can be used to access the resource again. The returned URL can be used for
+   * get or update requests.
+   */
+  public String selfLink() {
+    return selfLink;
+  }
+
+  /**
+   * Returns the table identity.
+   */
+  public TableId tableId() {
+    return tableId;
+  }
+
+  /**
+   * Returns a user-friendly name for the table.
+   */
+  public String friendlyName() {
+    return Data.isNull(friendlyName) ? null : friendlyName;
+  }
+
+  /**
+   * Returns a user-friendly description for the table.
+   */
+  public String description() {
+    return Data.isNull(description) ? null : description;
+  }
+
+  /**
+   * Returns the size of this table in bytes, excluding any data in the streaming buffer.
+   */
+  public Long numBytes() {
+    return numBytes;
+  }
+
+  /**
+   * Returns the number of rows in this table, excluding any data in the streaming buffer.
+   */
+  public Long numRows() {
+    return numRows;
+  }
+
+  /**
+   * Returns the time when this table was created, in milliseconds since the epoch.
+   */
+  public Long creationTime() {
+    return creationTime;
+  }
+
+  /**
+   * Returns the time when this table expires, in milliseconds since the epoch. If not present, the
+   * table will persist indefinitely. Expired tables will be deleted and their storage reclaimed.
+   */
+  public Long expirationTime() {
+    return Data.isNull(expirationTime) ? null : expirationTime;
+  }
+
+  /**
+   * Returns the time when this table was last modified, in milliseconds since the epoch.
+   */
+  public Long lastModifiedTime() {
+    return lastModifiedTime;
+  }
+
+  /**
+   * Returns a builder for the {@code BaseTableInfo} object.
+   */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected MoreObjects.ToStringHelper toStringHelper() {
+    return MoreObjects.toStringHelper(this)
+        .add("tableId", tableId)
+        .add("type", type)
+        .add("schema", schema)
+        .add("etag", etag)
+        .add("id", id)
+        .add("selfLink", selfLink)
+        .add("friendlyName", friendlyName)
+        .add("description", description)
+        .add("numBytes", numBytes)
+        .add("numRows", numRows)
+        .add("expirationTime", expirationTime)
+        .add("creationTime", creationTime)
+        .add("lastModifiedTime", lastModifiedTime);
+  }
+
+  @Override
+  public String toString() {
+    return toStringHelper().toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(tableId);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof BaseTableInfo && Objects.equals(toPb(), ((BaseTableInfo) obj).toPb());
+  }
+
+  Table toPb() {
+    Table tablePb = new Table();
+    tablePb.setTableReference(tableId.toPb());
+    if (lastModifiedTime != null) {
+      tablePb.setLastModifiedTime(BigInteger.valueOf(lastModifiedTime));
+    }
+    if (numRows != null) {
+      tablePb.setNumRows(BigInteger.valueOf(numRows));
+    }
+    if (schema != null) {
+      tablePb.setSchema(schema.toPb());
+    }
+    tablePb.setCreationTime(creationTime);
+    tablePb.setDescription(description);
+    tablePb.setEtag(etag);
+    tablePb.setExpirationTime(expirationTime);
+    tablePb.setFriendlyName(friendlyName);
+    tablePb.setId(id);
+    tablePb.setNumBytes(numBytes);
+    tablePb.setSelfLink(selfLink);
+    return tablePb;
+  }
+
+  @SuppressWarnings("unchecked")
+  static  T fromPb(Table tablePb) {
+    Builder builder;
+    TableId tableId = TableId.fromPb(tablePb.getTableReference());
+    Schema schema = tablePb.getSchema() != null ? Schema.fromPb(tablePb.getSchema()) : null;
+    if (Objects.equals(tablePb.getType(), Type.VIEW.name()) || tablePb.getView() != null) {
+      ViewDefinition viewPb = tablePb.getView();
+      ViewInfo.Builder viewBuilder = ViewInfo.builder(tableId, viewPb.getQuery());
+      if (tablePb.getView().getUserDefinedFunctionResources() != null) {
+        viewBuilder.userDefinedFunctions(Lists.transform(viewPb.getUserDefinedFunctionResources(),
+            UserDefinedFunction.FROM_PB_FUNCTION));
+      }
+      builder = viewBuilder;
+    } else if (Objects.equals(tablePb.getType(), Type.EXTERNAL.name())
+        || tablePb.getExternalDataConfiguration() != null) {
+      ExternalTableInfo.Builder externalBuilder = ExternalTableInfo.builder(tableId,
+          ExternalDataConfiguration.fromPb(tablePb.getExternalDataConfiguration()));
+      if (tablePb.getStreamingBuffer() != null) {
+        externalBuilder.streamingBuffer(StreamingBuffer.fromPb(tablePb.getStreamingBuffer()));
+      }
+      builder = externalBuilder;
+    } else if (Objects.equals(tablePb.getType(), Type.TABLE.name()) || schema != null) {
+      TableInfo.Builder tableBuilder = TableInfo.builder(tableId, schema);
+      if (tablePb.getLocation() != null) {
+        tableBuilder.location(tablePb.getLocation());
+      }
+      if (tablePb.getStreamingBuffer() != null) {
+        tableBuilder.streamingBuffer(StreamingBuffer.fromPb(tablePb.getStreamingBuffer()));
+      }
+      builder = tableBuilder;
+    } else {
+      // This is for incomplete tables returned by bigquery.listTables
+      builder = new Builder().tableId(tableId);
+    }
+    if (schema != null) {
+      builder.schema(schema);
+    }
+    if (tablePb.getDescription() != null) {
+      builder.description(tablePb.getDescription());
+    }
+    if (tablePb.getExpirationTime() != null) {
+      builder.expirationTime(tablePb.getExpirationTime());
+    }
+    if (tablePb.getFriendlyName() != null) {
+      builder.friendlyName(tablePb.getFriendlyName());
+    }
+    if (tablePb.getLastModifiedTime() != null) {
+      builder.lastModifiedTime(tablePb.getLastModifiedTime().longValue());
+    }
+    if (tablePb.getNumRows() != null) {
+      builder.numRows(tablePb.getNumRows().longValue());
+    }
+    if (tablePb.getCreationTime() != null) {
+      builder.creationTime(tablePb.getCreationTime());
+    }
+    if (tablePb.getEtag() != null) {
+      builder.etag(tablePb.getEtag());
+    }
+    if (tablePb.getId() != null) {
+      builder.id(tablePb.getId());
+    }
+    if (tablePb.getNumBytes() != null) {
+      builder.numBytes(tablePb.getNumBytes());
+    }
+    if (tablePb.getSelfLink() != null) {
+      builder.selfLink(tablePb.getSelfLink());
+    }
+    return (T) builder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
new file mode 100644
index 000000000000..a885eeb77d1b
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.Table;
+import com.google.common.base.MoreObjects;
+
+import java.util.Objects;
+
+/**
+ * Google BigQuery External Table information. BigQuery's external tables are tables whose data
+ * reside outside of BigQuery but can be queried as normal BigQuery tables. External tables are
+ * experimental and might be subject to change or removed.
+ *
+ * @see Federated Data
+ *     Sources
+ */
+public class ExternalTableInfo extends BaseTableInfo {
+
+  private static final long serialVersionUID = -5893406738246214865L;
+
+  private final ExternalDataConfiguration configuration;
+  private final StreamingBuffer streamingBuffer;
+
+  public static final class Builder extends BaseTableInfo.Builder {
+
+    private ExternalDataConfiguration configuration;
+    private StreamingBuffer streamingBuffer;
+
+    private Builder() {}
+
+    private Builder(ExternalTableInfo tableInfo) {
+      super(tableInfo);
+      this.configuration = tableInfo.configuration;
+      this.streamingBuffer = tableInfo.streamingBuffer;
+    }
+
+    @Override
+    protected Builder self() {
+      return this;
+    }
+
+    /**
+     * Sets the data format, location and other properties of a table stored outside of BigQuery.
+     *
+     * @see Federated Data
+     *     Sources
+     */
+    public Builder configuration(ExternalDataConfiguration configuration) {
+      this.configuration = checkNotNull(configuration);
+      return self();
+    }
+
+    Builder streamingBuffer(StreamingBuffer streamingBuffer) {
+      this.streamingBuffer = streamingBuffer;
+      return self();
+    }
+
+    /**
+     * Creates a {@code ExternalTableInfo} object.
+     */
+    @Override
+    public ExternalTableInfo build() {
+      return new ExternalTableInfo(this);
+    }
+  }
+
+  private ExternalTableInfo(Builder builder) {
+    super(builder);
+    this.configuration = checkNotNull(builder.configuration);
+    this.streamingBuffer = builder.streamingBuffer;
+  }
+
+  /**
+   * Returns the data format, location and other properties of a table stored outside of BigQuery.
+   * This property is experimental and might be subject to change or removed.
+   *
+   * @see Federated Data
+   *     Sources
+   */
+  public ExternalDataConfiguration configuration() {
+    return configuration;
+  };
+
+  /**
+   * Returns information on the table's streaming buffer if any exists. Returns {@code null} if no
+   * streaming buffer exists.
+   */
+  public StreamingBuffer streamingBuffer() {
+    return streamingBuffer;
+  }
+
+  /**
+   * Returns a builder for the {@code ExternalTableInfo} object.
+   */
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  protected MoreObjects.ToStringHelper toStringHelper() {
+    return super.toStringHelper()
+        .add("configuration", configuration)
+        .add("streamingBuffer", streamingBuffer);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ExternalTableInfo
+        && Objects.equals(toPb(), ((ExternalTableInfo) obj).toPb());
+  }
+
+  @Override
+  Table toPb() {
+    Table tablePb = super.toPb();
+    tablePb.setExternalDataConfiguration(configuration.toPb());
+    if (streamingBuffer != null) {
+      tablePb.setStreamingBuffer(streamingBuffer.toPb());
+    }
+    return tablePb;
+  }
+
+  /**
+   * Returns a builder for a BigQuery External Table.
+   *
+   * @param tableId table id
+   * @param configuration data format, location and other properties of an External Table
+   */
+  public static Builder builder(TableId tableId, ExternalDataConfiguration configuration) {
+    return new Builder().tableId(tableId).type(Type.EXTERNAL).configuration(configuration);
+  }
+
+  /**
+   * Returns a BigQuery External Table.
+   *
+   * @param table table id
+   * @param configuration data format, location and other properties of an External Table
+   */
+  public static ExternalTableInfo of(TableId table, ExternalDataConfiguration configuration) {
+    return builder(table, configuration).build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index c899ac53da94..732444ebdf26 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -16,381 +16,69 @@
 
 package com.google.gcloud.bigquery;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.api.client.util.Data;
-import com.google.api.services.bigquery.model.Streamingbuffer;
 import com.google.api.services.bigquery.model.Table;
-import com.google.api.services.bigquery.model.ViewDefinition;
-import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
-import com.google.common.collect.Lists;
 
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.util.List;
 import java.util.Objects;
 
 /**
- * Google BigQuery Table information. A BigQuery table is a standard, two-dimensional table with
+ * A Google BigQuery Table information. A BigQuery table is a standard, two-dimensional table with
  * individual records organized in rows, and a data type assigned to each column (also called a
  * field). Individual fields within a record may contain nested and repeated children fields. Every
  * table is described by a schema that describes field names, types, and other information.
  *
  * @see Managing Tables
  */
-public class TableInfo implements Serializable {
-
-  static final Function FROM_PB_FUNCTION =
-      new Function() {
-        @Override
-        public TableInfo apply(Table pb) {
-          return TableInfo.fromPb(pb);
-        }
-      };
-  static final Function TO_PB_FUNCTION =
-      new Function() {
-        @Override
-        public Table apply(TableInfo tableInfo) {
-          return tableInfo.toPb();
-        }
-      };
-
-  private static final long serialVersionUID = -7679032506430816205L;
-
-  /**
-   * Google BigQuery Table's Streaming Buffer information. This class contains information on a
-   * table's streaming buffer as the estimated size in number of rows/bytes.
-   */
-  public static class StreamingBuffer implements Serializable {
-
-    private static final long serialVersionUID = -6713971364725267597L;
-    private final long estimatedRows;
-    private final long estimatedBytes;
-    private final long oldestEntryTime;
-
-    StreamingBuffer(long estimatedRows, long estimatedBytes, long oldestEntryTime) {
-      this.estimatedRows = estimatedRows;
-      this.estimatedBytes = estimatedBytes;
-      this.oldestEntryTime = oldestEntryTime;
-    }
-
-    /**
-     * Returns a lower-bound estimate of the number of rows currently in the streaming buffer.
-     */
-    public long estimatedRows() {
-      return estimatedRows;
-    }
-
-    /**
-     * Returns a lower-bound estimate of the number of bytes currently in the streaming buffer.
-     */
-    public long estimatedBytes() {
-      return estimatedBytes;
-    }
-
-    /**
-     * Returns the timestamp of the oldest entry in the streaming buffer, in milliseconds since
-     * epoch.
-     */
-    public long oldestEntryTime() {
-      return oldestEntryTime;
-    }
+public class TableInfo extends BaseTableInfo {
 
-    @Override
-    public String toString() {
-      return MoreObjects.toStringHelper(this)
-          .add("estimatedRows", estimatedRows)
-          .add("estimatedBytes", estimatedBytes)
-          .add("oldestEntryTime", oldestEntryTime)
-          .toString();
-    }
+  private static final long serialVersionUID = -5910575573063546949L;
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(estimatedRows, estimatedBytes, oldestEntryTime);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      return obj instanceof StreamingBuffer
-          && Objects.equals(toPb(), ((StreamingBuffer) obj).toPb());
-    }
-
-    public Streamingbuffer toPb() {
-      return new Streamingbuffer()
-          .setEstimatedBytes(BigInteger.valueOf(estimatedBytes))
-          .setEstimatedRows(BigInteger.valueOf(estimatedRows))
-          .setOldestEntryTime(BigInteger.valueOf(oldestEntryTime));
-    }
-
-    static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
-      return new StreamingBuffer(streamingBufferPb.getEstimatedRows().longValue(),
-          streamingBufferPb.getEstimatedBytes().longValue(),
-          streamingBufferPb.getOldestEntryTime().longValue());
-    }
-  }
-
-  private final String etag;
-  private final String id;
-  private final String selfLink;
-  private final TableId tableId;
-  private final TableType type;
-  private final String friendlyName;
-  private final String description;
-  private final Long numBytes;
-  private final Long numRows;
-  private final Long creationTime;
-  private final Long expirationTime;
-  private final Long lastModifiedTime;
   private final String location;
   private final StreamingBuffer streamingBuffer;
 
-  public static final class Builder {
+  public static final class Builder extends BaseTableInfo.Builder {
 
-    private String etag;
-    private String id;
-    private String selfLink;
-    private TableId tableId;
-    private TableType type;
-    private String friendlyName;
-    private String description;
-    private Long numBytes;
-    private Long numRows;
-    private Long creationTime;
-    private Long expirationTime;
-    private Long lastModifiedTime;
     private String location;
     private StreamingBuffer streamingBuffer;
 
     private Builder() {}
 
     private Builder(TableInfo tableInfo) {
-      this.etag = tableInfo.etag;
-      this.id = tableInfo.id;
-      this.selfLink = tableInfo.selfLink;
-      this.tableId = tableInfo.tableId;
-      this.type = tableInfo.type;
-      this.friendlyName = tableInfo.friendlyName;
-      this.description = tableInfo.description;
-      this.numBytes = tableInfo.numBytes;
-      this.numRows = tableInfo.numRows;
-      this.creationTime = tableInfo.creationTime;
-      this.expirationTime = tableInfo.expirationTime;
-      this.lastModifiedTime = tableInfo.lastModifiedTime;
+      super(tableInfo);
       this.location = tableInfo.location;
       this.streamingBuffer = tableInfo.streamingBuffer;
     }
 
-    Builder creationTime(Long creationTime) {
-      this.creationTime = creationTime;
-      return this;
-    }
-
-    /**
-     * Sets a user-friendly description for the table.
-     */
-    public Builder description(String description) {
-      this.description = firstNonNull(description, Data.nullOf(String.class));
-      return this;
-    }
-
-    Builder etag(String etag) {
-      this.etag = etag;
-      return this;
-    }
-
-    /**
-     * Sets the time when this table expires, in milliseconds since the epoch. If not present, the
-     * table will persist indefinitely. Expired tables will be deleted and their storage reclaimed.
-     */
-    public Builder expirationTime(Long expirationTime) {
-      this.expirationTime = firstNonNull(expirationTime, Data.nullOf(Long.class));
-      return this;
-    }
-
-    /**
-     * Sets a user-friendly name for the table.
-     */
-    public Builder friendlyName(String friendlyName) {
-      this.friendlyName = firstNonNull(friendlyName, Data.nullOf(String.class));
-      return this;
-    }
-
-    Builder id(String id) {
-      this.id = id;
-      return this;
-    }
-
-    Builder lastModifiedTime(Long lastModifiedTime) {
-      this.lastModifiedTime = lastModifiedTime;
+    @Override
+    protected Builder self() {
       return this;
     }
 
     Builder location(String location) {
       this.location = location;
-      return this;
-    }
-
-    Builder numBytes(Long numBytes) {
-      this.numBytes = numBytes;
-      return this;
-    }
-
-    Builder numRows(Long numRows) {
-      this.numRows = numRows;
-      return this;
-    }
-
-    Builder selfLink(String selfLink) {
-      this.selfLink = selfLink;
-      return this;
+      return self();
     }
 
     Builder streamingBuffer(StreamingBuffer streamingBuffer) {
       this.streamingBuffer = streamingBuffer;
-      return this;
-    }
-
-    /**
-     * Sets the table identity.
-     */
-    public Builder tableId(TableId tableId) {
-      this.tableId = tableId;
-      return this;
-    }
-
-    /**
-     * Sets the table type.
-     */
-    public Builder type(TableType type) {
-      this.type = type;
-      return this;
+      return self();
     }
 
     /**
      * Creates a {@code TableInfo} object.
      */
+    @Override
     public TableInfo build() {
       return new TableInfo(this);
     }
   }
 
   private TableInfo(Builder builder) {
-    this.tableId = checkNotNull(builder.tableId);
-    this.etag = builder.etag;
-    this.id = builder.id;
-    this.selfLink = builder.selfLink;
-    this.friendlyName = builder.friendlyName;
-    this.description = builder.description;
-    this.type = builder.type;
-    this.numBytes = builder.numBytes;
-    this.numRows = builder.numRows;
-    this.creationTime = builder.creationTime;
-    this.expirationTime = builder.expirationTime;
-    this.lastModifiedTime = builder.lastModifiedTime;
+    super(builder);
     this.location = builder.location;
     this.streamingBuffer = builder.streamingBuffer;
   }
 
-  /**
-   * Returns the hash of the table resource.
-   */
-  public String etag() {
-    return etag;
-  }
-
-  /**
-   * Returns an opaque id for the table.
-   */
-  public String id() {
-    return id;
-  }
-
-  /**
-   * Returns an URL that can be used to access the resource again. The returned URL can be used for
-   * get or update requests.
-   */
-  public String selfLink() {
-    return selfLink;
-  }
-
-  /**
-   * Returns the table identity.
-   */
-  public TableId tableId() {
-    return tableId;
-  }
-
-  /**
-   * Returns a user-friendly name for the table.
-   */
-  public String friendlyName() {
-    return Data.isNull(friendlyName) ? null : friendlyName;
-  }
-
-  /**
-   * Returns a user-friendly description for the table.
-   */
-  public String description() {
-    return Data.isNull(description) ? null : description;
-  }
-
-  /**
-   * Returns the size of this table in bytes, excluding any data in the streaming buffer.
-   */
-  public Long numBytes() {
-    return numBytes;
-  }
-
-  /**
-   * Returns the number of rows in this table, excluding any data in the streaming buffer.
-   */
-  public Long numRows() {
-    return numRows;
-  }
-
-  /**
-   * Returns the time when this table was created, in milliseconds since the epoch.
-   */
-  public Long creationTime() {
-    return creationTime;
-  }
-
-  /**
-   * Returns the time when this table expires, in milliseconds since the epoch. If not present, the
-   * table will persist indefinitely. Expired tables will be deleted and their storage reclaimed.
-   */
-  public Long expirationTime() {
-    return Data.isNull(expirationTime) ? null : expirationTime;
-  }
-
-  /**
-   * Returns the time when this table was last modified, in milliseconds since the epoch.
-   */
-  public Long lastModifiedTime() {
-    return lastModifiedTime;
-  }
-
-  /**
-   * Returns the type of the table.
-   */
-  public Schema schema() {
-    return type.schema();
-  }
-
-  /**
-   * Returns the table's type. If this table is simple table the method returns an instance of
-   * {@link TableType}. If this table is an external table this method returns an instance of
-   * {@link com.google.gcloud.bigquery.TableType.ExternalTable}. If this table is a view table this
-   * method returns an instance of {@link com.google.gcloud.bigquery.TableType.View}.
-   */
-  @SuppressWarnings("unchecked")
-  public  T type() {
-    return (T) type;
-  }
-
   /**
    * Returns the geographic location where the table should reside. This value is inherited from the
    * dataset.
@@ -411,159 +99,53 @@ public StreamingBuffer streamingBuffer() {
   }
 
   /**
-   * Returns a builder for the {@code TableInfo} object.
+   * Returns a builder for a BigQuery Table.
+   *
+   * @param tableId table id
+   * @param schema the schema of the table
    */
-  public Builder toBuilder() {
-    return new Builder(this);
+  public static Builder builder(TableId tableId, Schema schema) {
+    return new Builder().tableId(tableId).type(Type.TABLE).schema(schema);
+  }
+
+  /**
+   * Creates BigQuery table given its type
+   *
+   * @param tableId table id
+   * @param schema the schema of the table
+   */
+  public static BaseTableInfo of(TableId tableId, Schema schema) {
+    return builder(tableId, schema).build();
   }
 
+  /**
+   * Returns a builder for the {@code ExternalTableInfo} object.
+   */
   @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("tableId", tableId)
-        .add("type", type)
-        .add("location", location)
-        .add("streamingBuffer", streamingBuffer)
-        .add("etag", etag)
-        .add("id", id)
-        .add("selfLink", selfLink)
-        .add("friendlyName", friendlyName)
-        .add("description", description)
-        .add("numBytes", numBytes)
-        .add("numRows", numRows)
-        .add("expirationTime", expirationTime)
-        .add("creationTime", creationTime)
-        .add("lastModifiedTime", lastModifiedTime)
-        .toString();
+  public Builder toBuilder() {
+    return new Builder(this);
   }
 
   @Override
-  public int hashCode() {
-    return Objects.hash(tableId);
+  protected MoreObjects.ToStringHelper toStringHelper() {
+    return super.toStringHelper()
+        .add("location", location)
+        .add("streamingBuffer", streamingBuffer);
   }
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof TableInfo && Objects.equals(toPb(), ((TableInfo) obj).toPb());
+    return obj instanceof TableInfo
+        && Objects.equals(toPb(), ((TableInfo) obj).toPb());
   }
 
+  @Override
   Table toPb() {
-    Table tablePb = new Table();
-    tablePb.setTableReference(tableId.toPb());
-    if (lastModifiedTime != null) {
-      tablePb.setLastModifiedTime(BigInteger.valueOf(lastModifiedTime));
-    }
-    if (numRows != null) {
-      tablePb.setNumRows(BigInteger.valueOf(numRows));
-    }
-    if (schema() != null) {
-      tablePb.setSchema(schema().toPb());
-    }
-    if (type instanceof TableType.View) {
-      TableType.View viewType = (TableType.View) type;
-      ViewDefinition viewDefinition = new ViewDefinition().setQuery(viewType.query());
-      if (viewType.userDefinedFunctions() != null) {
-        viewDefinition.setUserDefinedFunctionResources(
-            Lists.transform(viewType.userDefinedFunctions(), UserDefinedFunction.TO_PB_FUNCTION));
-      }
-      tablePb.setView(viewDefinition);
-    }
-    if (type instanceof TableType.ExternalTable) {
-      tablePb.setExternalDataConfiguration(
-          ((TableType.ExternalTable) type).configuration().toPb());
-    }
+    Table tablePb = super.toPb();
+    tablePb.setLocation(location);
     if (streamingBuffer != null) {
       tablePb.setStreamingBuffer(streamingBuffer.toPb());
     }
-    tablePb.setCreationTime(creationTime);
-    tablePb.setDescription(description);
-    tablePb.setEtag(etag);
-    tablePb.setExpirationTime(expirationTime);
-    tablePb.setFriendlyName(friendlyName);
-    tablePb.setId(id);
-    tablePb.setLocation(location);
-    tablePb.setNumBytes(numBytes);
-    tablePb.setSelfLink(selfLink);
     return tablePb;
   }
-
-  /**
-   * Returns a builder for a BigQuery table given its type.
-   *
-   * @param tableId table id
-   * @param type the type of the table
-   */
-  public static Builder builder(TableId tableId, TableType type) {
-    return new Builder().tableId(tableId).type(type);
-  }
-
-  /**
-   * Creates BigQuery table given its type
-   *
-   * @param tableId table id
-   * @param type the type of the table
-   */
-  public static TableInfo of(TableId tableId, TableType type) {
-    return builder(tableId, type).build();
-  }
-
-  static TableInfo fromPb(Table tablePb) {
-    Builder builder = new Builder().tableId(TableId.fromPb(tablePb.getTableReference()));
-    Schema schema = null;
-    if (tablePb.getSchema() != null) {
-      schema = Schema.fromPb(tablePb.getSchema());
-      builder.type(TableType.table(schema));
-    }
-    if (tablePb.getDescription() != null) {
-      builder.description(tablePb.getDescription());
-    }
-    if (tablePb.getExpirationTime() != null) {
-      builder.expirationTime(tablePb.getExpirationTime());
-    }
-    if (tablePb.getFriendlyName() != null) {
-      builder.friendlyName(tablePb.getFriendlyName());
-    }
-    if (tablePb.getLastModifiedTime() != null) {
-      builder.lastModifiedTime(tablePb.getLastModifiedTime().longValue());
-    }
-    if (tablePb.getLocation() != null) {
-      builder.location(tablePb.getLocation());
-    }
-    if (tablePb.getNumRows() != null) {
-      builder.numRows(tablePb.getNumRows().longValue());
-    }
-    if (tablePb.getStreamingBuffer() != null) {
-      builder.streamingBuffer(StreamingBuffer.fromPb(tablePb.getStreamingBuffer()));
-    }
-    if (tablePb.getView() != null) {
-      String query = tablePb.getView().getQuery();
-      List functions = null;
-      if (tablePb.getView().getUserDefinedFunctionResources() != null) {
-        functions = Lists.transform(tablePb.getView().getUserDefinedFunctionResources(),
-                UserDefinedFunction.FROM_PB_FUNCTION);
-      }
-      builder.type(new TableType.View(schema, query, functions));
-    }
-    if (tablePb.getExternalDataConfiguration() != null) {
-      ExternalDataConfiguration configuration =
-          ExternalDataConfiguration.fromPb(tablePb.getExternalDataConfiguration());
-      builder.type(new TableType.ExternalTable(schema, configuration));
-    }
-    if (tablePb.getCreationTime() != null) {
-      builder.creationTime(tablePb.getCreationTime());
-    }
-    if (tablePb.getEtag() != null) {
-      builder.etag(tablePb.getEtag());
-    }
-    if (tablePb.getId() != null) {
-      builder.id(tablePb.getId());
-    }
-    if (tablePb.getNumBytes() != null) {
-      builder.numBytes(tablePb.getNumBytes());
-    }
-    if (tablePb.getSelfLink() != null) {
-      builder.selfLink(tablePb.getSelfLink());
-    }
-    return builder.build();
-  }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableType.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableType.java
deleted file mode 100644
index 9a74d55e8bbb..000000000000
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableType.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Google BigQuery Table type. A BigQuery table can be of three types. {@link Type#TABLE} is a
- * normal BigQuery table. {@link Type#VIEW} is a view table, created from a query.
- * {@link Type#EXTERNAL} is an external table, backed by Google Cloud Storage data.
- */
-public class TableType implements Serializable {
-
-  /**
-   * The table type.
-   */
-  public enum Type {
-    /**
-     * A normal BigQuery table.
-     */
-    TABLE,
-    /**
-     * A virtual table defined by a SQL query.
-     *
-     * @see Views
-     */
-    VIEW,
-    /**
-     * A BigQuery table backed by external data.
-     *
-     * @see Federated Data
-     *     Sources
-     */
-    EXTERNAL
-  }
-
-  private final Type type;
-  private final Schema schema;
-
-  TableType(Type type, Schema schema) {
-    this.type = type;
-    this.schema = schema;
-  }
-
-  /**
-   * Returns the type of the table.
-   */
-  public Type type() {
-    return type;
-  }
-
-  /**
-   * Returns the table's schema.
-   */
-  public Schema schema() {
-    return schema;
-  }
-
-  /**
-   * Google BigQuery View type.
-   */
-  public static class View extends TableType {
-
-    private static final long serialVersionUID = 8275064752050652381L;
-
-    private final String query;
-    private final List userDefinedFunctions;
-
-    View(String query) {
-      this(null, query, null);
-    }
-
-    View(String query, List userDefinedFunctions) {
-      this(null, query, userDefinedFunctions);
-    }
-
-    View(Schema schema, String query, List userDefinedFunctions) {
-      super(Type.VIEW, schema);
-      this.query = query;
-      this.userDefinedFunctions = userDefinedFunctions;
-    }
-
-    /**
-     * Returns the query used to create the view.
-     */
-    public String query() {
-      return query;
-    };
-
-    /**
-     * Returns user defined functions that can be used by {@link #query()}. Returns {@code null} if
-     * not set.
-     *
-     * @see User-Defined Functions
-     *     
-     */
-    public List userDefinedFunctions() {
-      return userDefinedFunctions;
-    }
-
-    @Override
-    public String toString() {
-      return MoreObjects.toStringHelper(this)
-          .add("type", type())
-          .add("query", query)
-          .add("userDefinedFunctions", userDefinedFunctions)
-          .toString();
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(schema(), query, userDefinedFunctions);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (!(obj instanceof View)) {
-        return false;
-      }
-      View other = (View) obj;
-      return Objects.equals(type(), other.type())
-          && Objects.equals(query, other.query)
-          && Objects.equals(userDefinedFunctions, other.userDefinedFunctions);
-    }
-  }
-
-  /**
-   * Google BigQuery External Table type.
-   */
-  public static class ExternalTable extends TableType {
-
-    private static final long serialVersionUID = -6912214693318638552L;
-
-    private final ExternalDataConfiguration configuration;
-
-    ExternalTable(ExternalDataConfiguration configuration) {
-      this(null, configuration);
-    }
-
-    ExternalTable(Schema schema, ExternalDataConfiguration configuration) {
-      super(Type.EXTERNAL, schema);
-      this.configuration = configuration;
-    }
-
-    /**
-     * Returns the data format, location and other properties of a table stored outside of BigQuery.
-     * This property is experimental and might be subject to change or removed.
-     *
-     * @see Federated Data
-     *     Sources
-     */
-    public ExternalDataConfiguration configuration() {
-      return configuration;
-    };
-
-    @Override
-    public String toString() {
-      return MoreObjects.toStringHelper(this)
-          .add("type", type())
-          .add("configuration", configuration)
-          .toString();
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(schema(), configuration);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (!(obj instanceof ExternalTable)) {
-        return false;
-      }
-      ExternalTable other = (ExternalTable) obj;
-      return Objects.equals(type(), other.type())
-          && Objects.equals(configuration, other.configuration);
-    }
-  }
-
-  @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("type", type)
-        .add("schema", schema)
-        .toString();
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(type, schema);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (!(obj instanceof TableType)) {
-      return false;
-    }
-    TableType other = (TableType) obj;
-    return Objects.equals(type, other.type)
-        && Objects.equals(schema, other.schema);
-  }
-
-  /**
-   * Returns a simple BigQuery Table type.
-   */
-  public static TableType table(Schema schema) {
-    return new TableType(Type.TABLE, checkNotNull(schema));
-  }
-
-  /**
-   * Returns a BigQuery View type given the query needed to create the view.
-   */
-  public static View view(String query) {
-    return new View(checkNotNull(query));
-  }
-
-  /**
-   * Returns a BigQuery View type given the query needed to create the view and a list of user
-   * defined functions that can be used by the query.
-   */
-  public static View view(String query, List userDefinedFunctions) {
-    return new View(checkNotNull(query), checkNotNull(userDefinedFunctions));
-  }
-
-  /**
-   * Returns a BigQuery View type given the query needed to create the view and a list of user
-   * defined functions that can be used by the query.
-   */
-  public static View view(String query, UserDefinedFunction... userDefinedFunctions) {
-    return new View(checkNotNull(query), ImmutableList.copyOf(userDefinedFunctions));
-  }
-
-  /**
-   * Returns a BigQuery External Table type given the external data configuration.
-   */
-  public static ExternalTable externalTable(ExternalDataConfiguration configuration) {
-    return new ExternalTable(checkNotNull(configuration));
-  }
-}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
new file mode 100644
index 000000000000..6a98a446e294
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.Table;
+import com.google.api.services.bigquery.model.ViewDefinition;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery View Table information. BigQuery's views are logical views, not materialized
+ * views, which means that the query that defines the view is re-executed every time the view is
+ * queried.
+ *
+ * @see Views
+ */
+public class ViewInfo extends BaseTableInfo {
+
+  private static final long serialVersionUID = 7567772157817454901L;
+
+  private final String query;
+  private final List userDefinedFunctions;
+
+  public static final class Builder extends BaseTableInfo.Builder {
+
+    private String query;
+    private List userDefinedFunctions;
+
+    private Builder() {}
+
+    private Builder(ViewInfo viewInfo) {
+      super(viewInfo);
+      this.query = viewInfo.query;
+      this.userDefinedFunctions = viewInfo.userDefinedFunctions;
+    }
+
+    @Override
+    protected Builder self() {
+      return this;
+    }
+
+    /**
+     * Sets the query used to create the view.
+     */
+    public Builder query(String query) {
+      this.query = checkNotNull(query);
+      return self();
+    }
+
+    /**
+     * Sets user defined functions that can be used by {@link #query()}.
+     *
+     * @see User-Defined Functions
+     *     
+     */
+    public Builder userDefinedFunctions(List userDefinedFunctions) {
+      this.userDefinedFunctions = ImmutableList.copyOf(checkNotNull(userDefinedFunctions));
+      return self();
+    }
+
+    /**
+     * Sets user defined functions that can be used by {@link #query()}.
+     *
+     * @see User-Defined Functions
+     *     
+     */
+    public Builder userDefinedFunctions(UserDefinedFunction... userDefinedFunctions) {
+      this.userDefinedFunctions = ImmutableList.copyOf(userDefinedFunctions);
+      return self();
+    }
+
+    /**
+     * Creates a {@code ViewInfo} object.
+     */
+    @Override
+    public ViewInfo build() {
+      return new ViewInfo(this);
+    }
+  }
+
+  private ViewInfo(Builder builder) {
+    super(builder);
+    this.query = checkNotNull(builder.query);
+    this.userDefinedFunctions = builder.userDefinedFunctions;
+  }
+
+  /**
+   * Returns the query used to create the view.
+   */
+  public String query() {
+    return query;
+  };
+
+  /**
+   * Returns user defined functions that can be used by {@link #query()}. Returns {@code null} if
+   * not set.
+   *
+   * @see User-Defined Functions
+   *     
+   */
+  public List userDefinedFunctions() {
+    return userDefinedFunctions;
+  }
+
+  /**
+   * Returns a builder for the {@code ViewInfo} object.
+   */
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  protected MoreObjects.ToStringHelper toStringHelper() {
+    return super.toStringHelper()
+        .add("query", query)
+        .add("userDefinedFunctions", userDefinedFunctions);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ViewInfo && Objects.equals(toPb(), ((ViewInfo) obj).toPb());
+  }
+
+  @Override
+  Table toPb() {
+    Table tablePb = super.toPb();
+    ViewDefinition viewDefinition = new ViewDefinition()
+        .setQuery(query);
+    if (userDefinedFunctions != null) {
+      viewDefinition.setUserDefinedFunctionResources(Lists.transform(userDefinedFunctions,
+          UserDefinedFunction.TO_PB_FUNCTION));
+    }
+    tablePb.setView(viewDefinition);
+    return tablePb;
+  }
+
+  /**
+   * Returns a builder for a BigQuery View Table.
+   *
+   * @param tableId table id
+   * @param query the query used to generate the table
+   */
+  public static Builder builder(TableId tableId, String query) {
+    return new Builder().tableId(tableId).type(Type.VIEW).query(query);
+  }
+
+  /**
+   * Returns a builder for a BigQuery View Table.
+   *
+   * @param table table id
+   * @param query the query used to generate the table
+   * @param functions user-defined functions that can be used by the query
+   */
+  public static Builder builder(TableId table, String query, List functions) {
+    return new Builder()
+        .tableId(table)
+        .type(Type.VIEW)
+        .userDefinedFunctions(functions)
+        .query(query);
+  }
+
+  /**
+   * Returns a builder for a BigQuery View Table.
+   *
+   * @param table table id
+   * @param query the query used to generate the table
+   * @param functions user-defined functions that can be used by the query
+   */
+  public static Builder builder(TableId table, String query, UserDefinedFunction... functions) {
+    return new Builder()
+        .tableId(table)
+        .type(Type.VIEW)
+        .userDefinedFunctions(functions)
+        .query(query);
+  }
+
+  /**
+   * Creates a BigQuery View given table identity and query.
+   *
+   * @param tableId table id
+   * @param query the query used to generate the table
+   */
+  public static ViewInfo of(TableId tableId, String query) {
+    return builder(tableId, query).build();
+  }
+
+  /**
+   * Creates a BigQuery View given table identity, a query and some user-defined functions.
+   *
+   * @param table table id
+   * @param query the query used to generate the table
+   * @param functions user-defined functions that can be used by the query
+   */
+  public static ViewInfo of(TableId table, String query, List functions) {
+    return builder(table, query, functions).build();
+  }
+
+  /**
+   * Creates a BigQuery View given table identity, a query and some user-defined functions.
+   *
+   * @param table table id
+   * @param query the query used to generate the table
+   * @param functions user-defined functions that can be used by the query
+   */
+  public static ViewInfo of(TableId table, String query, UserDefinedFunction... functions) {
+    return builder(table, query, functions).build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 86e18ac74c97..c75337431580 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -92,8 +92,8 @@ public class SerializationTest {
           .description("FieldDescription3")
           .build();
   private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
-  private static final TableInfo.StreamingBuffer STREAMING_BUFFER =
-      new TableInfo.StreamingBuffer(1L, 2L, 3L);
+  private static final BaseTableInfo.StreamingBuffer STREAMING_BUFFER =
+      new BaseTableInfo.StreamingBuffer(1L, 2L, 3L);
   private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
   private static final ExternalDataConfiguration EXTERNAL_DATA_CONFIGURATION =
       ExternalDataConfiguration.builder(SOURCE_URIS, TABLE_SCHEMA, CSV_OPTIONS)
@@ -104,8 +104,8 @@ public class SerializationTest {
       new UserDefinedFunction.InlineFunction("inline");
   private static final UserDefinedFunction URI_FUNCTION =
       new UserDefinedFunction.UriFunction("URI");
-  private static final TableInfo TABLE_INFO =
-      TableInfo.builder(TABLE_ID, TableType.table(TABLE_SCHEMA))
+  private static final BaseTableInfo TABLE_INFO =
+      TableInfo.builder(TABLE_ID, TABLE_SCHEMA)
           .creationTime(CREATION_TIME)
           .description(DESCRIPTION)
           .etag(ETAG)
@@ -113,6 +113,21 @@ public class SerializationTest {
           .location(LOCATION)
           .streamingBuffer(STREAMING_BUFFER)
           .build();
+  private static final ViewInfo VIEW_INFO =
+      ViewInfo.builder(TABLE_ID, "QUERY")
+          .creationTime(CREATION_TIME)
+          .description(DESCRIPTION)
+          .etag(ETAG)
+          .id(ID)
+          .build();
+  private static final ExternalTableInfo EXTERNAL_TABLE_INFO =
+      ExternalTableInfo.builder(TABLE_ID, EXTERNAL_DATA_CONFIGURATION)
+          .creationTime(CREATION_TIME)
+          .description(DESCRIPTION)
+          .etag(ETAG)
+          .id(ID)
+          .streamingBuffer(STREAMING_BUFFER)
+          .build();
 
   @Test
   public void testServiceOptions() throws Exception {
@@ -136,7 +151,7 @@ public void testServiceOptions() throws Exception {
   public void testModelAndRequests() throws Exception {
     Serializable[] objects = {DOMAIN_ACCESS, GROUP_ACCESS, USER_ACCESS, VIEW_ACCESS, DATASET_ID,
         DATASET_INFO, TABLE_ID, CSV_OPTIONS, STREAMING_BUFFER, EXTERNAL_DATA_CONFIGURATION,
-        TABLE_SCHEMA, TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION};
+        TABLE_SCHEMA, TABLE_INFO, VIEW_INFO, EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
index ecde5f2c907c..f9e073906578 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
-import com.google.gcloud.bigquery.TableInfo.StreamingBuffer;
+import com.google.gcloud.bigquery.BaseTableInfo.StreamingBuffer;
 
 import org.junit.Test;
 
@@ -70,7 +70,7 @@ public class TableInfoTest {
   private static final String LOCATION = "US";
   private static final StreamingBuffer STREAMING_BUFFER = new StreamingBuffer(1L, 2L, 3L);
   private static final TableInfo TABLE_INFO =
-      TableInfo.builder(TABLE_ID, TableType.table(TABLE_SCHEMA))
+      TableInfo.builder(TABLE_ID, TABLE_SCHEMA)
           .creationTime(CREATION_TIME)
           .description(DESCRIPTION)
           .etag(ETAG)
@@ -84,8 +84,8 @@ public class TableInfoTest {
           .selfLink(SELF_LINK)
           .streamingBuffer(STREAMING_BUFFER)
           .build();
-  private static final TableInfo EXTERNAL_TABLE_INFO =
-      TableInfo.builder(TABLE_ID, TableType.externalTable(CONFIGURATION))
+  private static final ExternalTableInfo EXTERNAL_TABLE_INFO =
+      ExternalTableInfo.builder(TABLE_ID, CONFIGURATION)
           .creationTime(CREATION_TIME)
           .description(DESCRIPTION)
           .etag(ETAG)
@@ -93,7 +93,6 @@ public class TableInfoTest {
           .friendlyName(FRIENDLY_NAME)
           .id(ID)
           .lastModifiedTime(LAST_MODIFIED_TIME)
-          .location(LOCATION)
           .numBytes(NUM_BYTES)
           .numRows(NUM_ROWS)
           .selfLink(SELF_LINK)
@@ -101,8 +100,8 @@ public class TableInfoTest {
           .build();
   private static List USER_DEFINED_FUNCTIONS = ImmutableList.of(
       UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
-  private static final TableInfo VIEW_INFO =
-      TableInfo.builder(TABLE_ID, TableType.view(VIEW_QUERY, USER_DEFINED_FUNCTIONS))
+  private static final ViewInfo VIEW_INFO =
+      ViewInfo.builder(TABLE_ID, VIEW_QUERY, USER_DEFINED_FUNCTIONS)
           .creationTime(CREATION_TIME)
           .description(DESCRIPTION)
           .etag(ETAG)
@@ -110,37 +109,39 @@ public class TableInfoTest {
           .friendlyName(FRIENDLY_NAME)
           .id(ID)
           .lastModifiedTime(LAST_MODIFIED_TIME)
-          .location(LOCATION)
           .numBytes(NUM_BYTES)
           .numRows(NUM_ROWS)
           .selfLink(SELF_LINK)
-          .streamingBuffer(STREAMING_BUFFER)
           .build();
 
   @Test
   public void testToBuilder() {
     compareTableInfo(TABLE_INFO, TABLE_INFO.toBuilder().build());
-    compareTableInfo(VIEW_INFO, VIEW_INFO.toBuilder().build());
-    compareTableInfo(EXTERNAL_TABLE_INFO, EXTERNAL_TABLE_INFO.toBuilder().build());
-    TableInfo tableInfo = TABLE_INFO.toBuilder()
+    compareViewInfo(VIEW_INFO, VIEW_INFO.toBuilder().build());
+    compareExternalTableInfo(EXTERNAL_TABLE_INFO, EXTERNAL_TABLE_INFO.toBuilder().build());
+    BaseTableInfo tableInfo = TABLE_INFO.toBuilder()
         .description("newDescription")
         .build();
     assertEquals("newDescription", tableInfo.description());
     tableInfo = tableInfo.toBuilder()
         .description("description")
         .build();
-    compareTableInfo(TABLE_INFO, tableInfo);
+    compareBaseTableInfo(TABLE_INFO, tableInfo);
   }
 
   @Test
   public void testToBuilderIncomplete() {
-    TableInfo tableInfo = TableInfo.of(TABLE_ID, TableType.view(VIEW_QUERY));
+    BaseTableInfo tableInfo = TableInfo.of(TABLE_ID, TABLE_SCHEMA);
+    assertEquals(tableInfo, tableInfo.toBuilder().build());
+    tableInfo = ViewInfo.of(TABLE_ID, VIEW_QUERY);
+    assertEquals(tableInfo, tableInfo.toBuilder().build());
+    tableInfo = ExternalTableInfo.of(TABLE_ID, CONFIGURATION);
     assertEquals(tableInfo, tableInfo.toBuilder().build());
   }
+
   @Test
   public void testBuilder() {
     assertEquals(TABLE_ID, TABLE_INFO.tableId());
-    assertTrue(VIEW_INFO.type() instanceof TableType);
     assertEquals(TABLE_SCHEMA, TABLE_INFO.schema());
     assertEquals(CREATION_TIME, TABLE_INFO.creationTime());
     assertEquals(DESCRIPTION, TABLE_INFO.description());
@@ -154,11 +155,11 @@ public void testBuilder() {
     assertEquals(NUM_ROWS, TABLE_INFO.numRows());
     assertEquals(SELF_LINK, TABLE_INFO.selfLink());
     assertEquals(STREAMING_BUFFER, TABLE_INFO.streamingBuffer());
-    assertEquals(TableType.Type.TABLE, TABLE_INFO.type().type());
+    assertEquals(BaseTableInfo.Type.TABLE, TABLE_INFO.type());
     assertEquals(TABLE_ID, VIEW_INFO.tableId());
     assertEquals(null, VIEW_INFO.schema());
-    assertTrue(VIEW_INFO.type() instanceof TableType.View);
-    assertEquals(VIEW_QUERY, ((TableType.View) VIEW_INFO.type()).query());
+    assertEquals(VIEW_QUERY, VIEW_INFO.query());
+    assertEquals(BaseTableInfo.Type.VIEW, VIEW_INFO.type());
     assertEquals(CREATION_TIME, VIEW_INFO.creationTime());
     assertEquals(DESCRIPTION, VIEW_INFO.description());
     assertEquals(ETAG, VIEW_INFO.etag());
@@ -166,17 +167,13 @@ public void testBuilder() {
     assertEquals(FRIENDLY_NAME, VIEW_INFO.friendlyName());
     assertEquals(ID, VIEW_INFO.id());
     assertEquals(LAST_MODIFIED_TIME, VIEW_INFO.lastModifiedTime());
-    assertEquals(LOCATION, VIEW_INFO.location());
     assertEquals(NUM_BYTES, VIEW_INFO.numBytes());
     assertEquals(NUM_ROWS, VIEW_INFO.numRows());
     assertEquals(SELF_LINK, VIEW_INFO.selfLink());
-    assertEquals(STREAMING_BUFFER, VIEW_INFO.streamingBuffer());
-    assertEquals(TableType.Type.VIEW, VIEW_INFO.type().type());
+    assertEquals(BaseTableInfo.Type.VIEW, VIEW_INFO.type());
     assertEquals(TABLE_ID, EXTERNAL_TABLE_INFO.tableId());
     assertEquals(null, EXTERNAL_TABLE_INFO.schema());
-    assertTrue(EXTERNAL_TABLE_INFO.type() instanceof TableType.ExternalTable);
-    assertEquals(CONFIGURATION,
-        ((TableType.ExternalTable) EXTERNAL_TABLE_INFO.type()).configuration());
+    assertEquals(CONFIGURATION, EXTERNAL_TABLE_INFO.configuration());
     assertEquals(CREATION_TIME, EXTERNAL_TABLE_INFO.creationTime());
     assertEquals(DESCRIPTION, EXTERNAL_TABLE_INFO.description());
     assertEquals(ETAG, EXTERNAL_TABLE_INFO.etag());
@@ -184,22 +181,25 @@ public void testBuilder() {
     assertEquals(FRIENDLY_NAME, EXTERNAL_TABLE_INFO.friendlyName());
     assertEquals(ID, EXTERNAL_TABLE_INFO.id());
     assertEquals(LAST_MODIFIED_TIME, EXTERNAL_TABLE_INFO.lastModifiedTime());
-    assertEquals(LOCATION, EXTERNAL_TABLE_INFO.location());
     assertEquals(NUM_BYTES, EXTERNAL_TABLE_INFO.numBytes());
     assertEquals(NUM_ROWS, EXTERNAL_TABLE_INFO.numRows());
     assertEquals(SELF_LINK, EXTERNAL_TABLE_INFO.selfLink());
     assertEquals(STREAMING_BUFFER, EXTERNAL_TABLE_INFO.streamingBuffer());
-    assertEquals(TableType.Type.EXTERNAL, EXTERNAL_TABLE_INFO.type().type());
+    assertEquals(BaseTableInfo.Type.EXTERNAL, EXTERNAL_TABLE_INFO.type());
   }
 
   @Test
   public void testToAndFromPb() {
-    compareTableInfo(TABLE_INFO, TableInfo.fromPb(TABLE_INFO.toPb()));
-    compareTableInfo(VIEW_INFO, TableInfo.fromPb(VIEW_INFO.toPb()));
-    compareTableInfo(EXTERNAL_TABLE_INFO, TableInfo.fromPb(EXTERNAL_TABLE_INFO.toPb()));
+    assertTrue(BaseTableInfo.fromPb(TABLE_INFO.toPb()) instanceof BaseTableInfo);
+    compareTableInfo(TABLE_INFO, BaseTableInfo.fromPb(TABLE_INFO.toPb()));
+    assertTrue(BaseTableInfo.fromPb(VIEW_INFO.toPb()) instanceof ViewInfo);
+    compareViewInfo(VIEW_INFO, BaseTableInfo.fromPb(VIEW_INFO.toPb()));
+    assertTrue(BaseTableInfo.fromPb(EXTERNAL_TABLE_INFO.toPb()) instanceof ExternalTableInfo);
+    compareExternalTableInfo(EXTERNAL_TABLE_INFO,
+        BaseTableInfo.fromPb(EXTERNAL_TABLE_INFO.toPb()));
   }
 
-  private void compareTableInfo(TableInfo expected, TableInfo value) {
+  private void compareBaseTableInfo(BaseTableInfo expected, BaseTableInfo value) {
     assertEquals(expected, value);
     assertEquals(expected.tableId(), value.tableId());
     assertEquals(expected.schema(), value.schema());
@@ -211,11 +211,30 @@ private void compareTableInfo(TableInfo expected, TableInfo value) {
     assertEquals(expected.friendlyName(), value.friendlyName());
     assertEquals(expected.id(), value.id());
     assertEquals(expected.lastModifiedTime(), value.lastModifiedTime());
-    assertEquals(expected.location(), value.location());
     assertEquals(expected.numBytes(), value.numBytes());
     assertEquals(expected.numRows(), value.numRows());
     assertEquals(expected.selfLink(), value.selfLink());
-    assertEquals(expected.streamingBuffer(), value.streamingBuffer());
     assertEquals(expected.type(), value.type());
   }
+
+  private void compareTableInfo(TableInfo expected, TableInfo value) {
+    compareBaseTableInfo(expected, value);
+    assertEquals(expected, value);
+    assertEquals(expected.location(), value.location());
+    assertEquals(expected.streamingBuffer(), value.streamingBuffer());
+  }
+
+  private void compareViewInfo(ViewInfo expected, ViewInfo value) {
+    compareBaseTableInfo(expected, value);
+    assertEquals(expected, value);
+    assertEquals(expected.query(), value.query());
+    assertEquals(expected.userDefinedFunctions(), value.userDefinedFunctions());
+  }
+
+  private void compareExternalTableInfo(ExternalTableInfo expected, ExternalTableInfo value) {
+    compareBaseTableInfo(expected, value);
+    assertEquals(expected, value);
+    assertEquals(expected.configuration(), value.configuration());
+    assertEquals(expected.streamingBuffer(), value.streamingBuffer());
+  }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTypeTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTypeTest.java
deleted file mode 100644
index 6b67e8968e03..000000000000
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTypeTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import com.google.common.collect.ImmutableList;
-
-import org.junit.Test;
-
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-
-public class TableTypeTest {
-
-  private static final Field FIELD_SCHEMA1 =
-      Field.builder("StringField", Field.Type.string())
-          .mode(Field.Mode.NULLABLE)
-          .description("FieldDescription1")
-          .build();
-  private static final Field FIELD_SCHEMA2 =
-      Field.builder("IntegerField", Field.Type.integer())
-          .mode(Field.Mode.REPEATED)
-          .description("FieldDescription2")
-          .build();
-  private static final Field FIELD_SCHEMA3 =
-      Field.builder("RecordField", Field.Type.record(FIELD_SCHEMA1, FIELD_SCHEMA2))
-          .mode(Field.Mode.REQUIRED)
-          .description("FieldDescription3")
-          .build();
-  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
-  private static final String VIEW_QUERY = "VIEW QUERY";
-  private static final ExternalDataConfiguration CONFIGURATION = ExternalDataConfiguration
-      .builder(ImmutableList.of("URI"), TABLE_SCHEMA, FormatOptions.datastoreBackup())
-      .compression("ZIP")
-      .ignoreUnknownValues(true)
-      .maxBadRecords(42)
-      .build();
-  private static List FUNCTIONS = ImmutableList.of(
-      UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
-  private static final TableType TABLE = TableType.table(TABLE_SCHEMA);
-  private static final TableType.View VIEW = TableType.view(VIEW_QUERY);
-  private static final TableType.View VIEW_WITH_FUNCTIONS = TableType.view(VIEW_QUERY, FUNCTIONS);
-  private static final TableType.ExternalTable EXTERNAL = TableType.externalTable(CONFIGURATION);
-
-  @Test
-  public void testConstructor() {
-    TableType table = new TableType(TableType.Type.TABLE, TABLE_SCHEMA);
-    assertEquals(TableType.Type.TABLE, table.type());
-    assertEquals(TABLE_SCHEMA, table.schema());
-    TableType.View view = new TableType.View(VIEW_QUERY);
-    assertEquals(TableType.Type.VIEW, view.type());
-    assertEquals(null, view.schema());
-    assertEquals(VIEW_QUERY, view.query());
-    assertEquals(null, view.userDefinedFunctions());
-    view = new TableType.View(VIEW_QUERY, FUNCTIONS);
-    assertEquals(TableType.Type.VIEW, view.type());
-    assertEquals(null, view.schema());
-    assertEquals(VIEW_QUERY, view.query());
-    assertEquals(FUNCTIONS, view.userDefinedFunctions());
-    view = new TableType.View(TABLE_SCHEMA, VIEW_QUERY, FUNCTIONS);
-    assertEquals(TableType.Type.VIEW, view.type());
-    assertEquals(TABLE_SCHEMA, view.schema());
-    assertEquals(VIEW_QUERY, view.query());
-    assertEquals(FUNCTIONS, view.userDefinedFunctions());
-    TableType.ExternalTable extern = new TableType.ExternalTable(CONFIGURATION);
-    assertEquals(TableType.Type.EXTERNAL, extern.type());
-    assertEquals(null, extern.schema());
-    assertEquals(CONFIGURATION, extern.configuration());
-    extern = new TableType.ExternalTable(TABLE_SCHEMA, CONFIGURATION);
-    assertEquals(TableType.Type.EXTERNAL, extern.type());
-    assertEquals(TABLE_SCHEMA, extern.schema());
-    assertEquals(CONFIGURATION, extern.configuration());
-  }
-
-  @Test
-  public void testFactoryMethods() {
-    TableType table = TableType.table(TABLE_SCHEMA);
-    assertEquals(TableType.Type.TABLE, table.type());
-    assertEquals(TABLE_SCHEMA, table.schema());
-    TableType.View view = TableType.view(VIEW_QUERY);
-    assertEquals(TableType.Type.VIEW, view.type());
-    assertEquals(null, view.schema());
-    assertEquals(VIEW_QUERY, view.query());
-    assertEquals(null, view.userDefinedFunctions());
-    view = TableType.view(VIEW_QUERY, FUNCTIONS);
-    assertEquals(TableType.Type.VIEW, view.type());
-    assertEquals(null, view.schema());
-    assertEquals(VIEW_QUERY, view.query());
-    assertEquals(FUNCTIONS, view.userDefinedFunctions());
-    TableType.ExternalTable extern = TableType.externalTable(CONFIGURATION);
-    assertEquals(TableType.Type.EXTERNAL, extern.type());
-    assertEquals(null, extern.schema());
-    assertEquals(CONFIGURATION, extern.configuration());
-  }
-
-  @Test
-  public void testEquals() {
-    assertEquals(new TableType(TableType.Type.TABLE, TABLE_SCHEMA), TableType.table(TABLE_SCHEMA));
-    assertEquals(new TableType.View(VIEW_QUERY), TableType.view(VIEW_QUERY));
-    assertEquals(new TableType.View(VIEW_QUERY, FUNCTIONS), TableType.view(VIEW_QUERY, FUNCTIONS));
-    assertEquals(new TableType.ExternalTable(CONFIGURATION),
-        TableType.externalTable(CONFIGURATION));
-    assertEquals(new TableType(TableType.Type.TABLE, TABLE_SCHEMA).hashCode(),
-        TableType.table(TABLE_SCHEMA).hashCode());
-    assertEquals(new TableType.View(VIEW_QUERY).hashCode(),
-        TableType.view(VIEW_QUERY).hashCode());
-    assertEquals(new TableType.View(VIEW_QUERY, FUNCTIONS).hashCode(),
-        TableType.view(VIEW_QUERY, FUNCTIONS).hashCode());
-    assertEquals(new TableType.ExternalTable(CONFIGURATION).hashCode(),
-        TableType.externalTable(CONFIGURATION).hashCode());
-  }
-}

From 338ede110628da0e980bcae8c7ec499b89c12dc1 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 4 Dec 2015 15:33:57 +0100
Subject: [PATCH 159/322] Fix mode's nullability by internally storing a string

---
 .../gcloud/bigquery/ExternalDataConfiguration.java   |  2 +-
 .../main/java/com/google/gcloud/bigquery/Field.java  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
index 9e049c4f13d6..4344aeba186b 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
@@ -283,7 +283,7 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toPb() {
     if (sourceUris != null) {
       externalConfigurationPb.setSourceUris(sourceUris);
     }
-    if (formatOptions instanceof CsvOptions) {
+    if (formatOptions != null && FormatOptions.CSV.equals(formatOptions.type())) {
       externalConfigurationPb.setCsvOptions(((CsvOptions) formatOptions).toPb());
     }
     return externalConfigurationPb;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
index d28e5eb9fed7..54fdb9f50329 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
@@ -182,19 +182,19 @@ public boolean equals(Object obj) {
    * than one value.
    */
   public enum Mode {
-    NULLABLE, REQUIRED, REPEATED, NOT_SET
+    NULLABLE, REQUIRED, REPEATED
   }
 
   private final String name;
   private final Type type;
-  private final Mode mode;
+  private final String mode;
   private final String description;
 
   public static final class Builder {
 
     private String name;
     private Type type;
-    private Mode mode;
+    private String mode;
     private String description;
 
     private Builder() {}
@@ -231,7 +231,7 @@ public Builder type(Type type) {
      * Sets the mode of the field. When not specified {@link Mode#NULLABLE} is used.
      */
     public Builder mode(Mode mode) {
-      this.mode = firstNonNull(mode, Mode.NOT_SET);
+      this.mode = mode != null ? mode.name() : Data.nullOf(String.class);
       return this;
     }
 
@@ -279,7 +279,7 @@ public Type type() {
    * Returns the field mode. By default {@link Mode#NULLABLE} is used.
    */
   public Mode mode() {
-    return mode == Mode.NOT_SET ? null : mode;
+    return mode != null ? Mode.valueOf(mode) : null;
   }
 
   /**
@@ -329,7 +329,7 @@ TableFieldSchema toPb() {
     fieldSchemaPb.setName(name);
     fieldSchemaPb.setType(type.value().name());
     if (mode != null) {
-      fieldSchemaPb.setMode(mode == Mode.NOT_SET ? Data.nullOf(String.class) : mode.name());
+      fieldSchemaPb.setMode(mode);
     }
     if (description != null) {
       fieldSchemaPb.setDescription(description);

From 9df4005c0a9c7e782a51bbd842420f8d241904aa Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 4 Dec 2015 23:07:02 +0100
Subject: [PATCH 160/322] Make BaseTableInfo abstract and other minor fixes

---
 .../google/gcloud/bigquery/BaseTableInfo.java | 117 ++++++------------
 .../gcloud/bigquery/ExternalTableInfo.java    |  27 ++--
 .../com/google/gcloud/bigquery/TableInfo.java |  24 ++--
 .../com/google/gcloud/bigquery/ViewInfo.java  |  29 +++--
 4 files changed, 83 insertions(+), 114 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
index d409e440aabd..8845179b31c5 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
@@ -22,10 +22,8 @@
 import com.google.api.client.util.Data;
 import com.google.api.services.bigquery.model.Streamingbuffer;
 import com.google.api.services.bigquery.model.Table;
-import com.google.api.services.bigquery.model.ViewDefinition;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
-import com.google.common.collect.Lists;
 
 import java.io.Serializable;
 import java.math.BigInteger;
@@ -38,7 +36,7 @@
  *
  * @see Managing Tables
  */
-public class BaseTableInfo implements Serializable {
+public abstract class BaseTableInfo implements Serializable {
 
   static final Function FROM_PB_FUNCTION =
       new Function() {
@@ -167,7 +165,7 @@ static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
   private final Long expirationTime;
   private final Long lastModifiedTime;
 
-  public static class Builder> {
+  public static abstract class Builder> {
 
     private String etag;
     private String id;
@@ -201,6 +199,28 @@ protected Builder(BaseTableInfo tableInfo) {
       this.lastModifiedTime = tableInfo.lastModifiedTime;
     }
 
+    protected Builder(Table tablePb) {
+      this.type = Type.valueOf(tablePb.getType());
+      this.tableId = TableId.fromPb(tablePb.getTableReference());
+      if (tablePb.getSchema() != null) {
+        this.schema(Schema.fromPb(tablePb.getSchema()));
+      }
+      if (tablePb.getLastModifiedTime() != null) {
+        this.lastModifiedTime(tablePb.getLastModifiedTime().longValue());
+      }
+      if (tablePb.getNumRows() != null) {
+        this.numRows(tablePb.getNumRows().longValue());
+      }
+      this.description = tablePb.getDescription();
+      this.expirationTime = tablePb.getExpirationTime();
+      this.friendlyName = tablePb.getFriendlyName();
+      this.creationTime = tablePb.getCreationTime();
+      this.etag = tablePb.getEtag();
+      this.id = tablePb.getId();
+      this.numBytes = tablePb.getNumBytes();
+      this.selfLink = tablePb.getSelfLink();
+    }
+
     @SuppressWarnings("unchecked")
     protected B self() {
       return (B) this;
@@ -288,12 +308,9 @@ public B schema(Schema schema) {
     }
 
     /**
-     * Creates a {@code BaseTableInfo} object.
+     * Creates an object.
      */
-    @SuppressWarnings("unchecked")
-    public T build() {
-      return (T) new BaseTableInfo(this);
-    }
+    public abstract T build();
   }
 
   protected BaseTableInfo(Builder builder) {
@@ -408,11 +425,9 @@ public Long lastModifiedTime() {
   }
 
   /**
-   * Returns a builder for the {@code BaseTableInfo} object.
+   * Returns a builder for the object.
    */
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
+  public abstract Builder toBuilder();
 
   protected MoreObjects.ToStringHelper toStringHelper() {
     return MoreObjects.toStringHelper(this)
@@ -458,6 +473,7 @@ Table toPb() {
     if (schema != null) {
       tablePb.setSchema(schema.toPb());
     }
+    tablePb.setType(type.name());
     tablePb.setCreationTime(creationTime);
     tablePb.setDescription(description);
     tablePb.setEtag(etag);
@@ -471,71 +487,16 @@ Table toPb() {
 
   @SuppressWarnings("unchecked")
   static  T fromPb(Table tablePb) {
-    Builder builder;
-    TableId tableId = TableId.fromPb(tablePb.getTableReference());
-    Schema schema = tablePb.getSchema() != null ? Schema.fromPb(tablePb.getSchema()) : null;
-    if (Objects.equals(tablePb.getType(), Type.VIEW.name()) || tablePb.getView() != null) {
-      ViewDefinition viewPb = tablePb.getView();
-      ViewInfo.Builder viewBuilder = ViewInfo.builder(tableId, viewPb.getQuery());
-      if (tablePb.getView().getUserDefinedFunctionResources() != null) {
-        viewBuilder.userDefinedFunctions(Lists.transform(viewPb.getUserDefinedFunctionResources(),
-            UserDefinedFunction.FROM_PB_FUNCTION));
-      }
-      builder = viewBuilder;
-    } else if (Objects.equals(tablePb.getType(), Type.EXTERNAL.name())
-        || tablePb.getExternalDataConfiguration() != null) {
-      ExternalTableInfo.Builder externalBuilder = ExternalTableInfo.builder(tableId,
-          ExternalDataConfiguration.fromPb(tablePb.getExternalDataConfiguration()));
-      if (tablePb.getStreamingBuffer() != null) {
-        externalBuilder.streamingBuffer(StreamingBuffer.fromPb(tablePb.getStreamingBuffer()));
-      }
-      builder = externalBuilder;
-    } else if (Objects.equals(tablePb.getType(), Type.TABLE.name()) || schema != null) {
-      TableInfo.Builder tableBuilder = TableInfo.builder(tableId, schema);
-      if (tablePb.getLocation() != null) {
-        tableBuilder.location(tablePb.getLocation());
-      }
-      if (tablePb.getStreamingBuffer() != null) {
-        tableBuilder.streamingBuffer(StreamingBuffer.fromPb(tablePb.getStreamingBuffer()));
-      }
-      builder = tableBuilder;
-    } else {
-      // This is for incomplete tables returned by bigquery.listTables
-      builder = new Builder().tableId(tableId);
-    }
-    if (schema != null) {
-      builder.schema(schema);
-    }
-    if (tablePb.getDescription() != null) {
-      builder.description(tablePb.getDescription());
-    }
-    if (tablePb.getExpirationTime() != null) {
-      builder.expirationTime(tablePb.getExpirationTime());
-    }
-    if (tablePb.getFriendlyName() != null) {
-      builder.friendlyName(tablePb.getFriendlyName());
-    }
-    if (tablePb.getLastModifiedTime() != null) {
-      builder.lastModifiedTime(tablePb.getLastModifiedTime().longValue());
-    }
-    if (tablePb.getNumRows() != null) {
-      builder.numRows(tablePb.getNumRows().longValue());
-    }
-    if (tablePb.getCreationTime() != null) {
-      builder.creationTime(tablePb.getCreationTime());
-    }
-    if (tablePb.getEtag() != null) {
-      builder.etag(tablePb.getEtag());
-    }
-    if (tablePb.getId() != null) {
-      builder.id(tablePb.getId());
-    }
-    if (tablePb.getNumBytes() != null) {
-      builder.numBytes(tablePb.getNumBytes());
-    }
-    if (tablePb.getSelfLink() != null) {
-      builder.selfLink(tablePb.getSelfLink());
+    switch (Type.valueOf(tablePb.getType())) {
+      case TABLE:
+        return (T) TableInfo.fromPb(tablePb);
+      case VIEW:
+        return (T) ViewInfo.fromPb(tablePb);
+      case EXTERNAL:
+        return (T) ExternalTableInfo.fromPb(tablePb);
+      default:
+        // never reached
+        throw new IllegalArgumentException("Format " + tablePb.getType() + " is not supported");
     }
-    return (T) builder.build();
   }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
index a885eeb77d1b..775a0294db77 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
@@ -21,8 +21,6 @@
 import com.google.api.services.bigquery.model.Table;
 import com.google.common.base.MoreObjects;
 
-import java.util.Objects;
-
 /**
  * Google BigQuery External Table information. BigQuery's external tables are tables whose data
  * reside outside of BigQuery but can be queried as normal BigQuery tables. External tables are
@@ -51,9 +49,15 @@ private Builder(ExternalTableInfo tableInfo) {
       this.streamingBuffer = tableInfo.streamingBuffer;
     }
 
-    @Override
-    protected Builder self() {
-      return this;
+    protected Builder(Table tablePb) {
+      super(tablePb);
+      if (tablePb.getExternalDataConfiguration() != null) {
+        this.configuration =
+            ExternalDataConfiguration.fromPb(tablePb.getExternalDataConfiguration());
+      }
+      if (tablePb.getStreamingBuffer() != null) {
+        this.streamingBuffer = StreamingBuffer.fromPb(tablePb.getStreamingBuffer());
+      }
     }
 
     /**
@@ -83,7 +87,7 @@ public ExternalTableInfo build() {
 
   private ExternalTableInfo(Builder builder) {
     super(builder);
-    this.configuration = checkNotNull(builder.configuration);
+    this.configuration = builder.configuration;
     this.streamingBuffer = builder.streamingBuffer;
   }
 
@@ -121,12 +125,6 @@ protected MoreObjects.ToStringHelper toStringHelper() {
         .add("streamingBuffer", streamingBuffer);
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof ExternalTableInfo
-        && Objects.equals(toPb(), ((ExternalTableInfo) obj).toPb());
-  }
-
   @Override
   Table toPb() {
     Table tablePb = super.toPb();
@@ -156,4 +154,9 @@ public static Builder builder(TableId tableId, ExternalDataConfiguration configu
   public static ExternalTableInfo of(TableId table, ExternalDataConfiguration configuration) {
     return builder(table, configuration).build();
   }
+
+  @SuppressWarnings("unchecked")
+  static ExternalTableInfo fromPb(Table tablePb) {
+    return new Builder(tablePb).build();
+  }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index 732444ebdf26..6594a3f25a67 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -19,8 +19,6 @@
 import com.google.api.services.bigquery.model.Table;
 import com.google.common.base.MoreObjects;
 
-import java.util.Objects;
-
 /**
  * A Google BigQuery Table information. A BigQuery table is a standard, two-dimensional table with
  * individual records organized in rows, and a data type assigned to each column (also called a
@@ -49,9 +47,12 @@ private Builder(TableInfo tableInfo) {
       this.streamingBuffer = tableInfo.streamingBuffer;
     }
 
-    @Override
-    protected Builder self() {
-      return this;
+    protected Builder(Table tablePb) {
+      super(tablePb);
+      this.location = tablePb.getLocation();
+      if (tablePb.getStreamingBuffer() != null) {
+        this.streamingBuffer = StreamingBuffer.fromPb(tablePb.getStreamingBuffer());
+      }
     }
 
     Builder location(String location) {
@@ -119,7 +120,7 @@ public static BaseTableInfo of(TableId tableId, Schema schema) {
   }
 
   /**
-   * Returns a builder for the {@code ExternalTableInfo} object.
+   * Returns a builder for the {@code TableInfo} object.
    */
   @Override
   public Builder toBuilder() {
@@ -133,12 +134,6 @@ protected MoreObjects.ToStringHelper toStringHelper() {
         .add("streamingBuffer", streamingBuffer);
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof TableInfo
-        && Objects.equals(toPb(), ((TableInfo) obj).toPb());
-  }
-
   @Override
   Table toPb() {
     Table tablePb = super.toPb();
@@ -148,4 +143,9 @@ Table toPb() {
     }
     return tablePb;
   }
+
+  @SuppressWarnings("unchecked")
+  static TableInfo fromPb(Table tablePb) {
+    return new Builder(tablePb).build();
+  }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
index 6a98a446e294..01e07663b363 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
@@ -25,7 +25,6 @@
 import com.google.common.collect.Lists;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Google BigQuery View Table information. BigQuery's views are logical views, not materialized
@@ -54,9 +53,16 @@ private Builder(ViewInfo viewInfo) {
       this.userDefinedFunctions = viewInfo.userDefinedFunctions;
     }
 
-    @Override
-    protected Builder self() {
-      return this;
+    protected Builder(Table tablePb) {
+      super(tablePb);
+      ViewDefinition viewPb = tablePb.getView();
+      if (viewPb != null) {
+        this.query = viewPb.getQuery();
+        if (viewPb.getUserDefinedFunctionResources() != null) {
+          this.userDefinedFunctions = Lists.transform(viewPb.getUserDefinedFunctionResources(),
+              UserDefinedFunction.FROM_PB_FUNCTION);
+        }
+      }
     }
 
     /**
@@ -100,7 +106,7 @@ public ViewInfo build() {
 
   private ViewInfo(Builder builder) {
     super(builder);
-    this.query = checkNotNull(builder.query);
+    this.query = builder.query;
     this.userDefinedFunctions = builder.userDefinedFunctions;
   }
 
@@ -137,16 +143,10 @@ protected MoreObjects.ToStringHelper toStringHelper() {
         .add("userDefinedFunctions", userDefinedFunctions);
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof ViewInfo && Objects.equals(toPb(), ((ViewInfo) obj).toPb());
-  }
-
   @Override
   Table toPb() {
     Table tablePb = super.toPb();
-    ViewDefinition viewDefinition = new ViewDefinition()
-        .setQuery(query);
+    ViewDefinition viewDefinition = new ViewDefinition().setQuery(query);
     if (userDefinedFunctions != null) {
       viewDefinition.setUserDefinedFunctionResources(Lists.transform(userDefinedFunctions,
           UserDefinedFunction.TO_PB_FUNCTION));
@@ -226,4 +226,9 @@ public static ViewInfo of(TableId table, String query, List
   public static ViewInfo of(TableId table, String query, UserDefinedFunction... functions) {
     return builder(table, query, functions).build();
   }
+
+  @SuppressWarnings("unchecked")
+  static ViewInfo fromPb(Table tablePb) {
+    return new Builder(tablePb).build();
+  }
 }

From 722e4a73d7fe520487709099bbbeb7fdf018b085 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 9 Dec 2015 12:38:42 +0100
Subject: [PATCH 161/322] Add JobInfo hierarcy and related classes

---
 .../google/gcloud/bigquery/BigQueryError.java | 119 ++++
 .../google/gcloud/bigquery/CopyJobInfo.java   | 258 +++++++++
 .../gcloud/bigquery/ExtractJobInfo.java       | 286 ++++++++++
 .../com/google/gcloud/bigquery/JobId.java     |  91 +++
 .../com/google/gcloud/bigquery/JobInfo.java   | 301 ++++++++++
 .../google/gcloud/bigquery/JobStatistics.java | 487 ++++++++++++++++
 .../com/google/gcloud/bigquery/JobStatus.java | 130 +++++
 .../google/gcloud/bigquery/LoadJobInfo.java   | 430 +++++++++++++++
 .../google/gcloud/bigquery/QueryJobInfo.java  | 520 ++++++++++++++++++
 .../gcloud/bigquery/BigQueryErrorTest.java    |  45 ++
 .../gcloud/bigquery/CopyJobInfoTest.java      | 174 ++++++
 .../gcloud/bigquery/ExtractJobInfoTest.java   | 182 ++++++
 .../com/google/gcloud/bigquery/JobIdTest.java |  56 ++
 .../gcloud/bigquery/JobStatisticsTest.java    | 178 ++++++
 .../google/gcloud/bigquery/JobStatusTest.java |  67 +++
 .../gcloud/bigquery/LoadJobInfoTest.java      | 178 ++++++
 .../gcloud/bigquery/QueryJobInfoTest.java     | 202 +++++++
 .../gcloud/bigquery/SerializationTest.java    |  45 +-
 18 files changed, 3748 insertions(+), 1 deletion(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryErrorTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobInfoTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobIdTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatusTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobInfoTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java
new file mode 100644
index 000000000000..2d89bccf62ea
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java
@@ -0,0 +1,119 @@
+package com.google.gcloud.bigquery;
+
+import com.google.api.services.bigquery.model.ErrorProto;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Google Cloud BigQuery Job Error. Objects of this class represent errors occurred during the
+ * execution of a BigQuery Job.
+ */
+public class BigQueryError implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public BigQueryError apply(ErrorProto pb) {
+          return BigQueryError.fromPb(pb);
+        }
+      };
+  static final Function TO_PB_FUNCTION =
+      new Function() {
+        @Override
+        public ErrorProto apply(BigQueryError error) {
+          return error.toPb();
+        }
+      };
+  private static final long serialVersionUID = -6566785320629096688L;
+
+  private final String reason;
+  private final String location;
+  private final String debugInfo;
+  private final String message;
+
+  BigQueryError(String reason, String location, String message, String debugInfo) {
+    this.reason = reason;
+    this.location = location;
+    this.debugInfo = debugInfo;
+    this.message = message;
+  }
+
+  BigQueryError(String reason, String location, String message) {
+    this.reason = reason;
+    this.location = location;
+    this.message = message;
+    this.debugInfo = null;
+  }
+
+  /**
+   * Returns short error code that summarizes the error.
+   *
+   * @see Troubleshooting
+   *     Errors
+   */
+  public String reason() {
+    return reason;
+  }
+
+  /**
+   * Returns where the error occurred, if present.
+   */
+  public String location() {
+    return location;
+  }
+
+  String debugInfo() {
+    return debugInfo;
+  }
+
+  /**
+   * Returns a human-readable description of the error.
+   */
+  public String message() {
+    return message;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(reason, location, message);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("reason", reason)
+        .add("location", location)
+        .add("message", message)
+        .toString();
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof BigQueryError && Objects.equals(toPb(), ((BigQueryError) obj).toPb());
+  }
+
+  ErrorProto toPb() {
+    ErrorProto errorPb = new ErrorProto();
+    if (reason != null) {
+      errorPb.setReason(reason);
+    }
+    if (location != null) {
+      errorPb.setLocation(location);
+    }
+    if (message != null) {
+      errorPb.setMessage(message);
+    }
+    if (debugInfo != null) {
+      errorPb.setDebugInfo(debugInfo);
+    }
+    return errorPb;
+  }
+
+  static BigQueryError fromPb(ErrorProto errorPb) {
+    return new BigQueryError(errorPb.getReason(), errorPb.getLocation(), errorPb.getMessage(),
+        errorPb.getDebugInfo());
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
new file mode 100644
index 000000000000..a3247b78d5b8
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.JobConfiguration;
+import com.google.api.services.bigquery.model.JobConfigurationTableCopy;
+import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Copy Job. A Copy Job copies an existing table to another new or existing table.
+ */
+public class CopyJobInfo extends JobInfo {
+
+  private static final long serialVersionUID = 7830335512951916299L;
+
+  private final List sourceTables;
+  private final TableId destinationTable;
+  private final CreateDisposition createDisposition;
+  private final WriteDisposition writeDisposition;
+
+  public static final class Builder extends JobInfo.Builder {
+
+    private List sourceTables;
+    private TableId destinationTable;
+    private CreateDisposition createDisposition;
+    private WriteDisposition writeDisposition;
+
+    private Builder() {}
+
+    private Builder(CopyJobInfo jobInfo) {
+      super(jobInfo);
+      this.sourceTables = jobInfo.sourceTables;
+      this.destinationTable = jobInfo.destinationTable;
+      this.createDisposition = jobInfo.createDisposition;
+      this.writeDisposition = jobInfo.writeDisposition;
+    }
+
+    private Builder(Job jobPb) {
+      super(jobPb);
+      JobConfigurationTableCopy copyConfigurationPb = jobPb.getConfiguration().getCopy();
+      this.destinationTable = TableId.fromPb(copyConfigurationPb.getDestinationTable());
+      if (copyConfigurationPb.getSourceTables() != null) {
+        this.sourceTables =
+            Lists.transform(copyConfigurationPb.getSourceTables(), TableId.FROM_PB_FUNCTION);
+      } else {
+        this.sourceTables = ImmutableList.of(TableId.fromPb(copyConfigurationPb.getSourceTable()));
+      }
+      if (copyConfigurationPb.getCreateDisposition() != null) {
+        this.createDisposition =
+            CreateDisposition.valueOf(copyConfigurationPb.getCreateDisposition());
+      }
+      if (copyConfigurationPb.getWriteDisposition() != null) {
+        this.writeDisposition = WriteDisposition.valueOf(copyConfigurationPb.getWriteDisposition());
+      }
+    }
+
+    /**
+     * Sets the source tables to copy.
+     */
+    public Builder sourceTables(List sourceTables) {
+      this.sourceTables = sourceTables != null ? ImmutableList.copyOf(sourceTables) : null;
+      return self();
+    }
+
+    /**
+     * Sets the destination table of the copy job.
+     */
+    public Builder destinationTable(TableId destinationTable) {
+      this.destinationTable = destinationTable;
+      return self();
+    }
+
+    /**
+     * Sets whether the job is allowed to create new tables.
+     *
+     * @see 
+     *     Jobs: Link Configuration
+     */
+    public Builder createDisposition(CreateDisposition createDisposition) {
+      this.createDisposition = createDisposition;
+      return self();
+    }
+
+    /**
+     * Sets the action that should occur if the destination table already exists.
+     *
+     * @see 
+     *     Jobs: Link Configuration
+     */
+    public Builder writeDisposition(WriteDisposition writeDisposition) {
+      this.writeDisposition = writeDisposition;
+      return self();
+    }
+
+    @Override
+    public CopyJobInfo build() {
+      return new CopyJobInfo(this);
+    }
+  }
+
+  private CopyJobInfo(Builder builder) {
+    super(builder);
+    this.sourceTables = checkNotNull(builder.sourceTables);
+    this.destinationTable = checkNotNull(builder.destinationTable);
+    this.createDisposition = builder.createDisposition;
+    this.writeDisposition = builder.writeDisposition;
+  }
+
+  /**
+   * Returns the source tables to copy.
+   */
+  public List sourceTables() {
+    return sourceTables;
+  }
+
+  /**
+   * Returns the destination table to load the data into.
+   */
+  public TableId destinationTable() {
+    return destinationTable;
+  }
+
+  /**
+   * Returns whether the job is allowed to create new tables.
+   *
+   * @see 
+   *     Jobs: Copy Configuration
+   */
+  public CreateDisposition createDisposition() {
+    return this.createDisposition;
+  }
+
+  /**
+   * Returns the action that should occur if the destination table already exists.
+   *
+   * @see 
+   *     Jobs: Copy Configuration
+   */
+  public WriteDisposition writeDisposition() {
+    return writeDisposition;
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  ToStringHelper toStringHelper() {
+    return super.toStringHelper()
+        .add("sourceTables", sourceTables)
+        .add("destinationTable", destinationTable)
+        .add("createDisposition", createDisposition)
+        .add("writeDisposition", writeDisposition);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof CopyJobInfo && Objects.equals(toPb(), ((CopyJobInfo) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), sourceTables, destinationTable, createDisposition,
+        writeDisposition);
+  }
+
+  @Override
+  Job toPb() {
+    JobConfigurationTableCopy copyConfigurationPb = new JobConfigurationTableCopy();
+    copyConfigurationPb.setDestinationTable(destinationTable.toPb());
+    if (sourceTables.size() == 1) {
+      copyConfigurationPb.setSourceTable(sourceTables.get(0).toPb());
+    } else {
+      copyConfigurationPb.setSourceTables(Lists.transform(sourceTables, TableId.TO_PB_FUNCTION));
+    }
+    if (createDisposition != null) {
+      copyConfigurationPb.setCreateDisposition(createDisposition.toString());
+    }
+    if (writeDisposition != null) {
+      copyConfigurationPb.setWriteDisposition(writeDisposition.toString());
+    }
+    return super.toPb().setConfiguration(new JobConfiguration().setCopy(copyConfigurationPb));
+  }
+
+  /**
+   * Creates a builder for a BigQuery Copy Job given destination and source table.
+   */
+  public static Builder builder(TableId destinationTable, TableId sourceTable) {
+    return builder(destinationTable, ImmutableList.of(checkNotNull(sourceTable)));
+  }
+
+  /**
+   * Creates a builder for a BigQuery Copy Job given destination and source tables.
+   */
+  public static Builder builder(TableId destinationTable, List sourceTables) {
+    return new Builder().destinationTable(destinationTable).sourceTables(sourceTables);
+  }
+
+  /**
+   * Returns a BigQuery Copy Job for the given destination and source table. Job's id is chosen by
+   * the service.
+   */
+  public static CopyJobInfo of(TableId destinationTable, TableId sourceTable) {
+    return builder(destinationTable, sourceTable).build();
+  }
+
+  /**
+   * Returns a BigQuery Copy Job for the given destination and source tables. Job's id is chosen by
+   * the service.
+   */
+  public static CopyJobInfo of(TableId destinationTable, List sourceTables) {
+    return builder(destinationTable, sourceTables).build();
+  }
+
+  /**
+   * Returns a BigQuery Copy Job for the given destination and source table. Job's id is set to the
+   * provided value.
+   */
+  public static CopyJobInfo of(JobId jobId, TableId destinationTable, TableId sourceTable) {
+    return builder(destinationTable, sourceTable).jobId(jobId).build();
+  }
+
+  /**
+   * Returns a BigQuery Copy Job for the given destination and source tables. Job's id is set to the
+   * provided value.
+   */
+  public static CopyJobInfo of(JobId jobId, TableId destinationTable, List sourceTables) {
+    return builder(destinationTable, sourceTables).jobId(jobId).build();
+  }
+
+  @SuppressWarnings("unchecked")
+  static CopyJobInfo fromPb(Job jobPb) {
+    return new Builder(jobPb).build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
new file mode 100644
index 000000000000..268672b04d68
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.JobConfiguration;
+import com.google.api.services.bigquery.model.JobConfigurationExtract;
+import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobStatistics.ExtractStatistics;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Extract Jobs. An Extract Job exports a BigQuery table to Google Cloud Storage.
+ * The extract destination provided as URIs that point to objects in Google Cloud Storage.
+ */
+public class ExtractJobInfo extends JobInfo {
+
+  private static final long serialVersionUID = -9126951217071361576L;
+
+  private final TableId sourceTable;
+  private final List destinationUris;
+  private final Boolean printHeader;
+  private final String fieldDelimiter;
+  private final String format;
+  private final String compression;
+
+  public static final class Builder extends JobInfo.Builder {
+
+    private TableId sourceTable;
+    private List destinationUris;
+    private Boolean printHeader;
+    private String fieldDelimiter;
+    private String format;
+    private String compression;
+
+    private Builder() {}
+
+    private Builder(ExtractJobInfo jobInfo) {
+      super(jobInfo);
+      this.sourceTable = jobInfo.sourceTable;
+      this.destinationUris = jobInfo.destinationUris;
+      this.printHeader = jobInfo.printHeader;
+      this.fieldDelimiter = jobInfo.fieldDelimiter;
+      this.format = jobInfo.format;
+      this.compression = jobInfo.compression;
+    }
+
+    private Builder(Job jobPb) {
+      super(jobPb);
+      JobConfigurationExtract extractConfigurationPb = jobPb.getConfiguration().getExtract();
+      this.sourceTable = TableId.fromPb(extractConfigurationPb.getSourceTable());
+      this.destinationUris = extractConfigurationPb.getDestinationUris();
+      this.printHeader = extractConfigurationPb.getPrintHeader();
+      this.fieldDelimiter = extractConfigurationPb.getFieldDelimiter();
+      this.format = extractConfigurationPb.getDestinationFormat();
+      this.compression = extractConfigurationPb.getCompression();
+    }
+
+    /**
+     * Sets the table to export.
+     */
+    public Builder sourceTable(TableId sourceTable) {
+      this.sourceTable = sourceTable;
+      return self();
+    }
+
+    /**
+     * Sets the list of fully-qualified Google Cloud Storage URIs (e.g. gs://bucket/path) where the
+     * extracted table should be written.
+     */
+    public Builder destinationUris(List destinationUris) {
+      this.destinationUris = destinationUris != null ? ImmutableList.copyOf(destinationUris) : null;
+      return self();
+    }
+
+    /**
+     * Sets whether to print out a header row in the results. By default an header is printed.
+     */
+    public Builder printHeader(Boolean printHeader) {
+      this.printHeader = printHeader;
+      return self();
+    }
+
+    /**
+     * Sets the delimiter to use between fields in the exported data. By default "," is used.
+     */
+    public Builder fieldDelimiter(String fieldDelimiter) {
+      this.fieldDelimiter = fieldDelimiter;
+      return self();
+    }
+
+    /**
+     * Sets the exported file format. If not set table is exported in CSV format.
+     *
+     * 
+     *     Destination Format
+     */
+    public Builder format(String format) {
+      this.format = format;
+      return self();
+    }
+
+    /**
+     * Sets the compression value to use for exported files. If not set exported files are not
+     * compressed.
+     *
+     * 
+     *     Compression
+     */
+    public Builder compression(String compression) {
+      this.compression = compression;
+      return self();
+    }
+
+    @Override
+    public ExtractJobInfo build() {
+      return new ExtractJobInfo(this);
+    }
+  }
+
+  private ExtractJobInfo(Builder builder) {
+    super(builder);
+    this.sourceTable = checkNotNull(builder.sourceTable);
+    this.destinationUris = checkNotNull(builder.destinationUris);
+    this.printHeader = builder.printHeader;
+    this.fieldDelimiter = builder.fieldDelimiter;
+    this.format = builder.format;
+    this.compression = builder.compression;
+  }
+
+  /**
+   * Returns the table to export.
+   */
+  public TableId sourceTable() {
+    return sourceTable;
+  }
+
+  /**
+   * Returns the list of fully-qualified Google Cloud Storage URIs where the extracted table should
+   * be written.
+   *
+   * @see 
+   *     Exporting Data Into One or More Files
+   */
+  public List destinationUris() {
+    return destinationUris;
+  }
+
+  /**
+   * Returns whether an header row is printed with the result.
+   */
+  public Boolean printHeader() {
+    return printHeader;
+  }
+
+  /**
+   * Returns the delimiter used between fields in the exported data.
+   */
+  public String fieldDelimiter() {
+    return fieldDelimiter;
+  }
+
+  /**
+   * Returns the exported files format.
+   */
+  public String format() {
+    return format;
+  }
+
+  /**
+   * Returns the compression value of exported files.
+   */
+  public String compression() {
+    return compression;
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  ToStringHelper toStringHelper() {
+    return super.toStringHelper()
+        .add("sourceTable", sourceTable)
+        .add("destinationUris", destinationUris)
+        .add("format", format)
+        .add("printHeader", printHeader)
+        .add("fieldDelimiter", fieldDelimiter)
+        .add("compression", compression);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ExtractJobInfo && Objects.equals(toPb(), ((ExtractJobInfo) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,
+        format, compression);
+  }
+
+  @Override
+  Job toPb() {
+    JobConfigurationExtract extractConfigurationPb = new JobConfigurationExtract();
+    extractConfigurationPb.setDestinationUris(destinationUris);
+    extractConfigurationPb.setSourceTable(sourceTable.toPb());
+    extractConfigurationPb.setPrintHeader(printHeader);
+    extractConfigurationPb.setFieldDelimiter(fieldDelimiter);
+    extractConfigurationPb.setDestinationFormat(format);
+    extractConfigurationPb.setCompression(compression);
+    return super.toPb().setConfiguration(new JobConfiguration().setExtract(extractConfigurationPb));
+  }
+
+  /**
+   * Creates a builder for a BigQuery Extract Job given source table and destination URI.
+   */
+  public static Builder builder(TableId sourceTable, String destinationUri) {
+    return builder(sourceTable, ImmutableList.of(checkNotNull(destinationUri)));
+  }
+
+  /**
+   * Creates a builder for a BigQuery Extract Job given source table and destination URIs.
+   */
+  public static Builder builder(TableId sourceTable, List destinationUris) {
+    return new Builder().sourceTable(sourceTable).destinationUris(destinationUris);
+  }
+
+  /**
+   * Returns a BigQuery Extract Job for the given source table and destination URI. Job's id is
+   * chosen by the service.
+   */
+  public static ExtractJobInfo of(TableId sourceTable, String destinationUri) {
+    return builder(sourceTable, destinationUri).build();
+  }
+
+  /**
+   * Returns a BigQuery Extract Job for the given source table and destination URIs. Job's id is
+   * chosen by the service.
+   */
+  public static ExtractJobInfo of(TableId sourceTable, List destinationUris) {
+    return builder(sourceTable, destinationUris).build();
+  }
+
+  /**
+   * Returns a BigQuery Extract Job for the given source table and destination URI. Job's id is set
+   * to the provided value.
+   */
+  public static ExtractJobInfo of(JobId jobId, TableId sourceTable, String destinationUri) {
+    return builder(sourceTable, destinationUri).jobId(jobId).build();
+  }
+
+  /**
+   * Returns a BigQuery Extract Job for the given source table and destination URIs. Job's id is set
+   * to the provided value.
+   */
+  public static ExtractJobInfo of(JobId jobId, TableId sourceTable, List destinationUris) {
+    return builder(sourceTable, destinationUris).jobId(jobId).build();
+  }
+
+  @SuppressWarnings("unchecked")
+  static ExtractJobInfo fromPb(Job jobPb) {
+    return new Builder(jobPb).build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java
new file mode 100644
index 000000000000..43f54a0502aa
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.JobReference;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Job identity.
+ */
+public class JobId implements Serializable {
+
+  private static final long serialVersionUID = 1225914835379688976L;
+
+  private final String project;
+  private final String job;
+
+  /**
+   * Returns project's user-defined id.
+   */
+  public String project() {
+    return project;
+  }
+
+  /**
+   * Returns the job's user-defined id.
+   */
+  public String job() {
+    return job;
+  }
+
+  private JobId(String project, String dataset) {
+    this.project = project;
+    this.job = dataset;
+  }
+
+  /**
+   * Creates a job identity given project's and job's user-defined id.
+   */
+  public static JobId of(String project, String job) {
+    return new JobId(checkNotNull(project), checkNotNull(job));
+  }
+
+  /**
+   * Creates a job identity given only its user-defined id.
+   */
+  public static JobId of(String job) {
+    return new JobId(null, checkNotNull(job));
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof JobId && Objects.equals(toPb(), ((JobId) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(project, job);
+  }
+
+  @Override
+  public String toString() {
+    return toPb().toString();
+  }
+
+  JobReference toPb() {
+    return new JobReference().setProjectId(project).setJobId(job);
+  }
+
+  static JobId fromPb(JobReference jobRef) {
+    return new JobId(jobRef.getProjectId(), jobRef.getJobId());
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
new file mode 100644
index 000000000000..317f7cc0bde5
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.api.services.bigquery.model.Job;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Base class for Google BigQuery Job information. Jobs are objects that manage asynchronous tasks
+ * such as running queries, loading data, and exporting data. Use {@link CopyJobInfo} for a job that
+ * copies an existing table. Use {@link ExtractJobInfo} for a job that exports a table to Google
+ * Cloud Storage. Use {@link LoadJobInfo} for a job that loads data from Google Cloud Storage into
+ * a table. Use {@link QueryJobInfo} for a job that runs a query.
+ *
+ * @see Jobs
+ */
+public abstract class JobInfo implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public JobInfo apply(Job pb) {
+          return JobInfo.fromPb(pb);
+        }
+      };
+  private static final long serialVersionUID = -7086529810736715842L;
+
+  /**
+   * Specifies whether the job is allowed to create new tables.
+   */
+  public enum CreateDisposition {
+    /**
+     * Configures the job to create the table if it does not exist.
+     */
+    CREATE_IF_NEEDED,
+
+    /**
+     * Configures the job to fail with a not-found error if the table does not exist.
+     */
+    CREATE_NEVER
+  }
+
+  /**
+   * Specifies the action that occurs if the destination table already exists.
+   */
+  public enum WriteDisposition {
+    /**
+     * Configures the job to overwrite the table data if table already exists.
+     */
+    WRITE_TRUNCATE,
+
+    /**
+     * Configures the job to append data to the table if it already exists.
+     */
+    WRITE_APPEND,
+
+    /**
+     * Configures the job to fail with a duplicate error if the table already exists.
+     */
+    WRITE_EMPTY
+  }
+
+  private final String etag;
+  private final String id;
+  private final JobId jobId;
+  private final String selfLink;
+  private final JobStatus status;
+  private final S statistics;
+  private final String userEmail;
+
+  public abstract static class Builder> {
+
+    private String etag;
+    private String id;
+    private JobId jobId;
+    private String selfLink;
+    private JobStatus status;
+    private S statistics;
+    private String userEmail;
+
+    protected Builder() {}
+
+    protected Builder(JobInfo jobInfo) {
+      this.etag = jobInfo.etag;
+      this.id = jobInfo.id;
+      this.jobId = jobInfo.jobId;
+      this.selfLink = jobInfo.selfLink;
+      this.status = jobInfo.status;
+      this.statistics = jobInfo.statistics;
+      this.userEmail = jobInfo.userEmail;
+
+    }
+
+    protected Builder(Job jobPb) {
+      this.etag = jobPb.getEtag();
+      this.id = jobPb.getId();
+      if (jobPb.getJobReference() != null) {
+        this.jobId = JobId.fromPb(jobPb.getJobReference());
+      }
+      this.selfLink = jobPb.getSelfLink();
+      if (jobPb.getStatus() != null) {
+        this.status = JobStatus.fromPb(jobPb.getStatus());
+      }
+      if (jobPb.getStatistics() != null) {
+        this.statistics = JobStatistics.fromPb(jobPb.getStatistics());
+      }
+      this.userEmail = jobPb.getUserEmail();
+    }
+
+    @SuppressWarnings("unchecked")
+    protected B self() {
+      return (B) this;
+    }
+
+    B etag(String etag) {
+      this.etag = etag;
+      return self();
+    }
+
+    B id(String id) {
+      this.id = id;
+      return self();
+    }
+
+    /**
+     * Sets the job identity.
+     */
+    public B jobId(JobId jobId) {
+      this.jobId = jobId;
+      return self();
+    }
+
+    B selfLink(String selfLink) {
+      this.selfLink = selfLink;
+      return self();
+    }
+
+    B status(JobStatus status) {
+      this.status = status;
+      return self();
+    }
+
+    B statistics(S statistics) {
+      this.statistics = statistics;
+      return self();
+    }
+
+    B userEmail(String userEmail) {
+      this.userEmail = userEmail;
+      return self();
+    }
+
+    public abstract T build();
+  }
+
+  protected JobInfo(Builder builder) {
+    this.jobId = builder.jobId;
+    this.etag = builder.etag;
+    this.id = builder.id;
+    this.selfLink = builder.selfLink;
+    this.status = builder.status;
+    this.statistics = builder.statistics;
+    this.userEmail = builder.userEmail;
+  }
+
+  /**
+   * Returns the hash of the job resource.
+   */
+  public String etag() {
+    return etag;
+  }
+
+  /**
+   * Returns an opaque id for the job.
+   */
+  public String id() {
+    return id;
+  }
+
+  /**
+   * Returns the job identity.
+   */
+  public JobId jobId() {
+    return jobId;
+  }
+
+  /**
+   * Returns an URL that can be used to access the resource again. The returned URL can be used for
+   * GET requests.
+   */
+  public String selfLink() {
+    return selfLink;
+  }
+
+  /**
+   * Returns the status of this job. Examine this value when polling an asynchronous job to see if
+   * the job is complete.
+   */
+  public JobStatus status() {
+    return status;
+  }
+
+  /**
+   * Returns information about the job, including starting time and ending time of the job.
+   */
+  public S statistics() {
+    return statistics;
+  }
+
+  /**
+   * Returns the email address of the user who ran the job.
+   */
+  public String userEmail() {
+    return userEmail;
+  }
+
+  /**
+   * Returns a builder for the job.
+   */
+  public abstract Builder toBuilder();
+
+  ToStringHelper toStringHelper() {
+    return MoreObjects.toStringHelper(this)
+        .add("jobId", jobId)
+        .add("status", status)
+        .add("statistics", statistics)
+        .add("userEmail", userEmail)
+        .add("etag", etag)
+        .add("id", id)
+        .add("selfLink", selfLink);
+  }
+
+  @Override
+  public String toString() {
+    return toStringHelper().toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(jobId);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof JobInfo && Objects.equals(toPb(), ((JobInfo) obj).toPb());
+  }
+
+  Job toPb() {
+    Job jobPb = new Job();
+    jobPb.setEtag(etag);
+    jobPb.setId(id);
+    jobPb.setSelfLink(selfLink);
+    jobPb.setUserEmail(userEmail);
+    if (jobId != null) {
+      jobPb.setJobReference(jobId.toPb());
+    }
+    if (status != null) {
+      jobPb.setStatus(status.toPb());
+    }
+    if (statistics != null) {
+      jobPb.setStatistics(statistics.toPb());
+    }
+    return jobPb;
+  }
+
+  @SuppressWarnings("unchecked")
+  static  T fromPb(Job jobPb) {
+    if (jobPb.getConfiguration().getLoad() != null) {
+      return (T) LoadJobInfo.fromPb(jobPb);
+    } else if (jobPb.getConfiguration().getCopy() != null) {
+      return (T) CopyJobInfo.fromPb(jobPb);
+    } else if (jobPb.getConfiguration().getExtract() != null) {
+      return (T) ExtractJobInfo.fromPb(jobPb);
+    } else  if (jobPb.getConfiguration().getQuery() != null) {
+      return (T) QueryJobInfo.fromPb(jobPb);
+    } else {
+      // never reached
+      throw new IllegalArgumentException("Job configuration is not supported");
+    }
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
new file mode 100644
index 000000000000..8322a887a4a0
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
@@ -0,0 +1,487 @@
+package com.google.gcloud.bigquery;
+
+import com.google.api.services.bigquery.model.JobStatistics2;
+import com.google.api.services.bigquery.model.JobStatistics3;
+import com.google.api.services.bigquery.model.JobStatistics4;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A Google BigQuery Job statistics.
+ */
+public class JobStatistics implements Serializable {
+
+  private static final long serialVersionUID = 1433024714741660399L;
+
+  private final Long creationTime;
+  private final Long endTime;
+  private final Long startTime;
+
+  /**
+   * A Google BigQuery Extract Job statistics.
+   */
+  public static class ExtractStatistics extends JobStatistics {
+
+    private static final long serialVersionUID = -1566598819212767373L;
+
+    private final List destinationUriFileCounts;
+
+    static final class Builder extends JobStatistics.Builder {
+
+      private List destinationUriFileCounts;
+
+      private Builder() {}
+
+      private Builder(com.google.api.services.bigquery.model.JobStatistics statisticsPb) {
+        super(statisticsPb);
+        this.destinationUriFileCounts = statisticsPb.getExtract().getDestinationUriFileCounts();
+      }
+
+      Builder destinationUriFileCounts(List destinationUriFileCounts) {
+        this.destinationUriFileCounts = destinationUriFileCounts;
+        return self();
+      }
+
+      @Override
+      ExtractStatistics build() {
+        return new ExtractStatistics(this);
+      }
+    }
+
+    private ExtractStatistics(Builder builder) {
+      super(builder);
+      this.destinationUriFileCounts = builder.destinationUriFileCounts;
+    }
+
+    /**
+     * Returns the number of files per destination URI or URI pattern specified in the extract job.
+     * These values will be in the same order as the URIs specified by
+     * {@link ExtractJobInfo#destinationUris()}.
+     */
+    public List destinationUriFileCounts() {
+      return destinationUriFileCounts;
+    }
+
+    @Override
+    ToStringHelper toStringHelper() {
+      return super.toStringHelper().add("destinationUriFileCounts", destinationUriFileCounts);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj instanceof ExtractStatistics
+          && Objects.equals(toPb(), ((ExtractStatistics) obj).toPb());
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(super.hashCode(), destinationUriFileCounts);
+    }
+
+    @Override
+    com.google.api.services.bigquery.model.JobStatistics toPb() {
+      com.google.api.services.bigquery.model.JobStatistics statisticsPb = super.toPb();
+      return statisticsPb.setExtract(
+          new JobStatistics4().setDestinationUriFileCounts(destinationUriFileCounts));
+    }
+
+    static Builder builder() {
+      return new Builder();
+    }
+
+    @SuppressWarnings("unchecked")
+    static ExtractStatistics fromPb(
+        com.google.api.services.bigquery.model.JobStatistics statisticPb) {
+      return new Builder(statisticPb).build();
+    }
+  }
+
+  /**
+   * A Google BigQuery Load Job statistics.
+   */
+  public static class LoadStatistics extends JobStatistics {
+
+    private static final long serialVersionUID = -707369246536309215L;
+
+    private final Long inputBytes;
+    private final Long inputFiles;
+    private final Long outputBytes;
+    private final Long outputRows;
+
+    static final class Builder extends JobStatistics.Builder {
+
+      private Long inputBytes;
+      private Long inputFiles;
+      private Long outputBytes;
+      private Long outputRows;
+
+      private Builder() {}
+
+      private Builder(com.google.api.services.bigquery.model.JobStatistics statisticsPb) {
+        super(statisticsPb);
+        this.inputBytes = statisticsPb.getLoad().getInputFileBytes();
+        this.inputFiles = statisticsPb.getLoad().getInputFiles();
+        this.outputBytes = statisticsPb.getLoad().getOutputBytes();
+        this.outputRows = statisticsPb.getLoad().getOutputRows();
+      }
+
+      Builder inputBytes(Long inputBytes) {
+        this.inputBytes = inputBytes;
+        return self();
+      }
+
+      Builder inputFiles(Long inputFiles) {
+        this.inputFiles = inputFiles;
+        return self();
+      }
+
+      Builder outputBytes(Long outputBytes) {
+        this.outputBytes = outputBytes;
+        return self();
+      }
+
+      Builder outputRows(Long outputRows) {
+        this.outputRows = outputRows;
+        return self();
+      }
+
+      @Override
+      LoadStatistics build() {
+        return new LoadStatistics(this);
+      }
+    }
+
+    private LoadStatistics(Builder builder) {
+      super(builder);
+      this.inputBytes = builder.inputBytes;
+      this.inputFiles = builder.inputFiles;
+      this.outputBytes = builder.outputBytes;
+      this.outputRows = builder.outputRows;
+
+    }
+
+    /**
+     * Returns the number of bytes of source data in a load job.
+     */
+    public Long inputBytes() {
+      return inputBytes;
+    }
+
+    /**
+     * Returns the number of source files in a load job.
+     */
+    public Long inputFiles() {
+      return inputFiles;
+    }
+
+    /**
+     * Returns the size of the data loaded by a load job so far, in bytes.
+     */
+    public Long outputBytes() {
+      return outputBytes;
+    }
+
+    /**
+     * Returns the number of rows loaded by a load job so far.
+     */
+    public Long outputRows() {
+      return outputRows;
+    }
+
+    @Override
+    ToStringHelper toStringHelper() {
+      return super.toStringHelper()
+          .add("inputBytes", inputBytes)
+          .add("inputFiles", inputFiles)
+          .add("outputBytes", outputBytes)
+          .add("outputRows", outputRows);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj instanceof LoadStatistics && Objects.equals(toPb(), ((LoadStatistics) obj).toPb());
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(super.hashCode(), inputBytes, inputFiles, outputBytes, outputRows);
+    }
+
+    @Override
+    com.google.api.services.bigquery.model.JobStatistics toPb() {
+      JobStatistics3 loadStatisticsPb = new JobStatistics3();
+      loadStatisticsPb.setInputFileBytes(inputBytes);
+      loadStatisticsPb.setInputFiles(inputFiles);
+      loadStatisticsPb.setOutputBytes(outputBytes);
+      loadStatisticsPb.setOutputRows(outputRows);
+      return super.toPb().setLoad(loadStatisticsPb);
+    }
+
+    static Builder builder() {
+      return new Builder();
+    }
+
+    @SuppressWarnings("unchecked")
+    static LoadStatistics fromPb(com.google.api.services.bigquery.model.JobStatistics statisticPb) {
+      return new Builder(statisticPb).build();
+    }
+  }
+
+  /**
+   * A Google BigQuery Query Job statistics.
+   */
+  public static class QueryStatistics extends JobStatistics {
+
+    private static final long serialVersionUID = 7539354109226732353L;
+
+    private final Integer billingTier;
+    private final Boolean cacheHit;
+    private final Long totalBytesBilled;
+    private final Long totalBytesProcessed;
+
+    static final class Builder extends JobStatistics.Builder {
+
+      private Integer billingTier;
+      private Boolean cacheHit;
+      private Long totalBytesBilled;
+      private Long totalBytesProcessed;
+
+      private Builder() {}
+
+      private Builder(com.google.api.services.bigquery.model.JobStatistics statisticsPb) {
+        super(statisticsPb);
+        this.billingTier = statisticsPb.getQuery().getBillingTier();
+        this.cacheHit = statisticsPb.getQuery().getCacheHit();
+        this.totalBytesBilled = statisticsPb.getQuery().getTotalBytesBilled();
+        this.totalBytesProcessed = statisticsPb.getQuery().getTotalBytesProcessed();
+      }
+
+      Builder billingTier(Integer billingTier) {
+        this.billingTier = billingTier;
+        return self();
+      }
+
+      Builder cacheHit(Boolean cacheHit) {
+        this.cacheHit = cacheHit;
+        return self();
+      }
+
+      Builder totalBytesBilled(Long totalBytesBilled) {
+        this.totalBytesBilled = totalBytesBilled;
+        return self();
+      }
+
+      Builder totalBytesProcessed(Long totalBytesProcessed) {
+        this.totalBytesProcessed = totalBytesProcessed;
+        return self();
+      }
+
+      @Override
+      QueryStatistics build() {
+        return new QueryStatistics(this);
+      }
+    }
+
+    private QueryStatistics(Builder builder) {
+      super(builder);
+      this.billingTier = builder.billingTier;
+      this.cacheHit = builder.cacheHit;
+      this.totalBytesBilled = builder.totalBytesBilled;
+      this.totalBytesProcessed = builder.totalBytesProcessed;
+    }
+
+    /**
+     * Returns the billing tier for the job.
+     */
+    public Integer billingTier() {
+      return billingTier;
+    }
+
+    /**
+     * Returns whether the query result was fetched from the query cache.
+     *
+     * @see 
+     *     Query Caching
+     */
+    public Boolean cacheHit() {
+      return cacheHit;
+    }
+
+    /**
+     * Returns the total number of bytes billed for the job.
+     */
+    public Long totalBytesBilled() {
+      return totalBytesBilled;
+    }
+
+    /**
+     * Returns the total number of bytes processed by the job.
+     */
+    public Long totalBytesProcessed() {
+      return totalBytesProcessed;
+    }
+
+    @Override
+    ToStringHelper toStringHelper() {
+      return super.toStringHelper()
+          .add("billingTier", billingTier)
+          .add("cacheHit", cacheHit)
+          .add("totalBytesBilled", totalBytesBilled)
+          .add("totalBytesProcessed", totalBytesProcessed);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj instanceof QueryStatistics
+          && Objects.equals(toPb(), ((QueryStatistics) obj).toPb());
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(super.hashCode(), billingTier, cacheHit, totalBytesBilled,
+          totalBytesProcessed);
+    }
+
+    @Override
+    com.google.api.services.bigquery.model.JobStatistics toPb() {
+      JobStatistics2 queryStatisticsPb = new JobStatistics2();
+      queryStatisticsPb.setBillingTier(billingTier);
+      queryStatisticsPb.setCacheHit(cacheHit);
+      queryStatisticsPb.setTotalBytesBilled(totalBytesBilled);
+      queryStatisticsPb.setTotalBytesProcessed(totalBytesProcessed);
+      return super.toPb().setQuery(queryStatisticsPb);
+    }
+
+    static Builder builder() {
+      return new Builder();
+    }
+
+    @SuppressWarnings("unchecked")
+    static QueryStatistics fromPb(
+        com.google.api.services.bigquery.model.JobStatistics statisticPb) {
+      return new Builder(statisticPb).build();
+    }
+  }
+
+  static class Builder> {
+
+    private Long creationTime;
+    private Long endTime;
+    private Long startTime;
+
+    protected Builder() {}
+
+    protected Builder(com.google.api.services.bigquery.model.JobStatistics statisticsPb) {
+      this.creationTime = statisticsPb.getCreationTime();
+      this.endTime = statisticsPb.getEndTime();
+      this.startTime = statisticsPb.getStartTime();
+    }
+
+    @SuppressWarnings("unchecked")
+    protected B self() {
+      return (B) this;
+    }
+
+    B creationTime(Long creationTime) {
+      this.creationTime = creationTime;
+      return self();
+    }
+
+    B endTime(Long endTime) {
+      this.endTime = endTime;
+      return self();
+    }
+
+    B startTime(Long startTime) {
+      this.startTime = startTime;
+      return self();
+    }
+
+    @SuppressWarnings("unchecked")
+    T build() {
+      return (T) new JobStatistics(this);
+    }
+  }
+
+  protected JobStatistics(Builder builder) {
+    this.creationTime = builder.creationTime;
+    this.endTime = builder.endTime;
+    this.startTime = builder.startTime;
+  }
+
+  /**
+   * Returns the creation time of the job in milliseconds since epoch.
+   */
+  public Long creationTime() {
+    return creationTime;
+  }
+
+  /**
+   * Returns the end time of the job in milliseconds since epoch. Returns {@code null} if the
+   * job has not finished yet.
+   */
+  public Long endTime() {
+    return endTime;
+  }
+
+  /**
+   * Returns the start time of the job in milliseconds since epoch. Returns {@code null} if the
+   * job has not started yet.
+   */
+  public Long startTime() {
+    return startTime;
+  }
+
+  ToStringHelper toStringHelper() {
+    return MoreObjects.toStringHelper(this)
+        .add("creationTime", creationTime)
+        .add("endTime", endTime)
+        .add("startTime", startTime);
+  }
+
+  @Override
+  public String toString() {
+    return toStringHelper().toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(creationTime, endTime, startTime);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof JobStatistics && Objects.equals(toPb(), ((JobStatistics) obj).toPb());
+  }
+
+  com.google.api.services.bigquery.model.JobStatistics toPb() {
+    com.google.api.services.bigquery.model.JobStatistics statistics =
+        new com.google.api.services.bigquery.model.JobStatistics();
+    statistics.setCreationTime(creationTime);
+    statistics.setEndTime(endTime);
+    statistics.setStartTime(startTime);
+    return statistics;
+  }
+
+  static Builder builder() {
+    return new Builder();
+  }
+
+  @SuppressWarnings("unchecked")
+  static  T fromPb(
+      com.google.api.services.bigquery.model.JobStatistics statisticPb) {
+    if (statisticPb.getLoad() != null) {
+      return (T) LoadStatistics.fromPb(statisticPb);
+    } else if (statisticPb.getExtract() != null) {
+      return (T) ExtractStatistics.fromPb(statisticPb);
+    } else if (statisticPb.getQuery() != null) {
+      return (T) QueryStatistics.fromPb(statisticPb);
+    } else {
+      return (T) new Builder(statisticPb).build();
+    }
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java
new file mode 100644
index 000000000000..9d780e5dc003
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java
@@ -0,0 +1,130 @@
+package com.google.gcloud.bigquery;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A Google BigQuery Job status. Objects of this class can be examined when polling an asynchronous
+ * job to see if the job completed.
+ */
+public class JobStatus implements Serializable {
+
+  private static final long serialVersionUID = -714976456815445365L;
+
+  /**
+   * Possible states that a BigQuery Job can assume.
+   */
+  public enum State {
+    /**
+     * The BigQuery Job is waiting to be executed.
+     */
+    PENDING,
+
+    /**
+     * The BigQuery Job is being executed.
+     */
+    RUNNING,
+
+    /**
+     * The BigQuery Job has completed either succeeding or failing. If failed {@link #error()} will
+     * be non-null.
+     */
+    DONE
+  }
+
+  private final State state;
+  private final BigQueryError error;
+  private final List executionErrors;
+
+  JobStatus(State state) {
+    this.state = state;
+    this.error = null;
+    this.executionErrors = null;
+  }
+
+  JobStatus(State state, BigQueryError error, List executionErrors) {
+    this.state = state;
+    this.error = error;
+    this.executionErrors = executionErrors != null ? ImmutableList.copyOf(executionErrors) : null;
+  }
+
+  /**
+   * Returns the state of the job. A {@link State#PENDING} job is waiting to be executed. A
+   * {@link State#RUNNING} is being executed. A {@link State#DONE} job has completed either
+   * suceeding or failing. If failed {@link #error()} will be non-null.
+   */
+  public State state() {
+    return state;
+  }
+
+  /**
+   * Returns the final error result of the job. If present, indicates that the job has completed
+   * and was unsuccessful.
+   *
+   * @see 
+   *     Troubleshooting Errors
+   */
+  public BigQueryError error() {
+    return error;
+  }
+
+  /**
+   * Returns all errors encountered during the running of the job. Errors here do not necessarily
+   * mean that the job has completed or was unsuccessful.
+   *
+   * @see 
+   *     Troubleshooting Errors
+   */
+  public List executionErrors() {
+    return executionErrors;
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("state", state)
+        .add("error", error)
+        .add("executionErrors", executionErrors)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(state, error, executionErrors);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof JobStatus && Objects.equals(toPb(), ((JobStatus) obj).toPb());
+  }
+
+  com.google.api.services.bigquery.model.JobStatus toPb() {
+    com.google.api.services.bigquery.model.JobStatus statusPb =
+        new com.google.api.services.bigquery.model.JobStatus();
+    if (state != null) {
+      statusPb.setState(state.toString());
+    }
+    if (error != null) {
+      statusPb.setErrorResult(error.toPb());
+    }
+    if (executionErrors != null) {
+      statusPb.setErrors(Lists.transform(executionErrors, BigQueryError.TO_PB_FUNCTION));
+    }
+    return statusPb;
+  }
+
+  static JobStatus fromPb(com.google.api.services.bigquery.model.JobStatus statusPb) {
+    List allErrors = null;
+    if (statusPb.getErrors() != null) {
+      allErrors = Lists.transform(statusPb.getErrors(), BigQueryError.FROM_PB_FUNCTION);
+    }
+    BigQueryError error =
+        statusPb.getErrorResult() != null ? BigQueryError.fromPb(statusPb.getErrorResult()) : null;
+    return new JobStatus(State.valueOf(statusPb.getState()), error, allErrors);
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
new file mode 100644
index 000000000000..df78b7ecec2f
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
@@ -0,0 +1,430 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.JobConfiguration;
+import com.google.api.services.bigquery.model.JobConfigurationLoad;
+import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobStatistics.LoadStatistics;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Load Job. A Load Job loads data from one of several formats into a table. Data is
+ * provided as URIs that point to objects in Google Cloud Storage.
+ */
+public class LoadJobInfo extends JobInfo {
+
+  private static final long serialVersionUID = 2515503817007974115L;
+
+  private final List sourceUris;
+  private final TableId destinationTable;
+  private final CreateDisposition createDisposition;
+  private final WriteDisposition writeDisposition;
+  private final FormatOptions formatOptions;
+  private final Integer maxBadRecords;
+  private final Schema schema;
+  private final Boolean ignoreUnknownValues;
+  private final List projectionFields;
+
+  public static final class Builder extends JobInfo.Builder {
+
+    private List sourceUris;
+    private TableId destinationTable;
+    private CreateDisposition createDisposition;
+    private WriteDisposition writeDisposition;
+    private FormatOptions formatOptions;
+    private Integer maxBadRecords;
+    private Schema schema;
+    private Boolean ignoreUnknownValues;
+    private List projectionFields;
+
+    private Builder() {}
+
+    private Builder(LoadJobInfo jobInfo) {
+      super(jobInfo);
+      this.sourceUris = jobInfo.sourceUris;
+      this.destinationTable = jobInfo.destinationTable;
+      this.createDisposition = jobInfo.createDisposition;
+      this.writeDisposition = jobInfo.writeDisposition;
+      this.formatOptions = jobInfo.formatOptions;
+      this.maxBadRecords = jobInfo.maxBadRecords;
+      this.schema = jobInfo.schema;
+      this.ignoreUnknownValues = jobInfo.ignoreUnknownValues;
+      this.projectionFields = jobInfo.projectionFields;
+    }
+
+    private Builder(Job jobPb) {
+      super(jobPb);
+      JobConfigurationLoad loadConfigurationPb = jobPb.getConfiguration().getLoad();
+      this.sourceUris = loadConfigurationPb.getSourceUris();
+      this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
+      if (loadConfigurationPb.getCreateDisposition() != null) {
+        this.createDisposition =
+            CreateDisposition.valueOf(loadConfigurationPb.getCreateDisposition());
+      }
+      if (loadConfigurationPb.getWriteDisposition() != null) {
+        this.writeDisposition = WriteDisposition.valueOf(loadConfigurationPb.getWriteDisposition());
+      }
+      if (loadConfigurationPb.getSourceFormat() != null) {
+        this.formatOptions = FormatOptions.of(loadConfigurationPb.getSourceFormat());
+      }
+      if (loadConfigurationPb.getAllowJaggedRows() != null
+          || loadConfigurationPb.getAllowQuotedNewlines() != null
+          || loadConfigurationPb.getEncoding() != null
+          || loadConfigurationPb.getFieldDelimiter() != null
+          || loadConfigurationPb.getQuote() != null
+          || loadConfigurationPb.getSkipLeadingRows() != null) {
+        CsvOptions.Builder builder = CsvOptions.builder()
+            .allowJaggedRows(loadConfigurationPb.getAllowJaggedRows())
+            .allowQuotedNewLines(loadConfigurationPb.getAllowQuotedNewlines())
+            .encoding(loadConfigurationPb.getEncoding())
+            .fieldDelimiter(loadConfigurationPb.getFieldDelimiter())
+            .quote(loadConfigurationPb.getQuote())
+            .skipLeadingRows(loadConfigurationPb.getSkipLeadingRows());
+        this.formatOptions = builder.build();
+      }
+      this.maxBadRecords = loadConfigurationPb.getMaxBadRecords();
+      if (loadConfigurationPb.getSchema() != null) {
+        this.schema = Schema.fromPb(loadConfigurationPb.getSchema());
+      }
+      this.ignoreUnknownValues = loadConfigurationPb.getIgnoreUnknownValues();
+      this.projectionFields = loadConfigurationPb.getProjectionFields();
+    }
+
+    /**
+     * Sets the fully-qualified URIs that point to source data in Google Cloud Storage (e.g.
+     * gs://bucket/path). Each URI can contain one '*' wildcard character and it must come after the
+     * 'bucket' name.
+     */
+    public Builder sourceUris(List sourceUris) {
+      this.sourceUris = sourceUris != null ? ImmutableList.copyOf(sourceUris) : null;
+      return this;
+    }
+
+    /**
+     * Sets the destination table to load the data into.
+     */
+    public Builder destinationTable(TableId destinationTable) {
+      this.destinationTable = destinationTable;
+      return this;
+    }
+
+    /**
+     * Sets whether the job is allowed to create new tables.
+     *
+     * @see 
+     *     Jobs: Load Configuration
+     */
+    public Builder createDisposition(CreateDisposition createDisposition) {
+      this.createDisposition = createDisposition;
+      return this;
+    }
+
+    /**
+     * Sets the action that should occur if the destination table already exists.
+     *
+     * @see 
+     *     Jobs: Load Configuration
+     */
+    public Builder writeDisposition(WriteDisposition writeDisposition) {
+      this.writeDisposition = writeDisposition;
+      return this;
+    }
+
+    /**
+     * Sets the source format, and possibly some parsing options, of the external data. Supported
+     * formats are {@code CSV}, {@code NEWLINE_DELIMITED_JSON} and {@code DATASTORE_BACKUP}. If not
+     * specified, {@code CSV} format is assumed.
+     *
+     * 
+     *     Source Format
+     */
+    public Builder formatOptions(FormatOptions formatOptions) {
+      this.formatOptions = formatOptions;
+      return this;
+    }
+
+    /**
+     * Sets the maximum number of bad records that BigQuery can ignore when running the job. If the
+     * number of bad records exceeds this value, an invalid error is returned in the job result.
+     * By default no bad record is ignored.
+     */
+    public Builder maxBadRecords(Integer maxBadRecords) {
+      this.maxBadRecords = maxBadRecords;
+      return this;
+    }
+
+    /**
+     * Sets the schema for the destination table. The schema can be omitted if the destination table
+     * already exists, or if you're loading data from Google Cloud Datastore.
+     */
+    public Builder schema(Schema schema) {
+      this.schema = schema;
+      return this;
+    }
+
+    /**
+     * Sets whether BigQuery should allow extra values that are not represented in the table schema.
+     * If {@code true}, the extra values are ignored. If {@code true}, records with extra columns
+     * are treated as bad records, and if there are too many bad records, an invalid error is
+     * returned in the job result. By default unknown values are not allowed.
+     */
+    public Builder ignoreUnknownValues(Boolean ignoreUnknownValues) {
+      this.ignoreUnknownValues = ignoreUnknownValues;
+      return this;
+    }
+
+    /**
+     * Sets which entity properties to load into BigQuery from a Cloud Datastore backup. This field
+     * is only used if the source format is set to {@code DATASTORE_BACKUP}. Property names are case
+     * sensitive and must be top-level properties. If no properties are specified, BigQuery loads
+     * all properties. If any named property isn't found in the Cloud Datastore backup, an invalid
+     * error is returned in the job result.
+     */
+    public Builder projectionFields(List projectionFields) {
+      this.projectionFields =
+          projectionFields != null ? ImmutableList.copyOf(projectionFields) : null;
+      return this;
+    }
+
+    @Override
+    public LoadJobInfo build() {
+      return new LoadJobInfo(this);
+    }
+  }
+
+  private LoadJobInfo(Builder builder) {
+    super(builder);
+    this.sourceUris = builder.sourceUris;
+    this.destinationTable = checkNotNull(builder.destinationTable);
+    this.createDisposition = builder.createDisposition;
+    this.writeDisposition = builder.writeDisposition;
+    this.formatOptions = builder.formatOptions;
+    this.maxBadRecords = builder.maxBadRecords;
+    this.schema = builder.schema;
+    this.ignoreUnknownValues = builder.ignoreUnknownValues;
+    this.projectionFields = builder.projectionFields;
+  }
+
+  /**
+   * Returns the fully-qualified URIs that point to source data in Google Cloud Storage (e.g.
+   * gs://bucket/path). Each URI can contain one '*' wildcard character and it must come after the
+   * 'bucket' name.
+   */
+  public List sourceUris() {
+    return sourceUris;
+  }
+
+  /**
+   * Returns the destination table to load the data into.
+   */
+  public TableId destinationTable() {
+    return destinationTable;
+  }
+
+  /**
+   * Returns whether the job is allowed to create new tables.
+   *
+   * @see 
+   *     Jobs: Load Configuration
+   */
+  public CreateDisposition createDisposition() {
+    return this.createDisposition;
+  }
+
+  /**
+   * Returns the action that should occur if the destination table already exists.
+   *
+   * @see 
+   *     Jobs: Load Configuration
+   */
+  public WriteDisposition writeDisposition() {
+    return writeDisposition;
+  }
+
+  /**
+   * Returns additional properties used to parse CSV data (used when {@link #format()} is set
+   * to CSV). Returns {@code null} if not set.
+   */
+  public CsvOptions csvOptions() {
+    return formatOptions instanceof CsvOptions ? (CsvOptions) formatOptions : null;
+  }
+
+  /**
+   * Returns the maximum number of bad records that BigQuery can ignore when running the job. If the
+   * number of bad records exceeds this value, an invalid error is returned in the job result.
+   * By default no bad record is ignored.
+   */
+  public Integer maxBadRecords() {
+    return maxBadRecords;
+  }
+
+  /**
+   * Returns the schema for the destination table, if set. Returns {@code null} otherwise.
+   */
+  public Schema schema() {
+    return schema;
+  }
+
+  /**
+   * Returns the format of the data files.
+   */
+  public String format() {
+    return formatOptions != null ? formatOptions.type() : null;
+  }
+
+  /**
+   * Returns whether BigQuery should allow extra values that are not represented in the table
+   * schema. If {@code true}, the extra values are ignored. If {@code true}, records with extra
+   * columns are treated as bad records, and if there are too many bad records, an invalid error is
+   * returned in the job result. By default unknown values are not allowed.
+   */
+  public Boolean ignoreUnknownValues() {
+    return ignoreUnknownValues;
+  }
+
+  /**
+   * Returns which entity properties to load into BigQuery from a Cloud Datastore backup. This field
+   * is only used if the source format is set to {@code DATASTORE_BACKUP}. Property names are case
+   * sensitive and must be top-level properties. If no properties are specified, BigQuery loads
+   * all properties. If any named property isn't found in the Cloud Datastore backup, an invalid
+   * error is returned in the job result.
+   */
+  public List projectionFields() {
+    return projectionFields;
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  ToStringHelper toStringHelper() {
+    return super.toStringHelper()
+        .add("destinationTable", destinationTable)
+        .add("sourceUris", sourceUris)
+        .add("createDisposition", createDisposition)
+        .add("writeDisposition", writeDisposition)
+        .add("formatOptions", formatOptions)
+        .add("maxBadRecords", maxBadRecords)
+        .add("schema", schema)
+        .add("ignoreUnknownValue", ignoreUnknownValues)
+        .add("projectionFields", projectionFields);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof LoadJobInfo && Objects.equals(toPb(), ((LoadJobInfo) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), sourceUris, destinationTable, createDisposition,
+        writeDisposition, formatOptions, maxBadRecords, schema, ignoreUnknownValues,
+        projectionFields);
+  }
+
+  @Override
+  Job toPb() {
+    JobConfigurationLoad loadConfigurationPb = new JobConfigurationLoad();
+    loadConfigurationPb.setSourceUris(sourceUris);
+    loadConfigurationPb.setDestinationTable(destinationTable.toPb());
+    if (createDisposition != null) {
+      loadConfigurationPb.setCreateDisposition(createDisposition.toString());
+    }
+    if (writeDisposition != null) {
+      loadConfigurationPb.setWriteDisposition(writeDisposition.toString());
+    }
+    if (csvOptions() != null) {
+      CsvOptions csvOptions = csvOptions();
+      loadConfigurationPb.setFieldDelimiter(csvOptions.fieldDelimiter())
+          .setAllowJaggedRows(csvOptions.allowJaggedRows())
+          .setAllowQuotedNewlines(csvOptions.allowQuotedNewLines())
+          .setEncoding(csvOptions.encoding())
+          .setQuote(csvOptions.quote())
+          .setSkipLeadingRows(csvOptions.skipLeadingRows());
+    }
+    if (schema != null) {
+      loadConfigurationPb.setSchema(schema.toPb());
+    }
+    if (formatOptions != null) {
+      loadConfigurationPb.setSourceFormat(formatOptions.type());
+    }
+    loadConfigurationPb.setMaxBadRecords(maxBadRecords);
+    loadConfigurationPb.setIgnoreUnknownValues(ignoreUnknownValues);
+    loadConfigurationPb.setProjectionFields(projectionFields);
+    return super.toPb().setConfiguration(new JobConfiguration().setLoad(loadConfigurationPb));
+  }
+
+  /**
+   * Creates a builder for a BigQuery Load Job given destination table and source URI.
+   */
+  public static Builder builder(TableId destinationTable, String sourceUri) {
+    return builder(destinationTable, ImmutableList.of(checkNotNull(sourceUri)));
+  }
+
+  /**
+   * Creates a builder for a BigQuery Load Job given destination table and source URIs.
+   */
+  public static Builder builder(TableId destinationTable, List sourceUris) {
+    return new Builder().destinationTable(destinationTable).sourceUris(sourceUris);
+  }
+
+  /**
+   * Returns a BigQuery Load Job for the given destination table and source URI. Job's id is chosen
+   * by the service.
+   */
+  public static LoadJobInfo of(TableId destinationTable, String sourceUri) {
+    return builder(destinationTable, sourceUri).build();
+  }
+
+  /**
+   * Returns a BigQuery Load Job for the given destination table and source URIs. Job's id is chosen
+   * by the service.
+   */
+  public static LoadJobInfo of(TableId destinationTable, List sourceUris) {
+    return builder(destinationTable, sourceUris).build();
+  }
+
+  /**
+   * Returns a BigQuery Load Job for the given destination table and source URI. Job's id is set to
+   * the provided value.
+   */
+  public static LoadJobInfo of(JobId jobId, TableId destinationTable, String sourceUri) {
+    return builder(destinationTable, sourceUri).jobId(jobId).build();
+  }
+
+  /**
+   * Returns a BigQuery Load Job for the given destination table and source URIs. Job's id is set to
+   * the provided value.
+   */
+  public static LoadJobInfo of(JobId jobId, TableId destinationTable, List sourceUris) {
+    return builder(destinationTable, sourceUris).jobId(jobId).build();
+  }
+
+  @SuppressWarnings("unchecked")
+  static LoadJobInfo fromPb(Job jobPb) {
+    return new Builder(jobPb).build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
new file mode 100644
index 000000000000..9b6becdb75c3
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
@@ -0,0 +1,520 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.JobConfiguration;
+import com.google.api.services.bigquery.model.JobConfigurationQuery;
+import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.gcloud.bigquery.JobStatistics.QueryStatistics;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Query Job. A Query Job runs a query against BigQuery data.
+ */
+public class QueryJobInfo extends JobInfo {
+
+  private static final long serialVersionUID = -8708709356039780158L;
+
+  /**
+   * Priority levels for a query. If not specified the priority is assumed to be
+   * {@link Priority#INTERACTIVE}.
+   */
+  public enum Priority {
+    /**
+     * Query is executed as soon as possible and count towards the
+     * concurrent rate limit and the daily
+     * rate limit.
+     */
+    INTERACTIVE,
+
+    /**
+     * Query is queued and started as soon as idle resources are available, usually within a few
+     * minutes. If a {@link Priority#BATCH} query hasn't started within 3 hours, its priority is
+     * changed to {@link Priority#INTERACTIVE}.
+     */
+    BATCH
+  }
+
+  private final String query;
+  private final TableId destinationTable;
+  private final Map tableDefinitions;
+  private final List userDefinedFunctions;
+  private final CreateDisposition createDisposition;
+  private final WriteDisposition writeDisposition;
+  private final DatasetId defaultDataset;
+  private final Priority priority;
+  private final Boolean allowLargeResults;
+  private final Boolean useQueryCache;
+  private final Boolean flattenResults;
+  private final Boolean dryRun;
+
+  public static final class Builder extends JobInfo.Builder {
+
+    private String query;
+    private TableId destinationTable;
+    private Map tableDefinitions;
+    private List userDefinedFunctions;
+    private CreateDisposition createDisposition;
+    private WriteDisposition writeDisposition;
+    private DatasetId defaultDataset;
+    private Priority priority;
+    private Boolean allowLargeResults;
+    private Boolean useQueryCache;
+    private Boolean flattenResults;
+    private Boolean dryRun;
+
+    private Builder() {}
+
+    private Builder(QueryJobInfo jobInfo) {
+      super(jobInfo);
+      this.query = jobInfo.query;
+      this.destinationTable = jobInfo.destinationTable;
+      this.tableDefinitions = jobInfo.tableDefinitions;
+      this.userDefinedFunctions = jobInfo.userDefinedFunctions;
+      this.createDisposition = jobInfo.createDisposition;
+      this.writeDisposition = jobInfo.writeDisposition;
+      this.defaultDataset = jobInfo.defaultDataset;
+      this.priority = jobInfo.priority;
+      this.allowLargeResults = jobInfo.allowLargeResults;
+      this.useQueryCache = jobInfo.useQueryCache;
+      this.flattenResults = jobInfo.flattenResults;
+      this.dryRun = jobInfo.dryRun;
+    }
+
+    private Builder(Job jobPb) {
+      super(jobPb);
+      JobConfigurationQuery queryConfigurationPb = jobPb.getConfiguration().getQuery();
+      this.query = queryConfigurationPb.getQuery();
+      allowLargeResults = queryConfigurationPb.getAllowLargeResults();
+      useQueryCache = queryConfigurationPb.getUseQueryCache();
+      flattenResults = queryConfigurationPb.getFlattenResults();
+      dryRun = jobPb.getConfiguration().getDryRun();
+      if (queryConfigurationPb.getDestinationTable() != null) {
+        destinationTable = TableId.fromPb(queryConfigurationPb.getDestinationTable());
+      }
+      if (queryConfigurationPb.getDefaultDataset() != null) {
+        defaultDataset = DatasetId.fromPb(queryConfigurationPb.getDefaultDataset());
+      }
+      if (queryConfigurationPb.getPriority() != null) {
+        priority = Priority.valueOf(queryConfigurationPb.getPriority());
+      }
+      if (queryConfigurationPb.getTableDefinitions() != null) {
+        tableDefinitions = Maps.transformValues(queryConfigurationPb.getTableDefinitions(),
+            ExternalDataConfiguration.FROM_PB_FUNCTION);
+      }
+      if (queryConfigurationPb.getUserDefinedFunctionResources() != null) {
+        userDefinedFunctions = Lists.transform(
+            queryConfigurationPb.getUserDefinedFunctionResources(),
+            UserDefinedFunction.FROM_PB_FUNCTION);
+      }
+      if (queryConfigurationPb.getCreateDisposition() != null) {
+        createDisposition = CreateDisposition.valueOf(queryConfigurationPb.getCreateDisposition());
+      }
+      if (queryConfigurationPb.getWriteDisposition() != null) {
+        writeDisposition = WriteDisposition.valueOf(queryConfigurationPb.getWriteDisposition());
+      }
+    }
+
+    /**
+     * Sets the BigQuery SQL query to execute.
+     */
+    public Builder query(String query) {
+      this.query = query;
+      return self();
+    }
+
+    /**
+     * Sets the table where to put query results. If not provided a new table is created. This value
+     * is required if {@link Builder#allowLargeResults(Boolean)} is set to {@code true}.
+     */
+    public Builder destinationTable(TableId destinationTable) {
+      this.destinationTable = destinationTable;
+      return self();
+    }
+
+    /**
+     * Sets the external tables definitions. If querying external data sources outside of BigQuery,
+     * this value describes the data format, location and other properties of the data
+     * sources. By defining these properties, the data sources can be queried as if they were
+     * standard BigQuery tables.
+     */
+    public Builder tableDefinitions(Map tableDefinitions) {
+      this.tableDefinitions = tableDefinitions != null ? Maps.newHashMap(tableDefinitions) : null;
+      return self();
+    }
+
+    /**
+     * Adds a new external table definition. If a definition already exists for {@code tableName}
+     * it is updated.
+     *
+     * @param tableName name of the table
+     * @param tableDefinition external data configuration for the table used by this query
+     */
+    public Builder addTableDefinition(String tableName, ExternalDataConfiguration tableDefinition) {
+      if (this.tableDefinitions == null) {
+        this.tableDefinitions = Maps.newHashMap();
+      }
+      this.tableDefinitions.put(checkNotNull(tableName), checkNotNull(tableDefinition));
+      return self();
+    }
+
+    /**
+     * Sets user defined function resources that can be used by this query. Function resources
+     * can either be defined inline ({@link UserDefinedFunction#inline(String)}) or loaded from
+     * a Google Cloud Storage URI ({@link UserDefinedFunction#fromUri(String)}.
+     */
+    public Builder userDefinedFunctions(List userDefinedFunctions) {
+      this.userDefinedFunctions =
+          userDefinedFunctions != null ? ImmutableList.copyOf(userDefinedFunctions) : null;
+      return self();
+    }
+
+    /**
+     * Sets whether the job is allowed to create tables.
+     *
+     * @see 
+     *     Jobs: Query Configuration
+     */
+    public Builder createDisposition(CreateDisposition createDisposition) {
+      this.createDisposition = createDisposition;
+      return self();
+    }
+
+    /**
+     * Sets the action that should occur if the destination table already exists.
+     *
+     * @see 
+     *     Jobs: Query Configuration
+     */
+    public Builder writeDisposition(WriteDisposition writeDisposition) {
+      this.writeDisposition = writeDisposition;
+      return self();
+    }
+
+    /**
+     * Sets the default dataset. This dataset is used for all unqualified table names used in the
+     * query.
+     */
+    public Builder defaultDataset(DatasetId defaultDataset) {
+      this.defaultDataset = defaultDataset;
+      return self();
+    }
+
+    /**
+     * Sets a priority for the query. If not specified the priority is assumed to be
+     * {@link Priority#INTERACTIVE}.
+     */
+    public Builder priority(Priority priority) {
+      this.priority = priority;
+      return self();
+    }
+
+    /**
+     * Sets whether the job is enabled to create arbitrarily large results. If {@code true}
+     * the query is allowed to create large results at a slight cost in performance. If {@code true}
+     * {@link Builder#destinationTable(TableId)} must be provided.
+     *
+     * @see Query Caching
+     */
+    public Builder useQueryCache(Boolean useQueryCache) {
+      this.useQueryCache = useQueryCache;
+      return self();
+    }
+
+    /**
+     * Sets whether nested and repeated fields should be flattened. If set to {@code false}
+     * {@link Builder#allowLargeResults(Boolean)} must be {@code true}. By default results are
+     * flattened.
+     *
+     * @see Flatten
+     */
+    public Builder flattenResults(Boolean flattenResults) {
+      this.flattenResults = flattenResults;
+      return self();
+    }
+
+    /**
+     * Sets whether the job has to be dry run or not. If set, the job is not executed. A valid query
+     * will return a mostly empty response with some processing statistics, while an invalid query
+     * will return the same error it would if it wasn't a dry run.
+     */
+    public Builder dryRun(Boolean dryRun) {
+      this.dryRun = dryRun;
+      return self();
+    }
+
+    @Override
+    public QueryJobInfo build() {
+      return new QueryJobInfo(this);
+    }
+  }
+
+  private QueryJobInfo(Builder builder) {
+    super(builder);
+    this.query = checkNotNull(builder.query);
+    this.allowLargeResults = builder.allowLargeResults;
+    this.createDisposition = builder.createDisposition;
+    this.defaultDataset = builder.defaultDataset;
+    this.destinationTable = builder.destinationTable;
+    this.flattenResults = builder.flattenResults;
+    this.priority = builder.priority;
+    this.useQueryCache = builder.useQueryCache;
+    this.userDefinedFunctions = builder.userDefinedFunctions;
+    this.writeDisposition = builder.writeDisposition;
+    this.tableDefinitions =
+        builder.tableDefinitions != null ? ImmutableMap.copyOf(builder.tableDefinitions) : null;
+    this.dryRun = builder.dryRun;
+  }
+
+  /**
+   * Returns whether the job is enabled to create arbitrarily large results. If {@code true}
+   * the query is allowed to create large results at a slight cost in performance.
+   * the query is allowed to create large results at a slight cost in performance.
+   *
+   * @see 
+   *     Jobs: Query Configuration
+   */
+  public CreateDisposition createDisposition() {
+    return createDisposition;
+  }
+
+  /**
+   * Returns the default dataset. This dataset is used for all unqualified table names used in the
+   * query.
+   */
+  public DatasetId defaultDataset() {
+    return defaultDataset;
+  }
+
+  /**
+   * Returns the table where to put query results. If not provided a new table is created. This
+   * value is required if {@link #allowLargeResults()} is {@code true}.
+   */
+  public TableId destinationTable() {
+    return destinationTable;
+  }
+
+  /**
+   * Returns whether nested and repeated fields should be flattened. If set to {@code false}
+   * {@link Builder#allowLargeResults(Boolean)} must be {@code true}.
+   *
+   * @see Flatten
+   */
+  public Boolean flattenResults() {
+    return flattenResults;
+  }
+
+  /**
+   * Returns the query priority.
+   */
+  public Priority priority() {
+    return priority;
+  }
+
+  /**
+   * Returns the Google BigQuery SQL query.
+   */
+  public String query() {
+    return query;
+  }
+
+  /**
+   * Returns the external tables definitions. If querying external data sources outside of BigQuery,
+   * this value describes the data format, location and other properties of the data
+   * sources. By defining these properties, the data sources can be queried as if they were
+   * standard BigQuery tables.
+   */
+  public Map tableDefinitions() {
+    return tableDefinitions;
+  }
+
+  /**
+   * Returns whether to look for the result in the query cache. The query cache is a best-effort
+   * cache that will be flushed whenever tables in the query are modified. Moreover, the query
+   * cache is only available when {@link Builder#destinationTable(TableId)} is not set.
+   *
+   * @see Query Caching
+   */
+  public Boolean useQueryCache() {
+    return useQueryCache;
+  }
+
+  /**
+   * Returns user defined function resources that can be used by this query. Function resources
+   * can either be defined inline ({@link UserDefinedFunction.Type#INLINE}) or loaded from
+   * a Google Cloud Storage URI ({@link UserDefinedFunction.Type#FROM_URI}.
+   */
+  public List userDefinedFunctions() {
+    return userDefinedFunctions;
+  }
+
+  /**
+   * Returns the action that should occur if the destination table already exists.
+   *
+   * @see 
+   *     Jobs: Query Configuration
+   */
+  public WriteDisposition writeDisposition() {
+    return writeDisposition;
+  }
+
+  /**
+   * Returns whether the job has to be dry run or not. If set, the job is not executed. A valid
+   * query will return a mostly empty response with some processing statistics, while an invalid
+   * query will return the same error it would if it wasn't a dry run.
+   */
+  public Boolean dryRun() {
+    return dryRun;
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  ToStringHelper toStringHelper() {
+    return super.toStringHelper()
+        .add("query", query)
+        .add("destinationTable", destinationTable)
+        .add("defaultDataset", defaultDataset)
+        .add("allowLargeResults", allowLargeResults)
+        .add("flattenResults", flattenResults)
+        .add("priority", priority)
+        .add("tableDefinitions", tableDefinitions)
+        .add("userQueryCache", useQueryCache)
+        .add("userDefinedFunctions", userDefinedFunctions)
+        .add("createDisposition", createDisposition)
+        .add("writeDisposition", writeDisposition)
+        .add("dryRun", dryRun);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof QueryJobInfo && Objects.equals(toPb(), ((QueryJobInfo) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), allowLargeResults, createDisposition, destinationTable,
+        defaultDataset, flattenResults, priority, query, tableDefinitions, useQueryCache,
+        userDefinedFunctions, writeDisposition, dryRun);
+  }
+
+  @Override
+  Job toPb() {
+    JobConfiguration configurationPb = new JobConfiguration();
+    JobConfigurationQuery queryConfigurationPb = new JobConfigurationQuery();
+    queryConfigurationPb.setQuery(query);
+    configurationPb.setDryRun(dryRun());
+    if (allowLargeResults != null) {
+      queryConfigurationPb.setAllowLargeResults(allowLargeResults);
+    }
+    if (createDisposition != null) {
+      queryConfigurationPb.setCreateDisposition(createDisposition.toString());
+    }
+    if (destinationTable != null) {
+      queryConfigurationPb.setDestinationTable(destinationTable.toPb());
+    }
+    if (defaultDataset != null) {
+      queryConfigurationPb.setDefaultDataset(defaultDataset.toPb());
+    }
+    if (flattenResults != null) {
+      queryConfigurationPb.setFlattenResults(flattenResults);
+    }
+    if (priority != null) {
+      queryConfigurationPb.setPriority(priority.toString());
+    }
+    if (tableDefinitions != null) {
+      queryConfigurationPb.setTableDefinitions(
+          Maps.transformValues(tableDefinitions, ExternalDataConfiguration.TO_PB_FUNCTION));
+    }
+    if (useQueryCache != null) {
+      queryConfigurationPb.setUseQueryCache(useQueryCache);
+    }
+    if (userDefinedFunctions != null) {
+      queryConfigurationPb.setUserDefinedFunctionResources(
+          Lists.transform(userDefinedFunctions, UserDefinedFunction.TO_PB_FUNCTION));
+    }
+    if (writeDisposition != null) {
+      queryConfigurationPb.setWriteDisposition(writeDisposition.toString());
+    }
+    return super.toPb().setConfiguration(configurationPb.setQuery(queryConfigurationPb));
+  }
+
+  /**
+   * Creates a builder for a BigQuery Query Job given the query to be run.
+   */
+  public static Builder builder(String query) {
+    return new Builder().query(query);
+  }
+
+  /**
+   * Returns a BigQuery Copy Job for the given the query to be run. Job's id is chosen by the
+   * service.
+   */
+  public static QueryJobInfo of(String query) {
+    return builder(query).build();
+  }
+
+  /**
+   * Returns a BigQuery Copy Job for the given the query to be run. Job's id is set to the provided
+   * value.
+   */
+  public static QueryJobInfo of(JobId jobId, String query) {
+    return builder(query).jobId(jobId).build();
+  }
+
+  @SuppressWarnings("unchecked")
+  static QueryJobInfo fromPb(Job jobPb) {
+    return new Builder(jobPb).build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryErrorTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryErrorTest.java
new file mode 100644
index 000000000000..c8de039e233f
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryErrorTest.java
@@ -0,0 +1,45 @@
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class BigQueryErrorTest {
+
+  private static final String REASON = "reason";
+  private static final String LOCATION = "location";
+  private static final String DEBUG_INFO = "debugInfo";
+  private static final String MESSAGE = "message";
+  private static final BigQueryError ERROR =
+      new BigQueryError(REASON, LOCATION, MESSAGE, DEBUG_INFO);
+  private static final BigQueryError ERROR_INCOMPLETE =
+      new BigQueryError(REASON, LOCATION, MESSAGE);
+
+  @Test
+  public void testConstructor() {
+    assertEquals(REASON, ERROR.reason());
+    assertEquals(LOCATION, ERROR.location());
+    assertEquals(DEBUG_INFO, ERROR.debugInfo());
+    assertEquals(MESSAGE, ERROR.message());
+    assertEquals(REASON, ERROR_INCOMPLETE.reason());
+    assertEquals(LOCATION, ERROR_INCOMPLETE.location());
+    assertEquals(null, ERROR_INCOMPLETE.debugInfo());
+    assertEquals(MESSAGE, ERROR_INCOMPLETE.message());
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    compareBigQueryError(ERROR, BigQueryError.fromPb(ERROR.toPb()));
+    compareBigQueryError(ERROR_INCOMPLETE, BigQueryError.fromPb(ERROR_INCOMPLETE.toPb()));
+  }
+
+  private void compareBigQueryError(BigQueryError expected, BigQueryError value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.reason(), value.reason());
+    assertEquals(expected.location(), value.location());
+    assertEquals(expected.debugInfo(), value.debugInfo());
+    assertEquals(expected.message(), value.message());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobInfoTest.java
new file mode 100644
index 000000000000..81da59644cf0
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobInfoTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
+import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class CopyJobInfoTest {
+
+  private static final String ETAG = "etag";
+  private static final String ID = "id";
+  private static final String SELF_LINK = "selfLink";
+  private static final String EMAIL = "email";
+  private static final TableId SOURCE_TABLE = TableId.of("dataset", "sourceTable");
+  private static final List SOURCE_TABLES = ImmutableList.of(
+      TableId.of("dataset", "sourceTable1"),
+      TableId.of("dataset", "sourceTable2")
+  );
+  private static final TableId DESTINATION_TABLE = TableId.of("dataset", "destinationTable");
+  private static final CreateDisposition CREATE_DISPOSITION = CreateDisposition.CREATE_IF_NEEDED;
+  private static final WriteDisposition WRITE_DISPOSITION = WriteDisposition.WRITE_APPEND;
+  private static final JobId JOB_ID = JobId.of("job");
+  private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
+  private static final JobStatistics JOB_STATISTICS = JobStatistics.builder()
+      .creationTime(1L)
+      .endTime(3L)
+      .startTime(2L)
+      .build();
+  private static final CopyJobInfo COPY_JOB =
+      CopyJobInfo.builder(DESTINATION_TABLE, SOURCE_TABLE)
+          .etag(ETAG)
+          .id(ID)
+          .selfLink(SELF_LINK)
+          .userEmail(EMAIL)
+          .jobId(JOB_ID)
+          .status(JOB_STATUS)
+          .createDisposition(CREATE_DISPOSITION)
+          .writeDisposition(WRITE_DISPOSITION)
+          .statistics(JOB_STATISTICS)
+          .build();
+  private static final CopyJobInfo COPY_JOB_INFO_MULTIPLE_TABLES =
+      CopyJobInfo.builder(DESTINATION_TABLE, SOURCE_TABLES)
+          .etag(ETAG)
+          .id(ID)
+          .selfLink(SELF_LINK)
+          .userEmail(EMAIL)
+          .jobId(JOB_ID)
+          .status(JOB_STATUS)
+          .createDisposition(CREATE_DISPOSITION)
+          .writeDisposition(WRITE_DISPOSITION)
+          .build();
+
+  @Test
+  public void testToBuilder() {
+    compareCopyJobInfo(COPY_JOB, COPY_JOB.toBuilder().build());
+    compareCopyJobInfo(COPY_JOB_INFO_MULTIPLE_TABLES,
+        COPY_JOB_INFO_MULTIPLE_TABLES.toBuilder().build());
+    CopyJobInfo job = COPY_JOB.toBuilder()
+        .destinationTable(TableId.of("dataset", "newTable"))
+        .build();
+    assertEquals("newTable", job.destinationTable().table());
+    job = job.toBuilder().destinationTable(DESTINATION_TABLE).build();
+    compareCopyJobInfo(COPY_JOB, job);
+  }
+
+  @Test
+  public void testOf() {
+    CopyJobInfo job = CopyJobInfo.of(DESTINATION_TABLE, SOURCE_TABLES);
+    assertEquals(DESTINATION_TABLE, job.destinationTable());
+    assertEquals(SOURCE_TABLES, job.sourceTables());
+    job = CopyJobInfo.of(DESTINATION_TABLE, SOURCE_TABLE);
+    assertEquals(DESTINATION_TABLE, job.destinationTable());
+    assertEquals(ImmutableList.of(SOURCE_TABLE), job.sourceTables());
+    job = CopyJobInfo.of(JOB_ID, DESTINATION_TABLE, SOURCE_TABLES);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(DESTINATION_TABLE, job.destinationTable());
+    assertEquals(SOURCE_TABLES, job.sourceTables());
+    job = CopyJobInfo.of(JOB_ID, DESTINATION_TABLE, SOURCE_TABLE);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(DESTINATION_TABLE, job.destinationTable());
+    assertEquals(ImmutableList.of(SOURCE_TABLE), job.sourceTables());
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    CopyJobInfo job = CopyJobInfo.of(DESTINATION_TABLE, SOURCE_TABLES);
+    compareCopyJobInfo(job, job.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(ETAG, COPY_JOB_INFO_MULTIPLE_TABLES.etag());
+    assertEquals(ID, COPY_JOB_INFO_MULTIPLE_TABLES.id());
+    assertEquals(SELF_LINK, COPY_JOB_INFO_MULTIPLE_TABLES.selfLink());
+    assertEquals(EMAIL, COPY_JOB_INFO_MULTIPLE_TABLES.userEmail());
+    assertEquals(JOB_ID, COPY_JOB_INFO_MULTIPLE_TABLES.jobId());
+    assertEquals(JOB_STATUS, COPY_JOB_INFO_MULTIPLE_TABLES.status());
+    assertEquals(DESTINATION_TABLE, COPY_JOB_INFO_MULTIPLE_TABLES.destinationTable());
+    assertEquals(SOURCE_TABLES, COPY_JOB_INFO_MULTIPLE_TABLES.sourceTables());
+    assertEquals(CREATE_DISPOSITION, COPY_JOB_INFO_MULTIPLE_TABLES.createDisposition());
+    assertEquals(WRITE_DISPOSITION, COPY_JOB_INFO_MULTIPLE_TABLES.writeDisposition());
+    assertEquals(ETAG, COPY_JOB.etag());
+    assertEquals(ID, COPY_JOB.id());
+    assertEquals(SELF_LINK, COPY_JOB.selfLink());
+    assertEquals(EMAIL, COPY_JOB.userEmail());
+    assertEquals(JOB_ID, COPY_JOB.jobId());
+    assertEquals(JOB_STATUS, COPY_JOB.status());
+    assertEquals(DESTINATION_TABLE, COPY_JOB.destinationTable());
+    assertEquals(ImmutableList.of(SOURCE_TABLE), COPY_JOB.sourceTables());
+    assertEquals(CREATE_DISPOSITION, COPY_JOB.createDisposition());
+    assertEquals(WRITE_DISPOSITION, COPY_JOB.writeDisposition());
+    assertEquals(JOB_STATISTICS, COPY_JOB.statistics());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    assertNotNull(COPY_JOB.toPb().getConfiguration().getCopy());
+    assertNull(COPY_JOB.toPb().getConfiguration().getExtract());
+    assertNull(COPY_JOB.toPb().getConfiguration().getLoad());
+    assertNull(COPY_JOB.toPb().getConfiguration().getQuery());
+    assertNull(COPY_JOB.toPb().getConfiguration().getCopy().getSourceTables());
+    assertEquals(JOB_STATISTICS, JobStatistics.fromPb(COPY_JOB.statistics().toPb()));
+    assertNull(COPY_JOB_INFO_MULTIPLE_TABLES.toPb().getConfiguration().getCopy().getSourceTable());
+    compareCopyJobInfo(COPY_JOB, CopyJobInfo.fromPb(COPY_JOB.toPb()));
+    compareCopyJobInfo(COPY_JOB, (CopyJobInfo) JobInfo.fromPb(COPY_JOB.toPb()));
+    compareCopyJobInfo(COPY_JOB_INFO_MULTIPLE_TABLES,
+        CopyJobInfo.fromPb(COPY_JOB_INFO_MULTIPLE_TABLES.toPb()));
+    compareCopyJobInfo(COPY_JOB_INFO_MULTIPLE_TABLES,
+        (CopyJobInfo) JobInfo.fromPb(COPY_JOB_INFO_MULTIPLE_TABLES.toPb()));
+    CopyJobInfo job = CopyJobInfo.of(DESTINATION_TABLE, SOURCE_TABLES);
+    compareCopyJobInfo(job, CopyJobInfo.fromPb(job.toPb()));
+    compareCopyJobInfo(job, (CopyJobInfo) JobInfo.fromPb(job.toPb()));
+  }
+
+  private void compareCopyJobInfo(CopyJobInfo expected, CopyJobInfo value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.etag(), value.etag());
+    assertEquals(expected.id(), value.id());
+    assertEquals(expected.jobId(), value.jobId());
+    assertEquals(expected.selfLink(), value.selfLink());
+    assertEquals(expected.status(), value.status());
+    assertEquals(expected.statistics(), value.statistics());
+    assertEquals(expected.userEmail(), value.userEmail());
+    assertEquals(expected.destinationTable(), value.destinationTable());
+    assertEquals(expected.sourceTables(), value.sourceTables());
+    assertEquals(expected.createDisposition(), value.createDisposition());
+    assertEquals(expected.writeDisposition(), value.writeDisposition());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java
new file mode 100644
index 000000000000..e73975c6c3ab
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobStatistics.ExtractStatistics;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class ExtractJobInfoTest {
+
+  private static final String ETAG = "etag";
+  private static final String ID = "id";
+  private static final String SELF_LINK = "selfLink";
+  private static final String EMAIL = "email";
+  private static final List DESTINATION_URIS = ImmutableList.of("uri1", "uri2");
+  private static final String DESTINATION_URI = "uri1";
+  private static final TableId TABLE_ID = TableId.of("dataset", "table");
+  private static final String FIELD_DELIMITER = ",";
+  private static final String FORMAT = "CSV";
+  private static final Boolean PRINT_HEADER = true;
+  private static final String COMPRESSION = "GZIP";
+  private static final JobId JOB_ID = JobId.of("job");
+  private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
+  private static final ExtractStatistics JOB_STATISTICS = ExtractStatistics.builder()
+      .creationTime(1L)
+      .endTime(3L)
+      .startTime(2L)
+      .destinationUriFileCounts(ImmutableList.of(42L))
+      .build();
+  private static final ExtractJobInfo EXTRACT_JOB =
+      ExtractJobInfo.builder(TABLE_ID, DESTINATION_URIS)
+          .etag(ETAG)
+          .id(ID)
+          .selfLink(SELF_LINK)
+          .userEmail(EMAIL)
+          .jobId(JOB_ID)
+          .status(JOB_STATUS)
+          .printHeader(PRINT_HEADER)
+          .fieldDelimiter(FIELD_DELIMITER)
+          .compression(COMPRESSION)
+          .format(FORMAT)
+          .statistics(JOB_STATISTICS)
+          .build();
+  private static final ExtractJobInfo EXTRACT_JOB_ONE_URI =
+      ExtractJobInfo.builder(TABLE_ID, DESTINATION_URI)
+          .etag(ETAG)
+          .id(ID)
+          .selfLink(SELF_LINK)
+          .userEmail(EMAIL)
+          .jobId(JOB_ID)
+          .status(JOB_STATUS)
+          .printHeader(PRINT_HEADER)
+          .fieldDelimiter(FIELD_DELIMITER)
+          .compression(COMPRESSION)
+          .format(FORMAT)
+          .build();
+
+  @Test
+  public void testToBuilder() {
+    compareExtractJobInfo(EXTRACT_JOB, EXTRACT_JOB.toBuilder().build());
+    ExtractJobInfo job = EXTRACT_JOB.toBuilder()
+        .sourceTable(TableId.of("dataset", "newTable"))
+        .build();
+    assertEquals("newTable", job.sourceTable().table());
+    job = job.toBuilder().sourceTable(TABLE_ID).build();
+    compareExtractJobInfo(EXTRACT_JOB, job);
+  }
+
+  @Test
+  public void testOf() {
+    ExtractJobInfo job = ExtractJobInfo.of(TABLE_ID, DESTINATION_URIS);
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(DESTINATION_URIS, job.destinationUris());
+    job = ExtractJobInfo.of(TABLE_ID, DESTINATION_URI);
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
+    job = ExtractJobInfo.of(JOB_ID, TABLE_ID, DESTINATION_URIS);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(DESTINATION_URIS, job.destinationUris());
+    job = ExtractJobInfo.of(JOB_ID, TABLE_ID, DESTINATION_URI);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    ExtractJobInfo job = ExtractJobInfo.of(TABLE_ID, DESTINATION_URIS);
+    compareExtractJobInfo(job, job.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(ETAG, EXTRACT_JOB.etag());
+    assertEquals(ID, EXTRACT_JOB.id());
+    assertEquals(SELF_LINK, EXTRACT_JOB.selfLink());
+    assertEquals(EMAIL, EXTRACT_JOB.userEmail());
+    assertEquals(JOB_ID, EXTRACT_JOB.jobId());
+    assertEquals(JOB_STATUS, EXTRACT_JOB.status());
+    assertEquals(TABLE_ID, EXTRACT_JOB.sourceTable());
+    assertEquals(DESTINATION_URIS, EXTRACT_JOB.destinationUris());
+    assertEquals(FIELD_DELIMITER, EXTRACT_JOB.fieldDelimiter());
+    assertEquals(COMPRESSION, EXTRACT_JOB.compression());
+    assertEquals(PRINT_HEADER, EXTRACT_JOB.printHeader());
+    assertEquals(FORMAT, EXTRACT_JOB.format());
+    assertEquals(JOB_STATISTICS, EXTRACT_JOB.statistics());
+    assertEquals(ETAG, EXTRACT_JOB_ONE_URI.etag());
+    assertEquals(ID, EXTRACT_JOB_ONE_URI.id());
+    assertEquals(SELF_LINK, EXTRACT_JOB_ONE_URI.selfLink());
+    assertEquals(EMAIL, EXTRACT_JOB_ONE_URI.userEmail());
+    assertEquals(JOB_ID, EXTRACT_JOB_ONE_URI.jobId());
+    assertEquals(JOB_STATUS, EXTRACT_JOB_ONE_URI.status());
+    assertEquals(TABLE_ID, EXTRACT_JOB_ONE_URI.sourceTable());
+    assertEquals(ImmutableList.of(DESTINATION_URI),
+        EXTRACT_JOB_ONE_URI.destinationUris());
+    assertEquals(FIELD_DELIMITER, EXTRACT_JOB_ONE_URI.fieldDelimiter());
+    assertEquals(COMPRESSION, EXTRACT_JOB_ONE_URI.compression());
+    assertEquals(PRINT_HEADER, EXTRACT_JOB_ONE_URI.printHeader());
+    assertEquals(FORMAT, EXTRACT_JOB_ONE_URI.format());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    assertNotNull(EXTRACT_JOB.toPb().getConfiguration().getExtract());
+    assertNull(EXTRACT_JOB.toPb().getConfiguration().getCopy());
+    assertNull(EXTRACT_JOB.toPb().getConfiguration().getLoad());
+    assertNull(EXTRACT_JOB.toPb().getConfiguration().getQuery());
+    assertEquals(JOB_STATISTICS, JobStatistics.fromPb(EXTRACT_JOB.toPb().getStatistics()));
+    compareExtractJobInfo(EXTRACT_JOB,
+        ExtractJobInfo.fromPb(EXTRACT_JOB.toPb()));
+    compareExtractJobInfo(EXTRACT_JOB,
+        (ExtractJobInfo) JobInfo.fromPb(EXTRACT_JOB.toPb()));
+    compareExtractJobInfo(EXTRACT_JOB_ONE_URI,
+        ExtractJobInfo.fromPb(EXTRACT_JOB_ONE_URI.toPb()));
+    compareExtractJobInfo(EXTRACT_JOB_ONE_URI,
+        (ExtractJobInfo) JobInfo.fromPb(EXTRACT_JOB_ONE_URI.toPb()));
+    ExtractJobInfo job = ExtractJobInfo.of(TABLE_ID, DESTINATION_URIS);
+    compareExtractJobInfo(job, ExtractJobInfo.fromPb(job.toPb()));
+    compareExtractJobInfo(job, (ExtractJobInfo) JobInfo.fromPb(job.toPb()));
+  }
+
+  private void compareExtractJobInfo(ExtractJobInfo expected, ExtractJobInfo value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.etag(), value.etag());
+    assertEquals(expected.id(), value.id());
+    assertEquals(expected.jobId(), value.jobId());
+    assertEquals(expected.selfLink(), value.selfLink());
+    assertEquals(expected.status(), value.status());
+    assertEquals(expected.statistics(), value.statistics());
+    assertEquals(expected.userEmail(), value.userEmail());
+    assertEquals(expected.sourceTable(), value.sourceTable());
+    assertEquals(expected.destinationUris(), value.destinationUris());
+    assertEquals(expected.compression(), value.compression());
+    assertEquals(expected.printHeader(), value.printHeader());
+    assertEquals(expected.fieldDelimiter(), value.fieldDelimiter());
+    assertEquals(expected.format(), value.format());
+  }
+}
\ No newline at end of file
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobIdTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobIdTest.java
new file mode 100644
index 000000000000..740830f07544
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobIdTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class JobIdTest {
+
+  private static final JobId JOB = JobId.of("job");
+  private static final JobId JOB_COMPLETE = JobId.of("project", "job");
+
+  @Test
+  public void testOf() {
+    assertEquals(null, JOB.project());
+    assertEquals("job", JOB.job());
+    assertEquals("project", JOB_COMPLETE.project());
+    assertEquals("job", JOB_COMPLETE.job());
+  }
+
+  @Test
+  public void testEquals() {
+    compareJobs(JOB, JobId.of("job"));
+    compareJobs(JOB_COMPLETE, JobId.of("project", "job"));
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    compareJobs(JOB, JobId.fromPb(JOB.toPb()));
+    compareJobs(JOB_COMPLETE, JobId.fromPb(JOB_COMPLETE.toPb()));
+  }
+
+  private void compareJobs(JobId expected, JobId value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.project(), value.project());
+    assertEquals(expected.job(), value.job());
+    assertEquals(expected.hashCode(), value.hashCode());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java
new file mode 100644
index 000000000000..5b2123faa67d
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobStatistics.ExtractStatistics;
+import com.google.gcloud.bigquery.JobStatistics.LoadStatistics;
+import com.google.gcloud.bigquery.JobStatistics.QueryStatistics;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class JobStatisticsTest {
+
+  private static final Integer BILLING_TIER = 42;
+  private static final Boolean CACHE_HIT = true;
+  private static final Long TOTAL_BYTES_BILLED = 24L;
+  private static final Long TOTAL_BYTES_PROCESSED = 42L;
+  private static final Long INPUT_BYTES = 1L;
+  private static final Long INPUT_FILES = 2L;
+  private static final Long OUTPUT_BYTES = 3L;
+  private static final Long OUTPUT_ROWS = 4L;
+  private static final List FILE_COUNT = ImmutableList.of(1L, 2L, 3L);
+  private static final Long CREATION_TIME = 10L;
+  private static final Long END_TIME = 20L;
+  private static final Long START_TIME = 15L;
+  private static final ExtractStatistics EXTRACT_STATISTICS = ExtractStatistics.builder()
+      .creationTime(CREATION_TIME)
+      .endTime(END_TIME)
+      .startTime(START_TIME)
+      .destinationUriFileCounts(FILE_COUNT)
+      .build();
+  private static final LoadStatistics LOAD_STATISTICS = LoadStatistics.builder()
+      .creationTime(CREATION_TIME)
+      .endTime(END_TIME)
+      .startTime(START_TIME)
+      .inputBytes(INPUT_BYTES)
+      .inputFiles(INPUT_FILES)
+      .outputBytes(OUTPUT_BYTES)
+      .outputRows(OUTPUT_ROWS)
+      .build();
+  private static final LoadStatistics LOAD_STATISTICS_INCOMPLETE = LoadStatistics.builder()
+      .creationTime(CREATION_TIME)
+      .endTime(END_TIME)
+      .startTime(START_TIME)
+      .inputBytes(INPUT_BYTES)
+      .inputFiles(INPUT_FILES)
+      .build();
+  private static final QueryStatistics QUERY_STATISTICS = QueryStatistics.builder()
+      .creationTime(CREATION_TIME)
+      .endTime(END_TIME)
+      .startTime(START_TIME)
+      .billingTier(BILLING_TIER)
+      .cacheHit(CACHE_HIT)
+      .totalBytesBilled(TOTAL_BYTES_BILLED)
+      .totalBytesProcessed(TOTAL_BYTES_PROCESSED)
+      .build();
+  private static final QueryStatistics QUERY_STATISTICS_INCOMPLETE = QueryStatistics.builder()
+      .creationTime(CREATION_TIME)
+      .endTime(END_TIME)
+      .startTime(START_TIME)
+      .billingTier(BILLING_TIER)
+      .cacheHit(CACHE_HIT)
+      .build();
+  private static final JobStatistics STATISTICS = JobStatistics.builder()
+      .creationTime(CREATION_TIME)
+      .endTime(END_TIME)
+      .startTime(START_TIME)
+      .build();
+
+  @Test
+  public void testBuilder() {
+    assertEquals(CREATION_TIME, STATISTICS.creationTime());
+    assertEquals(START_TIME, STATISTICS.startTime());
+    assertEquals(END_TIME, STATISTICS.endTime());
+
+    assertEquals(CREATION_TIME, EXTRACT_STATISTICS.creationTime());
+    assertEquals(START_TIME, EXTRACT_STATISTICS.startTime());
+    assertEquals(END_TIME, EXTRACT_STATISTICS.endTime());
+    assertEquals(FILE_COUNT, EXTRACT_STATISTICS.destinationUriFileCounts());
+
+    assertEquals(CREATION_TIME, LOAD_STATISTICS.creationTime());
+    assertEquals(START_TIME, LOAD_STATISTICS.startTime());
+    assertEquals(END_TIME, LOAD_STATISTICS.endTime());
+    assertEquals(INPUT_BYTES, LOAD_STATISTICS.inputBytes());
+    assertEquals(INPUT_FILES, LOAD_STATISTICS.inputFiles());
+    assertEquals(OUTPUT_BYTES, LOAD_STATISTICS.outputBytes());
+    assertEquals(OUTPUT_ROWS, LOAD_STATISTICS.outputRows());
+
+    assertEquals(CREATION_TIME, QUERY_STATISTICS.creationTime());
+    assertEquals(START_TIME, QUERY_STATISTICS.startTime());
+    assertEquals(END_TIME, QUERY_STATISTICS.endTime());
+    assertEquals(BILLING_TIER, QUERY_STATISTICS.billingTier());
+    assertEquals(CACHE_HIT, QUERY_STATISTICS.cacheHit());
+    assertEquals(TOTAL_BYTES_BILLED, QUERY_STATISTICS.totalBytesBilled());
+    assertEquals(TOTAL_BYTES_PROCESSED, QUERY_STATISTICS.totalBytesProcessed());
+
+    assertEquals(CREATION_TIME, LOAD_STATISTICS_INCOMPLETE.creationTime());
+    assertEquals(START_TIME, LOAD_STATISTICS_INCOMPLETE.startTime());
+    assertEquals(END_TIME, LOAD_STATISTICS_INCOMPLETE.endTime());
+    assertEquals(INPUT_BYTES, LOAD_STATISTICS_INCOMPLETE.inputBytes());
+    assertEquals(INPUT_FILES, LOAD_STATISTICS_INCOMPLETE.inputFiles());
+    assertEquals(null, LOAD_STATISTICS_INCOMPLETE.outputBytes());
+    assertEquals(null, LOAD_STATISTICS_INCOMPLETE.outputRows());
+
+    assertEquals(CREATION_TIME, QUERY_STATISTICS_INCOMPLETE.creationTime());
+    assertEquals(START_TIME, QUERY_STATISTICS_INCOMPLETE.startTime());
+    assertEquals(END_TIME, QUERY_STATISTICS_INCOMPLETE.endTime());
+    assertEquals(BILLING_TIER, QUERY_STATISTICS_INCOMPLETE.billingTier());
+    assertEquals(CACHE_HIT, QUERY_STATISTICS_INCOMPLETE.cacheHit());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.totalBytesBilled());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.totalBytesProcessed());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    compareExtractStatistics(EXTRACT_STATISTICS,
+        ExtractStatistics.fromPb(EXTRACT_STATISTICS.toPb()));
+    compareLoadStatistics(LOAD_STATISTICS, LoadStatistics.fromPb(LOAD_STATISTICS.toPb()));
+    compareQueryStatistics(QUERY_STATISTICS, QueryStatistics.fromPb(QUERY_STATISTICS.toPb()));
+    compareStatistics(STATISTICS, JobStatistics.fromPb(STATISTICS.toPb()));
+
+    compareLoadStatistics(LOAD_STATISTICS_INCOMPLETE,
+        LoadStatistics.fromPb(LOAD_STATISTICS_INCOMPLETE.toPb()));
+    compareQueryStatistics(QUERY_STATISTICS_INCOMPLETE,
+        QueryStatistics.fromPb(QUERY_STATISTICS_INCOMPLETE.toPb()));
+  }
+
+  private void compareExtractStatistics(ExtractStatistics expected, ExtractStatistics value) {
+    assertEquals(expected, value);
+    compareStatistics(expected, value);
+    assertEquals(expected.destinationUriFileCounts(), value.destinationUriFileCounts());
+  }
+
+  private void compareLoadStatistics(LoadStatistics expected, LoadStatistics value) {
+    assertEquals(expected, value);
+    compareStatistics(expected, value);
+    assertEquals(expected.inputBytes(), value.inputBytes());
+    assertEquals(expected.inputFiles(), value.inputFiles());
+    assertEquals(expected.outputBytes(), value.outputBytes());
+    assertEquals(expected.outputRows(), value.outputRows());
+  }
+
+  private void compareQueryStatistics(QueryStatistics expected, QueryStatistics value) {
+    assertEquals(expected, value);
+    compareStatistics(expected, value);
+    assertEquals(expected.billingTier(), value.billingTier());
+    assertEquals(expected.cacheHit(), value.cacheHit());
+    assertEquals(expected.totalBytesBilled(), value.totalBytesBilled());
+    assertEquals(expected.totalBytesProcessed(), value.totalBytesProcessed());
+  }
+
+  private void compareStatistics(JobStatistics expected, JobStatistics value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.creationTime(), value.creationTime());
+    assertEquals(expected.endTime(), value.endTime());
+    assertEquals(expected.startTime(), value.startTime());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatusTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatusTest.java
new file mode 100644
index 000000000000..c44386a3e72c
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatusTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class JobStatusTest {
+
+  private static final JobStatus.State STATE = JobStatus.State.DONE;
+  private static final BigQueryError ERROR =
+      new BigQueryError("reason", "location", "message", "debugInfo");
+  private static final List ALL_ERRORS = ImmutableList.of(
+      new BigQueryError("reason1", "location1", "message1", "debugInfo1"),
+      new BigQueryError("reason2", "location2", "message2", "debugInfo2"));
+  private static final JobStatus JOB_STATUS = new JobStatus(STATE, ERROR, ALL_ERRORS);
+  private static final JobStatus JOB_STATUS_INCOMPLETE1 = new JobStatus(STATE, ERROR, null);
+  private static final JobStatus JOB_STATUS_INCOMPLETE2 = new JobStatus(STATE, null, null);
+
+  @Test
+  public void testConstructor() {
+    assertEquals(STATE, JOB_STATUS.state());
+    assertEquals(ERROR, JOB_STATUS.error());
+    assertEquals(ALL_ERRORS, JOB_STATUS.executionErrors());
+
+    assertEquals(STATE, JOB_STATUS_INCOMPLETE1.state());
+    assertEquals(ERROR, JOB_STATUS_INCOMPLETE1.error());
+    assertEquals(null, JOB_STATUS_INCOMPLETE1.executionErrors());
+
+    assertEquals(STATE, JOB_STATUS_INCOMPLETE2.state());
+    assertEquals(null, JOB_STATUS_INCOMPLETE2.error());
+    assertEquals(null, JOB_STATUS_INCOMPLETE2.executionErrors());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    compareStatus(JOB_STATUS, JobStatus.fromPb(JOB_STATUS.toPb()));
+    compareStatus(JOB_STATUS_INCOMPLETE1, JobStatus.fromPb(JOB_STATUS_INCOMPLETE1.toPb()));
+    compareStatus(JOB_STATUS_INCOMPLETE2, JobStatus.fromPb(JOB_STATUS_INCOMPLETE2.toPb()));
+  }
+
+  private void compareStatus(JobStatus expected, JobStatus value) {
+    assertEquals(expected, value);
+    assertEquals(expected.state(), value.state());
+    assertEquals(expected.error(), value.error());
+    assertEquals(expected.executionErrors(), value.executionErrors());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
new file mode 100644
index 000000000000..bb2a263fc3e0
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
+import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
+import com.google.gcloud.bigquery.JobStatistics.LoadStatistics;
+
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+public class LoadJobInfoTest {
+
+  private static final String ETAG = "etag";
+  private static final String ID = "id";
+  private static final String SELF_LINK = "selfLink";
+  private static final String EMAIL = "email";
+  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder()
+      .allowJaggedRows(true)
+      .allowQuotedNewLines(false)
+      .encoding(StandardCharsets.UTF_8)
+      .build();
+  private static final String SOURCE_URI = "uri";
+  private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
+  private static final TableId TABLE_ID = TableId.of("dataset", "table");
+  private static final CreateDisposition CREATE_DISPOSITION = CreateDisposition.CREATE_IF_NEEDED;
+  private static final WriteDisposition WRITE_DISPOSITION = WriteDisposition.WRITE_APPEND;
+  private static final Integer MAX_BAD_RECORDS = 42;
+  private static final String FORMAT = "CSV";
+  private static final Boolean IGNORE_UNKNOWN_VALUES = true;
+  private static final List PROJECTION_FIELDS = ImmutableList.of("field1", "field2");
+  private static final JobId JOB_ID = JobId.of("job");
+  private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
+  private static final Field FIELD_SCHEMA = Field.builder("IntegerField", Field.Type.integer())
+      .mode(Field.Mode.REQUIRED)
+      .description("FieldDescription")
+      .build();
+  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA);
+  private static final LoadStatistics JOB_STATISTICS = LoadStatistics.builder()
+      .creationTime(1L)
+      .endTime(3L)
+      .startTime(2L)
+      .inputFiles(42L)
+      .outputBytes(1024L)
+      .inputBytes(2048L)
+      .outputRows(24L)
+      .build();
+  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.builder(TABLE_ID, SOURCE_URIS)
+      .etag(ETAG)
+      .id(ID)
+      .selfLink(SELF_LINK)
+      .userEmail(EMAIL)
+      .jobId(JOB_ID)
+      .status(JOB_STATUS)
+      .createDisposition(CREATE_DISPOSITION)
+      .writeDisposition(WRITE_DISPOSITION)
+      .formatOptions(CSV_OPTIONS)
+      .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+      .maxBadRecords(MAX_BAD_RECORDS)
+      .projectionFields(PROJECTION_FIELDS)
+      .schema(TABLE_SCHEMA)
+      .statistics(JOB_STATISTICS)
+      .build();
+
+  @Test
+  public void testToBuilder() {
+    compareLoadJobInfo(LOAD_JOB, LOAD_JOB.toBuilder().build());
+    LoadJobInfo job = LOAD_JOB.toBuilder()
+        .destinationTable(TableId.of("dataset", "newTable"))
+        .build();
+    assertEquals("newTable", job.destinationTable().table());
+    job = job.toBuilder().destinationTable(TABLE_ID).build();
+    compareLoadJobInfo(LOAD_JOB, job);
+  }
+
+  @Test
+  public void testOf() {
+    LoadJobInfo job = LoadJobInfo.of(TABLE_ID, SOURCE_URIS);
+    assertEquals(TABLE_ID, job.destinationTable());
+    assertEquals(SOURCE_URIS, job.sourceUris());
+    job = LoadJobInfo.of(TABLE_ID, SOURCE_URI);
+    assertEquals(TABLE_ID, job.destinationTable());
+    assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
+    job = LoadJobInfo.of(JOB_ID, TABLE_ID, SOURCE_URIS);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(TABLE_ID, job.destinationTable());
+    assertEquals(SOURCE_URIS, job.sourceUris());
+    job = LoadJobInfo.of(JOB_ID, TABLE_ID, SOURCE_URI);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(TABLE_ID, job.destinationTable());
+    assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    LoadJobInfo job = LoadJobInfo.of(TABLE_ID, SOURCE_URIS);
+    compareLoadJobInfo(job, job.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(ETAG, LOAD_JOB.etag());
+    assertEquals(ID, LOAD_JOB.id());
+    assertEquals(SELF_LINK, LOAD_JOB.selfLink());
+    assertEquals(EMAIL, LOAD_JOB.userEmail());
+    assertEquals(JOB_ID, LOAD_JOB.jobId());
+    assertEquals(JOB_STATUS, LOAD_JOB.status());
+    assertEquals(TABLE_ID, LOAD_JOB.destinationTable());
+    assertEquals(SOURCE_URIS, LOAD_JOB.sourceUris());
+    assertEquals(CREATE_DISPOSITION, LOAD_JOB.createDisposition());
+    assertEquals(WRITE_DISPOSITION, LOAD_JOB.writeDisposition());
+    assertEquals(CSV_OPTIONS, LOAD_JOB.csvOptions());
+    assertEquals(FORMAT, LOAD_JOB.format());
+    assertEquals(IGNORE_UNKNOWN_VALUES, LOAD_JOB.ignoreUnknownValues());
+    assertEquals(MAX_BAD_RECORDS, LOAD_JOB.maxBadRecords());
+    assertEquals(PROJECTION_FIELDS, LOAD_JOB.projectionFields());
+    assertEquals(TABLE_SCHEMA, LOAD_JOB.schema());
+    assertEquals(JOB_STATISTICS, LOAD_JOB.statistics());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    assertNotNull(LOAD_JOB.toPb().getConfiguration().getLoad());
+    assertNull(LOAD_JOB.toPb().getConfiguration().getExtract());
+    assertNull(LOAD_JOB.toPb().getConfiguration().getCopy());
+    assertNull(LOAD_JOB.toPb().getConfiguration().getQuery());
+    assertEquals(JOB_STATISTICS, JobStatistics.fromPb(LOAD_JOB.toPb().getStatistics()));
+    compareLoadJobInfo(LOAD_JOB, LoadJobInfo.fromPb(LOAD_JOB.toPb()));
+    compareLoadJobInfo(LOAD_JOB, (LoadJobInfo) JobInfo.fromPb(LOAD_JOB.toPb()));
+    LoadJobInfo job = LoadJobInfo.of(TABLE_ID, SOURCE_URIS);
+    compareLoadJobInfo(job, LoadJobInfo.fromPb(job.toPb()));
+    compareLoadJobInfo(job, (LoadJobInfo) JobInfo.fromPb(job.toPb()));
+  }
+
+  private void compareLoadJobInfo(LoadJobInfo expected, LoadJobInfo value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.etag(), value.etag());
+    assertEquals(expected.id(), value.id());
+    assertEquals(expected.jobId(), value.jobId());
+    assertEquals(expected.selfLink(), value.selfLink());
+    assertEquals(expected.status(), value.status());
+    assertEquals(expected.statistics(), value.statistics());
+    assertEquals(expected.userEmail(), value.userEmail());
+    assertEquals(expected.destinationTable(), value.destinationTable());
+    assertEquals(expected.sourceUris(), value.sourceUris());
+    assertEquals(expected.createDisposition(), value.createDisposition());
+    assertEquals(expected.writeDisposition(), value.writeDisposition());
+    assertEquals(expected.csvOptions(), value.csvOptions());
+    assertEquals(expected.format(), value.format());
+    assertEquals(expected.ignoreUnknownValues(), value.ignoreUnknownValues());
+    assertEquals(expected.maxBadRecords(), value.maxBadRecords());
+    assertEquals(expected.projectionFields(), value.projectionFields());
+    assertEquals(expected.schema(), value.schema());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobInfoTest.java
new file mode 100644
index 000000000000..f99bec19efd9
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobInfoTest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
+import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
+import com.google.gcloud.bigquery.JobStatistics.QueryStatistics;
+import com.google.gcloud.bigquery.QueryJobInfo.Priority;
+
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+public class QueryJobInfoTest {
+
+  private static final String ETAG = "etag";
+  private static final String ID = "id";
+  private static final String SELF_LINK = "selfLink";
+  private static final String EMAIL = "email";
+  private static final String QUERY = "BigQuery SQL";
+  private static final DatasetId DATASET_ID = DatasetId.of("project", "dataset");
+  private static final TableId TABLE_ID = TableId.of("project", "dataset", "table");
+  private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
+  private static final Field FIELD_SCHEMA1 =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
+          .description("FieldDescription1")
+          .build();
+  private static final Field FIELD_SCHEMA2 =
+      Field.builder("IntegerField", Field.Type.integer())
+          .mode(Field.Mode.REPEATED)
+          .description("FieldDescription2")
+          .build();
+  private static final Field FIELD_SCHEMA3 =
+      Field.builder("RecordField", Field.Type.record(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(Field.Mode.REQUIRED)
+          .description("FieldDescription3")
+          .build();
+  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
+  private static final Integer MAX_BAD_RECORDS = 42;
+  private static final Boolean IGNORE_UNKNOWN_VALUES = true;
+  private static final String COMPRESSION = "GZIP";
+  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder().build();
+  private static final ExternalDataConfiguration TABLE_CONFIGURATION = ExternalDataConfiguration
+      .builder(SOURCE_URIS, TABLE_SCHEMA, CSV_OPTIONS)
+      .compression(COMPRESSION)
+      .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+      .maxBadRecords(MAX_BAD_RECORDS)
+      .build();
+  private static final Map TABLE_DEFINITIONS =
+      ImmutableMap.of("tableName", TABLE_CONFIGURATION);
+  private static final CreateDisposition CREATE_DISPOSITION = CreateDisposition.CREATE_IF_NEEDED;
+  private static final WriteDisposition WRITE_DISPOSITION = WriteDisposition.WRITE_APPEND;
+  private static final Priority PRIORITY = Priority.BATCH;
+  private static final boolean ALLOW_LARGE_RESULTS = true;
+  private static final boolean USE_QUERY_CACHE = false;
+  private static final boolean FLATTEN_RESULTS = true;
+  private static final List USER_DEFINED_FUNCTIONS = ImmutableList.of(
+      UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
+  private static final JobId JOB_ID = JobId.of("job");
+  private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
+  private static final QueryStatistics JOB_STATISTICS = QueryStatistics.builder()
+      .creationTime(1L)
+      .endTime(3L)
+      .startTime(2L)
+      .totalBytesProcessed(2048L)
+      .totalBytesBilled(1024L)
+      .cacheHit(false)
+      .billingTier(42)
+      .build();
+  private static final QueryJobInfo QUERY_JOB = QueryJobInfo.builder(QUERY)
+      .etag(ETAG)
+      .id(ID)
+      .selfLink(SELF_LINK)
+      .userEmail(EMAIL)
+      .jobId(JOB_ID)
+      .status(JOB_STATUS)
+      .useQueryCache(USE_QUERY_CACHE)
+      .tableDefinitions(TABLE_DEFINITIONS)
+      .allowLargeResults(ALLOW_LARGE_RESULTS)
+      .createDisposition(CREATE_DISPOSITION)
+      .defaultDataset(DATASET_ID)
+      .destinationTable(TABLE_ID)
+      .writeDisposition(WRITE_DISPOSITION)
+      .priority(PRIORITY)
+      .flattenResults(FLATTEN_RESULTS)
+      .userDefinedFunctions(USER_DEFINED_FUNCTIONS)
+      .dryRun(true)
+      .statistics(JOB_STATISTICS)
+      .build();
+
+  @Test
+  public void testToBuilder() {
+    compareQueryJobInfo(QUERY_JOB, QUERY_JOB.toBuilder().build());
+    QueryJobInfo job = QUERY_JOB.toBuilder()
+        .query("New BigQuery SQL")
+        .build();
+    assertEquals("New BigQuery SQL", job.query());
+    job = job.toBuilder().query(QUERY).build();
+    compareQueryJobInfo(QUERY_JOB, job);
+  }
+
+  @Test
+  public void testOf() {
+    QueryJobInfo job = QueryJobInfo.of(QUERY);
+    assertEquals(QUERY, job.query());
+    job = QueryJobInfo.of(JOB_ID, QUERY);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(QUERY, job.query());
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    QueryJobInfo job = QueryJobInfo.of(QUERY);
+    compareQueryJobInfo(job, job.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(ETAG, QUERY_JOB.etag());
+    assertEquals(ID, QUERY_JOB.id());
+    assertEquals(SELF_LINK, QUERY_JOB.selfLink());
+    assertEquals(EMAIL, QUERY_JOB.userEmail());
+    assertEquals(JOB_ID, QUERY_JOB.jobId());
+    assertEquals(JOB_STATUS, QUERY_JOB.status());
+    assertEquals(ALLOW_LARGE_RESULTS, QUERY_JOB.allowLargeResults());
+    assertEquals(CREATE_DISPOSITION, QUERY_JOB.createDisposition());
+    assertEquals(DATASET_ID, QUERY_JOB.defaultDataset());
+    assertEquals(TABLE_ID, QUERY_JOB.destinationTable());
+    assertEquals(FLATTEN_RESULTS, QUERY_JOB.flattenResults());
+    assertEquals(PRIORITY, QUERY_JOB.priority());
+    assertEquals(QUERY, QUERY_JOB.query());
+    assertEquals(TABLE_DEFINITIONS, QUERY_JOB.tableDefinitions());
+    assertEquals(USE_QUERY_CACHE, QUERY_JOB.useQueryCache());
+    assertEquals(USER_DEFINED_FUNCTIONS, QUERY_JOB.userDefinedFunctions());
+    assertEquals(WRITE_DISPOSITION, QUERY_JOB.writeDisposition());
+    assertTrue(QUERY_JOB.dryRun());
+    assertEquals(JOB_STATISTICS, QUERY_JOB.statistics());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    assertNotNull(QUERY_JOB.toPb().getConfiguration().getQuery());
+    assertNull(QUERY_JOB.toPb().getConfiguration().getExtract());
+    assertNull(QUERY_JOB.toPb().getConfiguration().getCopy());
+    assertNull(QUERY_JOB.toPb().getConfiguration().getLoad());
+    assertEquals(JOB_STATISTICS, JobStatistics.fromPb(QUERY_JOB.statistics().toPb()));
+    compareQueryJobInfo(QUERY_JOB, QueryJobInfo.fromPb(QUERY_JOB.toPb()));
+    compareQueryJobInfo(QUERY_JOB,
+        (QueryJobInfo) JobInfo.fromPb(QUERY_JOB.toPb()));
+    QueryJobInfo job = QueryJobInfo.of(QUERY);
+    compareQueryJobInfo(job, QueryJobInfo.fromPb(job.toPb()));
+    compareQueryJobInfo(job, (QueryJobInfo) JobInfo.fromPb(job.toPb()));
+  }
+
+  private void compareQueryJobInfo(QueryJobInfo expected, QueryJobInfo value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.etag(), value.etag());
+    assertEquals(expected.id(), value.id());
+    assertEquals(expected.jobId(), value.jobId());
+    assertEquals(expected.selfLink(), value.selfLink());
+    assertEquals(expected.status(), value.status());
+    assertEquals(expected.statistics(), value.statistics());
+    assertEquals(expected.dryRun(), value.dryRun());
+    assertEquals(expected.userEmail(), value.userEmail());
+    assertEquals(expected.allowLargeResults(), value.allowLargeResults());
+    assertEquals(expected.createDisposition(), value.createDisposition());
+    assertEquals(expected.defaultDataset(), value.defaultDataset());
+    assertEquals(expected.destinationTable(), value.destinationTable());
+    assertEquals(expected.flattenResults(), value.flattenResults());
+    assertEquals(expected.priority(), value.priority());
+    assertEquals(expected.query(), value.query());
+    assertEquals(expected.tableDefinitions(), value.tableDefinitions());
+    assertEquals(expected.useQueryCache(), value.useQueryCache());
+    assertEquals(expected.userDefinedFunctions(), value.userDefinedFunctions());
+    assertEquals(expected.writeDisposition(), value.writeDisposition());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index c75337431580..15a652719703 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -128,6 +128,47 @@ public class SerializationTest {
           .id(ID)
           .streamingBuffer(STREAMING_BUFFER)
           .build();
+  private static final JobStatistics JOB_STATISTICS = JobStatistics.builder()
+          .creationTime(1L)
+          .endTime(3L)
+          .startTime(2L)
+          .build();
+  private static final JobStatistics.ExtractStatistics EXTRACT_STATISTICS =
+      JobStatistics.ExtractStatistics.builder()
+          .creationTime(1L)
+          .endTime(3L)
+          .startTime(2L)
+          .destinationUriFileCounts(ImmutableList.of(42L))
+          .build();
+  private static final JobStatistics.LoadStatistics LOAD_STATISTICS =
+      JobStatistics.LoadStatistics.builder()
+          .creationTime(1L)
+          .endTime(3L)
+          .startTime(2L)
+          .inputFiles(42L)
+          .outputBytes(1024L)
+          .inputBytes(2048L)
+          .outputRows(24L)
+          .build();
+  private static final JobStatistics.QueryStatistics QUERY_STATISTICS =
+      JobStatistics.QueryStatistics.builder()
+          .creationTime(1L)
+          .endTime(3L)
+          .startTime(2L)
+          .totalBytesProcessed(2048L)
+          .totalBytesBilled(1024L)
+          .cacheHit(false)
+          .billingTier(42)
+          .build();
+  private static final BigQueryError BIGQUERY_ERROR =
+      new BigQueryError("reason", "location", "message", "debugInfo");
+  private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE, BIGQUERY_ERROR,
+      ImmutableList.of(BIGQUERY_ERROR));
+  private static final JobId JOB_ID = JobId.of("project", "job");
+  private static final CopyJobInfo COPY_JOB = CopyJobInfo.of(TABLE_ID, TABLE_ID);
+  private static final ExtractJobInfo EXTRACT_JOB = ExtractJobInfo.of(TABLE_ID, SOURCE_URIS);
+  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.of(TABLE_ID, SOURCE_URIS);
+  private static final QueryJobInfo QUERY_JOB = QueryJobInfo.of("query");
 
   @Test
   public void testServiceOptions() throws Exception {
@@ -151,7 +192,9 @@ public void testServiceOptions() throws Exception {
   public void testModelAndRequests() throws Exception {
     Serializable[] objects = {DOMAIN_ACCESS, GROUP_ACCESS, USER_ACCESS, VIEW_ACCESS, DATASET_ID,
         DATASET_INFO, TABLE_ID, CSV_OPTIONS, STREAMING_BUFFER, EXTERNAL_DATA_CONFIGURATION,
-        TABLE_SCHEMA, TABLE_INFO, VIEW_INFO, EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION};
+        TABLE_SCHEMA, TABLE_INFO, VIEW_INFO, EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION,
+        JOB_STATISTICS, EXTRACT_STATISTICS, LOAD_STATISTICS, QUERY_STATISTICS, BIGQUERY_ERROR,
+        JOB_STATUS, JOB_ID, COPY_JOB, EXTRACT_JOB, LOAD_JOB, QUERY_JOB};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);

From c36b857f7eabee5d069899195b613271a9c31332 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 9 Dec 2015 17:54:19 -0800
Subject: [PATCH 162/322] fix checkstyle issues and warnings

---
 .../src/main/java/com/google/gcloud/PageImpl.java   |  1 +
 .../main/java/com/google/gcloud/ServiceFactory.java |  1 +
 .../main/java/com/google/gcloud/ServiceOptions.java |  8 ++++++--
 .../com/google/gcloud/spi/ServiceRpcFactory.java    |  1 +
 .../test/java/com/google/gcloud/PageImplTest.java   |  2 --
 .../google/gcloud/datastore/DatastoreException.java |  3 ++-
 .../google/gcloud/datastore/DatastoreOptions.java   |  3 +++
 .../gcloud/datastore/DatastoreOptionsTest.java      |  4 +---
 .../com/google/gcloud/datastore/DatastoreTest.java  |  2 +-
 .../java/com/google/gcloud/datastore/ValueTest.java |  3 +++
 .../com/google/gcloud/examples/StorageExample.java  |  2 +-
 .../com/google/gcloud/spi/DefaultStorageRpc.java    |  6 ++++--
 .../main/java/com/google/gcloud/storage/Blob.java   |  2 +-
 .../google/gcloud/storage/BlobWriteChannelImpl.java |  1 -
 .../main/java/com/google/gcloud/storage/Bucket.java |  2 +-
 .../java/com/google/gcloud/storage/BucketInfo.java  |  1 +
 .../java/com/google/gcloud/storage/Storage.java     |  3 +--
 .../java/com/google/gcloud/storage/StorageImpl.java |  4 ++--
 .../com/google/gcloud/storage/StorageOptions.java   |  3 +++
 .../gcloud/storage/BlobReadChannelImplTest.java     | 13 +++++++------
 .../java/com/google/gcloud/storage/BlobTest.java    |  2 +-
 .../gcloud/storage/BlobWriteChannelImplTest.java    |  3 ++-
 .../com/google/gcloud/storage/BucketInfoTest.java   |  1 -
 .../java/com/google/gcloud/storage/BucketTest.java  |  6 +++---
 .../com/google/gcloud/storage/CopyWriterTest.java   |  9 ++++-----
 .../com/google/gcloud/storage/ITStorageTest.java    | 10 ++++------
 .../google/gcloud/storage/SerializationTest.java    |  2 ++
 .../com/google/gcloud/storage/StorageImplTest.java  |  4 ++--
 28 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
index 5e83b53b33a9..97c2931e0cfb 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -71,6 +71,7 @@ public PageImpl(NextPageFetcher pageFetcher, String cursor, Iterable resul
     this.results = results;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public Iterable values() {
     return results == null ? Collections.EMPTY_LIST : results;
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java
index b59fc1e9a10e..3828bf30260b 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java
@@ -22,6 +22,7 @@
  * Implementation must provide a public no-arg constructor.
  * Loading of a factory implementation is done via {@link java.util.ServiceLoader}.
  */
+@SuppressWarnings("rawtypes")
 public interface ServiceFactory {
 
   ServiceT create(ServiceOptionsT serviceOptions);
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 715b0b92ca98..9e5d6730f551 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -53,6 +53,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+@SuppressWarnings("rawtypes")
 public abstract class ServiceOptions<
     ServiceT extends Service,
     ServiceRpcT,
@@ -305,8 +306,8 @@ protected ServiceOptions(Class> ser
     if (projectIdRequired()) {
       checkArgument(
           projectId != null,
-          "A project ID is required for this service but could not be determined from the builder or "
-          + "the environment.  Please set a project ID using the builder.");
+          "A project ID is required for this service but could not be determined from the builder "
+          + "or the environment.  Please set a project ID using the builder.");
     }
     host = firstNonNull(builder.host, defaultHost());
     httpTransportFactory = firstNonNull(builder.httpTransportFactory,
@@ -453,6 +454,7 @@ protected static String getAppEngineProjectId() {
     }
   }
 
+  @SuppressWarnings("unchecked")
   public ServiceT service() {
     if (service == null) {
       service = serviceFactory.create((OptionsT) this);
@@ -460,6 +462,7 @@ public ServiceT service() {
     return service;
   }
 
+  @SuppressWarnings("unchecked")
   public ServiceRpcT rpc() {
     if (rpc == null) {
       rpc = serviceRpcFactory.create((OptionsT) this);
@@ -587,6 +590,7 @@ private void readObject(ObjectInputStream input) throws IOException, ClassNotFou
     authCredentials = authCredentialsState != null ? authCredentialsState.restore() : null;
   }
 
+  @SuppressWarnings("unchecked")
   private static  T newInstance(String className) throws IOException, ClassNotFoundException {
     try {
       return (T) Class.forName(className).newInstance();
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/spi/ServiceRpcFactory.java b/gcloud-java-core/src/main/java/com/google/gcloud/spi/ServiceRpcFactory.java
index d20b690167a1..d19f6047e4b2 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/spi/ServiceRpcFactory.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/spi/ServiceRpcFactory.java
@@ -24,6 +24,7 @@
  * Implementation must provide a public no-arg constructor.
  * Loading of a factory implementation is done via {@link java.util.ServiceLoader}.
  */
+@SuppressWarnings("rawtypes")
 public interface ServiceRpcFactory {
 
   ServiceRpcT create(OptionsT options);
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java
index fb289186de8d..4389171fb49c 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/PageImplTest.java
@@ -22,8 +22,6 @@
 
 import org.junit.Test;
 
-import java.util.Collections;
-
 public class PageImplTest {
 
   private static final ImmutableList VALUES = ImmutableList.of("1", "2");
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
index dded1d11875e..ebef6b44f6b6 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
@@ -146,7 +146,8 @@ static DatastoreException translateAndThrow(DatastoreRpcException exception) {
    * @throws DatastoreException every time
    */
   static DatastoreException throwInvalidRequest(String massage, Object... params) {
-    throw new DatastoreException(DatastoreError.FAILED_PRECONDITION, String.format(massage, params));
+    throw new DatastoreException(
+        DatastoreError.FAILED_PRECONDITION, String.format(massage, params));
   }
 
   static DatastoreException propagateUserException(Exception ex) {
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
index ee15393a8048..227419d8acc8 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -157,11 +157,13 @@ protected String defaultProject() {
     return projectId != null ? projectId : super.defaultProject();
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   protected DatastoreFactory defaultServiceFactory() {
     return DefaultDatastoreFactory.INSTANCE;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   protected DatastoreRpcFactory defaultRpcFactory() {
     return DefaultDatastoreRpcFactory.INSTANCE;
@@ -199,6 +201,7 @@ protected Set scopes() {
     return SCOPES;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public Builder toBuilder() {
     return new Builder(this);
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java
index 78536e3f45cb..284a9d322793 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java
@@ -30,8 +30,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
-
 public class DatastoreOptionsTest {
 
   private static final String PROJECT_ID = "project_id";
@@ -41,7 +39,7 @@ public class DatastoreOptionsTest {
   private DatastoreOptions.Builder options;
 
   @Before
-  public void setUp() throws IOException, InterruptedException {
+  public void setUp() {
     datastoreRpcFactory = EasyMock.createMock(DatastoreRpcFactory.class);
     datastoreRpc = EasyMock.createMock(DatastoreRpc.class);
     options = DatastoreOptions.builder()
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index 162104c0dd84..029b161c1c38 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -121,7 +121,7 @@ public static void beforeClass() throws IOException, InterruptedException {
   }
 
   @Before
-  public void setUp() throws IOException, InterruptedException {
+  public void setUp() {
     options = DatastoreOptions.builder()
         .projectId(PROJECT_ID)
         .host("http://localhost:" + PORT)
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java
index 199b3f90f442..3867e194d060 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java
@@ -60,11 +60,13 @@ public class ValueTest {
 
   private ImmutableMap> typeToValue;
 
+  @SuppressWarnings("rawtypes")
   private class TestBuilder extends Value.BaseBuilder, TestBuilder> {
     TestBuilder() {
       super(ValueType.LIST);
     }
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
     public Value build() {
       return new Value(this) {
@@ -197,6 +199,7 @@ public void testGet() throws Exception {
   @Test
   public void testToBuilder() throws Exception {
     Set content = Collections.singleton("bla");
+    @SuppressWarnings("rawtypes")
     ValueBuilder builder = new TestBuilder();
     builder.meaning(1).set(content).indexed(true);
     Value value = builder.build();
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index 0e7d6bbbf3ea..abd912aacd23 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -24,10 +24,10 @@
 import com.google.gcloud.storage.BlobId;
 import com.google.gcloud.storage.BlobInfo;
 import com.google.gcloud.storage.BlobReadChannel;
-import com.google.gcloud.storage.CopyWriter;
 import com.google.gcloud.storage.BlobWriteChannel;
 import com.google.gcloud.storage.Bucket;
 import com.google.gcloud.storage.BucketInfo;
+import com.google.gcloud.storage.CopyWriter;
 import com.google.gcloud.storage.Storage;
 import com.google.gcloud.storage.Storage.ComposeRequest;
 import com.google.gcloud.storage.Storage.CopyRequest;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index d874f99ebb4c..5e39bce5ed94 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -371,8 +371,10 @@ public BatchResponse batch(BatchRequest request) throws StorageException {
     List>>> partitionedToDelete =
         Lists.partition(request.toDelete, MAX_BATCH_DELETES);
     Iterator>>> iterator = partitionedToDelete.iterator();
-    BatchRequest chunkRequest = new BatchRequest(iterator.hasNext() ? iterator.next() :
-        ImmutableList.>>of(), request.toUpdate, request.toGet);
+    BatchRequest chunkRequest = new BatchRequest(
+        iterator.hasNext()
+            ? iterator.next() : ImmutableList.>>of(),
+        request.toUpdate, request.toGet);
     BatchResponse response = batchChunk(chunkRequest);
     Map> deletes =
         Maps.newHashMapWithExpectedSize(request.toDelete.size());
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index 503cad361e29..6bbc3843f97e 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -18,8 +18,8 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.gcloud.storage.Blob.BlobSourceOption.toSourceOptions;
 import static com.google.gcloud.storage.Blob.BlobSourceOption.toGetOptions;
+import static com.google.gcloud.storage.Blob.BlobSourceOption.toSourceOptions;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java
index 8c3254a28d44..95656985043f 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java
@@ -37,7 +37,6 @@
  */
 class BlobWriteChannelImpl implements BlobWriteChannel {
 
-  private static final long serialVersionUID = 8675286882724938737L;
   private static final int MIN_CHUNK_SIZE = 256 * 1024;
   private static final int DEFAULT_CHUNK_SIZE = 8 * MIN_CHUNK_SIZE;
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 54e60cc006dc..38a767508356 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -24,8 +24,8 @@
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Iterators;
-import com.google.gcloud.PageImpl;
 import com.google.gcloud.Page;
+import com.google.gcloud.PageImpl;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.storage.Storage.BlobGetOption;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
index a8cc4a0f32d8..62fbf9c6521f 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
@@ -217,6 +217,7 @@ private void readObject(ObjectInputStream in) throws IOException,
       rule = new JacksonFactory().fromString(in.readUTF(), Rule.class);
     }
 
+    @Override
     Rule toPb() {
       return rule;
     }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 6e1c33b137fd..23c3c19a6676 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -25,15 +25,14 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
-import com.google.gcloud.Service;
 import com.google.gcloud.Page;
+import com.google.gcloud.Service;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 
 import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URL;
-import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index e31c4073548e..d1535c92dfdb 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -522,8 +522,8 @@ private  List> transformBatch
       if (exception != null) {
         response.add(new BatchResponse.Result(exception));
       } else {
-        response.add(object != null ?
-            BatchResponse.Result.of(transform.apply(object)) : BatchResponse.Result.empty());
+        response.add(object != null
+            ? BatchResponse.Result.of(transform.apply(object)) : BatchResponse.Result.empty());
       }
     }
     return response;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
index 2ad0950aa6aa..9ec743c079e7 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
@@ -89,11 +89,13 @@ private StorageOptions(Builder builder) {
     pathDelimiter = MoreObjects.firstNonNull(builder.pathDelimiter, DEFAULT_PATH_DELIMITER);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   protected StorageFactory defaultServiceFactory() {
     return DefaultStorageFactory.INSTANCE;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   protected StorageRpcFactory defaultRpcFactory() {
     return DefaultStorageRpcFactory.INSTANCE;
@@ -118,6 +120,7 @@ public static StorageOptions defaultInstance() {
     return builder().build();
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public Builder toBuilder() {
     return new Builder(this);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
index f99fe893d0d9..d943715580c9 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
@@ -57,7 +57,7 @@ public class BlobReadChannelImplTest {
   private BlobReadChannelImpl reader;
 
   @Before
-  public void setUp() throws IOException, InterruptedException {
+  public void setUp() {
     rpcFactoryMock = createMock(StorageRpcFactory.class);
     storageRpcMock = createMock(StorageRpc.class);
     expect(rpcFactoryMock.create(anyObject(StorageOptions.class))).andReturn(storageRpcMock);
@@ -144,7 +144,7 @@ public void testSeek() throws IOException {
   }
 
   @Test
-  public void testClose() throws IOException {
+  public void testClose() {
     replay(storageRpcMock);
     reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     assertTrue(reader.isOpen());
@@ -176,9 +176,9 @@ public void testReadGenerationChanged() throws IOException {
     ByteBuffer secondReadBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
     expect(storageRpcMock.read(blobId.toPb(), EMPTY_RPC_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
         .andReturn(StorageRpc.Tuple.of("etag1", firstResult));
-    expect(storageRpcMock.read(
-        blobId.toPb(), EMPTY_RPC_OPTIONS, DEFAULT_CHUNK_SIZE, DEFAULT_CHUNK_SIZE))
-            .andReturn(StorageRpc.Tuple.of("etag2", firstResult));
+    expect(
+        storageRpcMock.read(blobId.toPb(), EMPTY_RPC_OPTIONS, DEFAULT_CHUNK_SIZE,
+            DEFAULT_CHUNK_SIZE)).andReturn(StorageRpc.Tuple.of("etag2", secondResult));
     replay(storageRpcMock);
     reader.read(firstReadBuffer);
     try {
@@ -192,7 +192,7 @@ public void testReadGenerationChanged() throws IOException {
   }
 
   @Test
-  public void testSaveAndRestore() throws IOException, ClassNotFoundException {
+  public void testSaveAndRestore() throws IOException {
     byte[] firstResult = randomByteArray(DEFAULT_CHUNK_SIZE);
     byte[] secondResult = randomByteArray(DEFAULT_CHUNK_SIZE);
     ByteBuffer firstReadBuffer = ByteBuffer.allocate(42);
@@ -216,6 +216,7 @@ public void testSaveAndRestore() throws IOException, ClassNotFoundException {
   public void testStateEquals() {
     replay(storageRpcMock);
     reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    @SuppressWarnings("resource") // avoid closing when you don't want partial writes to GCS
     BlobReadChannel secondReader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     RestorableState state = reader.capture();
     RestorableState secondState = secondReader.capture();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
index 02e325716c8b..3998ae554327 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
@@ -155,7 +155,7 @@ public void testCopyTo() throws Exception {
   public void testCopyToBlobId() throws Exception {
     BlobId targetId = BlobId.of("bt", "nt");
     CopyWriter copyWriter = createMock(CopyWriter.class);
-    BlobInfo target = BLOB_INFO.builder(targetId).build();
+    BlobInfo target = BlobInfo.builder(targetId).build();
     Capture capturedCopyRequest = Capture.newInstance();
     expect(storage.copy(capture(capturedCopyRequest))).andReturn(copyWriter);
     replay(storage);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
index 6faa36173ab9..5d44fcb5f320 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
@@ -65,7 +65,7 @@ public class BlobWriteChannelImplTest {
   private BlobWriteChannelImpl writer;
 
   @Before
-  public void setUp() throws IOException, InterruptedException {
+  public void setUp() {
     rpcFactoryMock = createMock(StorageRpcFactory.class);
     storageRpcMock = createMock(StorageRpc.class);
     expect(rpcFactoryMock.create(anyObject(StorageOptions.class)))
@@ -234,6 +234,7 @@ public void testStateEquals() {
         .times(2);
     replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    @SuppressWarnings("resource") // avoid closing when you don't want partial writes to GCS
     BlobWriteChannel writer2 = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     RestorableState state = writer.capture();
     RestorableState state2 = writer2.capture();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
index e0de2b77a899..b705685a04b1 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
@@ -18,7 +18,6 @@
 
 import static com.google.gcloud.storage.Acl.Project.ProjectRole.VIEWERS;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import com.google.api.services.storage.model.Bucket.Lifecycle.Rule;
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
index 5d8fc5a9dffc..596f43a3c87a 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -27,8 +27,8 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
-import com.google.gcloud.PageImpl;
 import com.google.gcloud.Page;
+import com.google.gcloud.PageImpl;
 import com.google.gcloud.storage.BatchResponse.Result;
 
 import org.easymock.Capture;
@@ -153,8 +153,8 @@ public void testGetAll() throws Exception {
     for (BlobInfo info : BLOB_INFO_RESULTS) {
       batchResultList.add(new Result<>(info));
     }
-    BatchResponse response =
-        new BatchResponse(Collections.EMPTY_LIST, Collections.EMPTY_LIST, batchResultList);
+    BatchResponse response = new BatchResponse(Collections.>emptyList(),
+        Collections.>emptyList(), batchResultList);
     expect(storage.apply(capture(capturedBatchRequest))).andReturn(response);
     replay(storage);
     List blobs = bucket.get("n1", "n2", "n3");
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
index 0fcdb744c244..f14ee934638f 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
@@ -21,8 +21,8 @@
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.RestorableState;
@@ -33,10 +33,9 @@
 
 import org.easymock.EasyMock;
 import org.junit.After;
-import org.junit.Test;
 import org.junit.Before;
+import org.junit.Test;
 
-import java.io.IOException;
 import java.util.Map;
 
 public class CopyWriterTest {
@@ -64,7 +63,7 @@ public class CopyWriterTest {
   private CopyWriter copyWriter;
 
   @Before
-  public void setUp() throws IOException, InterruptedException {
+  public void setUp() {
     rpcFactoryMock = createMock(StorageRpcFactory.class);
     storageRpcMock = createMock(StorageRpc.class);
     expect(rpcFactoryMock.create(anyObject(StorageOptions.class)))
@@ -105,7 +104,7 @@ public void testRewriteMultipleRequests() {
   }
 
   @Test
-  public void testSaveAndRestore() throws IOException {
+  public void testSaveAndRestore() {
     EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE);
     EasyMock.expect(storageRpcMock.continueRewrite(RESPONSE)).andReturn(RESPONSE_DONE);
     EasyMock.replay(storageRpcMock);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index ed58690efde7..05055e9c3ca9 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -41,7 +41,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.ByteBuffer;
@@ -53,7 +52,6 @@
 import java.util.Random;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -77,7 +75,7 @@ public static void beforeClass() {
 
   @AfterClass
   public static void afterClass()
-      throws ExecutionException, TimeoutException, InterruptedException {
+throws ExecutionException, InterruptedException {
     if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS)) {
       if (log.isLoggable(Level.WARNING)) {
         log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);
@@ -154,7 +152,7 @@ public void testCreateEmptyBlob() {
   }
 
   @Test
-  public void testCreateBlobStream() throws UnsupportedEncodingException {
+  public void testCreateBlobStream() {
     String blobName = "test-create-blob-stream";
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).contentType(CONTENT_TYPE).build();
     ByteArrayInputStream stream = new ByteArrayInputStream(BLOB_STRING_CONTENT.getBytes(UTF_8));
@@ -185,7 +183,7 @@ public void testCreateBlobFail() {
   }
 
   @Test
-  public void testCreateBlobMd5Fail() throws UnsupportedEncodingException {
+  public void testCreateBlobMd5Fail() {
     String blobName = "test-create-blob-md5-fail";
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName)
         .contentType(CONTENT_TYPE)
@@ -809,7 +807,7 @@ public void testReadChannelFailUpdatedGeneration() throws IOException {
       readBytes = ByteBuffer.allocate(chunkSize);
       reader.read(readBytes);
       fail("StorageException was expected");
-    } catch(StorageException ex) {
+    } catch (StorageException ex) {
       StringBuilder messageBuilder = new StringBuilder();
       messageBuilder.append("Blob ").append(blob.blobId()).append(" was updated while reading");
       assertEquals(messageBuilder.toString(), ex.getMessage());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index 256f5fc23f9a..af779512e0e8 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -119,6 +119,7 @@ public void testReadChannelState() throws IOException, ClassNotFoundException {
     assertEquals(state, deserializedState);
     assertEquals(state.hashCode(), deserializedState.hashCode());
     assertEquals(state.toString(), deserializedState.toString());
+    reader.close();
   }
 
   @Test
@@ -127,6 +128,7 @@ public void testWriteChannelState() throws IOException, ClassNotFoundException {
         .projectId("p2")
         .retryParams(RetryParams.defaultInstance())
         .build();
+    @SuppressWarnings("resource") // avoid closing when you don't want partial writes to GCS
     BlobWriteChannelImpl writer = new BlobWriteChannelImpl(
         options, BlobInfo.builder(BlobId.of("b", "n")).build(), "upload-id");
     RestorableState state = writer.capture();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 42671d37c60c..dea635c3d264 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -251,7 +251,7 @@ public static void beforeClass() throws NoSuchAlgorithmException, InvalidKeySpec
   }
 
   @Before
-  public void setUp() throws IOException, InterruptedException {
+  public void setUp() {
     rpcFactoryMock = EasyMock.createMock(StorageRpcFactory.class);
     storageRpcMock = EasyMock.createMock(StorageRpc.class);
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(StorageOptions.class)))
@@ -363,7 +363,7 @@ public void testCreateBlobWithOptions() throws IOException {
   }
 
   @Test
-  public void testCreateBlobFromStream() throws IOException {
+  public void testCreateBlobFromStream() {
     ByteArrayInputStream fileStream = new ByteArrayInputStream(BLOB_CONTENT);
     BlobInfo.Builder infoBuilder = BLOB_INFO1.toBuilder();
     BlobInfo infoWithHashes = infoBuilder.md5(CONTENT_MD5).crc32c(CONTENT_CRC32C).build();

From 27f4d0d41e32a2bfab313e4cea969ff820c5fc6a Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 9 Dec 2015 14:35:21 +0100
Subject: [PATCH 163/322] Add InsertAllRequest and InsertAllResponse. Add model
 classes for table data

---
 .../google/gcloud/bigquery/FieldValue.java    | 232 ++++++++++
 .../gcloud/bigquery/InsertAllRequest.java     | 399 ++++++++++++++++++
 .../gcloud/bigquery/InsertAllResponse.java    | 119 ++++++
 .../com/google/gcloud/bigquery/TableRow.java  | 104 +++++
 .../gcloud/bigquery/FieldValueTest.java       | 111 +++++
 .../gcloud/bigquery/InsertAllRequestTest.java | 197 +++++++++
 .../bigquery/InsertAllResponseTest.java       |  77 ++++
 .../gcloud/bigquery/SerializationTest.java    |  22 +-
 .../google/gcloud/bigquery/TableRowTest.java  |  80 ++++
 9 files changed, 1340 insertions(+), 1 deletion(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableRow.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldValueTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllResponseTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
new file mode 100644
index 000000000000..19d68bfb2678
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import com.google.api.client.util.Data;
+import com.google.api.client.util.Lists;
+import com.google.common.base.MoreObjects;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Table Field Value class. Objects of this class represent values of a BigQuery
+ * Table Field. A list of values forms a {@link TableRow}. Tables rows can be gotten as the result
+ * of a query or when listing table data.
+ */
+public class FieldValue implements Serializable {
+
+  private static final int MICROSECONDS = 1000000;
+  private static final long serialVersionUID = 469098630191710061L;
+
+  private final Kind kind;
+  private final Object value;
+
+  /**
+   * The field value's kind, giving information on the field's content type.
+   */
+  public enum Kind {
+    /**
+     * A primitive field value. A {@code FieldValue} has type {@link #PRIMITIVE} when the
+     * corresponding field has type {@link Field.Type#bool()}, {@link Field.Type#string()}
+     * {@link Field.Type#floatingPoint()}, {@link Field.Type#integer()},
+     * {@link Field.Type#timestamp()} or the value is set to {@code null}.
+     */
+    PRIMITIVE,
+
+    /**
+     * A {@code FieldValue} for a field with {@link Field.Mode#REPEATED} mode.
+     */
+    REPEATED,
+
+    /**
+     * A {@code FieldValue} for a field of type {@link Field.Type#record(Field...)}.
+     */
+    RECORD
+  }
+
+  FieldValue(Kind kind, Object value) {
+    this.kind = kind;
+    this.value = value;
+  }
+
+  /**
+   * Returns the kind of this Field Value.
+   *
+   * @return {@link Kind#PRIMITIVE} if the value is of primitive type ({@link Field.Type#bool()},
+   *     {@link Field.Type#string()}, {@link Field.Type#floatingPoint()},
+   *     {@link Field.Type#integer()}, {@link Field.Type#timestamp()}) or is {@code null}. Returns
+   *     {@link Kind#REPEATED} if the corresponding field has ({@link Field.Mode#REPEATED}) mode.
+   *     Returns {@link Kind#RECORD} if the corresponding field has
+   *     {@link Field.Type#record(Field...)} type.
+   */
+  public Kind kind() {
+    return kind;
+  }
+
+  /**
+   * Return this field's value as an {@link Object}.
+   */
+  public Object value() {
+    return value;
+  }
+
+  /**
+   * Return this field's value as a {@link String}. This method should only be used if the
+   * corresponding field has primitive type ({@link Field.Type#bool()}, {@link Field.Type#string()},
+   * {@link Field.Type#floatingPoint()}, {@link Field.Type#integer()},
+   * {@link Field.Type#timestamp()}).
+   *
+   * @throws ClassCastException if the field has not primitive type
+   */
+  @SuppressWarnings("unchecked")
+  public String stringValue() {
+    return (String) value;
+  }
+
+  /**
+   * Returns this field's value as a {@link Long}. This method should only be used if the
+   * corresponding field has {@link Field.Type#integer()} type.
+   *
+   * @throws NumberFormatException if the field's value could not be converted to {@link Integer}
+   */
+  @SuppressWarnings("unchecked")
+  public long longValue() {
+    return Long.valueOf(stringValue());
+  }
+
+  /**
+   * Returns this field's value as a {@link Double}. This method should only be used if the
+   * corresponding field has {@link Field.Type#floatingPoint()} type.
+   *
+   * @throws NumberFormatException if the field's value could not be converted to {@link Double}
+   */
+  @SuppressWarnings("unchecked")
+  public double doubleValue() {
+    return Double.valueOf(stringValue());
+  }
+
+  /**
+   * Returns this field's value as a {@link Boolean}. This method should only be used if the
+   * corresponding field has {@link Field.Type#bool()} type.
+   *
+   * @throws IllegalStateException if the field's value could not be converted to {@link Boolean}
+   */
+  @SuppressWarnings("unchecked")
+  public boolean booleanValue() {
+    String stringValue = stringValue();
+    checkState(stringValue.equalsIgnoreCase("true") || stringValue.equalsIgnoreCase("false"),
+        "Field value is not of boolean type");
+    return Boolean.parseBoolean(stringValue);
+  }
+
+  /**
+   * Returns this field's value as a {@link Long}, representing a timestamp in microseconds. This
+   * method should only be used if the corresponding field has {@link Field.Type#timestamp()} type.
+   *
+   * @throws NumberFormatException if the field's value could not be converted to {@link Long}
+   */
+  @SuppressWarnings("unchecked")
+  public long timestampValue() {
+    return new Double(((Double.valueOf(stringValue())) * MICROSECONDS)).longValue();
+  }
+
+  /**
+   * Returns this field's value as a list of {@link FieldValue}. This method should only be used if
+   * the corresponding field has {@link Field.Mode#REPEATED} mode (i.e. {@link #kind()} is
+   * {@link Kind#REPEATED}).
+   *
+   * @throws ClassCastException if the field has not {@link Field.Mode#REPEATED} mode
+   */
+  @SuppressWarnings("unchecked")
+  public List repeatedValue() {
+    return (List) value;
+  }
+
+  /**
+   * Returns this field's value as a list of {@link FieldValue}. This method should only be used if
+   * the corresponding field has {@link Field.Type#record(Field...)} type (i.e. {@link #kind()} is
+   * {@link Kind#RECORD}).
+   *
+   * @throws ClassCastException if the field has not {@link Field.Type#record(Field...)} type
+   */
+  @SuppressWarnings("unchecked")
+  public List recordValue() {
+    return (List) value;
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("kind", kind)
+        .add("value", value)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(kind, value);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (!(obj instanceof FieldValue)) {
+      return false;
+    }
+    FieldValue other = (FieldValue) obj;
+    return kind == other.kind && Objects.equals(value, other.value);
+  }
+
+  @SuppressWarnings("unchecked")
+  static FieldValue fromPb(Object cellPb) {
+    if (Data.isNull(cellPb)) {
+      return new FieldValue(Kind.PRIMITIVE, null);
+    }
+    if (cellPb instanceof String) {
+      return new FieldValue(Kind.PRIMITIVE, cellPb);
+    }
+    if (cellPb instanceof List) {
+      List cellsListPb = (List) cellPb;
+      List repeatedCells = Lists.newArrayListWithCapacity(cellsListPb.size());
+      for (Object repeatedCellPb : cellsListPb) {
+        repeatedCells.add(FieldValue.fromPb(repeatedCellPb));
+      }
+      return new FieldValue(Kind.REPEATED, repeatedCells);
+    }
+    if (cellPb instanceof Map) {
+      Map cellMapPb = (Map) cellPb;
+      if (cellMapPb.containsKey("f")) {
+        List cellsListPb = (List) cellMapPb.get("f");
+        List recordCells = Lists.newArrayListWithCapacity(cellsListPb.size());
+        for (Object repeatedCellPb : cellsListPb) {
+          recordCells.add(FieldValue.fromPb(repeatedCellPb));
+        }
+        return new FieldValue(Kind.RECORD, recordCells);
+      }
+      // This should never be the case when we are processing a first level table field (i.e. a
+      // row's field, not a record sub-field)
+      if (cellMapPb.containsKey("v")) {
+        return FieldValue.fromPb(cellMapPb.get("v"));
+      }
+    }
+    throw new AssertionError("Unexpected table cell format");
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
new file mode 100644
index 000000000000..bcc9e5691c20
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
@@ -0,0 +1,399 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Google Cloud BigQuery insert all request. This class can be used to stream data into BigQuery one
+ * record at a time without needing to run a load job. This approach enables querying data without
+ * the delay of running a load job. There are several important trade-offs to consider before
+ * choosing an approach.
+ *
+ * @see Streaming Data into
+ *     BigQuery
+ */
+public class InsertAllRequest implements Serializable {
+
+  private static final long serialVersionUID = 211200307773853078L;
+
+  private final TableId table;
+  private final List rows;
+  private final Boolean skipInvalidRows;
+  private final Boolean ignoreUnknownValues;
+
+  /**
+   * A Google Big Query row to be inserted into a table. Each {@code RowToInsert} has an associated
+   * id used by BigQuery to detect duplicate insertion requests on a best-effort basis.
+   *
+   * 

+   * Example usage of creating a row to insert:
+   * 
    {@code
+   *   List repeatedFieldValue = Arrays.asList(1L, 2L);
+   *   Map recordContent = new HashMap();
+   *   recordContent.put("subfieldName1", "value");
+   *   recordContent.put("subfieldName2", repeatedFieldValue);
+   *   Map rowContent = new HashMap();
+   *   rowContent.put("fieldName1", true);
+   *   rowContent.put("fieldName2", recordContent);
+   *   RowToInsert row = new RowToInsert("rowId", rowContent);
+   * }

+   *
+   * @see 
+   *     Data Consistency
+   */
+  public static class RowToInsert implements Serializable {
+
+    private static final long serialVersionUID = 8563060538219179157L;
+
+    private final String id;
+    private final Map content;
+
+    RowToInsert(String id, Map content) {
+      this.id = id;
+      this.content = content;
+    }
+
+    /**
+     * Returns the id associated with the row. Returns {@code null} if not set.
+     */
+    public String id() {
+      return id;
+    }
+
+    /**
+     * Returns the actual content of the row, as a map.
+     */
+    public Map content() {
+      return content;
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("id", id)
+          .add("content", content)
+          .toString();
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(id, content);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (!(obj instanceof RowToInsert)) {
+        return false;
+      }
+      RowToInsert other = (RowToInsert) obj;
+      return Objects.equals(id, other.id)
+          && Objects.equals(content, other.content);
+    }
+
+    /**
+     * Creates a row to be inserted.
+     *
+     * @param id id of the row, used to identify duplicates
+     * @param content the actual content of the row
+     */
+    public static RowToInsert of(String id, Map content) {
+      return new RowToInsert(checkNotNull(id), checkNotNull(content));
+    }
+  }
+
+  public static final class Builder {
+
+    private TableId table;
+    private List rows;
+    private Boolean skipInvalidRows;
+    private Boolean ignoreUnknownValues;
+
+    private Builder() {}
+
+    /**
+     * Sets the destination table for rows insert request.
+     */
+    public Builder table(TableId table) {
+      this.table = checkNotNull(table);
+      return this;
+    }
+
+    /**
+     * Sets the rows to insert as a list of {@link RowToInsert} objects.
+     */
+    public Builder rows(Iterable rows) {
+      this.rows = Lists.newLinkedList(checkNotNull(rows));
+      return this;
+    }
+
+    /**
+     * Adds a row to be inserted.
+     */
+    public Builder addRow(RowToInsert rowToInsert) {
+      checkNotNull(rowToInsert);
+      if (rows == null) {
+        rows = Lists.newArrayList();
+      }
+      rows.add(rowToInsert);
+      return this;
+    }
+
+    /**
+     * Adds a row to be inserted with associated id.
+     *
+     * 

+     * Example usage of adding a row with associated id:
+     * 
    {@code
+     *   InsertAllRequest.Buider builder = InsertAllRequest.builder(tableId);
+     *   List repeatedFieldValue = Arrays.asList(1L, 2L);
+     *   Map recordContent = new HashMap();
+     *   recordContent.put("subfieldName1", "value");
+     *   recordContent.put("subfieldName2", repeatedFieldValue);
+     *   Map rowContent = new HashMap();
+     *   rowContent.put("fieldName1", true);
+     *   rowContent.put("fieldName2", recordContent);
+     *   builder.addRow("rowId", rowContent);
+     * }

+     */
+    public Builder addRow(String id, Map content) {
+      addRow(new RowToInsert(id, content));
+      return this;
+    }
+
+    /**
+     * Adds a row to be inserted without an associated id.
+     *
+     * 

+     * Example usage of adding a row without an associated id:
+     * 
    {@code
+     *   InsertAllRequest.Buider builder = InsertAllRequest.builder(tableId);
+     *   List repeatedFieldValue = Arrays.asList(1L, 2L);
+     *   Map recordContent = new HashMap();
+     *   recordContent.put("subfieldName1", "value");
+     *   recordContent.put("subfieldName2", repeatedFieldValue);
+     *   Map rowContent = new HashMap();
+     *   rowContent.put("fieldName1", true);
+     *   rowContent.put("fieldName2", recordContent);
+     *   builder.addRow(rowContent);
+     * }

+     */
+    public Builder addRow(Map content) {
+      addRow(new RowToInsert(null, content));
+      return this;
+    }
+
+    /**
+     * Sets whether to insert all valid rows of a request, even if invalid rows exist. If not set
+     * the entire insert request will fail if it contains an invalid row.
+     */
+    public Builder skipInvalidRows(boolean skipInvalidRows) {
+      this.skipInvalidRows = skipInvalidRows;
+      return this;
+    }
+
+    /**
+     * Sets whether to accept rows that contain values that do not match the schema. The unknown
+     * values are ignored. If not set, rows with unknown values are considered to be invalid.
+     */
+    public Builder ignoreUnknownValues(boolean ignoreUnknownValues) {
+      this.ignoreUnknownValues = ignoreUnknownValues;
+      return this;
+    }
+
+    public InsertAllRequest build() {
+      return new InsertAllRequest(this);
+    }
+  }
+
+  private InsertAllRequest(Builder builder) {
+    this.table = checkNotNull(builder.table);
+    this.rows = ImmutableList.copyOf(checkNotNull(builder.rows));
+    this.ignoreUnknownValues = builder.ignoreUnknownValues;
+    this.skipInvalidRows = builder.skipInvalidRows;
+  }
+
+  /**
+   * Returns the destination table for rows insert request.
+   */
+  public TableId table() {
+    return table;
+  }
+
+  /**
+   * Returns the rows to be inserted.
+   */
+  public List rows() {
+    return rows;
+  }
+
+  /**
+   * Returns whether to accept rows that contain values that do not match the schema. The unknown
+   * values are ignored. If not set, rows with unknown values are considered to be invalid.
+   */
+  public Boolean ignoreUnknownValues() {
+    return ignoreUnknownValues;
+  }
+
+  /**
+   * Returns whether to insert all valid rows of a request, even if invalid rows exist. If not set
+   * the entire insert request will fail if it contains an invalid row.
+   */
+  public Boolean skipInvalidRows() {
+    return skipInvalidRows;
+  }
+
+  /**
+   * Returns a builder for an {@code InsertAllRequest} object given the destination table.
+   */
+  public static Builder builder(TableId table) {
+    return new Builder().table(table);
+  }
+
+  /**
+   * Returns a builder for an {@code InsertAllRequest} object given the destination table and the
+   * rows to insert.
+   */
+  public static Builder builder(TableId table, Iterable rows) {
+    return builder(table).rows(rows);
+  }
+
+  /**
+   * Returns a builder for an {@code InsertAllRequest} object given the destination table and the
+   * rows to insert.
+   */
+  public static Builder builder(TableId table, RowToInsert... rows) {
+    return builder(table, ImmutableList.copyOf(rows));
+  }
+
+  /**
+   * Returns a builder for an {@code InsertAllRequest} object given the destination table.
+   */
+  public static Builder builder(String datasetId, String tableId) {
+    return new Builder().table(TableId.of(datasetId, tableId));
+  }
+
+  /**
+   * Returns a builder for an {@code InsertAllRequest} object given the destination table and the
+   * rows to insert.
+   */
+  public static Builder builder(String datasetId, String tableId, Iterable rows) {
+    return builder(TableId.of(datasetId, tableId), rows);
+  }
+
+  /**
+   * Returns a builder for an {@code InsertAllRequest} object given the destination table and the
+   * rows to insert.
+   */
+  public static Builder builder(String datasetId, String tableId, RowToInsert... rows) {
+    return builder(TableId.of(datasetId, tableId), rows);
+  }
+
+  /**
+   * Returns a builder for an {@code InsertAllRequest} object given the destination table and the
+   * rows to insert.
+   */
+  public static Builder builder(BaseTableInfo tableInfo, Iterable rows) {
+    return builder(tableInfo.tableId(), rows);
+  }
+
+  /**
+   * Returns a builder for an {@code InsertAllRequest} object given the destination table and the
+   * rows to insert.
+   */
+  public static Builder builder(BaseTableInfo tableInfo, RowToInsert... rows) {
+    return builder(tableInfo.tableId(), rows);
+  }
+
+  /**
+   * Returns a {@code InsertAllRequest} object given the destination table and the rows to insert.
+   */
+  public static InsertAllRequest of(TableId tableId, Iterable rows) {
+    return builder(tableId, rows).build();
+  }
+
+  /**
+   * Returns a {@code InsertAllRequest} object given the destination table and the rows to insert.
+   */
+  public static InsertAllRequest of(TableId tableId, RowToInsert... rows) {
+    return builder(tableId, rows).build();
+  }
+
+  /**
+   * Returns a {@code InsertAllRequest} object given the destination table and the rows to insert.
+   */
+  public static InsertAllRequest of(String datasetId, String tableId, Iterable rows) {
+    return builder(datasetId, tableId, rows).build();
+  }
+
+  /**
+   * Returns a {@code InsertAllRequest} object given the destination table and the rows to insert.
+   */
+  public static InsertAllRequest of(String datasetId, String tableId, RowToInsert... rows) {
+    return builder(datasetId, tableId, rows).build();
+  }
+
+  /**
+   * Returns a {@code InsertAllRequest} object given the destination table and the rows to insert.
+   */
+  public static InsertAllRequest of(BaseTableInfo tableInfo, Iterable rows) {
+    return builder(tableInfo.tableId(), rows).build();
+  }
+
+  /**
+   * Returns a {@code InsertAllRequest} object given the destination table and the rows to insert.
+   */
+  public static InsertAllRequest of(BaseTableInfo tableInfo, RowToInsert... rows) {
+    return builder(tableInfo.tableId(), rows).build();
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("table", table)
+        .add("rows", rows)
+        .add("ignoreUnknownValues", ignoreUnknownValues)
+        .add("skipInvalidRows", skipInvalidRows)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(table, rows, ignoreUnknownValues, skipInvalidRows);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (!(obj instanceof InsertAllRequest)) {
+      return false;
+    }
+    InsertAllRequest other = (InsertAllRequest) obj;
+    return Objects.equals(table, other.table)
+        && Objects.equals(rows, other.rows)
+        && Objects.equals(ignoreUnknownValues, other.ignoreUnknownValues)
+        && Objects.equals(skipInvalidRows, other.skipInvalidRows);
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
new file mode 100644
index 000000000000..2534f4f23f67
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.api.services.bigquery.model.ErrorProto;
+import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
+import com.google.api.services.bigquery.model.TableDataInsertAllResponse.InsertErrors;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Google Cloud BigQuery insert all response. Objects of this class possibly contain errors for an
+ * {@link InsertAllRequest}. If a row failed to be inserted, the non-empty list of errors associated
+ * to that row's index can be obtained with {@link InsertAllResponse#errorsFor(Long)}.
+ * {@link InsertAllResponse#insertErrors()} can be used to return all errors caused by a
+ * {@link InsertAllRequest} as a map.
+ */
+public class InsertAllResponse implements Serializable {
+
+  private final Map> insertErrors;
+
+  InsertAllResponse(Map> insertErrors) {
+    this.insertErrors = insertErrors != null ? ImmutableMap.copyOf(insertErrors)
+        : ImmutableMap.>of();
+  }
+
+  /**
+   * Returns all insertion errors as a map whose keys are indexes of rows that failed to insert.
+   * Each failed row index is associated with a non-empty list of {@link BigQueryError}.
+   */
+  public Map> insertErrors() {
+    return insertErrors;
+  }
+
+  /**
+   * Returns errors for the provided row index. If no error exists returns {@code null}.
+   */
+  public List errorsFor(Long index) {
+    return insertErrors.get(index);
+  }
+
+  /**
+   * Returns {@code true} if no row insertion failed, {@code false} otherwise. If {@code false}
+   * {@link #insertErrors()} returns an empty map.
+   */
+  public boolean hasErrors() {
+    return !insertErrors.isEmpty();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(insertErrors);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof InsertAllResponse
+        && Objects.equals(insertErrors, ((InsertAllResponse) obj).insertErrors);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this).add("insertErrors", insertErrors).toString();
+  }
+
+  TableDataInsertAllResponse toPb() {
+    TableDataInsertAllResponse responsePb = new TableDataInsertAllResponse();
+    if (insertErrors.size() > 0) {
+      responsePb.setInsertErrors(ImmutableList.copyOf(Iterables.transform(insertErrors.entrySet(),
+          new Function>, InsertErrors>() {
+            @Override
+            public InsertErrors apply(Map.Entry> entry) {
+              return new InsertErrors()
+                  .setIndex(entry.getKey())
+                  .setErrors(Lists.transform(entry.getValue(), BigQueryError.TO_PB_FUNCTION));
+            }
+          })));
+    }
+    return responsePb;
+  }
+
+  static InsertAllResponse fromPb(TableDataInsertAllResponse responsePb) {
+    Map> insertErrors = null;
+    if (responsePb.getInsertErrors() != null) {
+      List errorsPb = responsePb.getInsertErrors();
+      insertErrors = Maps.newHashMapWithExpectedSize(errorsPb.size());
+      for (InsertErrors errorPb : errorsPb) {
+        insertErrors.put(errorPb.getIndex(), Lists.transform(
+            errorPb.getErrors() != null ? errorPb.getErrors() : ImmutableList.of(),
+            BigQueryError.FROM_PB_FUNCTION));
+      }
+    }
+    return new InsertAllResponse(insertErrors);
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableRow.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableRow.java
new file mode 100644
index 000000000000..7dde02280701
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableRow.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.client.util.Lists;
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Table Row class. Objects of this class contain a list of {@link FieldValue}, one
+ * for each field in the table.
+ */
+public class TableRow implements Serializable {
+
+  static final Function
+      FROM_PB_FUNCTION = new Function() {
+        @Override
+        public TableRow apply(com.google.api.services.bigquery.model.TableRow pb) {
+          return TableRow.fromPb(pb);
+        }
+      };
+  private static final long serialVersionUID = 1770751621297868029L;
+
+  private final List values;
+
+  static final class Builder {
+
+    private List values;
+
+    Builder() {}
+
+    Builder values(List values) {
+      this.values = Lists.newArrayList(checkNotNull(values));
+      return this;
+    }
+
+    Builder addValue(FieldValue fieldValue) {
+      checkNotNull(fieldValue);
+      if (values == null) {
+        values = Lists.newArrayList();
+      }
+      values.add(fieldValue);
+      return this;
+    }
+
+    TableRow build() {
+      return new TableRow(this);
+    }
+  }
+
+  TableRow(Builder builder) {
+    this.values = ImmutableList.copyOf(builder.values);
+  }
+
+  /**
+   * Returns table row data as a list of {@link FieldValue}.
+   */
+  public List values() {
+    return values;
+  }
+
+  @Override
+  public String toString() {
+    return values.toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(values);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof TableRow && Objects.equals(values, ((TableRow) obj).values);
+  }
+
+  static TableRow fromPb(com.google.api.services.bigquery.model.TableRow rowPb) {
+    Builder builder = new Builder();
+    for (com.google.api.services.bigquery.model.TableCell cellPb : rowPb.getF()) {
+      builder.addValue(FieldValue.fromPb(cellPb.getV()));
+    }
+    return builder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldValueTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldValueTest.java
new file mode 100644
index 000000000000..6fd3cf4472c9
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldValueTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+
+import com.google.api.client.util.Data;
+import com.google.api.services.bigquery.model.TableCell;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import org.junit.Test;
+
+import java.util.Map;
+
+public class FieldValueTest {
+
+  private static final TableCell BOOLEAN_FIELD = new TableCell().setV("false");
+  private static final Map INTEGER_FIELD = ImmutableMap.of("v", "1");
+  private static final Map FLOAT_FIELD = ImmutableMap.of("v", "1.5");
+  private static final Map STRING_FIELD = ImmutableMap.of("v", "string");
+  private static final Map TIMESTAMP_FIELD = ImmutableMap.of("v", "42");
+  private static final Map NULL_FIELD =
+      ImmutableMap.of("v", Data.nullOf(String.class));
+  private static final Map REPEATED_FIELD =
+      ImmutableMap.of("v", ImmutableList.of(INTEGER_FIELD, INTEGER_FIELD));
+  private static final Map RECORD_FIELD =
+      ImmutableMap.of("f", ImmutableList.of(FLOAT_FIELD, TIMESTAMP_FIELD));
+
+  @Test
+  public void testFromPb() {
+    FieldValue value = FieldValue.fromPb(BOOLEAN_FIELD);
+    assertEquals(FieldValue.Kind.PRIMITIVE, value.kind());
+    assertFalse(value.booleanValue());
+    value = FieldValue.fromPb(INTEGER_FIELD);
+    assertEquals(FieldValue.Kind.PRIMITIVE, value.kind());
+    assertEquals(1, value.longValue());
+    value = FieldValue.fromPb(FLOAT_FIELD);
+    assertEquals(FieldValue.Kind.PRIMITIVE, value.kind());
+    assertEquals(1.5, value.doubleValue(), 0);
+    value = FieldValue.fromPb(STRING_FIELD);
+    assertEquals(FieldValue.Kind.PRIMITIVE, value.kind());
+    assertEquals("string", value.stringValue());
+    value = FieldValue.fromPb(TIMESTAMP_FIELD);
+    assertEquals(FieldValue.Kind.PRIMITIVE, value.kind());
+    assertEquals(42000000, value.timestampValue());
+    value = FieldValue.fromPb(NULL_FIELD);
+    assertNull(value.value());
+    value = FieldValue.fromPb(REPEATED_FIELD);
+    assertEquals(FieldValue.Kind.REPEATED, value.kind());
+    assertEquals(FieldValue.fromPb(INTEGER_FIELD), value.repeatedValue().get(0));
+    assertEquals(FieldValue.fromPb(INTEGER_FIELD), value.repeatedValue().get(1));
+    value = FieldValue.fromPb(RECORD_FIELD);
+    assertEquals(FieldValue.Kind.RECORD, value.kind());
+    assertEquals(FieldValue.fromPb(FLOAT_FIELD), value.repeatedValue().get(0));
+    assertEquals(FieldValue.fromPb(TIMESTAMP_FIELD), value.repeatedValue().get(1));
+  }
+
+  @Test
+  public void testEquals() {
+    FieldValue booleanValue = new FieldValue(FieldValue.Kind.PRIMITIVE, "false");
+    assertEquals(booleanValue, FieldValue.fromPb(BOOLEAN_FIELD));
+    assertEquals(booleanValue.hashCode(), FieldValue.fromPb(BOOLEAN_FIELD).hashCode());
+
+    FieldValue integerValue = new FieldValue(FieldValue.Kind.PRIMITIVE, "1");
+    assertEquals(integerValue, FieldValue.fromPb(INTEGER_FIELD));
+    assertEquals(integerValue.hashCode(), FieldValue.fromPb(INTEGER_FIELD).hashCode());
+
+    FieldValue floatValue = new FieldValue(FieldValue.Kind.PRIMITIVE, "1.5");
+    assertEquals(floatValue, FieldValue.fromPb(FLOAT_FIELD));
+    assertEquals(floatValue.hashCode(), FieldValue.fromPb(FLOAT_FIELD).hashCode());
+
+    FieldValue stringValue = new FieldValue(FieldValue.Kind.PRIMITIVE, "string");
+    assertEquals(stringValue, FieldValue.fromPb(STRING_FIELD));
+    assertEquals(stringValue.hashCode(), FieldValue.fromPb(STRING_FIELD).hashCode());
+
+    FieldValue timestampValue = new FieldValue(FieldValue.Kind.PRIMITIVE, "42");
+    assertEquals(timestampValue, FieldValue.fromPb(TIMESTAMP_FIELD));
+    assertEquals(timestampValue.hashCode(), FieldValue.fromPb(TIMESTAMP_FIELD).hashCode());
+
+    FieldValue nullValue = new FieldValue(FieldValue.Kind.PRIMITIVE, null);
+    assertEquals(nullValue, FieldValue.fromPb(NULL_FIELD));
+    assertEquals(nullValue.hashCode(), FieldValue.fromPb(NULL_FIELD).hashCode());
+
+    FieldValue repeatedValue = new FieldValue(FieldValue.Kind.REPEATED,
+        ImmutableList.of(integerValue, integerValue));
+    assertEquals(repeatedValue, FieldValue.fromPb(REPEATED_FIELD));
+    assertEquals(repeatedValue.hashCode(), FieldValue.fromPb(REPEATED_FIELD).hashCode());
+
+    FieldValue recordValue = new FieldValue(FieldValue.Kind.RECORD,
+        ImmutableList.of(floatValue, timestampValue));
+    assertEquals(recordValue, FieldValue.fromPb(RECORD_FIELD));
+    assertEquals(recordValue.hashCode(), FieldValue.fromPb(RECORD_FIELD).hashCode());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java
new file mode 100644
index 000000000000..8a153c8c4da1
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+public class InsertAllRequestTest {
+
+  private static final Map CONTENT1 =
+      ImmutableMap.of("key", "val1");
+  private static final Map CONTENT2 =
+      ImmutableMap.of("key", "val2");
+  private static final List ROWS =
+      ImmutableList.of(new InsertAllRequest.RowToInsert(null, CONTENT1),
+          new InsertAllRequest.RowToInsert(null, CONTENT2));
+  private static final List ROWS_WITH_ID =
+      ImmutableList.of(new InsertAllRequest.RowToInsert("id1", CONTENT1),
+          new InsertAllRequest.RowToInsert("id2", CONTENT2));
+  private static final TableId TABLE_ID = TableId.of("dataset", "table");
+  private static final Schema TABLE_SCHEMA = Schema.of();
+  private static final BaseTableInfo TABLE_INFO = TableInfo.of(TABLE_ID, TABLE_SCHEMA);
+  private static final boolean SKIP_INVALID_ROWS = true;
+  private static final boolean IGNORE_UNKNOWN_VALUES = false;
+  private static final InsertAllRequest INSERT_ALL_REQUEST1 = InsertAllRequest.builder(TABLE_ID)
+      .addRow(CONTENT1)
+      .addRow(CONTENT2)
+      .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+      .skipInvalidRows(SKIP_INVALID_ROWS)
+      .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST2 = InsertAllRequest.builder(TABLE_ID)
+      .rows(ROWS)
+      .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+      .skipInvalidRows(SKIP_INVALID_ROWS)
+      .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST3 =
+      InsertAllRequest.builder(TABLE_ID.dataset(), TABLE_ID.table())
+          .rows(ROWS_WITH_ID)
+          .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+          .skipInvalidRows(SKIP_INVALID_ROWS)
+          .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST4 =
+      InsertAllRequest.builder(TABLE_ID, ROWS)
+          .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+          .skipInvalidRows(SKIP_INVALID_ROWS)
+          .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST5 =
+      InsertAllRequest.builder(TABLE_ID.dataset(), TABLE_ID.table(), ROWS_WITH_ID)
+          .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+          .skipInvalidRows(SKIP_INVALID_ROWS)
+          .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST6 =
+      InsertAllRequest.builder(TABLE_ID, ROWS.get(0), ROWS.get(1))
+          .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+          .skipInvalidRows(SKIP_INVALID_ROWS)
+          .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST7 =
+      InsertAllRequest.builder(TABLE_ID.dataset(), TABLE_ID.table(), ROWS_WITH_ID.get(0),
+          ROWS_WITH_ID.get(1))
+          .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+          .skipInvalidRows(SKIP_INVALID_ROWS)
+          .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST8 =
+      InsertAllRequest.builder(TABLE_ID.dataset(), TABLE_ID.table())
+          .addRow("id1", CONTENT1)
+          .addRow("id2", CONTENT2)
+          .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+          .skipInvalidRows(SKIP_INVALID_ROWS)
+          .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST9 =
+      InsertAllRequest.builder(TABLE_INFO)
+          .addRow("id1", CONTENT1)
+          .addRow("id2", CONTENT2)
+          .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+          .skipInvalidRows(SKIP_INVALID_ROWS)
+          .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST10 =
+      InsertAllRequest.builder(TABLE_INFO)
+          .addRow("id1", CONTENT1)
+          .addRow("id2", CONTENT2)
+          .ignoreUnknownValues(true)
+          .skipInvalidRows(false)
+          .build();
+
+  @Test
+  public void testBuilder() {
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST1.table());
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST2.table());
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST3.table());
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST4.table());
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST5.table());
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST6.table());
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST7.table());
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST8.table());
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST9.table());
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST10.table());
+    assertEquals(ROWS, INSERT_ALL_REQUEST1.rows());
+    assertEquals(ROWS, INSERT_ALL_REQUEST2.rows());
+    assertEquals(ROWS, INSERT_ALL_REQUEST4.rows());
+    assertEquals(ROWS, INSERT_ALL_REQUEST6.rows());
+    assertEquals(ROWS_WITH_ID, INSERT_ALL_REQUEST3.rows());
+    assertEquals(ROWS_WITH_ID, INSERT_ALL_REQUEST5.rows());
+    assertEquals(ROWS_WITH_ID, INSERT_ALL_REQUEST7.rows());
+    assertEquals(ROWS_WITH_ID, INSERT_ALL_REQUEST8.rows());
+    assertEquals(ROWS_WITH_ID, INSERT_ALL_REQUEST9.rows());
+    assertEquals(ROWS_WITH_ID, INSERT_ALL_REQUEST10.rows());
+    assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST1.skipInvalidRows());
+    assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST2.skipInvalidRows());
+    assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST3.skipInvalidRows());
+    assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST4.skipInvalidRows());
+    assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST5.skipInvalidRows());
+    assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST6.skipInvalidRows());
+    assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST7.skipInvalidRows());
+    assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST8.skipInvalidRows());
+    assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST9.skipInvalidRows());
+    assertFalse(INSERT_ALL_REQUEST10.skipInvalidRows());
+    assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST1.ignoreUnknownValues());
+    assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST2.ignoreUnknownValues());
+    assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST3.ignoreUnknownValues());
+    assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST4.ignoreUnknownValues());
+    assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST5.ignoreUnknownValues());
+    assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST6.ignoreUnknownValues());
+    assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST7.ignoreUnknownValues());
+    assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST8.ignoreUnknownValues());
+    assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST9.ignoreUnknownValues());
+    assertTrue(INSERT_ALL_REQUEST10.ignoreUnknownValues());
+  }
+
+  @Test
+  public void testOf() {
+    InsertAllRequest request = InsertAllRequest.of(TABLE_ID, ROWS);
+    assertEquals(TABLE_ID, request.table());
+    assertEquals(ROWS, request.rows());
+    request = InsertAllRequest.of(TABLE_INFO, ROWS);
+    assertEquals(TABLE_ID, request.table());
+    assertEquals(ROWS, request.rows());
+    request = InsertAllRequest.of(TABLE_ID.dataset(), TABLE_ID.table(), ROWS);
+    assertEquals(TABLE_ID, request.table());
+    assertEquals(ROWS, request.rows());
+    request = InsertAllRequest.of(TABLE_ID.dataset(), TABLE_ID.table(), ROWS);
+    assertEquals(TABLE_ID, request.table());
+    assertEquals(ROWS, request.rows());
+    request = InsertAllRequest.of(TABLE_ID, ROWS.get(0), ROWS.get(1));
+    assertEquals(TABLE_ID, request.table());
+    assertEquals(ROWS, request.rows());
+    request = InsertAllRequest.of(TABLE_INFO, ROWS.get(0), ROWS.get(1));
+    assertEquals(TABLE_ID, request.table());
+    assertEquals(ROWS, request.rows());
+    request = InsertAllRequest.of(TABLE_ID.dataset(), TABLE_ID.table(), ROWS.get(0), ROWS.get(1));
+    assertEquals(TABLE_ID, request.table());
+    assertEquals(ROWS, request.rows());
+  }
+
+  @Test
+  public void testEquals() {
+    compareInsertAllRequest(INSERT_ALL_REQUEST1, INSERT_ALL_REQUEST2);
+    compareInsertAllRequest(INSERT_ALL_REQUEST2, INSERT_ALL_REQUEST4);
+    compareInsertAllRequest(INSERT_ALL_REQUEST3, INSERT_ALL_REQUEST5);
+    compareInsertAllRequest(INSERT_ALL_REQUEST4, INSERT_ALL_REQUEST6);
+    compareInsertAllRequest(INSERT_ALL_REQUEST5, INSERT_ALL_REQUEST7);
+    compareInsertAllRequest(INSERT_ALL_REQUEST7, INSERT_ALL_REQUEST8);
+    compareInsertAllRequest(INSERT_ALL_REQUEST8, INSERT_ALL_REQUEST9);
+  }
+
+  private void compareInsertAllRequest(InsertAllRequest expected, InsertAllRequest value) {
+    assertEquals(expected, value);
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.table(), value.table());
+    assertEquals(expected.rows(), value.rows());
+    assertEquals(expected.ignoreUnknownValues(), value.ignoreUnknownValues());
+    assertEquals(expected.skipInvalidRows(), value.skipInvalidRows());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllResponseTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllResponseTest.java
new file mode 100644
index 000000000000..b2eb0458f27f
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllResponseTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+public class InsertAllResponseTest {
+
+  private static final List ERRORS1 = ImmutableList.of(
+      new BigQueryError("reason1", "location1", "message1"),
+      new BigQueryError("reason2", "location2", "message2"));
+  private static final List ERRORS2 = ImmutableList.of(
+      new BigQueryError("reason3", "location3", "message3"),
+      new BigQueryError("reason4", "location4", "message4"));
+  private static final Map> ERRORS_MAP = ImmutableMap.of(
+      0L, ERRORS1, 1L, ERRORS2);
+  private static final InsertAllResponse INSERT_ALL_RESPONSE = new InsertAllResponse(ERRORS_MAP);
+  private static final InsertAllResponse EMPTY_INSERT_ALL_RESPONSE = new InsertAllResponse(null);
+
+  @Test
+  public void testConstructor() {
+    assertEquals(INSERT_ALL_RESPONSE, INSERT_ALL_RESPONSE);
+  }
+
+  @Test
+  public void testErrorsFor() {
+    assertEquals(ERRORS1, INSERT_ALL_RESPONSE.errorsFor(0L));
+    assertEquals(ERRORS2, INSERT_ALL_RESPONSE.errorsFor(1L));
+    assertNull(INSERT_ALL_RESPONSE.errorsFor(2L));
+  }
+
+  @Test
+  public void testHasErrors() {
+    assertTrue(INSERT_ALL_RESPONSE.hasErrors());
+    assertFalse(EMPTY_INSERT_ALL_RESPONSE.hasErrors());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    compareInsertAllResponse(INSERT_ALL_RESPONSE,
+        InsertAllResponse.fromPb(INSERT_ALL_RESPONSE.toPb()));
+    compareInsertAllResponse(EMPTY_INSERT_ALL_RESPONSE,
+        InsertAllResponse.fromPb(EMPTY_INSERT_ALL_RESPONSE.toPb()));
+  }
+
+  private void compareInsertAllResponse(InsertAllResponse expected, InsertAllResponse value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.insertErrors(), value.insertErrors());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 15a652719703..088820c298ec 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertNotSame;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.RetryParams;
 
@@ -33,6 +34,7 @@
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Map;
 
 public class SerializationTest {
 
@@ -169,6 +171,23 @@ public class SerializationTest {
   private static final ExtractJobInfo EXTRACT_JOB = ExtractJobInfo.of(TABLE_ID, SOURCE_URIS);
   private static final LoadJobInfo LOAD_JOB = LoadJobInfo.of(TABLE_ID, SOURCE_URIS);
   private static final QueryJobInfo QUERY_JOB = QueryJobInfo.of("query");
+  private static final Map CONTENT1 =
+      ImmutableMap.of("key", "val1");
+  private static final Map CONTENT2 =
+      ImmutableMap.of("key", "val2");
+  private static final InsertAllRequest INSERT_ALL_REQUEST = InsertAllRequest.builder(TABLE_ID)
+      .addRow(CONTENT1)
+      .addRow(CONTENT2)
+      .ignoreUnknownValues(true)
+      .skipInvalidRows(false)
+      .build();
+  private static final Map> ERRORS_MAP =
+      ImmutableMap.>of(0L, ImmutableList.of(BIGQUERY_ERROR));
+  private static final InsertAllResponse INSERT_ALL_RESPONSE = new InsertAllResponse(ERRORS_MAP);
+  private static final FieldValue FIELD_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "value");
+  private static final TableRow TABLE_ROW = new TableRow.Builder()
+      .addValue(FIELD_VALUE)
+      .build();
 
   @Test
   public void testServiceOptions() throws Exception {
@@ -194,7 +213,8 @@ public void testModelAndRequests() throws Exception {
         DATASET_INFO, TABLE_ID, CSV_OPTIONS, STREAMING_BUFFER, EXTERNAL_DATA_CONFIGURATION,
         TABLE_SCHEMA, TABLE_INFO, VIEW_INFO, EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION,
         JOB_STATISTICS, EXTRACT_STATISTICS, LOAD_STATISTICS, QUERY_STATISTICS, BIGQUERY_ERROR,
-        JOB_STATUS, JOB_ID, COPY_JOB, EXTRACT_JOB, LOAD_JOB, QUERY_JOB};
+        JOB_STATUS, JOB_ID, COPY_JOB, EXTRACT_JOB, LOAD_JOB, QUERY_JOB, INSERT_ALL_REQUEST,
+        INSERT_ALL_RESPONSE, FIELD_VALUE, TABLE_ROW};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java
new file mode 100644
index 000000000000..f20105ea9cd5
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.api.client.util.Data;
+import com.google.api.services.bigquery.model.TableCell;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+public class TableRowTest {
+
+  private static final FieldValue BOOL_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "false");
+  private static final FieldValue INT_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "1");
+  private static final FieldValue FLOAT_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "1.5");
+  private static final FieldValue STRING_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "str");
+  private static final FieldValue TIME_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "42");
+  private static final List ROW_VALUES =
+      ImmutableList.of(BOOL_VALUE, INT_VALUE, FLOAT_VALUE, STRING_VALUE, TIME_VALUE);
+  private static final TableRow TABLE_ROW1 = new TableRow.Builder()
+      .addValue(BOOL_VALUE)
+      .addValue(INT_VALUE)
+      .addValue(FLOAT_VALUE)
+      .addValue(STRING_VALUE)
+      .addValue(TIME_VALUE)
+      .build();
+  private static final TableRow TABLE_ROW2 = new TableRow.Builder().values(ROW_VALUES).build();
+
+  @Test
+  public void testBuilder() {
+    assertEquals(ROW_VALUES, TABLE_ROW1.values());
+    assertEquals(ROW_VALUES, TABLE_ROW2.values());
+  }
+
+  @Test
+  public void testEquals() {
+    compareTableRow(TABLE_ROW1, TABLE_ROW2);
+  }
+
+  @Test
+  public void testFromPb() {
+    TableCell booleanField = new TableCell().setV("false");
+    TableCell integerField = new TableCell().setV("1");
+    TableCell floatField = new TableCell().setV("1.5");
+    TableCell stringField = new TableCell().setV("str");
+    TableCell timestampField = new TableCell().setV("42");
+    com.google.api.services.bigquery.model.TableRow rowPb =
+        new com.google.api.services.bigquery.model.TableRow();
+    rowPb.setF(ImmutableList.of(booleanField, integerField, floatField, stringField,
+        timestampField));
+    compareTableRow(TABLE_ROW1, TableRow.fromPb(rowPb));
+  }
+
+  private void compareTableRow(TableRow expected, TableRow value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.values(), value.values());
+  }
+}

From d0eec713a4c838c67b3421b87eefa67500947e5d Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 10 Dec 2015 08:59:05 -0800
Subject: [PATCH 164/322] Add generic type to ServiceOption definition + minor
 fixes

---
 .../src/main/java/com/google/gcloud/PageImpl.java    |  3 +--
 .../main/java/com/google/gcloud/ServiceOptions.java  | 12 +++---------
 .../java/com/google/gcloud/datastore/ValueTest.java  |  2 +-
 .../gcloud/storage/BlobWriteChannelImplTest.java     |  3 ++-
 .../com/google/gcloud/storage/ITStorageTest.java     |  3 +--
 .../com/google/gcloud/storage/SerializationTest.java |  3 ++-
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
index 97c2931e0cfb..1c7a61ec471f 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -71,10 +71,9 @@ public PageImpl(NextPageFetcher pageFetcher, String cursor, Iterable resul
     this.results = results;
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public Iterable values() {
-    return results == null ? Collections.EMPTY_LIST : results;
+    return results == null ? Collections.emptyList() : results;
   }
 
   @Override
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 9e5d6730f551..862d3f7b533d 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -53,12 +53,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-@SuppressWarnings("rawtypes")
-public abstract class ServiceOptions<
-    ServiceT extends Service,
-    ServiceRpcT,
-    OptionsT extends ServiceOptions>
-    implements Serializable {
+public abstract class ServiceOptions, ServiceRpcT,
+    OptionsT extends ServiceOptions> implements Serializable {
 
   private static final String DEFAULT_HOST = "https://www.googleapis.com";
   private static final long serialVersionUID = 1203687993961393350L;
@@ -154,9 +150,7 @@ private Object readResolve() throws ObjectStreamException {
     }
   }
 
-  protected abstract static class Builder<
-      ServiceT extends Service,
-      ServiceRpcT,
+  protected abstract static class Builder, ServiceRpcT,
       OptionsT extends ServiceOptions,
       B extends Builder> {
 
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java
index 3867e194d060..891668990f66 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/ValueTest.java
@@ -66,7 +66,7 @@ private class TestBuilder extends Value.BaseBuilder, TestBuilder
       super(ValueType.LIST);
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings({"unchecked"})
     @Override
     public Value build() {
       return new Value(this) {
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
index 5d44fcb5f320..c2107ff13998 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
@@ -234,7 +234,8 @@ public void testStateEquals() {
         .times(2);
     replay(storageRpcMock);
     writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
-    @SuppressWarnings("resource") // avoid closing when you don't want partial writes to GCS
+    // avoid closing when you don't want partial writes to GCS upon failure
+    @SuppressWarnings("resource")
     BlobWriteChannel writer2 = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     RestorableState state = writer.capture();
     RestorableState state2 = writer2.capture();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 05055e9c3ca9..22b0a35c0620 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -74,8 +74,7 @@ public static void beforeClass() {
   }
 
   @AfterClass
-  public static void afterClass()
-throws ExecutionException, InterruptedException {
+  public static void afterClass() throws ExecutionException, InterruptedException {
     if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS)) {
       if (log.isLoggable(Level.WARNING)) {
         log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index af779512e0e8..555e231f7f0e 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -128,7 +128,8 @@ public void testWriteChannelState() throws IOException, ClassNotFoundException {
         .projectId("p2")
         .retryParams(RetryParams.defaultInstance())
         .build();
-    @SuppressWarnings("resource") // avoid closing when you don't want partial writes to GCS
+    // avoid closing when you don't want partial writes to GCS upon failure
+    @SuppressWarnings("resource")
     BlobWriteChannelImpl writer = new BlobWriteChannelImpl(
         options, BlobInfo.builder(BlobId.of("b", "n")).build(), "upload-id");
     RestorableState state = writer.capture();

From 1674c9c8a7a6ac69019a686244d76980cf2dc887 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 10 Dec 2015 22:00:13 +0100
Subject: [PATCH 165/322] Document ClassCastException in FieldValue

---
 .../src/main/java/com/google/gcloud/bigquery/FieldValue.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
index 19d68bfb2678..73bb3e9ad96f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
@@ -106,6 +106,7 @@ public String stringValue() {
    * Returns this field's value as a {@link Long}. This method should only be used if the
    * corresponding field has {@link Field.Type#integer()} type.
    *
+   * @throws ClassCastException if the field has not primitive type
    * @throws NumberFormatException if the field's value could not be converted to {@link Integer}
    */
   @SuppressWarnings("unchecked")
@@ -117,6 +118,7 @@ public long longValue() {
    * Returns this field's value as a {@link Double}. This method should only be used if the
    * corresponding field has {@link Field.Type#floatingPoint()} type.
    *
+   * @throws ClassCastException if the field has not primitive type
    * @throws NumberFormatException if the field's value could not be converted to {@link Double}
    */
   @SuppressWarnings("unchecked")
@@ -128,6 +130,7 @@ public double doubleValue() {
    * Returns this field's value as a {@link Boolean}. This method should only be used if the
    * corresponding field has {@link Field.Type#bool()} type.
    *
+   * @throws ClassCastException if the field has not primitive type
    * @throws IllegalStateException if the field's value could not be converted to {@link Boolean}
    */
   @SuppressWarnings("unchecked")
@@ -142,6 +145,7 @@ public boolean booleanValue() {
    * Returns this field's value as a {@link Long}, representing a timestamp in microseconds. This
    * method should only be used if the corresponding field has {@link Field.Type#timestamp()} type.
    *
+   * @throws ClassCastException if the field has not primitive type
    * @throws NumberFormatException if the field's value could not be converted to {@link Long}
    */
   @SuppressWarnings("unchecked")

From f22e41fd26a4d5aaacd3fc4e32083a060d018f9b Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 10 Dec 2015 16:52:42 -0800
Subject: [PATCH 166/322] Specify HTTP Transport in DefaultDatastoreRpc

---
 .../src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
index 028027f4bc33..4771895eec99 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -69,6 +69,7 @@ public DefaultDatastoreRpc(DatastoreOptions options) {
     String normalizedHost = normalizeHost(options.host());
     client = DatastoreFactory.get().create(
         new Builder()
+            .transport(options.httpTransportFactory().create())
             .dataset(options.projectId())
             .host(normalizedHost)
             .initializer(options.httpRequestInitializer())

From d2f0a821eaf9690401af6ce562bfcd83c63200b2 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 11 Dec 2015 13:16:33 +0100
Subject: [PATCH 167/322] Minor changes to FieldValue and InsertAllRequest -
 Add static FROM_PB_FUNCTION in FieldValue - Rename Kind to Attribute in
 FieldValue - Add isNull() and document NPEs in FieldValue getters - Change
 has type to is a type in FieldValue - Copy row content in RowToInsert
 constructor - Add factory method for null id to RowToInsert - Use isEmpty()
 instead of size() > 0 in InsertAllResponse - Better unit testing

---
 .../google/gcloud/bigquery/FieldValue.java    | 102 +++++++++++-------
 .../gcloud/bigquery/InsertAllRequest.java     |  19 +++-
 .../gcloud/bigquery/InsertAllResponse.java    |   6 +-
 .../gcloud/bigquery/FieldValueTest.java       |  30 +++---
 .../gcloud/bigquery/InsertAllRequestTest.java |   8 +-
 .../gcloud/bigquery/SerializationTest.java    |   2 +-
 .../google/gcloud/bigquery/TableRowTest.java  |  36 +++++--
 7 files changed, 130 insertions(+), 73 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
index 73bb3e9ad96f..8131cafb8bad 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
@@ -16,10 +16,12 @@
 
 package com.google.gcloud.bigquery;
 
+import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
 import com.google.api.client.util.Data;
 import com.google.api.client.util.Lists;
+import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 
 import java.io.Serializable;
@@ -34,19 +36,25 @@
  */
 public class FieldValue implements Serializable {
 
+  static final Function FROM_PB_FUNCTION = new Function() {
+    @Override
+    public FieldValue apply(Object pb) {
+      return FieldValue.fromPb(pb);
+    }
+  };
   private static final int MICROSECONDS = 1000000;
   private static final long serialVersionUID = 469098630191710061L;
 
-  private final Kind kind;
+  private final Attribute attribute;
   private final Object value;
 
   /**
-   * The field value's kind, giving information on the field's content type.
+   * The field value's attribute, giving information on the field's content type.
    */
-  public enum Kind {
+  public enum Attribute {
     /**
-     * A primitive field value. A {@code FieldValue} has type {@link #PRIMITIVE} when the
-     * corresponding field has type {@link Field.Type#bool()}, {@link Field.Type#string()}
+     * A primitive field value. A {@code FieldValue} is primitive when the corresponding field has
+     * type {@link Field.Type#bool()}, {@link Field.Type#string()},
      * {@link Field.Type#floatingPoint()}, {@link Field.Type#integer()},
      * {@link Field.Type#timestamp()} or the value is set to {@code null}.
      */
@@ -63,39 +71,47 @@ public enum Kind {
     RECORD
   }
 
-  FieldValue(Kind kind, Object value) {
-    this.kind = kind;
+  FieldValue(Attribute attribute, Object value) {
+    this.attribute = attribute;
     this.value = value;
   }
 
   /**
-   * Returns the kind of this Field Value.
+   * Returns the attribute of this Field Value.
    *
-   * @return {@link Kind#PRIMITIVE} if the value is of primitive type ({@link Field.Type#bool()},
-   *     {@link Field.Type#string()}, {@link Field.Type#floatingPoint()},
-   *     {@link Field.Type#integer()}, {@link Field.Type#timestamp()}) or is {@code null}. Returns
-   *     {@link Kind#REPEATED} if the corresponding field has ({@link Field.Mode#REPEATED}) mode.
-   *     Returns {@link Kind#RECORD} if the corresponding field has
+   * @return {@link Attribute#PRIMITIVE} if the field is a primitive type
+   *     ({@link Field.Type#bool()}, {@link Field.Type#string()},
+   *     {@link Field.Type#floatingPoint()}, {@link Field.Type#integer()},
+   *     {@link Field.Type#timestamp()}) or is {@code null}. Returns {@link Attribute#REPEATED} if
+   *     the corresponding field has ({@link Field.Mode#REPEATED}) mode. Returns
+   *     {@link Attribute#RECORD} if the corresponding field is a
    *     {@link Field.Type#record(Field...)} type.
    */
-  public Kind kind() {
-    return kind;
+  public Attribute attribute() {
+    return attribute;
+  }
+
+  /**
+   * Returns {@code true} if this field's value is {@code null}, {@code false} otherwise.
+   */
+  public boolean isNull() {
+    return value == null;
   }
 
   /**
-   * Return this field's value as an {@link Object}.
+   * Returns this field's value as an {@link Object}.
    */
   public Object value() {
     return value;
   }
 
   /**
-   * Return this field's value as a {@link String}. This method should only be used if the
+   * Returns this field's value as a {@link String}. This method should only be used if the
    * corresponding field has primitive type ({@link Field.Type#bool()}, {@link Field.Type#string()},
    * {@link Field.Type#floatingPoint()}, {@link Field.Type#integer()},
    * {@link Field.Type#timestamp()}).
    *
-   * @throws ClassCastException if the field has not primitive type
+   * @throws ClassCastException if the field is not a primitive type
    */
   @SuppressWarnings("unchecked")
   public String stringValue() {
@@ -103,60 +119,68 @@ public String stringValue() {
   }
 
   /**
-   * Returns this field's value as a {@link Long}. This method should only be used if the
+   * Returns this field's value as a {@code long}. This method should only be used if the
    * corresponding field has {@link Field.Type#integer()} type.
    *
-   * @throws ClassCastException if the field has not primitive type
+   * @throws ClassCastException if the field is not a primitive type
    * @throws NumberFormatException if the field's value could not be converted to {@link Integer}
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
    */
   @SuppressWarnings("unchecked")
   public long longValue() {
-    return Long.valueOf(stringValue());
+    return Long.parseLong(stringValue());
   }
 
   /**
    * Returns this field's value as a {@link Double}. This method should only be used if the
    * corresponding field has {@link Field.Type#floatingPoint()} type.
    *
-   * @throws ClassCastException if the field has not primitive type
+   * @throws ClassCastException if the field is not a primitive type
    * @throws NumberFormatException if the field's value could not be converted to {@link Double}
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
    */
   @SuppressWarnings("unchecked")
   public double doubleValue() {
-    return Double.valueOf(stringValue());
+    return Double.parseDouble(stringValue());
   }
 
   /**
    * Returns this field's value as a {@link Boolean}. This method should only be used if the
    * corresponding field has {@link Field.Type#bool()} type.
    *
-   * @throws ClassCastException if the field has not primitive type
+   * @throws ClassCastException if the field is not a primitive type
    * @throws IllegalStateException if the field's value could not be converted to {@link Boolean}
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
    */
   @SuppressWarnings("unchecked")
   public boolean booleanValue() {
     String stringValue = stringValue();
+    checkNotNull(stringValue);
     checkState(stringValue.equalsIgnoreCase("true") || stringValue.equalsIgnoreCase("false"),
         "Field value is not of boolean type");
     return Boolean.parseBoolean(stringValue);
   }
 
   /**
-   * Returns this field's value as a {@link Long}, representing a timestamp in microseconds. This
-   * method should only be used if the corresponding field has {@link Field.Type#timestamp()} type.
+   * Returns this field's value as a {@code long}, representing a timestamp in microseconds since
+   * epoch (UNIX time). This method should only be used if the corresponding field has
+   * {@link Field.Type#timestamp()} type.
    *
-   * @throws ClassCastException if the field has not primitive type
+   * @throws ClassCastException if the field is not a primitive type
    * @throws NumberFormatException if the field's value could not be converted to {@link Long}
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
    */
   @SuppressWarnings("unchecked")
   public long timestampValue() {
+    // timestamps are encoded in the format 1408452095.22 where the integer part is seconds since
+    // epoch (e.g. 1408452095.22 == 2014-08-19 07:41:35.220 -05:00)
     return new Double(((Double.valueOf(stringValue())) * MICROSECONDS)).longValue();
   }
 
   /**
    * Returns this field's value as a list of {@link FieldValue}. This method should only be used if
-   * the corresponding field has {@link Field.Mode#REPEATED} mode (i.e. {@link #kind()} is
-   * {@link Kind#REPEATED}).
+   * the corresponding field has {@link Field.Mode#REPEATED} mode (i.e. {@link #attribute()} is
+   * {@link Attribute#REPEATED}).
    *
    * @throws ClassCastException if the field has not {@link Field.Mode#REPEATED} mode
    */
@@ -167,10 +191,10 @@ public List repeatedValue() {
 
   /**
    * Returns this field's value as a list of {@link FieldValue}. This method should only be used if
-   * the corresponding field has {@link Field.Type#record(Field...)} type (i.e. {@link #kind()} is
-   * {@link Kind#RECORD}).
+   * the corresponding field has {@link Field.Type#record(Field...)} type (i.e. {@link #attribute()}
+   * is {@link Attribute#RECORD}).
    *
-   * @throws ClassCastException if the field has not {@link Field.Type#record(Field...)} type
+   * @throws ClassCastException if the field is not a {@link Field.Type#record(Field...)} type
    */
   @SuppressWarnings("unchecked")
   public List recordValue() {
@@ -180,14 +204,14 @@ public List recordValue() {
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
-        .add("kind", kind)
+        .add("attribute", attribute)
         .add("value", value)
         .toString();
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(kind, value);
+    return Objects.hash(attribute, value);
   }
 
   @Override
@@ -196,16 +220,16 @@ public boolean equals(Object obj) {
       return false;
     }
     FieldValue other = (FieldValue) obj;
-    return kind == other.kind && Objects.equals(value, other.value);
+    return attribute == other.attribute && Objects.equals(value, other.value);
   }
 
   @SuppressWarnings("unchecked")
   static FieldValue fromPb(Object cellPb) {
     if (Data.isNull(cellPb)) {
-      return new FieldValue(Kind.PRIMITIVE, null);
+      return new FieldValue(Attribute.PRIMITIVE, null);
     }
     if (cellPb instanceof String) {
-      return new FieldValue(Kind.PRIMITIVE, cellPb);
+      return new FieldValue(Attribute.PRIMITIVE, cellPb);
     }
     if (cellPb instanceof List) {
       List cellsListPb = (List) cellPb;
@@ -213,7 +237,7 @@ static FieldValue fromPb(Object cellPb) {
       for (Object repeatedCellPb : cellsListPb) {
         repeatedCells.add(FieldValue.fromPb(repeatedCellPb));
       }
-      return new FieldValue(Kind.REPEATED, repeatedCells);
+      return new FieldValue(Attribute.REPEATED, repeatedCells);
     }
     if (cellPb instanceof Map) {
       Map cellMapPb = (Map) cellPb;
@@ -223,7 +247,7 @@ static FieldValue fromPb(Object cellPb) {
         for (Object repeatedCellPb : cellsListPb) {
           recordCells.add(FieldValue.fromPb(repeatedCellPb));
         }
-        return new FieldValue(Kind.RECORD, recordCells);
+        return new FieldValue(Attribute.RECORD, recordCells);
       }
       // This should never be the case when we are processing a first level table field (i.e. a
       // row's field, not a record sub-field)
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
index bcc9e5691c20..c7ab8fa0dd7c 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
@@ -20,6 +20,7 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 
 import java.io.Serializable;
@@ -74,7 +75,7 @@ public static class RowToInsert implements Serializable {
 
     RowToInsert(String id, Map content) {
       this.id = id;
-      this.content = content;
+      this.content = ImmutableMap.copyOf(content);
     }
 
     /**
@@ -115,7 +116,7 @@ public boolean equals(Object obj) {
     }
 
     /**
-     * Creates a row to be inserted.
+     * Creates a row to be inserted with associated id.
      *
      * @param id id of the row, used to identify duplicates
      * @param content the actual content of the row
@@ -123,6 +124,16 @@ public boolean equals(Object obj) {
     public static RowToInsert of(String id, Map content) {
       return new RowToInsert(checkNotNull(id), checkNotNull(content));
     }
+
+    /**
+     * Creates a row to be inserted without associated id.
+     *
+     * @param id id of the row, used to identify duplicates
+     * @param content the actual content of the row
+     */
+    public static RowToInsert of(Map content) {
+      return new RowToInsert(null, checkNotNull(content));
+    }
   }
 
   public static final class Builder {
@@ -168,7 +179,7 @@ public Builder addRow(RowToInsert rowToInsert) {
      * 

      * Example usage of adding a row with associated id:
      * 
    {@code
-     *   InsertAllRequest.Buider builder = InsertAllRequest.builder(tableId);
+     *   InsertAllRequest.Builder builder = InsertAllRequest.builder(tableId);
      *   List repeatedFieldValue = Arrays.asList(1L, 2L);
      *   Map recordContent = new HashMap();
      *   recordContent.put("subfieldName1", "value");
@@ -190,7 +201,7 @@ public Builder addRow(String id, Map content) {
      * 

      * Example usage of adding a row without an associated id:
      * 
    {@code
-     *   InsertAllRequest.Buider builder = InsertAllRequest.builder(tableId);
+     *   InsertAllRequest.Builder builder = InsertAllRequest.builder(tableId);
      *   List repeatedFieldValue = Arrays.asList(1L, 2L);
      *   Map recordContent = new HashMap();
      *   recordContent.put("subfieldName1", "value");
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
index 2534f4f23f67..76d3e571c124 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
@@ -41,6 +41,8 @@
  */
 public class InsertAllResponse implements Serializable {
 
+  private static final long serialVersionUID = -6934152676514098452L;
+
   private final Map> insertErrors;
 
   InsertAllResponse(Map> insertErrors) {
@@ -59,7 +61,7 @@ public Map> insertErrors() {
   /**
    * Returns errors for the provided row index. If no error exists returns {@code null}.
    */
-  public List errorsFor(Long index) {
+  public List errorsFor(long index) {
     return insertErrors.get(index);
   }
 
@@ -89,7 +91,7 @@ public String toString() {
 
   TableDataInsertAllResponse toPb() {
     TableDataInsertAllResponse responsePb = new TableDataInsertAllResponse();
-    if (insertErrors.size() > 0) {
+    if (!insertErrors.isEmpty()) {
       responsePb.setInsertErrors(ImmutableList.copyOf(Iterables.transform(insertErrors.entrySet(),
           new Function>, InsertErrors>() {
             @Override
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldValueTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldValueTest.java
index 6fd3cf4472c9..d6d879dbd58f 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldValueTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/FieldValueTest.java
@@ -46,64 +46,64 @@ public class FieldValueTest {
   @Test
   public void testFromPb() {
     FieldValue value = FieldValue.fromPb(BOOLEAN_FIELD);
-    assertEquals(FieldValue.Kind.PRIMITIVE, value.kind());
+    assertEquals(FieldValue.Attribute.PRIMITIVE, value.attribute());
     assertFalse(value.booleanValue());
     value = FieldValue.fromPb(INTEGER_FIELD);
-    assertEquals(FieldValue.Kind.PRIMITIVE, value.kind());
+    assertEquals(FieldValue.Attribute.PRIMITIVE, value.attribute());
     assertEquals(1, value.longValue());
     value = FieldValue.fromPb(FLOAT_FIELD);
-    assertEquals(FieldValue.Kind.PRIMITIVE, value.kind());
+    assertEquals(FieldValue.Attribute.PRIMITIVE, value.attribute());
     assertEquals(1.5, value.doubleValue(), 0);
     value = FieldValue.fromPb(STRING_FIELD);
-    assertEquals(FieldValue.Kind.PRIMITIVE, value.kind());
+    assertEquals(FieldValue.Attribute.PRIMITIVE, value.attribute());
     assertEquals("string", value.stringValue());
     value = FieldValue.fromPb(TIMESTAMP_FIELD);
-    assertEquals(FieldValue.Kind.PRIMITIVE, value.kind());
+    assertEquals(FieldValue.Attribute.PRIMITIVE, value.attribute());
     assertEquals(42000000, value.timestampValue());
     value = FieldValue.fromPb(NULL_FIELD);
     assertNull(value.value());
     value = FieldValue.fromPb(REPEATED_FIELD);
-    assertEquals(FieldValue.Kind.REPEATED, value.kind());
+    assertEquals(FieldValue.Attribute.REPEATED, value.attribute());
     assertEquals(FieldValue.fromPb(INTEGER_FIELD), value.repeatedValue().get(0));
     assertEquals(FieldValue.fromPb(INTEGER_FIELD), value.repeatedValue().get(1));
     value = FieldValue.fromPb(RECORD_FIELD);
-    assertEquals(FieldValue.Kind.RECORD, value.kind());
+    assertEquals(FieldValue.Attribute.RECORD, value.attribute());
     assertEquals(FieldValue.fromPb(FLOAT_FIELD), value.repeatedValue().get(0));
     assertEquals(FieldValue.fromPb(TIMESTAMP_FIELD), value.repeatedValue().get(1));
   }
 
   @Test
   public void testEquals() {
-    FieldValue booleanValue = new FieldValue(FieldValue.Kind.PRIMITIVE, "false");
+    FieldValue booleanValue = new FieldValue(FieldValue.Attribute.PRIMITIVE, "false");
     assertEquals(booleanValue, FieldValue.fromPb(BOOLEAN_FIELD));
     assertEquals(booleanValue.hashCode(), FieldValue.fromPb(BOOLEAN_FIELD).hashCode());
 
-    FieldValue integerValue = new FieldValue(FieldValue.Kind.PRIMITIVE, "1");
+    FieldValue integerValue = new FieldValue(FieldValue.Attribute.PRIMITIVE, "1");
     assertEquals(integerValue, FieldValue.fromPb(INTEGER_FIELD));
     assertEquals(integerValue.hashCode(), FieldValue.fromPb(INTEGER_FIELD).hashCode());
 
-    FieldValue floatValue = new FieldValue(FieldValue.Kind.PRIMITIVE, "1.5");
+    FieldValue floatValue = new FieldValue(FieldValue.Attribute.PRIMITIVE, "1.5");
     assertEquals(floatValue, FieldValue.fromPb(FLOAT_FIELD));
     assertEquals(floatValue.hashCode(), FieldValue.fromPb(FLOAT_FIELD).hashCode());
 
-    FieldValue stringValue = new FieldValue(FieldValue.Kind.PRIMITIVE, "string");
+    FieldValue stringValue = new FieldValue(FieldValue.Attribute.PRIMITIVE, "string");
     assertEquals(stringValue, FieldValue.fromPb(STRING_FIELD));
     assertEquals(stringValue.hashCode(), FieldValue.fromPb(STRING_FIELD).hashCode());
 
-    FieldValue timestampValue = new FieldValue(FieldValue.Kind.PRIMITIVE, "42");
+    FieldValue timestampValue = new FieldValue(FieldValue.Attribute.PRIMITIVE, "42");
     assertEquals(timestampValue, FieldValue.fromPb(TIMESTAMP_FIELD));
     assertEquals(timestampValue.hashCode(), FieldValue.fromPb(TIMESTAMP_FIELD).hashCode());
 
-    FieldValue nullValue = new FieldValue(FieldValue.Kind.PRIMITIVE, null);
+    FieldValue nullValue = new FieldValue(FieldValue.Attribute.PRIMITIVE, null);
     assertEquals(nullValue, FieldValue.fromPb(NULL_FIELD));
     assertEquals(nullValue.hashCode(), FieldValue.fromPb(NULL_FIELD).hashCode());
 
-    FieldValue repeatedValue = new FieldValue(FieldValue.Kind.REPEATED,
+    FieldValue repeatedValue = new FieldValue(FieldValue.Attribute.REPEATED,
         ImmutableList.of(integerValue, integerValue));
     assertEquals(repeatedValue, FieldValue.fromPb(REPEATED_FIELD));
     assertEquals(repeatedValue.hashCode(), FieldValue.fromPb(REPEATED_FIELD).hashCode());
 
-    FieldValue recordValue = new FieldValue(FieldValue.Kind.RECORD,
+    FieldValue recordValue = new FieldValue(FieldValue.Attribute.RECORD,
         ImmutableList.of(floatValue, timestampValue));
     assertEquals(recordValue, FieldValue.fromPb(RECORD_FIELD));
     assertEquals(recordValue.hashCode(), FieldValue.fromPb(RECORD_FIELD).hashCode());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java
index 8a153c8c4da1..fb744bd78920 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java
@@ -35,11 +35,11 @@ public class InsertAllRequestTest {
   private static final Map CONTENT2 =
       ImmutableMap.of("key", "val2");
   private static final List ROWS =
-      ImmutableList.of(new InsertAllRequest.RowToInsert(null, CONTENT1),
-          new InsertAllRequest.RowToInsert(null, CONTENT2));
+      ImmutableList.of(InsertAllRequest.RowToInsert.of(CONTENT1),
+          InsertAllRequest.RowToInsert.of(CONTENT2));
   private static final List ROWS_WITH_ID =
-      ImmutableList.of(new InsertAllRequest.RowToInsert("id1", CONTENT1),
-          new InsertAllRequest.RowToInsert("id2", CONTENT2));
+      ImmutableList.of(InsertAllRequest.RowToInsert.of("id1", CONTENT1),
+          InsertAllRequest.RowToInsert.of("id2", CONTENT2));
   private static final TableId TABLE_ID = TableId.of("dataset", "table");
   private static final Schema TABLE_SCHEMA = Schema.of();
   private static final BaseTableInfo TABLE_INFO = TableInfo.of(TABLE_ID, TABLE_SCHEMA);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 088820c298ec..24caa6c9e9c3 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -184,7 +184,7 @@ public class SerializationTest {
   private static final Map> ERRORS_MAP =
       ImmutableMap.>of(0L, ImmutableList.of(BIGQUERY_ERROR));
   private static final InsertAllResponse INSERT_ALL_RESPONSE = new InsertAllResponse(ERRORS_MAP);
-  private static final FieldValue FIELD_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "value");
+  private static final FieldValue FIELD_VALUE = new FieldValue(FieldValue.Attribute.PRIMITIVE, "value");
   private static final TableRow TABLE_ROW = new TableRow.Builder()
       .addValue(FIELD_VALUE)
       .build();
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java
index f20105ea9cd5..7383b23387ee 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 
 import com.google.api.client.util.Data;
+import com.google.api.client.util.NullValue;
 import com.google.api.services.bigquery.model.TableCell;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -30,19 +31,33 @@
 
 public class TableRowTest {
 
-  private static final FieldValue BOOL_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "false");
-  private static final FieldValue INT_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "1");
-  private static final FieldValue FLOAT_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "1.5");
-  private static final FieldValue STRING_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "str");
-  private static final FieldValue TIME_VALUE = new FieldValue(FieldValue.Kind.PRIMITIVE, "42");
-  private static final List ROW_VALUES =
-      ImmutableList.of(BOOL_VALUE, INT_VALUE, FLOAT_VALUE, STRING_VALUE, TIME_VALUE);
+  private static final FieldValue BOOL_VALUE =
+      new FieldValue(FieldValue.Attribute.PRIMITIVE, "false");
+  private static final FieldValue INT_VALUE =
+      new FieldValue(FieldValue.Attribute.PRIMITIVE, "1");
+  private static final FieldValue FLOAT_VALUE =
+      new FieldValue(FieldValue.Attribute.PRIMITIVE, "1.5");
+  private static final FieldValue STRING_VALUE =
+      new FieldValue(FieldValue.Attribute.PRIMITIVE, "str");
+  private static final FieldValue TIME_VALUE =
+      new FieldValue(FieldValue.Attribute.PRIMITIVE, "42");
+  private static final FieldValue NULL_VALUE =
+      new FieldValue(FieldValue.Attribute.PRIMITIVE, null);
+  private static final FieldValue REPEATED_VALUE = new FieldValue(FieldValue.Attribute.REPEATED,
+      ImmutableList.of(INT_VALUE, INT_VALUE));
+  private static final FieldValue RECORD_VALUE = new FieldValue(FieldValue.Attribute.RECORD,
+      ImmutableList.of(FLOAT_VALUE, TIME_VALUE));
+  private static final List ROW_VALUES = ImmutableList.of(BOOL_VALUE, INT_VALUE,
+      FLOAT_VALUE, STRING_VALUE, TIME_VALUE, NULL_VALUE, REPEATED_VALUE, RECORD_VALUE);
   private static final TableRow TABLE_ROW1 = new TableRow.Builder()
       .addValue(BOOL_VALUE)
       .addValue(INT_VALUE)
       .addValue(FLOAT_VALUE)
       .addValue(STRING_VALUE)
       .addValue(TIME_VALUE)
+      .addValue(NULL_VALUE)
+      .addValue(REPEATED_VALUE)
+      .addValue(RECORD_VALUE)
       .build();
   private static final TableRow TABLE_ROW2 = new TableRow.Builder().values(ROW_VALUES).build();
 
@@ -64,10 +79,15 @@ public void testFromPb() {
     TableCell floatField = new TableCell().setV("1.5");
     TableCell stringField = new TableCell().setV("str");
     TableCell timestampField = new TableCell().setV("42");
+    TableCell nullField = new TableCell().setV(Data.nullOf(String.class));
+    TableCell repeatedField = new TableCell().setV(
+        ImmutableList.of(integerField, integerField));
+    TableCell recordField = new TableCell().setV(
+        ImmutableMap.of("f", ImmutableList.of(floatField, timestampField)));
     com.google.api.services.bigquery.model.TableRow rowPb =
         new com.google.api.services.bigquery.model.TableRow();
     rowPb.setF(ImmutableList.of(booleanField, integerField, floatField, stringField,
-        timestampField));
+        timestampField, nullField, repeatedField, recordField));
     compareTableRow(TABLE_ROW1, TableRow.fromPb(rowPb));
   }
 

From 50d381fe24952c775cbed6f9f7afb06a0c7ee6a9 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 11 Dec 2015 16:08:20 +0100
Subject: [PATCH 168/322] Remove TableRow class

---
 .../com/google/gcloud/bigquery/TableRow.java  | 104 ------------------
 .../gcloud/bigquery/SerializationTest.java    |   8 +-
 .../google/gcloud/bigquery/TableRowTest.java  | 100 -----------------
 3 files changed, 3 insertions(+), 209 deletions(-)
 delete mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableRow.java
 delete mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableRow.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableRow.java
deleted file mode 100644
index 7dde02280701..000000000000
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableRow.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.api.client.util.Lists;
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Google BigQuery Table Row class. Objects of this class contain a list of {@link FieldValue}, one
- * for each field in the table.
- */
-public class TableRow implements Serializable {
-
-  static final Function
-      FROM_PB_FUNCTION = new Function() {
-        @Override
-        public TableRow apply(com.google.api.services.bigquery.model.TableRow pb) {
-          return TableRow.fromPb(pb);
-        }
-      };
-  private static final long serialVersionUID = 1770751621297868029L;
-
-  private final List values;
-
-  static final class Builder {
-
-    private List values;
-
-    Builder() {}
-
-    Builder values(List values) {
-      this.values = Lists.newArrayList(checkNotNull(values));
-      return this;
-    }
-
-    Builder addValue(FieldValue fieldValue) {
-      checkNotNull(fieldValue);
-      if (values == null) {
-        values = Lists.newArrayList();
-      }
-      values.add(fieldValue);
-      return this;
-    }
-
-    TableRow build() {
-      return new TableRow(this);
-    }
-  }
-
-  TableRow(Builder builder) {
-    this.values = ImmutableList.copyOf(builder.values);
-  }
-
-  /**
-   * Returns table row data as a list of {@link FieldValue}.
-   */
-  public List values() {
-    return values;
-  }
-
-  @Override
-  public String toString() {
-    return values.toString();
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(values);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof TableRow && Objects.equals(values, ((TableRow) obj).values);
-  }
-
-  static TableRow fromPb(com.google.api.services.bigquery.model.TableRow rowPb) {
-    Builder builder = new Builder();
-    for (com.google.api.services.bigquery.model.TableCell cellPb : rowPb.getF()) {
-      builder.addValue(FieldValue.fromPb(cellPb.getV()));
-    }
-    return builder.build();
-  }
-}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 24caa6c9e9c3..67addce39d6d 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -184,10 +184,8 @@ public class SerializationTest {
   private static final Map> ERRORS_MAP =
       ImmutableMap.>of(0L, ImmutableList.of(BIGQUERY_ERROR));
   private static final InsertAllResponse INSERT_ALL_RESPONSE = new InsertAllResponse(ERRORS_MAP);
-  private static final FieldValue FIELD_VALUE = new FieldValue(FieldValue.Attribute.PRIMITIVE, "value");
-  private static final TableRow TABLE_ROW = new TableRow.Builder()
-      .addValue(FIELD_VALUE)
-      .build();
+  private static final FieldValue FIELD_VALUE =
+      new FieldValue(FieldValue.Attribute.PRIMITIVE, "value");
 
   @Test
   public void testServiceOptions() throws Exception {
@@ -214,7 +212,7 @@ public void testModelAndRequests() throws Exception {
         TABLE_SCHEMA, TABLE_INFO, VIEW_INFO, EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION,
         JOB_STATISTICS, EXTRACT_STATISTICS, LOAD_STATISTICS, QUERY_STATISTICS, BIGQUERY_ERROR,
         JOB_STATUS, JOB_ID, COPY_JOB, EXTRACT_JOB, LOAD_JOB, QUERY_JOB, INSERT_ALL_REQUEST,
-        INSERT_ALL_RESPONSE, FIELD_VALUE, TABLE_ROW};
+        INSERT_ALL_RESPONSE, FIELD_VALUE};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java
deleted file mode 100644
index 7383b23387ee..000000000000
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableRowTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import static org.junit.Assert.assertEquals;
-
-import com.google.api.client.util.Data;
-import com.google.api.client.util.NullValue;
-import com.google.api.services.bigquery.model.TableCell;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
-import org.junit.Test;
-
-import java.util.List;
-import java.util.Map;
-
-public class TableRowTest {
-
-  private static final FieldValue BOOL_VALUE =
-      new FieldValue(FieldValue.Attribute.PRIMITIVE, "false");
-  private static final FieldValue INT_VALUE =
-      new FieldValue(FieldValue.Attribute.PRIMITIVE, "1");
-  private static final FieldValue FLOAT_VALUE =
-      new FieldValue(FieldValue.Attribute.PRIMITIVE, "1.5");
-  private static final FieldValue STRING_VALUE =
-      new FieldValue(FieldValue.Attribute.PRIMITIVE, "str");
-  private static final FieldValue TIME_VALUE =
-      new FieldValue(FieldValue.Attribute.PRIMITIVE, "42");
-  private static final FieldValue NULL_VALUE =
-      new FieldValue(FieldValue.Attribute.PRIMITIVE, null);
-  private static final FieldValue REPEATED_VALUE = new FieldValue(FieldValue.Attribute.REPEATED,
-      ImmutableList.of(INT_VALUE, INT_VALUE));
-  private static final FieldValue RECORD_VALUE = new FieldValue(FieldValue.Attribute.RECORD,
-      ImmutableList.of(FLOAT_VALUE, TIME_VALUE));
-  private static final List ROW_VALUES = ImmutableList.of(BOOL_VALUE, INT_VALUE,
-      FLOAT_VALUE, STRING_VALUE, TIME_VALUE, NULL_VALUE, REPEATED_VALUE, RECORD_VALUE);
-  private static final TableRow TABLE_ROW1 = new TableRow.Builder()
-      .addValue(BOOL_VALUE)
-      .addValue(INT_VALUE)
-      .addValue(FLOAT_VALUE)
-      .addValue(STRING_VALUE)
-      .addValue(TIME_VALUE)
-      .addValue(NULL_VALUE)
-      .addValue(REPEATED_VALUE)
-      .addValue(RECORD_VALUE)
-      .build();
-  private static final TableRow TABLE_ROW2 = new TableRow.Builder().values(ROW_VALUES).build();
-
-  @Test
-  public void testBuilder() {
-    assertEquals(ROW_VALUES, TABLE_ROW1.values());
-    assertEquals(ROW_VALUES, TABLE_ROW2.values());
-  }
-
-  @Test
-  public void testEquals() {
-    compareTableRow(TABLE_ROW1, TABLE_ROW2);
-  }
-
-  @Test
-  public void testFromPb() {
-    TableCell booleanField = new TableCell().setV("false");
-    TableCell integerField = new TableCell().setV("1");
-    TableCell floatField = new TableCell().setV("1.5");
-    TableCell stringField = new TableCell().setV("str");
-    TableCell timestampField = new TableCell().setV("42");
-    TableCell nullField = new TableCell().setV(Data.nullOf(String.class));
-    TableCell repeatedField = new TableCell().setV(
-        ImmutableList.of(integerField, integerField));
-    TableCell recordField = new TableCell().setV(
-        ImmutableMap.of("f", ImmutableList.of(floatField, timestampField)));
-    com.google.api.services.bigquery.model.TableRow rowPb =
-        new com.google.api.services.bigquery.model.TableRow();
-    rowPb.setF(ImmutableList.of(booleanField, integerField, floatField, stringField,
-        timestampField, nullField, repeatedField, recordField));
-    compareTableRow(TABLE_ROW1, TableRow.fromPb(rowPb));
-  }
-
-  private void compareTableRow(TableRow expected, TableRow value) {
-    assertEquals(expected, value);
-    assertEquals(expected.hashCode(), value.hashCode());
-    assertEquals(expected.toString(), value.toString());
-    assertEquals(expected.values(), value.values());
-  }
-}

From aacc383db959088012b862c40f2514f15cf66ca0 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 11 Dec 2015 19:43:48 +0100
Subject: [PATCH 169/322] Fix javadoc error, add checkNotNull to FieldValue
 getters

---
 .../com/google/gcloud/bigquery/FieldValue.java     | 14 ++++++++++----
 .../google/gcloud/bigquery/InsertAllRequest.java   | 10 +++-------
 .../google/gcloud/bigquery/InsertAllResponse.java  |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
index 8131cafb8bad..24c4b28b7613 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
@@ -31,8 +31,8 @@
 
 /**
  * Google BigQuery Table Field Value class. Objects of this class represent values of a BigQuery
- * Table Field. A list of values forms a {@link TableRow}. Tables rows can be gotten as the result
- * of a query or when listing table data.
+ * Table Field. A list of values forms a table row. Tables rows can be gotten as the result of a
+ * query or when listing table data.
  */
 public class FieldValue implements Serializable {
 
@@ -99,7 +99,8 @@ public boolean isNull() {
   }
 
   /**
-   * Returns this field's value as an {@link Object}.
+   * Returns this field's value as an {@link Object}. If {@link #isNull()} is {@code true} this
+   * method returns {@code null}.
    */
   public Object value() {
     return value;
@@ -112,9 +113,11 @@ public Object value() {
    * {@link Field.Type#timestamp()}).
    *
    * @throws ClassCastException if the field is not a primitive type
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
    */
   @SuppressWarnings("unchecked")
   public String stringValue() {
+    checkNotNull(value);
     return (String) value;
   }
 
@@ -155,7 +158,6 @@ public double doubleValue() {
   @SuppressWarnings("unchecked")
   public boolean booleanValue() {
     String stringValue = stringValue();
-    checkNotNull(stringValue);
     checkState(stringValue.equalsIgnoreCase("true") || stringValue.equalsIgnoreCase("false"),
         "Field value is not of boolean type");
     return Boolean.parseBoolean(stringValue);
@@ -183,9 +185,11 @@ public long timestampValue() {
    * {@link Attribute#REPEATED}).
    *
    * @throws ClassCastException if the field has not {@link Field.Mode#REPEATED} mode
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
    */
   @SuppressWarnings("unchecked")
   public List repeatedValue() {
+    checkNotNull(value);
     return (List) value;
   }
 
@@ -195,9 +199,11 @@ public List repeatedValue() {
    * is {@link Attribute#RECORD}).
    *
    * @throws ClassCastException if the field is not a {@link Field.Type#record(Field...)} type
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
    */
   @SuppressWarnings("unchecked")
   public List recordValue() {
+    checkNotNull(value);
     return (List) value;
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
index c7ab8fa0dd7c..56be098b197b 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
@@ -50,8 +50,7 @@ public class InsertAllRequest implements Serializable {
    * A Google Big Query row to be inserted into a table. Each {@code RowToInsert} has an associated
    * id used by BigQuery to detect duplicate insertion requests on a best-effort basis.
    *
-   * 

-   * Example usage of creating a row to insert:
+   * 
Example usage of creating a row to insert:
    * 
    {@code
    *   List repeatedFieldValue = Arrays.asList(1L, 2L);
    *   Map recordContent = new HashMap();
@@ -128,7 +127,6 @@ public static RowToInsert of(String id, Map content) {
     /**
      * Creates a row to be inserted without associated id.
      *
-     * @param id id of the row, used to identify duplicates
      * @param content the actual content of the row
      */
     public static RowToInsert of(Map content) {
@@ -176,8 +174,7 @@ public Builder addRow(RowToInsert rowToInsert) {
     /**
      * Adds a row to be inserted with associated id.
      *
-     * 

-     * Example usage of adding a row with associated id:
+     * 
Example usage of adding a row with associated id:
      * 
    {@code
      *   InsertAllRequest.Builder builder = InsertAllRequest.builder(tableId);
      *   List repeatedFieldValue = Arrays.asList(1L, 2L);
@@ -198,8 +195,7 @@ public Builder addRow(String id, Map content) {
     /**
      * Adds a row to be inserted without an associated id.
      *
-     * 

-     * Example usage of adding a row without an associated id:
+     * 
Example usage of adding a row without an associated id:
      * 
    {@code
      *   InsertAllRequest.Builder builder = InsertAllRequest.builder(tableId);
      *   List repeatedFieldValue = Arrays.asList(1L, 2L);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
index 76d3e571c124..992c5d851bbc 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
@@ -35,7 +35,7 @@
 /**
  * Google Cloud BigQuery insert all response. Objects of this class possibly contain errors for an
  * {@link InsertAllRequest}. If a row failed to be inserted, the non-empty list of errors associated
- * to that row's index can be obtained with {@link InsertAllResponse#errorsFor(Long)}.
+ * to that row's index can be obtained with {@link InsertAllResponse#errorsFor(long)}.
  * {@link InsertAllResponse#insertErrors()} can be used to return all errors caused by a
  * {@link InsertAllRequest} as a map.
  */

From 20d48415ac9814a52b0f158d4f7f4ee6b6ff1645 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 11 Dec 2015 23:37:57 +0100
Subject: [PATCH 170/322] Add query request and query response classes and
 tests

---
 .../google/gcloud/bigquery/QueryRequest.java  | 272 ++++++++++++++++++
 .../google/gcloud/bigquery/QueryResponse.java | 233 +++++++++++++++
 .../gcloud/bigquery/QueryRequestTest.java     |  94 ++++++
 .../gcloud/bigquery/QueryResponseTest.java    | 113 ++++++++
 4 files changed, 712 insertions(+)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
new file mode 100644
index 000000000000..717fe78e6fc2
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.base.MoreObjects;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Google Cloud BigQuery Query Request. This class can be used to run a BigQuery SQL query and
+ * return results if the query completes within a specified timeout. The query results are saved to
+ * a temporary table that is deleted approximately 24 hours after the query is run. Query is run
+ * through a BigQuery Job whose identity can be accessed via {@link QueryResponse#job()}.
+ *
+ * @see Query
+ */
+public class QueryRequest implements Serializable {
+
+  private static final long serialVersionUID = -8727328332415880852L;
+
+  private final String query;
+  private final Long maxResults;
+  private final DatasetId defaultDataset;
+  private final Long maxWaitTime;
+  private final Boolean dryRun;
+  private final Boolean useQueryCache;
+
+  public static final class Builder {
+
+    private String query;
+    private Long maxResults;
+    private DatasetId defaultDataset;
+    private Long maxWaitTime;
+    private Boolean dryRun;
+    private Boolean useQueryCache;
+
+    private Builder() {}
+
+    /**
+     * Sets the BigQuery query to be executed.
+     */
+    public Builder query(String query) {
+      this.query = query;
+      return this;
+    }
+
+    /**
+     * Sets the maximum number of rows of data to return per page of results. Setting this flag to a
+     * small value such as 1000 and then paging through results might improve reliability when the
+     * query result set is large. In addition to this limit, responses are also limited to 10 MB.
+     * By default, there is no maximum row count, and only the byte limit applies.
+     */
+    public Builder maxResults(Long maxResults) {
+      this.maxResults = maxResults;
+      return this;
+    }
+
+    /**
+     * Sets the default dataset to assume for any unqualified table names in the query.
+     */
+    public Builder defaultDataset(DatasetId defaultDataset) {
+      this.defaultDataset = defaultDataset;
+      return this;
+    }
+
+    /**
+     * Sets how long to wait for the query to complete, in milliseconds, before the request times
+     * out and returns. Note that this is only a timeout for the request, not the query. If the
+     * query takes longer to run than the timeout value, the call returns without any results and
+     * with the {@link QueryResponse#jobComplete()} set to {@code false}. You can call
+     * {@link BigQuery#getQueryResults(JobId, BigQuery.QueryResultsOption...)} to wait for the query
+     * to complete and read the results. The default value is 10000 milliseconds (10 seconds).
+     */
+    public Builder maxWaitTime(Long maxWaitTime) {
+      this.maxWaitTime = maxWaitTime;
+      return this;
+    }
+
+    /**
+     * Sets whether the query has to be dry run or not. If set, the query is not executed: if the
+     * query is valid statistics are returned on how many bytes would be processed, if the query is
+     * invalid an error is returned.
+     */
+    public Builder dryRun(Boolean dryRun) {
+      this.dryRun = dryRun;
+      return this;
+    }
+
+    /**
+     * Sets whether to look for the result in the query cache. The query cache is a best-effort
+     * cache that will be flushed whenever tables in the query are modified.
+     *
+     * @see Query Caching
+     */
+    public Builder useQueryCache(Boolean useQueryCache) {
+      this.useQueryCache = useQueryCache;
+      return this;
+    }
+
+    public QueryRequest build() {
+      return new QueryRequest(this);
+    }
+  }
+
+  private QueryRequest(Builder builder) {
+    query = checkNotNull(builder.query);
+    maxResults = builder.maxResults;
+    defaultDataset = builder.defaultDataset;
+    maxWaitTime = builder.maxWaitTime;
+    dryRun = builder.dryRun;
+    useQueryCache = builder.useQueryCache;
+  }
+
+  /**
+   * Sets the BigQuery query to be executed.
+   */
+  public String query() {
+    return query;
+  }
+
+  /**
+   * Returns the maximum number of rows of data to return per page of results.
+   */
+  public Long maxResults() {
+    return maxResults;
+  }
+
+  /**
+   * Returns the default dataset to assume for any unqualified table names in the query.
+   */
+  public DatasetId defaultDataset() {
+    return defaultDataset;
+  }
+
+  /**
+   * Returns how long to wait for the query to complete, in milliseconds, before the request times
+   * out and returns. Note that this is only a timeout for the request, not the query. If the
+   * query takes longer to run than the timeout value, the call returns without any results and
+   * with the {@link QueryResponse#jobComplete()} set to {@code false}. You can call
+   * {@link BigQuery#getQueryResults(JobId, BigQuery.QueryResultsOption...)} to wait for the query
+   * to complete and read the results. The default value is 10000 milliseconds (10 seconds).
+   */
+  public Long maxWaitTime() {
+    return maxWaitTime;
+  }
+
+  /**
+   * Returns whether the query has to be dry run or not. If set, the query is not executed: if the
+   * query is valid statistics are returned on how many bytes would be processed, if the query is
+   * invalid an error is returned.
+   */
+  public Boolean dryRun() {
+    return dryRun;
+  }
+
+  /**
+   * Returns whether to look for the result in the query cache. The query cache is a best-effort
+   * cache that will be flushed whenever tables in the query are modified.
+   *
+   * @see Query Caching
+   */
+  public Boolean useQueryCache() {
+    return useQueryCache;
+  }
+
+  /**
+   * Returns a builder for the {@code QueryRequest} object.
+   */
+  public Builder toBuilder() {
+    return new Builder()
+        .query(query)
+        .maxResults(maxResults)
+        .defaultDataset(defaultDataset)
+        .maxWaitTime(maxWaitTime)
+        .dryRun(dryRun)
+        .useQueryCache(useQueryCache);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("query", query)
+        .add("maxResults", maxResults)
+        .add("defaultDataset", defaultDataset)
+        .add("maxWaitTime", maxWaitTime)
+        .add("dryRun", dryRun)
+        .add("useQueryCache", useQueryCache)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(query, maxResults, defaultDataset, maxWaitTime, dryRun, useQueryCache);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof QueryRequest && Objects.equals(toPb(), ((QueryRequest) obj).toPb());
+  }
+
+  com.google.api.services.bigquery.model.QueryRequest toPb() {
+    com.google.api.services.bigquery.model.QueryRequest queryRequestPb =
+        new com.google.api.services.bigquery.model.QueryRequest().setQuery(query);
+    if (maxResults != null) {
+      queryRequestPb.setMaxResults(maxResults);
+    }
+    if (defaultDataset != null) {
+      queryRequestPb.setDefaultDataset(defaultDataset.toPb());
+    }
+    if (maxWaitTime != null) {
+      queryRequestPb.setTimeoutMs(maxWaitTime);
+    }
+    if (dryRun != null) {
+      queryRequestPb.setDryRun(dryRun);
+    }
+    if (useQueryCache != null) {
+      queryRequestPb.setUseQueryCache(useQueryCache);
+    }
+    return queryRequestPb;
+  }
+
+  /**
+   * Creates a builder for a {@code QueryRequest} given the BigQuery SQL query to be executed.
+   */
+  public static Builder builder(String query) {
+    return new Builder().query(query);
+  }
+
+  /**
+   * Creates a {@code QueryRequest} object given the BigQuery SQL query to be executed.
+   */
+  public static QueryRequest of(String query) {
+    return new Builder().query(query).build();
+  }
+
+  static QueryRequest fromPb(com.google.api.services.bigquery.model.QueryRequest queryRequestPb) {
+    Builder builder = builder(queryRequestPb.getQuery());
+    if (queryRequestPb.getMaxResults() != null) {
+      builder.maxResults(queryRequestPb.getMaxResults());
+    }
+    if (queryRequestPb.getDefaultDataset() != null) {
+      builder.defaultDataset(DatasetId.fromPb(queryRequestPb.getDefaultDataset()));
+    }
+    if (queryRequestPb.getTimeoutMs() != null) {
+      builder.maxWaitTime(queryRequestPb.getTimeoutMs());
+    }
+    if (queryRequestPb.getDryRun() != null) {
+      builder.dryRun(queryRequestPb.getDryRun());
+    }
+    if (queryRequestPb.getUseQueryCache() != null) {
+      builder.useQueryCache(queryRequestPb.getUseQueryCache());
+    }
+    return builder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
new file mode 100644
index 000000000000..add54583f033
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.common.base.MoreObjects;
+import com.google.gcloud.Page;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google Cloud BigQuery Query Response. This class contains the results of a Query Job or of a
+ * Query Request.
+ */
+public class QueryResponse implements Serializable {
+
+  private static final long serialVersionUID = 3549226764825005655L;
+
+  private final String etag;
+  private final Schema schema;
+  private final JobId job;
+  private final Long totalRows;
+  private final Page> rows;
+  private final Long totalBytesProcessed;
+  private final Boolean jobComplete;
+  private final List errors;
+  private final Boolean cacheHit;
+
+  static final class Builder {
+
+    private String etag;
+    private Schema schema;
+    private JobId job;
+    private Long totalRows;
+    private Page> rows;
+    private Long totalBytesProcessed;
+    private Boolean jobComplete;
+    private List errors;
+    private Boolean cacheHit;
+
+    private Builder() {}
+
+    Builder etag(String etag) {
+      this.etag = etag;
+      return this;
+    }
+
+    Builder schema(Schema schema) {
+      this.schema = schema;
+      return this;
+    }
+
+    Builder job(JobId job) {
+      this.job = job;
+      return this;
+    }
+
+    Builder totalRows(Long totalRows) {
+      this.totalRows = totalRows;
+      return this;
+    }
+
+    Builder rows(Page> rows) {
+      this.rows = rows;
+      return this;
+    }
+
+    Builder totalBytesProcessed(Long totalBytesProcessed) {
+      this.totalBytesProcessed = totalBytesProcessed;
+      return this;
+    }
+
+    Builder jobComplete(Boolean jobComplete) {
+      this.jobComplete = jobComplete;
+      return this;
+    }
+
+    Builder errors(List errors) {
+      this.errors = errors;
+      return this;
+    }
+
+    Builder cacheHit(Boolean cacheHit) {
+      this.cacheHit = cacheHit;
+      return this;
+    }
+
+    QueryResponse build() {
+      return new QueryResponse(this);
+    }
+  }
+
+  private QueryResponse(Builder builder) {
+    this.etag = builder.etag;
+    this.schema = builder.schema;
+    this.job = builder.job;
+    this.totalRows = builder.totalRows;
+    this.rows = builder.rows;
+    this.totalBytesProcessed = builder.totalBytesProcessed;
+    this.jobComplete = builder.jobComplete;
+    this.errors = builder.errors;
+    this.cacheHit = builder.cacheHit;
+  }
+
+  /**
+   * Returns the hash of the {@code QueryResponse} resource or {@code null} if not set.
+   */
+  public String etag() {
+    return etag;
+  }
+
+  /**
+   * Returns the schema of the results when the query completed successfully. Returns {@code null}
+   * otherwise.
+   */
+  public Schema schema() {
+    return schema;
+  }
+
+  /**
+   * Returns the identity of the BigQuery Job that was created to run the query. This field will be
+   * present even if the original request timed out.
+   */
+  public JobId job() {
+    return job;
+  }
+
+  /**
+   * Returns the total number of rows in the complete query result set, which can be more than the
+   * number of rows in the first page of results returned by {@link #rows()}. Returns {@code null}
+   * if the query did not complete successfully.
+   */
+  public Long totalRows() {
+    return totalRows;
+  }
+
+  /**
+   * Returns the query result as a paginated list of rows, if the query completed successfully.
+   * Returns {@code null} otherwise.
+   */
+  public Page> rows() {
+    return rows;
+  }
+
+  /**
+   * Returns the total number of bytes processed for the query.
+   */
+  public Long totalBytesProcessed() {
+    return totalBytesProcessed;
+  }
+
+  /**
+   * Returns whether the job running the query has completed or not. If {@link #rows()} and
+   * {@link #totalRows()} are present, this method will always return {@code true}. If this method
+   * returns {@code false}, {@link #totalRows()} will not be available.
+   */
+  public Boolean jobComplete() {
+    return jobComplete;
+  }
+
+  /**
+   * Returns errors and warnings encountered during the running of the job, if any. Errors here do
+   * not necessarily mean that the job has completed or was unsuccessful.
+   */
+  public List errors() {
+    return errors;
+  }
+
+  /**
+   * Returns whether the query result was fetched from the query cache.
+   *
+   * @see Query Caching
+   */
+  public Boolean cacheHit() {
+    return cacheHit;
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("job", job)
+        .add("jobComplete", jobComplete)
+        .add("totalRows", totalRows)
+        .add("schema", schema)
+        .add("totalBytesProcessed", totalBytesProcessed)
+        .add("errors", errors)
+        .add("cacheHit", cacheHit)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(job);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    QueryResponse response = (QueryResponse) obj;
+    return Objects.equals(schema, response.schema)
+        && Objects.equals(job, response.job)
+        && Objects.equals(totalRows, response.totalRows)
+        && Objects.equals(rows, response.rows)
+        && Objects.equals(totalBytesProcessed, response.totalBytesProcessed)
+        && Objects.equals(jobComplete, response.jobComplete)
+        && Objects.equals(errors, response.errors)
+        && Objects.equals(cacheHit, response.cacheHit);
+  }
+
+  static Builder builder() {
+    return new Builder();
+  }
+}
\ No newline at end of file
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java
new file mode 100644
index 000000000000..f2ff83cc6009
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
+public class QueryRequestTest {
+
+  private static final String QUERY = "BigQuery SQL";
+  private static final DatasetId DATASET_ID = DatasetId.of("project", "dataset");
+  private static final Boolean USE_QUERY_CACHE = true;
+  private static final Boolean DRY_RUN = false;
+  private static final Long MAX_RESULTS = 42L;
+  private static final Long MAX_WAIT_TIME = 42000L;
+  private static final QueryRequest QUERY_REQUEST = QueryRequest.builder(QUERY)
+      .useQueryCache(USE_QUERY_CACHE)
+      .defaultDataset(DATASET_ID)
+      .dryRun(DRY_RUN)
+      .maxResults(MAX_RESULTS)
+      .maxWaitTime(MAX_WAIT_TIME)
+      .build();
+
+  @Test
+  public void testToBuilder() {
+    compareQueryRequest(QUERY_REQUEST, QUERY_REQUEST.toBuilder().build());
+    QueryRequest queryRequest = QUERY_REQUEST.toBuilder()
+        .query("New BigQuery SQL")
+        .build();
+    assertEquals("New BigQuery SQL", queryRequest.query());
+    queryRequest = queryRequest.toBuilder().query(QUERY).build();
+    compareQueryRequest(QUERY_REQUEST, queryRequest);
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    QueryRequest queryRequest = QueryRequest.of(QUERY);
+    compareQueryRequest(queryRequest, queryRequest.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(QUERY, QUERY_REQUEST.query());
+    assertEquals(USE_QUERY_CACHE, QUERY_REQUEST.useQueryCache());
+    assertEquals(DATASET_ID, QUERY_REQUEST.defaultDataset());
+    assertEquals(DRY_RUN, QUERY_REQUEST.dryRun());
+    assertEquals(MAX_RESULTS, QUERY_REQUEST.maxResults());
+    assertEquals(MAX_WAIT_TIME, QUERY_REQUEST.maxWaitTime());
+  }
+
+  @Test
+  public void testOf() {
+    QueryRequest request = QueryRequest.of(QUERY);
+    assertEquals(QUERY, request.query());
+    assertNull(request.useQueryCache());
+    assertNull(request.defaultDataset());
+    assertNull(request.dryRun());
+    assertNull(request.maxResults());
+    assertNull(request.maxWaitTime());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    compareQueryRequest(QUERY_REQUEST, QueryRequest.fromPb(QUERY_REQUEST.toPb()));
+    QueryRequest queryRequest = QueryRequest.of(QUERY);
+    compareQueryRequest(queryRequest, QueryRequest.fromPb(queryRequest.toPb()));
+  }
+
+  private void compareQueryRequest(QueryRequest expected, QueryRequest value) {
+    assertEquals(expected, value);
+    assertEquals(expected.query(), value.query());
+    assertEquals(expected.useQueryCache(), value.useQueryCache());
+    assertEquals(expected.defaultDataset(), value.defaultDataset());
+    assertEquals(expected.dryRun(), value.dryRun());
+    assertEquals(expected.maxResults(), value.maxResults());
+    assertEquals(expected.maxWaitTime(), value.maxWaitTime());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
new file mode 100644
index 000000000000..f6f29e7b1312
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.Page;
+import com.google.gcloud.PageImpl;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class QueryResponseTest {
+
+  private static final String ETAG = "etag";
+  private static final Field FIELD_SCHEMA1 =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
+          .description("FieldDescription1")
+          .build();
+  private static final Schema SCHEMA = Schema.of(FIELD_SCHEMA1);
+  private static final JobId JOB_ID = JobId.of("project", "job");
+  private static final Long TOTAL_ROWS = 42L;
+  private static final PageImpl.NextPageFetcher> FETCHER =
+      new PageImpl.NextPageFetcher>() {
+        @Override
+        public Page> nextPage() {
+          return null;
+        }
+      };
+  private static final Page> ROWS =
+      new PageImpl>(FETCHER, "cursor", ImmutableList.>of());
+  private static final Long TOTAL_BYTES_PROCESSED = 4200L;
+  private static final Boolean JOB_COMPLETE = true;
+  private static final List ERRORS = ImmutableList.of(
+      new BigQueryError("reason1", "location1", "message1", "debugInfo1"),
+      new BigQueryError("reason2", "location2", "message2", "debugInfo2")
+  );
+  private static final Boolean CACHE_HIT = false;
+  private static final QueryResponse QUERY_RESPONSE = QueryResponse.builder()
+      .etag(ETAG)
+      .schema(SCHEMA)
+      .job(JOB_ID)
+      .totalRows(TOTAL_ROWS)
+      .rows(ROWS)
+      .totalBytesProcessed(TOTAL_BYTES_PROCESSED)
+      .jobComplete(JOB_COMPLETE)
+      .errors(ERRORS)
+      .cacheHit(CACHE_HIT)
+      .build();
+
+  @Test
+  public void testBuilder() {
+    assertEquals(ETAG, QUERY_RESPONSE.etag());
+    assertEquals(SCHEMA, QUERY_RESPONSE.schema());
+    assertEquals(JOB_ID, QUERY_RESPONSE.job());
+    assertEquals(TOTAL_ROWS, QUERY_RESPONSE.totalRows());
+    assertEquals(ROWS, QUERY_RESPONSE.rows());
+    assertEquals(TOTAL_BYTES_PROCESSED, QUERY_RESPONSE.totalBytesProcessed());
+    assertEquals(JOB_COMPLETE, QUERY_RESPONSE.jobComplete());
+    assertEquals(ERRORS, QUERY_RESPONSE.errors());
+    assertEquals(CACHE_HIT, QUERY_RESPONSE.cacheHit());
+  }
+
+  @Test
+  public void testBuilderIncomplete() {
+    QueryResponse queryResponse = QueryResponse.builder().jobComplete(false).build();
+    assertNull(queryResponse.etag());
+    assertNull(queryResponse.schema());
+    assertNull(queryResponse.job());
+    assertNull(queryResponse.totalRows());
+    assertNull(queryResponse.rows());
+    assertNull(queryResponse.totalBytesProcessed());
+    assertEquals(false, queryResponse.jobComplete());
+    assertNull(queryResponse.errors());
+    assertNull(queryResponse.cacheHit());
+  }
+
+  @Test
+  public void testEquals() {
+    compareQueryResponse(QUERY_RESPONSE, QUERY_RESPONSE);
+  }
+
+  private void compareQueryResponse(QueryResponse expected, QueryResponse value) {
+    assertEquals(expected, value);
+    assertEquals(expected.etag(), value.etag());
+    assertEquals(expected.schema(), value.schema());
+    assertEquals(expected.job(), value.job());
+    assertEquals(expected.totalRows(), value.totalRows());
+    assertEquals(expected.rows(), value.rows());
+    assertEquals(expected.totalBytesProcessed(), value.totalBytesProcessed());
+    assertEquals(expected.jobComplete(), value.jobComplete());
+    assertEquals(expected.errors(), value.errors());
+    assertEquals(expected.cacheHit(), value.cacheHit());
+  }
+}

From 9756dff839d558145eaf927826d0b399af49f193 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 14 Dec 2015 11:34:29 +0100
Subject: [PATCH 171/322] Refactor QueryRequest and QueryResponse - Add better
 javadoc and snippet to QueryResponse - Use primitive boolean for jobComplete
 - Add test for NPE in QueryRequestTests - Add QueryRequest and QueryResponse
 to SerializationTest

---
 .../google/gcloud/bigquery/QueryRequest.java  | 33 ++++++-----
 .../google/gcloud/bigquery/QueryResponse.java | 58 ++++++++++++-------
 .../gcloud/bigquery/QueryRequestTest.java     |  9 +++
 .../gcloud/bigquery/QueryResponseTest.java    | 12 ++--
 .../gcloud/bigquery/SerializationTest.java    | 15 ++++-
 5 files changed, 85 insertions(+), 42 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
index 717fe78e6fc2..83d6ed4164b4 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
@@ -26,10 +26,11 @@
 /**
  * Google Cloud BigQuery Query Request. This class can be used to run a BigQuery SQL query and
  * return results if the query completes within a specified timeout. The query results are saved to
- * a temporary table that is deleted approximately 24 hours after the query is run. Query is run
+ * a temporary table that is deleted approximately 24 hours after the query is run. The query is run
  * through a BigQuery Job whose identity can be accessed via {@link QueryResponse#job()}.
  *
  * @see Query
+ * @see Query Reference
  */
 public class QueryRequest implements Serializable {
 
@@ -57,7 +58,7 @@ private Builder() {}
      * Sets the BigQuery query to be executed.
      */
     public Builder query(String query) {
-      this.query = query;
+      this.query = checkNotNull(query);
       return this;
     }
 
@@ -84,9 +85,8 @@ public Builder defaultDataset(DatasetId defaultDataset) {
      * Sets how long to wait for the query to complete, in milliseconds, before the request times
      * out and returns. Note that this is only a timeout for the request, not the query. If the
      * query takes longer to run than the timeout value, the call returns without any results and
-     * with the {@link QueryResponse#jobComplete()} set to {@code false}. You can call
-     * {@link BigQuery#getQueryResults(JobId, BigQuery.QueryResultsOption...)} to wait for the query
-     * to complete and read the results. The default value is 10000 milliseconds (10 seconds).
+     * with the {@link QueryResponse#jobComplete()} set to {@code false}. If not set, a wait time of
+     * 10000 milliseconds (10 seconds) is used.
      */
     public Builder maxWaitTime(Long maxWaitTime) {
       this.maxWaitTime = maxWaitTime;
@@ -94,9 +94,9 @@ public Builder maxWaitTime(Long maxWaitTime) {
     }
 
     /**
-     * Sets whether the query has to be dry run or not. If set, the query is not executed: if the
-     * query is valid statistics are returned on how many bytes would be processed, if the query is
-     * invalid an error is returned.
+     * Sets whether the query has to be dry run or not. If set, the query is not executed. If the
+     * query is valid statistics are returned on how many bytes would be processed. If the query is
+     * invalid an error is returned. If not set the query is executed.
      */
     public Builder dryRun(Boolean dryRun) {
       this.dryRun = dryRun;
@@ -105,7 +105,8 @@ public Builder dryRun(Boolean dryRun) {
 
     /**
      * Sets whether to look for the result in the query cache. The query cache is a best-effort
-     * cache that will be flushed whenever tables in the query are modified.
+     * cache that will be flushed whenever tables in the query are modified. If not specified the
+     * query cache is used.
      *
      * @see Query Caching
      */
@@ -120,7 +121,7 @@ public QueryRequest build() {
   }
 
   private QueryRequest(Builder builder) {
-    query = checkNotNull(builder.query);
+    query = builder.query;
     maxResults = builder.maxResults;
     defaultDataset = builder.defaultDataset;
     maxWaitTime = builder.maxWaitTime;
@@ -155,16 +156,17 @@ public DatasetId defaultDataset() {
    * query takes longer to run than the timeout value, the call returns without any results and
    * with the {@link QueryResponse#jobComplete()} set to {@code false}. You can call
    * {@link BigQuery#getQueryResults(JobId, BigQuery.QueryResultsOption...)} to wait for the query
-   * to complete and read the results. The default value is 10000 milliseconds (10 seconds).
+   * to complete and read the results. If not set, a wait time of 10000 milliseconds (10 seconds)
+   * is used.
    */
   public Long maxWaitTime() {
     return maxWaitTime;
   }
 
   /**
-   * Returns whether the query has to be dry run or not. If set, the query is not executed: if the
-   * query is valid statistics are returned on how many bytes would be processed, if the query is
-   * invalid an error is returned.
+   * Returns whether the query has to be dry run or not. If set, the query is not executed. If the
+   * query is valid statistics are returned on how many bytes would be processed. If the query is
+   * invalid an error is returned. If not set the query is executed.
    */
   public Boolean dryRun() {
     return dryRun;
@@ -172,7 +174,8 @@ public Boolean dryRun() {
 
   /**
    * Returns whether to look for the result in the query cache. The query cache is a best-effort
-   * cache that will be flushed whenever tables in the query are modified.
+   * cache that will be flushed whenever tables in the query are modified. If not specified the
+   * query cache is used.
    *
    * @see Query Caching
    */
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
index add54583f033..2c9257388b12 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
@@ -26,6 +26,21 @@
 /**
  * Google Cloud BigQuery Query Response. This class contains the results of a Query Job or of a
  * Query Request.
+ *
+ * 
Example usage of a query response:
+ * 
    {@code
+ *    QueryResponse response = bigquery.query(request);
+ *    while (!response.jobComplete()) {
+ *      response = bigquery.getQueryResults(response.job());
+ *      Thread.sleep(1000);
+ *    }
+ *    List executionErrors = response.executionErrors();
+ *    Page> rows = response.rows();
+ * }

+ *
+ * @see Get Query
+ *     Results
+ * @see Query
  */
 public class QueryResponse implements Serializable {
 
@@ -37,8 +52,8 @@ public class QueryResponse implements Serializable {
   private final Long totalRows;
   private final Page> rows;
   private final Long totalBytesProcessed;
-  private final Boolean jobComplete;
-  private final List errors;
+  private final boolean jobComplete;
+  private final List executionErrors;
   private final Boolean cacheHit;
 
   static final class Builder {
@@ -49,8 +64,8 @@ static final class Builder {
     private Long totalRows;
     private Page> rows;
     private Long totalBytesProcessed;
-    private Boolean jobComplete;
-    private List errors;
+    private boolean jobComplete;
+    private List executionErrors;
     private Boolean cacheHit;
 
     private Builder() {}
@@ -85,13 +100,13 @@ Builder totalBytesProcessed(Long totalBytesProcessed) {
       return this;
     }
 
-    Builder jobComplete(Boolean jobComplete) {
+    Builder jobComplete(boolean jobComplete) {
       this.jobComplete = jobComplete;
       return this;
     }
 
-    Builder errors(List errors) {
-      this.errors = errors;
+    Builder executionErrors(List executionErrors) {
+      this.executionErrors = executionErrors;
       return this;
     }
 
@@ -113,7 +128,7 @@ private QueryResponse(Builder builder) {
     this.rows = builder.rows;
     this.totalBytesProcessed = builder.totalBytesProcessed;
     this.jobComplete = builder.jobComplete;
-    this.errors = builder.errors;
+    this.executionErrors = builder.executionErrors;
     this.cacheHit = builder.cacheHit;
   }
 
@@ -125,7 +140,7 @@ public String etag() {
   }
 
   /**
-   * Returns the schema of the results when the query completed successfully. Returns {@code null}
+   * Returns the schema of the results if the query completed successfully. Returns {@code null}
    * otherwise.
    */
   public Schema schema() {
@@ -158,7 +173,9 @@ public Page> rows() {
   }
 
   /**
-   * Returns the total number of bytes processed for the query.
+   * Returns the total number of bytes processed for the query. If this query was a dry run, this is
+   * the number of bytes that would be processed if the query were run. Returns {@code null}
+   * if the query did not complete.
    */
   public Long totalBytesProcessed() {
     return totalBytesProcessed;
@@ -166,10 +183,11 @@ public Long totalBytesProcessed() {
 
   /**
    * Returns whether the job running the query has completed or not. If {@link #rows()} and
-   * {@link #totalRows()} are present, this method will always return {@code true}. If this method
-   * returns {@code false}, {@link #totalRows()} will not be available.
+   * {@link #totalRows()} are not {@code null}, this method will always return {@code true}. If this
+   * method returns {@code false} {@link #totalRows()} and {@link #rows()} return {@code null}. This
+   * method can be used to check if query execution completed and results are available.
    */
-  public Boolean jobComplete() {
+  public boolean jobComplete() {
     return jobComplete;
   }
 
@@ -177,8 +195,8 @@ public Boolean jobComplete() {
    * Returns errors and warnings encountered during the running of the job, if any. Errors here do
    * not necessarily mean that the job has completed or was unsuccessful.
    */
-  public List errors() {
-    return errors;
+  public List executionErrors() {
+    return executionErrors;
   }
 
   /**
@@ -198,7 +216,7 @@ public String toString() {
         .add("totalRows", totalRows)
         .add("schema", schema)
         .add("totalBytesProcessed", totalBytesProcessed)
-        .add("errors", errors)
+        .add("executionErrors", executionErrors)
         .add("cacheHit", cacheHit)
         .toString();
   }
@@ -217,17 +235,17 @@ public boolean equals(Object obj) {
       return false;
     }
     QueryResponse response = (QueryResponse) obj;
-    return Objects.equals(schema, response.schema)
+    return jobComplete == response.jobComplete
+        && Objects.equals(schema, response.schema)
         && Objects.equals(job, response.job)
         && Objects.equals(totalRows, response.totalRows)
         && Objects.equals(rows, response.rows)
         && Objects.equals(totalBytesProcessed, response.totalBytesProcessed)
-        && Objects.equals(jobComplete, response.jobComplete)
-        && Objects.equals(errors, response.errors)
+        && Objects.equals(executionErrors, response.executionErrors)
         && Objects.equals(cacheHit, response.cacheHit);
   }
 
   static Builder builder() {
     return new Builder();
   }
-}
\ No newline at end of file
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java
index f2ff83cc6009..276e4f6792b3 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java
@@ -19,7 +19,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 public class QueryRequestTest {
 
@@ -37,6 +39,9 @@ public class QueryRequestTest {
       .maxWaitTime(MAX_WAIT_TIME)
       .build();
 
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
+
   @Test
   public void testToBuilder() {
     compareQueryRequest(QUERY_REQUEST, QUERY_REQUEST.toBuilder().build());
@@ -62,6 +67,8 @@ public void testBuilder() {
     assertEquals(DRY_RUN, QUERY_REQUEST.dryRun());
     assertEquals(MAX_RESULTS, QUERY_REQUEST.maxResults());
     assertEquals(MAX_WAIT_TIME, QUERY_REQUEST.maxWaitTime());
+    thrown.expect(NullPointerException.class);
+    QueryRequest.builder(null);
   }
 
   @Test
@@ -73,6 +80,8 @@ public void testOf() {
     assertNull(request.dryRun());
     assertNull(request.maxResults());
     assertNull(request.maxWaitTime());
+    thrown.expect(NullPointerException.class);
+    QueryRequest.of(null);
   }
 
   @Test
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
index f6f29e7b1312..2c00e81a9f63 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
@@ -46,7 +46,7 @@ public Page> nextPage() {
         }
       };
   private static final Page> ROWS =
-      new PageImpl>(FETCHER, "cursor", ImmutableList.>of());
+      new PageImpl<>(FETCHER, "cursor", ImmutableList.>of());
   private static final Long TOTAL_BYTES_PROCESSED = 4200L;
   private static final Boolean JOB_COMPLETE = true;
   private static final List ERRORS = ImmutableList.of(
@@ -62,7 +62,7 @@ public Page> nextPage() {
       .rows(ROWS)
       .totalBytesProcessed(TOTAL_BYTES_PROCESSED)
       .jobComplete(JOB_COMPLETE)
-      .errors(ERRORS)
+      .executionErrors(ERRORS)
       .cacheHit(CACHE_HIT)
       .build();
 
@@ -73,9 +73,9 @@ public void testBuilder() {
     assertEquals(JOB_ID, QUERY_RESPONSE.job());
     assertEquals(TOTAL_ROWS, QUERY_RESPONSE.totalRows());
     assertEquals(ROWS, QUERY_RESPONSE.rows());
-    assertEquals(TOTAL_BYTES_PROCESSED, QUERY_RESPONSE.totalBytesProcessed());
+    assertEquals(TOTAL_BYTES_PROCESSED, (Long) QUERY_RESPONSE.totalBytesProcessed());
     assertEquals(JOB_COMPLETE, QUERY_RESPONSE.jobComplete());
-    assertEquals(ERRORS, QUERY_RESPONSE.errors());
+    assertEquals(ERRORS, QUERY_RESPONSE.executionErrors());
     assertEquals(CACHE_HIT, QUERY_RESPONSE.cacheHit());
   }
 
@@ -89,7 +89,7 @@ public void testBuilderIncomplete() {
     assertNull(queryResponse.rows());
     assertNull(queryResponse.totalBytesProcessed());
     assertEquals(false, queryResponse.jobComplete());
-    assertNull(queryResponse.errors());
+    assertNull(queryResponse.executionErrors());
     assertNull(queryResponse.cacheHit());
   }
 
@@ -107,7 +107,7 @@ private void compareQueryResponse(QueryResponse expected, QueryResponse value) {
     assertEquals(expected.rows(), value.rows());
     assertEquals(expected.totalBytesProcessed(), value.totalBytesProcessed());
     assertEquals(expected.jobComplete(), value.jobComplete());
-    assertEquals(expected.errors(), value.errors());
+    assertEquals(expected.executionErrors(), value.executionErrors());
     assertEquals(expected.cacheHit(), value.cacheHit());
   }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 67addce39d6d..20092395565a 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -186,6 +186,19 @@ public class SerializationTest {
   private static final InsertAllResponse INSERT_ALL_RESPONSE = new InsertAllResponse(ERRORS_MAP);
   private static final FieldValue FIELD_VALUE =
       new FieldValue(FieldValue.Attribute.PRIMITIVE, "value");
+  private static final QueryRequest QUERY_REQUEST = QueryRequest.builder("query")
+      .useQueryCache(true)
+      .defaultDataset(DATASET_ID)
+      .dryRun(false)
+      .maxResults(42L)
+      .maxWaitTime(10L)
+      .build();
+  private static final QueryResponse QUERY_RESPONSE = QueryResponse.builder()
+      .etag(ETAG)
+      .schema(TABLE_SCHEMA)
+      .job(JOB_ID)
+      .totalRows(1L)
+      .build();
 
   @Test
   public void testServiceOptions() throws Exception {
@@ -212,7 +225,7 @@ public void testModelAndRequests() throws Exception {
         TABLE_SCHEMA, TABLE_INFO, VIEW_INFO, EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION,
         JOB_STATISTICS, EXTRACT_STATISTICS, LOAD_STATISTICS, QUERY_STATISTICS, BIGQUERY_ERROR,
         JOB_STATUS, JOB_ID, COPY_JOB, EXTRACT_JOB, LOAD_JOB, QUERY_JOB, INSERT_ALL_REQUEST,
-        INSERT_ALL_RESPONSE, FIELD_VALUE};
+        INSERT_ALL_RESPONSE, FIELD_VALUE, QUERY_REQUEST, QUERY_RESPONSE};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);

From e16c027164ce0e9efb186fcc6f9798b52007cf3c Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 14 Dec 2015 22:25:53 +0100
Subject: [PATCH 172/322] Add QueryResult class and tests

---
 .../google/gcloud/bigquery/QueryResponse.java | 126 +++----------
 .../google/gcloud/bigquery/QueryResult.java   | 176 ++++++++++++++++++
 .../gcloud/bigquery/QueryResponseTest.java    |  46 ++---
 .../gcloud/bigquery/QueryResultTest.java      |  91 +++++++++
 .../gcloud/bigquery/SerializationTest.java    |  12 +-
 5 files changed, 324 insertions(+), 127 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResultTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
index 2c9257388b12..787047a7a06d 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
@@ -17,7 +17,6 @@
 package com.google.gcloud.bigquery;
 
 import com.google.common.base.MoreObjects;
-import com.google.gcloud.Page;
 
 import java.io.Serializable;
 import java.util.List;
@@ -35,7 +34,12 @@
  *      Thread.sleep(1000);
  *    }
  *    List executionErrors = response.executionErrors();
- *    Page> rows = response.rows();
+ *    QueryResult result = response.result();
+ *    Iterator> rowIterator = result.iterateAll();
+ *    while(rowIterator.hasNext()) {
+ *      List row = rowIterator.next();
+ *      // do something with row
+ *    }
  * }

  *
  * @see Get Query
@@ -46,37 +50,29 @@ public class QueryResponse implements Serializable {
 
   private static final long serialVersionUID = 3549226764825005655L;
 
+  private final QueryResult result;
   private final String etag;
-  private final Schema schema;
   private final JobId job;
-  private final Long totalRows;
-  private final Page> rows;
-  private final Long totalBytesProcessed;
   private final boolean jobComplete;
   private final List executionErrors;
-  private final Boolean cacheHit;
 
   static final class Builder {
 
+    private QueryResult result;
     private String etag;
-    private Schema schema;
     private JobId job;
-    private Long totalRows;
-    private Page> rows;
-    private Long totalBytesProcessed;
     private boolean jobComplete;
     private List executionErrors;
-    private Boolean cacheHit;
 
     private Builder() {}
 
-    Builder etag(String etag) {
-      this.etag = etag;
+    Builder result(QueryResult result) {
+      this.result = result;
       return this;
     }
 
-    Builder schema(Schema schema) {
-      this.schema = schema;
+    Builder etag(String etag) {
+      this.etag = etag;
       return this;
     }
 
@@ -85,21 +81,6 @@ Builder job(JobId job) {
       return this;
     }
 
-    Builder totalRows(Long totalRows) {
-      this.totalRows = totalRows;
-      return this;
-    }
-
-    Builder rows(Page> rows) {
-      this.rows = rows;
-      return this;
-    }
-
-    Builder totalBytesProcessed(Long totalBytesProcessed) {
-      this.totalBytesProcessed = totalBytesProcessed;
-      return this;
-    }
-
     Builder jobComplete(boolean jobComplete) {
       this.jobComplete = jobComplete;
       return this;
@@ -110,41 +91,32 @@ Builder executionErrors(List executionErrors) {
       return this;
     }
 
-    Builder cacheHit(Boolean cacheHit) {
-      this.cacheHit = cacheHit;
-      return this;
-    }
-
     QueryResponse build() {
       return new QueryResponse(this);
     }
   }
 
   private QueryResponse(Builder builder) {
+    this.result = builder.result;
     this.etag = builder.etag;
-    this.schema = builder.schema;
     this.job = builder.job;
-    this.totalRows = builder.totalRows;
-    this.rows = builder.rows;
-    this.totalBytesProcessed = builder.totalBytesProcessed;
     this.jobComplete = builder.jobComplete;
     this.executionErrors = builder.executionErrors;
-    this.cacheHit = builder.cacheHit;
   }
 
   /**
-   * Returns the hash of the {@code QueryResponse} resource or {@code null} if not set.
+   * Returns the result of the query. Returns {@code null} if {@link #jobComplete()} is {@code
+   * false}.
    */
-  public String etag() {
-    return etag;
+  public QueryResult result() {
+    return result;
   }
 
   /**
-   * Returns the schema of the results if the query completed successfully. Returns {@code null}
-   * otherwise.
+   * Returns the hash of the {@code QueryResponse} resource or {@code null} if not set.
    */
-  public Schema schema() {
-    return schema;
+  public String etag() {
+    return etag;
   }
 
   /**
@@ -156,36 +128,10 @@ public JobId job() {
   }
 
   /**
-   * Returns the total number of rows in the complete query result set, which can be more than the
-   * number of rows in the first page of results returned by {@link #rows()}. Returns {@code null}
-   * if the query did not complete successfully.
-   */
-  public Long totalRows() {
-    return totalRows;
-  }
-
-  /**
-   * Returns the query result as a paginated list of rows, if the query completed successfully.
-   * Returns {@code null} otherwise.
-   */
-  public Page> rows() {
-    return rows;
-  }
-
-  /**
-   * Returns the total number of bytes processed for the query. If this query was a dry run, this is
-   * the number of bytes that would be processed if the query were run. Returns {@code null}
-   * if the query did not complete.
-   */
-  public Long totalBytesProcessed() {
-    return totalBytesProcessed;
-  }
-
-  /**
-   * Returns whether the job running the query has completed or not. If {@link #rows()} and
-   * {@link #totalRows()} are not {@code null}, this method will always return {@code true}. If this
-   * method returns {@code false} {@link #totalRows()} and {@link #rows()} return {@code null}. This
-   * method can be used to check if query execution completed and results are available.
+   * Returns whether the job running the query has completed or not. If {@link #result()} is not
+   * {@code null}, this method will always return {@code true}. If this method returns {@code false}
+   * {@link #result()} returns {@code null}. This method can be used to check if query execution
+   * completed and results are available.
    */
   public boolean jobComplete() {
     return jobComplete;
@@ -199,25 +145,14 @@ public List executionErrors() {
     return executionErrors;
   }
 
-  /**
-   * Returns whether the query result was fetched from the query cache.
-   *
-   * @see Query Caching
-   */
-  public Boolean cacheHit() {
-    return cacheHit;
-  }
-
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
+        .add("result", result)
+        .add("etag", etag)
         .add("job", job)
         .add("jobComplete", jobComplete)
-        .add("totalRows", totalRows)
-        .add("schema", schema)
-        .add("totalBytesProcessed", totalBytesProcessed)
         .add("executionErrors", executionErrors)
-        .add("cacheHit", cacheHit)
         .toString();
   }
 
@@ -236,13 +171,10 @@ public boolean equals(Object obj) {
     }
     QueryResponse response = (QueryResponse) obj;
     return jobComplete == response.jobComplete
-        && Objects.equals(schema, response.schema)
+        && Objects.equals(etag, response.etag)
+        && Objects.equals(result, response.result)
         && Objects.equals(job, response.job)
-        && Objects.equals(totalRows, response.totalRows)
-        && Objects.equals(rows, response.rows)
-        && Objects.equals(totalBytesProcessed, response.totalBytesProcessed)
-        && Objects.equals(executionErrors, response.executionErrors)
-        && Objects.equals(cacheHit, response.cacheHit);
+        && Objects.equals(executionErrors, response.executionErrors);
   }
 
   static Builder builder() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java
new file mode 100644
index 000000000000..16942d249912
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.PageImpl;
+
+import java.util.List;
+import java.util.Objects;
+
+public class QueryResult extends PageImpl> {
+
+  private static final long serialVersionUID = -4831062717210349818L;
+
+  private final boolean cacheHit;
+  private final Schema schema;
+  private final long totalRows;
+  private final long totalBytesProcessed;
+
+  interface QueryResultsPageFetcher extends PageImpl.NextPageFetcher> {
+    @Override
+    QueryResult nextPage();
+  }
+
+  static final class Builder {
+
+    private QueryResultsPageFetcher pageFetcher;
+    private String cursor;
+    private Iterable> results;
+    private boolean cacheHit;
+    private Schema schema;
+    private long totalRows;
+    private long totalBytesProcessed;
+
+    private Builder() {}
+
+    Builder cacheHit(boolean cacheHit) {
+      this.cacheHit = cacheHit;
+      return this;
+    }
+
+    Builder schema(Schema schema) {
+      this.schema = schema;
+      return this;
+    }
+
+    Builder totalBytesProcessed(long totalBytesProcessed) {
+      this.totalBytesProcessed = totalBytesProcessed;
+      return this;
+    }
+
+    Builder totalRows(long totalRows) {
+      this.totalRows = totalRows;
+      return this;
+    }
+
+    Builder pageFetcher(QueryResultsPageFetcher pageFetcher) {
+      this.pageFetcher = pageFetcher;
+      return this;
+    };
+
+    Builder cursor(String cursor) {
+      this.cursor = cursor;
+      return this;
+    };
+
+    Builder results(Iterable> results) {
+      this.results = results;
+      return this;
+    };
+
+    QueryResult build() {
+      return new QueryResult(this);
+    }
+  }
+
+  private QueryResult(Builder builder) {
+    super(builder.pageFetcher, builder.cursor, builder.results != null ? builder.results
+      : ImmutableList.>of());
+    this.cacheHit = builder.cacheHit;
+    this.schema = builder.schema;
+    this.totalBytesProcessed = builder.totalBytesProcessed;
+    this.totalRows = builder.totalRows;
+  }
+
+  /**
+   * Returns whether the query result was fetched from the query cache.
+   *
+   * @see Query Caching
+   */
+  public boolean cacheHit() {
+    return cacheHit;
+  }
+
+  /**
+   * Returns the schema of the results.
+   */
+  public Schema schema() {
+    return schema;
+  }
+
+  /**
+   * Returns the total number of bytes processed for the query. If this query was a dry run, this is
+   * the number of bytes that would be processed if the query were run.
+   */
+  public long totalBytesProcessed() {
+    return totalBytesProcessed;
+  }
+
+  /**
+   * Returns the total number of rows in the complete query result set, which can be more than the
+   * number of rows in the first page of results returned by {@link #values()}. Returns {@code 0}
+   * if the query was a dry run.
+   */
+  public long totalRows() {
+    return totalRows;
+  }
+
+  @Override
+  public QueryResult nextPage() {
+    return (QueryResult) super.nextPage();
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("rows", values())
+        .add("cacheHit", cacheHit)
+        .add("schema", schema)
+        .add("totalBytesProcessed", totalBytesProcessed)
+        .add("totalRows", totalRows)
+        .add("cursor", nextPageCursor())
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), cacheHit, schema, totalBytesProcessed, totalRows);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    QueryResult response = (QueryResult) obj;
+    return Objects.equals(nextPageCursor(), response.nextPageCursor())
+        && Objects.equals(values(), response.values())
+        && Objects.equals(schema, response.schema)
+        && totalRows == response.totalRows
+        && totalBytesProcessed == response.totalBytesProcessed
+        && cacheHit == response.cacheHit;
+  }
+
+  static Builder builder() {
+    return new Builder();
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
index 2c00e81a9f63..cccf4d12b714 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
@@ -17,11 +17,10 @@
 package com.google.gcloud.bigquery;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 
 import com.google.common.collect.ImmutableList;
-import com.google.gcloud.Page;
-import com.google.gcloud.PageImpl;
 
 import org.junit.Test;
 
@@ -38,15 +37,13 @@ public class QueryResponseTest {
   private static final Schema SCHEMA = Schema.of(FIELD_SCHEMA1);
   private static final JobId JOB_ID = JobId.of("project", "job");
   private static final Long TOTAL_ROWS = 42L;
-  private static final PageImpl.NextPageFetcher> FETCHER =
-      new PageImpl.NextPageFetcher>() {
+  private static final QueryResult.QueryResultsPageFetcher FETCHER =
+      new QueryResult.QueryResultsPageFetcher() {
         @Override
-        public Page> nextPage() {
+        public QueryResult nextPage() {
           return null;
         }
       };
-  private static final Page> ROWS =
-      new PageImpl<>(FETCHER, "cursor", ImmutableList.>of());
   private static final Long TOTAL_BYTES_PROCESSED = 4200L;
   private static final Boolean JOB_COMPLETE = true;
   private static final List ERRORS = ImmutableList.of(
@@ -54,43 +51,40 @@ public Page> nextPage() {
       new BigQueryError("reason2", "location2", "message2", "debugInfo2")
   );
   private static final Boolean CACHE_HIT = false;
-  private static final QueryResponse QUERY_RESPONSE = QueryResponse.builder()
-      .etag(ETAG)
+  private static final QueryResult QUERY_RESULT = QueryResult.builder()
       .schema(SCHEMA)
-      .job(JOB_ID)
       .totalRows(TOTAL_ROWS)
-      .rows(ROWS)
       .totalBytesProcessed(TOTAL_BYTES_PROCESSED)
+      .cursor("cursor")
+      .pageFetcher(FETCHER)
+      .results(ImmutableList.>of())
+      .cacheHit(CACHE_HIT)
+      .build();
+  private static final QueryResponse QUERY_RESPONSE = QueryResponse.builder()
+      .etag(ETAG)
+      .job(JOB_ID)
       .jobComplete(JOB_COMPLETE)
       .executionErrors(ERRORS)
-      .cacheHit(CACHE_HIT)
+      .result(QUERY_RESULT)
       .build();
 
   @Test
   public void testBuilder() {
     assertEquals(ETAG, QUERY_RESPONSE.etag());
-    assertEquals(SCHEMA, QUERY_RESPONSE.schema());
+    assertEquals(QUERY_RESULT, QUERY_RESPONSE.result());
     assertEquals(JOB_ID, QUERY_RESPONSE.job());
-    assertEquals(TOTAL_ROWS, QUERY_RESPONSE.totalRows());
-    assertEquals(ROWS, QUERY_RESPONSE.rows());
-    assertEquals(TOTAL_BYTES_PROCESSED, (Long) QUERY_RESPONSE.totalBytesProcessed());
     assertEquals(JOB_COMPLETE, QUERY_RESPONSE.jobComplete());
     assertEquals(ERRORS, QUERY_RESPONSE.executionErrors());
-    assertEquals(CACHE_HIT, QUERY_RESPONSE.cacheHit());
   }
 
   @Test
   public void testBuilderIncomplete() {
     QueryResponse queryResponse = QueryResponse.builder().jobComplete(false).build();
     assertNull(queryResponse.etag());
-    assertNull(queryResponse.schema());
+    assertNull(queryResponse.result());
     assertNull(queryResponse.job());
-    assertNull(queryResponse.totalRows());
-    assertNull(queryResponse.rows());
-    assertNull(queryResponse.totalBytesProcessed());
-    assertEquals(false, queryResponse.jobComplete());
+    assertFalse(queryResponse.jobComplete());
     assertNull(queryResponse.executionErrors());
-    assertNull(queryResponse.cacheHit());
   }
 
   @Test
@@ -101,13 +95,9 @@ public void testEquals() {
   private void compareQueryResponse(QueryResponse expected, QueryResponse value) {
     assertEquals(expected, value);
     assertEquals(expected.etag(), value.etag());
-    assertEquals(expected.schema(), value.schema());
+    assertEquals(expected.result(), value.result());
     assertEquals(expected.job(), value.job());
-    assertEquals(expected.totalRows(), value.totalRows());
-    assertEquals(expected.rows(), value.rows());
-    assertEquals(expected.totalBytesProcessed(), value.totalBytesProcessed());
     assertEquals(expected.jobComplete(), value.jobComplete());
     assertEquals(expected.executionErrors(), value.executionErrors());
-    assertEquals(expected.cacheHit(), value.cacheHit());
   }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResultTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResultTest.java
new file mode 100644
index 000000000000..db2432753b52
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResultTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class QueryResultTest {
+
+  private static final String CURSOR = "cursor";
+  private static final Field FIELD_SCHEMA1 =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
+          .description("FieldDescription1")
+          .build();
+  private static final Schema SCHEMA = Schema.of(FIELD_SCHEMA1);
+  private static final long TOTAL_ROWS = 42L;
+  private static final QueryResult.QueryResultsPageFetcher FETCHER =
+      new QueryResult.QueryResultsPageFetcher() {
+        @Override
+        public QueryResult nextPage() {
+          return null;
+        }
+      };
+  private static final long TOTAL_BYTES_PROCESSED = 4200L;
+  private static final boolean CACHE_HIT = false;
+  private static final QueryResult QUERY_RESULT = QueryResult.builder()
+      .schema(SCHEMA)
+      .totalRows(TOTAL_ROWS)
+      .totalBytesProcessed(TOTAL_BYTES_PROCESSED)
+      .cursor(CURSOR)
+      .pageFetcher(FETCHER)
+      .results(ImmutableList.>of())
+      .cacheHit(CACHE_HIT)
+      .build();
+  private static final QueryResult QUERY_RESULT_INCOMPLETE = QueryResult.builder()
+      .totalBytesProcessed(TOTAL_BYTES_PROCESSED)
+      .build();
+
+  @Test
+  public void testBuilder() {
+    assertEquals(SCHEMA, QUERY_RESULT.schema());
+    assertEquals(TOTAL_ROWS, QUERY_RESULT.totalRows());
+    assertEquals(TOTAL_BYTES_PROCESSED, QUERY_RESULT.totalBytesProcessed());
+    assertEquals(CACHE_HIT, QUERY_RESULT.cacheHit());
+    assertEquals(CURSOR, QUERY_RESULT.nextPageCursor());
+    assertEquals(null, QUERY_RESULT.nextPage());
+    assertEquals(null, QUERY_RESULT_INCOMPLETE.schema());
+    assertEquals(0L, QUERY_RESULT_INCOMPLETE.totalRows());
+    assertEquals(TOTAL_BYTES_PROCESSED, QUERY_RESULT_INCOMPLETE.totalBytesProcessed());
+    assertEquals(false, QUERY_RESULT_INCOMPLETE.cacheHit());
+    assertEquals(null, QUERY_RESULT_INCOMPLETE.nextPageCursor());
+    assertEquals(null, QUERY_RESULT_INCOMPLETE.nextPage());
+  }
+
+  @Test
+  public void testEquals() {
+    compareQueryResult(QUERY_RESULT, QUERY_RESULT);
+    compareQueryResult(QUERY_RESULT_INCOMPLETE, QUERY_RESULT_INCOMPLETE);
+  }
+
+  private void compareQueryResult(QueryResult expected, QueryResult value) {
+    assertEquals(expected, value);
+    assertEquals(expected.nextPage(), value.nextPage());
+    assertEquals(expected.nextPageCursor(), value.nextPageCursor());
+    assertEquals(expected.values(), value.values());
+    assertEquals(expected.schema(), value.schema());
+    assertEquals(expected.totalRows(), value.totalRows());
+    assertEquals(expected.totalBytesProcessed(), value.totalBytesProcessed());
+    assertEquals(expected.cacheHit(), value.cacheHit());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 20092395565a..b14d4f2920c0 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -193,11 +193,19 @@ public class SerializationTest {
       .maxResults(42L)
       .maxWaitTime(10L)
       .build();
+  private static final QueryResult QUERY_RESULT = QueryResult.builder()
+      .schema(TABLE_SCHEMA)
+      .totalRows(1L)
+      .totalBytesProcessed(42L)
+      .cursor("cursor")
+      .pageFetcher(null)
+      .results(ImmutableList.>of())
+      .build();
   private static final QueryResponse QUERY_RESPONSE = QueryResponse.builder()
       .etag(ETAG)
-      .schema(TABLE_SCHEMA)
       .job(JOB_ID)
-      .totalRows(1L)
+      .jobComplete(true)
+      .result(QUERY_RESULT)
       .build();
 
   @Test

From c6e53c8cb58550bbfa769ec9666b4f77e945950a Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 14 Dec 2015 23:48:34 +0100
Subject: [PATCH 173/322] Rename QueryResponse.job to jobId, better javadoc, no
 errors as empty list, add hasErrors

---
 .../google/gcloud/bigquery/QueryRequest.java  |  2 +-
 .../google/gcloud/bigquery/QueryResponse.java | 36 ++++++++++++-------
 .../google/gcloud/bigquery/QueryResult.java   |  8 ++---
 .../gcloud/bigquery/QueryResponseTest.java    | 14 +++++---
 .../gcloud/bigquery/SerializationTest.java    |  2 +-
 5 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
index 83d6ed4164b4..d64994e69c76 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
@@ -27,7 +27,7 @@
  * Google Cloud BigQuery Query Request. This class can be used to run a BigQuery SQL query and
  * return results if the query completes within a specified timeout. The query results are saved to
  * a temporary table that is deleted approximately 24 hours after the query is run. The query is run
- * through a BigQuery Job whose identity can be accessed via {@link QueryResponse#job()}.
+ * through a BigQuery Job whose identity can be accessed via {@link QueryResponse#jobId()}.
  *
  * @see Query
  * @see Query Reference
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
index 787047a7a06d..b7bd5dc0efd0 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
@@ -17,6 +17,7 @@
 package com.google.gcloud.bigquery;
 
 import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
 
 import java.io.Serializable;
 import java.util.List;
@@ -30,10 +31,11 @@
  * 
    {@code
  *    QueryResponse response = bigquery.query(request);
  *    while (!response.jobComplete()) {
- *      response = bigquery.getQueryResults(response.job());
+ *      response = bigquery.getQueryResults(response.jobId());
  *      Thread.sleep(1000);
  *    }
  *    List executionErrors = response.executionErrors();
+ *    // look for errors in executionErrors
  *    QueryResult result = response.result();
  *    Iterator> rowIterator = result.iterateAll();
  *    while(rowIterator.hasNext()) {
@@ -52,7 +54,7 @@ public class QueryResponse implements Serializable {
 
   private final QueryResult result;
   private final String etag;
-  private final JobId job;
+  private final JobId jobId;
   private final boolean jobComplete;
   private final List executionErrors;
 
@@ -60,7 +62,7 @@ static final class Builder {
 
     private QueryResult result;
     private String etag;
-    private JobId job;
+    private JobId jobId;
     private boolean jobComplete;
     private List executionErrors;
 
@@ -76,8 +78,8 @@ Builder etag(String etag) {
       return this;
     }
 
-    Builder job(JobId job) {
-      this.job = job;
+    Builder jobId(JobId jobId) {
+      this.jobId = jobId;
       return this;
     }
 
@@ -99,9 +101,10 @@ QueryResponse build() {
   private QueryResponse(Builder builder) {
     this.result = builder.result;
     this.etag = builder.etag;
-    this.job = builder.job;
+    this.jobId = builder.jobId;
     this.jobComplete = builder.jobComplete;
-    this.executionErrors = builder.executionErrors;
+    this.executionErrors = builder.executionErrors != null ? builder.executionErrors
+      : ImmutableList.of();
   }
 
   /**
@@ -123,8 +126,8 @@ public String etag() {
    * Returns the identity of the BigQuery Job that was created to run the query. This field will be
    * present even if the original request timed out.
    */
-  public JobId job() {
-    return job;
+  public JobId jobId() {
+    return jobId;
   }
 
   /**
@@ -137,6 +140,15 @@ public boolean jobComplete() {
     return jobComplete;
   }
 
+  /**
+   * Returns whether errors and warnings occurred during the execution of the job. If this method
+   * returns {@code true} it does not necessarily mean that the job has completed or was
+   * unsuccessful.
+   */
+  public boolean hasErrors() {
+    return !executionErrors.isEmpty();
+  }
+
   /**
    * Returns errors and warnings encountered during the running of the job, if any. Errors here do
    * not necessarily mean that the job has completed or was unsuccessful.
@@ -150,7 +162,7 @@ public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("result", result)
         .add("etag", etag)
-        .add("job", job)
+        .add("jobId", jobId)
         .add("jobComplete", jobComplete)
         .add("executionErrors", executionErrors)
         .toString();
@@ -158,7 +170,7 @@ public String toString() {
 
   @Override
   public int hashCode() {
-    return Objects.hash(job);
+    return Objects.hash(jobId);
   }
 
   @Override
@@ -173,7 +185,7 @@ public boolean equals(Object obj) {
     return jobComplete == response.jobComplete
         && Objects.equals(etag, response.etag)
         && Objects.equals(result, response.result)
-        && Objects.equals(job, response.job)
+        && Objects.equals(jobId, response.jobId)
         && Objects.equals(executionErrors, response.executionErrors);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java
index 16942d249912..692abab937a9 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java
@@ -72,17 +72,17 @@ Builder totalRows(long totalRows) {
     Builder pageFetcher(QueryResultsPageFetcher pageFetcher) {
       this.pageFetcher = pageFetcher;
       return this;
-    };
+    }
 
     Builder cursor(String cursor) {
       this.cursor = cursor;
       return this;
-    };
+    }
 
     Builder results(Iterable> results) {
       this.results = results;
       return this;
-    };
+    }
 
     QueryResult build() {
       return new QueryResult(this);
@@ -108,7 +108,7 @@ public boolean cacheHit() {
   }
 
   /**
-   * Returns the schema of the results.
+   * Returns the schema of the results. This is present only when the query completes successfully.
    */
   public Schema schema() {
     return schema;
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
index cccf4d12b714..3ecae9b76e18 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
 
@@ -62,7 +63,7 @@ public QueryResult nextPage() {
       .build();
   private static final QueryResponse QUERY_RESPONSE = QueryResponse.builder()
       .etag(ETAG)
-      .job(JOB_ID)
+      .jobId(JOB_ID)
       .jobComplete(JOB_COMPLETE)
       .executionErrors(ERRORS)
       .result(QUERY_RESULT)
@@ -72,9 +73,10 @@ public QueryResult nextPage() {
   public void testBuilder() {
     assertEquals(ETAG, QUERY_RESPONSE.etag());
     assertEquals(QUERY_RESULT, QUERY_RESPONSE.result());
-    assertEquals(JOB_ID, QUERY_RESPONSE.job());
+    assertEquals(JOB_ID, QUERY_RESPONSE.jobId());
     assertEquals(JOB_COMPLETE, QUERY_RESPONSE.jobComplete());
     assertEquals(ERRORS, QUERY_RESPONSE.executionErrors());
+    assertTrue(QUERY_RESPONSE.hasErrors());
   }
 
   @Test
@@ -82,9 +84,10 @@ public void testBuilderIncomplete() {
     QueryResponse queryResponse = QueryResponse.builder().jobComplete(false).build();
     assertNull(queryResponse.etag());
     assertNull(queryResponse.result());
-    assertNull(queryResponse.job());
+    assertNull(queryResponse.jobId());
     assertFalse(queryResponse.jobComplete());
-    assertNull(queryResponse.executionErrors());
+    assertEquals(ImmutableList.of(), queryResponse.executionErrors());
+    assertFalse(queryResponse.hasErrors());
   }
 
   @Test
@@ -96,8 +99,9 @@ private void compareQueryResponse(QueryResponse expected, QueryResponse value) {
     assertEquals(expected, value);
     assertEquals(expected.etag(), value.etag());
     assertEquals(expected.result(), value.result());
-    assertEquals(expected.job(), value.job());
+    assertEquals(expected.jobId(), value.jobId());
     assertEquals(expected.jobComplete(), value.jobComplete());
     assertEquals(expected.executionErrors(), value.executionErrors());
+    assertEquals(expected.hasErrors(), value.hasErrors());
   }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index b14d4f2920c0..3576769f4007 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -203,7 +203,7 @@ public class SerializationTest {
       .build();
   private static final QueryResponse QUERY_RESPONSE = QueryResponse.builder()
       .etag(ETAG)
-      .job(JOB_ID)
+      .jobId(JOB_ID)
       .jobComplete(true)
       .result(QUERY_RESULT)
       .build();

From 3b70b20e36fa78f742d5bb4ce9a6cb126f53bd3f Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 15 Dec 2015 00:08:26 +0100
Subject: [PATCH 174/322] Refactor BigQueryRpc and DefaultBigQueryRpc - Remove
 options parameter where not necessary (query, cancel) - Unset JobInfo.type in
 create method as type is output only - Add javadoc to cancel method - Make
 checkstyle happy

---
 .../com/google/gcloud/spi/BigQueryRpc.java    |  35 ++--
 .../google/gcloud/spi/DefaultBigQueryRpc.java | 168 +++++++++---------
 2 files changed, 105 insertions(+), 98 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
index c45cb847eecb..d53ad838b802 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
@@ -19,13 +19,11 @@
 import com.google.api.services.bigquery.model.Dataset;
 import com.google.api.services.bigquery.model.GetQueryResultsResponse;
 import com.google.api.services.bigquery.model.Job;
-import com.google.api.services.bigquery.model.JobReference;
 import com.google.api.services.bigquery.model.QueryRequest;
 import com.google.api.services.bigquery.model.QueryResponse;
 import com.google.api.services.bigquery.model.Table;
 import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
 import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
-import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.TableRow;
 import com.google.gcloud.bigquery.BigQueryException;
 
@@ -113,6 +111,10 @@ public Y y() {
 
   Dataset create(Dataset dataset, Map options) throws BigQueryException;
 
+  Table create(Table table, Map options) throws BigQueryException;
+
+  Job create(Job job, Map options) throws BigQueryException;
+
   /**
    * Delete the requested dataset.
    *
@@ -123,6 +125,8 @@ public Y y() {
 
   Dataset patch(Dataset dataset, Map options) throws BigQueryException;
 
+  Table patch(Table table, Map options) throws BigQueryException;
+
   /**
    * Returns the requested table or {@code null} if not found.
    *
@@ -139,21 +143,16 @@ public Y y() {
   Tuple> listTables(String dataset, Map options)
       throws BigQueryException;
 
-  Table create(Table table, Map options) throws BigQueryException;
-
   /**
    * Delete the requested table.
    *
    * @return {@code true} if table was deleted, {@code false} if it was not found
    * @throws BigQueryException upon failure
    */
-  boolean deleteTable(String datasetId, String tableId, Map options)
-      throws BigQueryException;
+  boolean deleteTable(String datasetId, String tableId) throws BigQueryException;
 
-  Table patch(Table table, Map options) throws BigQueryException;
-
-  TableDataInsertAllResponse insertAll(TableReference table, TableDataInsertAllRequest request,
-      Map options) throws BigQueryException;
+  TableDataInsertAllResponse insertAll(String datasetId, String tableId,
+      TableDataInsertAllRequest request) throws BigQueryException;
 
   Tuple> listTableData(String datasetId, String tableId,
       Map options) throws BigQueryException;
@@ -172,12 +171,18 @@ Tuple> listTableData(String datasetId, String tableId
    */
   Tuple> listJobs(Map options) throws BigQueryException;
 
-  Job create(Job job, Map options) throws BigQueryException;
-
-  boolean cancel(String jobId, Map options) throws BigQueryException;
+  /**
+   * Sends a job cancel request. This call will return immediately, and the client will need to poll
+   * for the job status to see if the cancel completed successfully.
+   *
+   * @return {@code true} if cancel was requested successfully, {@code false} if the job was not
+   *     found
+   * @throws BigQueryException upon failure
+   */
+  boolean cancel(String jobId) throws BigQueryException;
 
-  GetQueryResultsResponse getQueryResults(JobReference job, Map options)
+  GetQueryResultsResponse getQueryResults(String jobId, Map options)
       throws BigQueryException;
 
-  QueryResponse query(QueryRequest request, Map options) throws BigQueryException;
+  QueryResponse query(QueryRequest request) throws BigQueryException;
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
index d2555d50f478..ffaa787fb1d8 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -16,6 +16,8 @@
 
 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 java.net.HttpURLConnection.HTTP_NOT_FOUND;
@@ -32,7 +34,6 @@
 import com.google.api.services.bigquery.model.GetQueryResultsResponse;
 import com.google.api.services.bigquery.model.Job;
 import com.google.api.services.bigquery.model.JobList;
-import com.google.api.services.bigquery.model.JobReference;
 import com.google.api.services.bigquery.model.JobStatus;
 import com.google.api.services.bigquery.model.QueryRequest;
 import com.google.api.services.bigquery.model.QueryResponse;
@@ -48,9 +49,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 
-import static com.google.gcloud.spi.BigQueryRpc.Option.MAX_RESULTS;
-import static com.google.gcloud.spi.BigQueryRpc.Option.PAGE_TOKEN;
-
 import com.google.gcloud.bigquery.BigQueryException;
 import com.google.gcloud.bigquery.BigQueryOptions;
 
@@ -103,7 +101,7 @@ public Dataset getDataset(String datasetId, Map options) throws BigQu
           .get(this.options.projectId(), datasetId)
           .setFields(FIELDS.getString(options))
           .execute();
-    } catch(IOException ex) {
+    } catch (IOException ex) {
       BigQueryException serviceException = translate(ex);
       if (serviceException.code() == HTTP_NOT_FOUND) {
         return null;
@@ -124,15 +122,16 @@ public Tuple> listDatasets(Map options)
           .execute();
       Iterable datasets = datasetsList.getDatasets();
       return Tuple.of(datasetsList.getNextPageToken(),
-          Iterables.transform(datasets != null ? datasets : ImmutableList.of(),
+          Iterables.transform(datasets != null ? datasets :
+              ImmutableList.of(),
               new Function() {
                 @Override
-                public Dataset apply(DatasetList.Datasets f) {
+                public Dataset apply(DatasetList.Datasets datasetPb) {
                   return new Dataset()
-                      .setDatasetReference(f.getDatasetReference())
-                      .setFriendlyName(f.getFriendlyName())
-                      .setId(f.getId())
-                      .setKind(f.getKind());
+                      .setDatasetReference(datasetPb.getDatasetReference())
+                      .setFriendlyName(datasetPb.getFriendlyName())
+                      .setId(datasetPb.getId())
+                      .setKind(datasetPb.getKind());
                 }
               }));
     } catch (IOException ex) {
@@ -151,6 +150,33 @@ public Dataset create(Dataset dataset, Map options) throws BigQueryEx
     }
   }
 
+  @Override
+  public Table create(Table table, Map options)
+      throws BigQueryException {
+    try {
+      // unset the type, as it is output only
+      table.setType(null);
+      return bigquery.tables()
+          .insert(this.options.projectId(), table.getTableReference().getDatasetId(), table)
+          .setFields(FIELDS.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public Job create(Job job, Map options) throws BigQueryException {
+    try {
+      return bigquery.jobs()
+          .insert(this.options.projectId(), job)
+          .setFields(FIELDS.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
   @Override
   public boolean deleteDataset(String datasetId, Map options) throws BigQueryException {
     try {
@@ -180,6 +206,21 @@ public Dataset patch(Dataset dataset, Map options) throws BigQueryExc
     }
   }
 
+  @Override
+  public Table patch(Table table, Map options) throws BigQueryException {
+    try {
+      // unset the type, as it is output only
+      table.setType(null);
+      TableReference reference = table.getTableReference();
+      return bigquery.tables()
+          .patch(this.options.projectId(), reference.getDatasetId(), reference.getTableId(), table)
+          .setFields(FIELDS.getString(options))
+          .execute();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
   @Override
   public Table getTable(String datasetId, String tableId, Map options)
       throws BigQueryException {
@@ -188,7 +229,7 @@ public Table getTable(String datasetId, String tableId, Map options)
           .get(this.options.projectId(), datasetId, tableId)
           .setFields(FIELDS.getString(options))
           .execute();
-    } catch(IOException ex) {
+    } catch (IOException ex) {
       BigQueryException serviceException = translate(ex);
       if (serviceException.code() == HTTP_NOT_FOUND) {
         return null;
@@ -211,13 +252,13 @@ public Tuple> listTables(String datasetId, Mapof(),
               new Function() {
                 @Override
-                public Table apply(TableList.Tables f) {
+                public Table apply(TableList.Tables tablePb) {
                   return new Table()
-                      .setFriendlyName(f.getFriendlyName())
-                      .setId(f.getId())
-                      .setKind(f.getKind())
-                      .setTableReference(f.getTableReference())
-                      .setType(f.getType());
+                      .setFriendlyName(tablePb.getFriendlyName())
+                      .setId(tablePb.getId())
+                      .setKind(tablePb.getKind())
+                      .setTableReference(tablePb.getTableReference())
+                      .setType(tablePb.getType());
                 }
               }));
     } catch (IOException ex) {
@@ -226,21 +267,7 @@ public Table apply(TableList.Tables f) {
   }
 
   @Override
-  public Table create(Table table, Map options)
-      throws BigQueryException {
-    try {
-      return bigquery.tables()
-          .insert(this.options.projectId(), table.getTableReference().getDatasetId(), table)
-          .setFields(FIELDS.getString(options))
-          .execute();
-    } catch (IOException ex) {
-      throw translate(ex);
-    }
-  }
-
-  @Override
-  public boolean deleteTable(String datasetId, String tableId, Map options)
-      throws BigQueryException {
+  public boolean deleteTable(String datasetId, String tableId) throws BigQueryException {
     try {
       bigquery.tables().delete(this.options.projectId(), datasetId, tableId).execute();
       return true;
@@ -254,24 +281,11 @@ public boolean deleteTable(String datasetId, String tableId, Map opti
   }
 
   @Override
-  public Table patch(Table table, Map options) throws BigQueryException {
-    try {
-      TableReference reference = table.getTableReference();
-      return bigquery.tables()
-          .patch(this.options.projectId(), reference.getDatasetId(), reference.getTableId(), table)
-          .setFields(FIELDS.getString(options))
-          .execute();
-    } catch (IOException ex) {
-      throw translate(ex);
-    }
-  }
-
-  @Override
-  public TableDataInsertAllResponse insertAll(TableReference table,
-      TableDataInsertAllRequest request, Map options) throws BigQueryException {
+  public TableDataInsertAllResponse insertAll(String datasetId, String tableId,
+      TableDataInsertAllRequest request) throws BigQueryException {
     try {
       return bigquery.tabledata()
-          .insertAll(this.options.projectId(), table.getDatasetId(), table.getTableId(), request)
+          .insertAll(this.options.projectId(), datasetId, tableId, request)
           .execute();
     } catch (IOException ex) {
       throw translate(ex);
@@ -286,8 +300,8 @@ public Tuple> listTableData(String datasetId, String
           .list(this.options.projectId(), datasetId, tableId)
           .setMaxResults(MAX_RESULTS.getLong(options))
           .setPageToken(PAGE_TOKEN.getString(options))
-          .setStartIndex(START_INDEX.getLong(options) != null ?
-              BigInteger.valueOf(START_INDEX.getLong(options)) : null)
+          .setStartIndex(START_INDEX.getLong(options) != null
+              ? BigInteger.valueOf(START_INDEX.getLong(options)) : null)
           .execute();
       return Tuple.>of(tableDataList.getPageToken(),
           tableDataList.getRows());
@@ -303,7 +317,7 @@ public Job getJob(String jobId, Map options) throws BigQueryException
           .get(this.options.projectId(), jobId)
           .setFields(FIELDS.getString(options))
           .execute();
-    } catch(IOException ex) {
+    } catch (IOException ex) {
       BigQueryException serviceException = translate(ex);
       if (serviceException.code() == HTTP_NOT_FOUND) {
         return null;
@@ -329,22 +343,23 @@ public Tuple> listJobs(Map options) throws BigQ
           Iterables.transform(jobs != null ? jobs : ImmutableList.of(),
               new Function() {
                 @Override
-                public Job apply(JobList.Jobs f) {
-                  JobStatus statusPb = f.getStatus() != null ? f.getStatus() : new JobStatus();
+                public Job apply(JobList.Jobs jobPb) {
+                  JobStatus statusPb = jobPb.getStatus() != null
+                      ? jobPb.getStatus() : new JobStatus();
                   if (statusPb.getState() == null) {
-                    statusPb.setState(f.getState());
+                    statusPb.setState(jobPb.getState());
                   }
                   if (statusPb.getErrorResult() == null) {
-                    statusPb.setErrorResult(f.getErrorResult());
+                    statusPb.setErrorResult(jobPb.getErrorResult());
                   }
                   return new Job()
-                      .setConfiguration(f.getConfiguration())
-                      .setId(f.getId())
-                      .setJobReference(f.getJobReference())
-                      .setKind(f.getKind())
-                      .setStatistics(f.getStatistics())
-                      .setStatus(f.getStatus())
-                      .setUserEmail(f.getUserEmail());
+                      .setConfiguration(jobPb.getConfiguration())
+                      .setId(jobPb.getId())
+                      .setJobReference(jobPb.getJobReference())
+                      .setKind(jobPb.getKind())
+                      .setStatistics(jobPb.getStatistics())
+                      .setStatus(statusPb)
+                      .setUserEmail(jobPb.getUserEmail());
                 }
               }));
     } catch (IOException ex) {
@@ -353,19 +368,7 @@ public Job apply(JobList.Jobs f) {
   }
 
   @Override
-  public Job create(Job job, Map options) throws BigQueryException {
-    try {
-      return bigquery.jobs()
-          .insert(this.options.projectId(), job)
-          .setFields(FIELDS.getString(options))
-          .execute();
-    } catch (IOException ex) {
-      throw translate(ex);
-    }
-  }
-
-  @Override
-  public boolean cancel(String jobId, Map options) throws BigQueryException {
+  public boolean cancel(String jobId) throws BigQueryException {
     try {
       bigquery.jobs().cancel(this.options.projectId(), jobId).execute();
       return true;
@@ -379,17 +382,17 @@ public boolean cancel(String jobId, Map options) throws BigQueryExcep
   }
 
   @Override
-  public GetQueryResultsResponse getQueryResults(JobReference job, Map options)
+  public GetQueryResultsResponse getQueryResults(String jobId, Map options)
       throws BigQueryException {
     try {
-      return bigquery.jobs().getQueryResults(this.options.projectId(), job.getJobId())
+      return bigquery.jobs().getQueryResults(this.options.projectId(), jobId)
           .setMaxResults(MAX_RESULTS.getLong(options))
           .setPageToken(PAGE_TOKEN.getString(options))
-          .setStartIndex(START_INDEX.getLong(options) != null ?
-              BigInteger.valueOf(START_INDEX.getLong(options)) : null)
+          .setStartIndex(START_INDEX.getLong(options) != null
+              ? BigInteger.valueOf(START_INDEX.getLong(options)) : null)
           .setTimeoutMs(TIMEOUT.getLong(options))
           .execute();
-    } catch(IOException ex) {
+    } catch (IOException ex) {
       BigQueryException serviceException = translate(ex);
       if (serviceException.code() == HTTP_NOT_FOUND) {
         return null;
@@ -399,8 +402,7 @@ public GetQueryResultsResponse getQueryResults(JobReference job, Map
   }
 
   @Override
-  public QueryResponse query(QueryRequest request, Map options)
-      throws BigQueryException {
+  public QueryResponse query(QueryRequest request) throws BigQueryException {
     try {
       return bigquery.jobs().query(this.options.projectId(), request).execute();
     } catch (IOException ex) {

From e1dc3af0ba48a6b274e6d432da751ba536b2ba4e Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 15 Dec 2015 16:56:35 +0100
Subject: [PATCH 175/322] Add BigQuery service implementation - Connect
 DefaultBigQueryRpc and BigQueryImpl to BigQueryOptions - Add defaultInstance
 method to BigQueryOptions - Add Option base class for BigQuery operation
 options and test - Add methods and options to the BigQuery interface - Add
 BigQueryImpl service implementation - Add BigQueryImplTest with unit tests

---
 .../com/google/gcloud/bigquery/BigQuery.java  | 608 ++++++++++-
 .../gcloud/bigquery/BigQueryFactory.java      |   1 -
 .../google/gcloud/bigquery/BigQueryImpl.java  | 723 +++++++++++++
 .../gcloud/bigquery/BigQueryOptions.java      |  12 +-
 .../com/google/gcloud/bigquery/Option.java    |  72 ++
 .../gcloud/bigquery/BigQueryImplTest.java     | 982 ++++++++++++++++++
 .../google/gcloud/bigquery/OptionTest.java    |  38 +
 7 files changed, 2429 insertions(+), 7 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Option.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
index 28fb33dcc58c..3a68a49c9003 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
@@ -16,7 +16,16 @@
 
 package com.google.gcloud.bigquery;
 
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.gcloud.Page;
 import com.google.gcloud.Service;
+import com.google.gcloud.spi.BigQueryRpc;
+
+import java.util.HashSet;
+import java.util.List;
 
 /**
  * An interface for Google Cloud BigQuery.
@@ -25,5 +34,602 @@
  */
 public interface BigQuery extends Service {
 
-  // TODO(mziccard) add missing methods
+  enum DatasetField {
+    ACCESS("access"),
+    CREATION_TIME("creationTime"),
+    DATASET_REFERENCE("datasetReference"),
+    DEFAULT_TABLE_EXPIRATION_MS("defaultTableLifetime"),
+    DESCRIPTION("description"),
+    ETAG("etag"),
+    FRIENDLY_NAME("friendlyName"),
+    ID("id"),
+    LAST_MODIFIED_TIME("lastModifiedTime"),
+    LOCATION("location"),
+    SELF_LINK("selfLink");
+
+    private final String selector;
+
+    DatasetField(String selector) {
+      this.selector = selector;
+    }
+
+    public String selector() {
+      return selector;
+    }
+
+    static String selector(DatasetField... fields) {
+      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 1);
+      fieldStrings.add(DATASET_REFERENCE.selector());
+      for (DatasetField field : fields) {
+        fieldStrings.add(field.selector());
+      }
+      return com.google.common.base.Joiner.on(',').join(fieldStrings);
+    }
+  }
+
+  enum TableField {
+    CREATION_TIME("creationTime"),
+    DESCRIPTION("description"),
+    ETAG("etag"),
+    EXPIRATION_TIME("expirationTime"),
+    EXTERNAL_DATA_CONFIGURATION("externalDataConfiguration"),
+    FRIENDLY_NAME("friendlyName"),
+    ID("id"),
+    LAST_MODIFIED_TIME("lastModifiedTime"),
+    LOCATION("location"),
+    NUM_BYTES("numBytes"),
+    NUM_ROWS("numRows"),
+    SCHEMA("schema"),
+    SELF_LINK("selfLink"),
+    STREAMING_BUFFER("streamingBuffer"),
+    TABLE_REFERENCE("tableReference"),
+    TYPE("type"),
+    VIEW("view");
+
+    private final String selector;
+
+    TableField(String selector) {
+      this.selector = selector;
+    }
+
+    public String selector() {
+      return selector;
+    }
+
+    static String selector(TableField... fields) {
+      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
+      fieldStrings.add(TABLE_REFERENCE.selector());
+      fieldStrings.add(TYPE.selector());
+      for (TableField field : fields) {
+        fieldStrings.add(field.selector());
+      }
+      return com.google.common.base.Joiner.on(',').join(fieldStrings);
+    }
+  }
+
+  enum JobField {
+    CONFIGURATION("configuration"),
+    ETAG("etag"),
+    ID("id"),
+    JOB_REFERENCE("jobReference"),
+    SELF_LINK("selfLink"),
+    STATISTICS("statistics"),
+    STATUS("status"),
+    USER_EMAIL("user_email");
+
+    private final String selector;
+
+    JobField(String selector) {
+      this.selector = selector;
+    }
+
+    public String selector() {
+      return selector;
+    }
+
+    static String selector(JobField... fields) {
+      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
+      fieldStrings.add(JOB_REFERENCE.selector());
+      fieldStrings.add(CONFIGURATION.selector());
+      for (JobField field : fields) {
+        fieldStrings.add(field.selector());
+      }
+      return com.google.common.base.Joiner.on(',').join(fieldStrings);
+    }
+  }
+
+  /**
+   * Class for specifying dataset list options.
+   */
+  class DatasetListOption extends Option {
+
+    private static final long serialVersionUID = 8660294969063340498L;
+
+    private DatasetListOption(BigQueryRpc.Option option, Object value) {
+      super(option, value);
+    }
+
+    /**
+     * Returns an option to specify the maximum number of datasets to be returned.
+     */
+    public static DatasetListOption maxResults(long maxResults) {
+      return new DatasetListOption(BigQueryRpc.Option.MAX_RESULTS, maxResults);
+    }
+
+    /**
+     * Returns an option to specify the page token from which to start listing datasets.
+     */
+    public static DatasetListOption startPageToken(String pageToken) {
+      return new DatasetListOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
+    }
+
+    /**
+     * Returns an options to list all datasets, even hidden ones.
+     */
+    public static DatasetListOption all() {
+      return new DatasetListOption(BigQueryRpc.Option.ALL_DATASETS, true);
+    }
+  }
+
+  /**
+   * Class for specifying dataset get, create and update options.
+   */
+  class DatasetOption extends Option {
+
+    private static final long serialVersionUID = 1674133909259913250L;
+
+    private DatasetOption(BigQueryRpc.Option option, Object value) {
+      super(option, value);
+    }
+
+    /**
+     * Returns an option to specify the dataset's fields to be returned by the RPC call. If this
+     * option is not provided all dataset's fields are returned. {@code DatasetOption.fields}) can
+     * be used to specify only the fields of interest. {@link DatasetInfo#datasetId()} is always
+     * returned, even if not specified.
+     */
+    public static DatasetOption fields(DatasetField... fields) {
+      return new DatasetOption(BigQueryRpc.Option.FIELDS, DatasetField.selector(fields));
+    }
+  }
+
+  /**
+   * Class for specifying dataset delete options.
+   */
+  class DatasetDeleteOption extends Option {
+
+    private static final long serialVersionUID = -7166083569900951337L;
+
+    private DatasetDeleteOption(BigQueryRpc.Option option, Object value) {
+      super(option, value);
+    }
+
+    /**
+     * Returns an option to delete a dataset even if non-empty. If not provided, attempting to
+     * delete a non-empty dataset will result in a {@link BigQueryException} being thrown.
+     */
+    public static DatasetDeleteOption deleteContents() {
+      return new DatasetDeleteOption(BigQueryRpc.Option.DELETE_CONTENTS, true);
+    }
+  }
+
+  /**
+   * Class for specifying table list options.
+   */
+  class TableListOption extends Option {
+
+    private static final long serialVersionUID = 8660294969063340498L;
+
+    private TableListOption(BigQueryRpc.Option option, Object value) {
+      super(option, value);
+    }
+
+    /**
+     * Returns an option to specify the maximum number of tables to be returned.
+     */
+    public static TableListOption maxResults(long maxResults) {
+      return new TableListOption(BigQueryRpc.Option.MAX_RESULTS, maxResults);
+    }
+
+    /**
+     * Returns an option to specify the page token from which to start listing tables.
+     */
+    public static TableListOption startPageToken(String pageToken) {
+      return new TableListOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
+    }
+  }
+
+  /**
+   * Class for specifying table get, create and update options.
+   */
+  class TableOption extends Option {
+
+    private static final long serialVersionUID = -1723870134095936772L;
+
+    private TableOption(BigQueryRpc.Option option, Object value) {
+      super(option, value);
+    }
+
+    /**
+     * Returns an option to specify the table's fields to be returned by the RPC call. If this
+     * option is not provided all table's fields are returned. {@code TableOption.fields}) can be
+     * used to specify only the fields of interest. {@link BaseTableInfo#tableId()} and
+     * {@link BaseTableInfo#type()} are always returned, even if not specified.
+     */
+    public static TableOption fields(TableField... fields) {
+      return new TableOption(BigQueryRpc.Option.FIELDS, TableField.selector(fields));
+    }
+  }
+
+  /**
+   * Class for specifying table data list options.
+   */
+  class TableDataListOption extends Option {
+
+    private static final long serialVersionUID = 8488823381738864434L;
+
+    private TableDataListOption(BigQueryRpc.Option option, Object value) {
+      super(option, value);
+    }
+
+    /**
+     * Returns an option to specify the maximum number of rows to be returned.
+     */
+    public static TableDataListOption maxResults(long maxResults) {
+      return new TableDataListOption(BigQueryRpc.Option.MAX_RESULTS, maxResults);
+    }
+
+    /**
+     * Returns an option to specify the page token from which to start listing table data.
+     */
+    public static TableDataListOption startPageToken(String pageToken) {
+      return new TableDataListOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
+    }
+
+    /**
+     * Returns an option that sets the zero-based index of the row from which to start listing table
+     * data.
+     */
+    public static TableDataListOption startIndex(long index) {
+      return new TableDataListOption(BigQueryRpc.Option.START_INDEX, index);
+    }
+  }
+
+  /**
+   * Class for specifying job list options.
+   */
+  class JobListOption extends Option {
+
+    private static final long serialVersionUID = -8207122131226481423L;
+
+    private JobListOption(BigQueryRpc.Option option, Object value) {
+      super(option, value);
+    }
+
+    /**
+     * Returns an option to list all jobs, even the ones issued by other users.
+     */
+    public static JobListOption allUsers() {
+      return new JobListOption(BigQueryRpc.Option.ALL_USERS, true);
+    }
+
+    /**
+     * Returns an option to list only jobs that match the provided filters.
+     */
+    public static JobListOption stateFilter(JobStatus.State... stateFilters) {
+      List stringFilters = Lists.transform(ImmutableList.copyOf(stateFilters),
+          new Function() {
+            @Override
+            public String apply(JobStatus.State state) {
+              return state.toString().toLowerCase();
+            }
+          });
+      return new JobListOption(BigQueryRpc.Option.STATE_FILTER, stringFilters);
+    }
+
+    /**
+     * Returns an option to specify the maximum number of jobs to be returned.
+     */
+    public static JobListOption maxResults(long maxResults) {
+      return new JobListOption(BigQueryRpc.Option.MAX_RESULTS, maxResults);
+    }
+
+    /**
+     * Returns an option to specify the page token from which to start listing jobs.
+     */
+    public static JobListOption startPageToken(String pageToken) {
+      return new JobListOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
+    }
+
+    /**
+     * Returns an option to specify the job's fields to be returned by the RPC call. If this option
+     * is not provided all job's fields are returned. {@code JobOption.fields()}) can be used to
+     * specify only the fields of interest. {@link JobInfo#jobId()}, {@link JobStatus#state()},
+     * {@link JobStatus#error()} as well as type-specific configuration (e.g.
+     * {@link QueryJobInfo#query()} for Query Jobs) are always returned, even if not specified.
+     * {@link JobField#SELF_LINK} and {@link JobField#ETAG} can not be selected when listing jobs.
+     */
+    public static JobListOption fields(JobField... fields) {
+      String selector = JobField.selector(fields);
+      StringBuilder builder = new StringBuilder();
+      builder.append("etag,jobs(").append(selector).append(",state,errorResult),nextPageToken");
+      return new JobListOption(BigQueryRpc.Option.FIELDS, builder.toString());
+    }
+  }
+
+  /**
+   * Class for specifying table get and create options.
+   */
+  class JobOption extends Option {
+
+    private static final long serialVersionUID = -3111736712316353665L;
+
+    private JobOption(BigQueryRpc.Option option, Object value) {
+      super(option, value);
+    }
+
+    /**
+     * Returns an option to specify the job's fields to be returned by the RPC call. If this option
+     * is not provided all job's fields are returned. {@code JobOption.fields}) can be used to
+     * specify only the fields of interest. {@link JobInfo#jobId()} as well as type-specific
+     * configuration (e.g. {@link QueryJobInfo#query()} for Query Jobs) are always returned, even if
+     * not specified.
+     */
+    public static JobOption fields(JobField... fields) {
+      return new JobOption(BigQueryRpc.Option.FIELDS, JobField.selector(fields));
+    }
+  }
+
+  /**
+   * Class for specifying query results options.
+   */
+  class QueryResultsOption extends Option {
+
+    private static final long serialVersionUID = 3788898503226985525L;
+
+    private QueryResultsOption(BigQueryRpc.Option option, Object value) {
+      super(option, value);
+    }
+
+    /**
+     * Returns an option to specify the maximum number of rows to be returned.
+     */
+    public static QueryResultsOption maxResults(long maxResults) {
+      return new QueryResultsOption(BigQueryRpc.Option.MAX_RESULTS, maxResults);
+    }
+
+    /**
+     * Returns an option to specify the page token from which to start listing query results.
+     */
+    public static QueryResultsOption startPageToken(String pageToken) {
+      return new QueryResultsOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
+    }
+
+    /**
+     * Returns an option that sets the zero-based index of the row from which to start listing query
+     * results.
+     */
+    public static QueryResultsOption startIndex(Long startIndex) {
+      return new QueryResultsOption(BigQueryRpc.Option.START_INDEX, startIndex);
+    }
+
+    /**
+     * Returns an option that sets how long to wait for the query to complete, in milliseconds,
+     * before returning. Default is 10 seconds. If the timeout passes before the job completes,
+     * {@link QueryResponse#jobComplete()} will be {@code false}.
+     */
+    public static QueryResultsOption maxWaitTime(Long maxWaitTime) {
+      return new QueryResultsOption(BigQueryRpc.Option.TIMEOUT, maxWaitTime);
+    }
+  }
+
+  /**
+   * Creates a new dataset.
+   *
+   * @throws BigQueryException upon failure
+   */
+  DatasetInfo create(DatasetInfo dataset, DatasetOption... options) throws BigQueryException;
+
+  /**
+   * Creates a new table.
+   *
+   * @throws BigQueryException upon failure
+   */
+  BaseTableInfo create(BaseTableInfo table, TableOption... options) throws BigQueryException;
+
+  /**
+   * Creates a new job.
+   *
+   * @throws BigQueryException upon failure
+   */
+  JobInfo create(JobInfo job, JobOption... options) throws BigQueryException;
+
+  /**
+   * Returns the requested dataset or {@code null} if not found.
+   *
+   * @throws BigQueryException upon failure
+   */
+  DatasetInfo getDataset(String datasetId, DatasetOption... options) throws BigQueryException;
+
+  /**
+   * Returns the requested dataset or {@code null} if not found.
+   *
+   * @throws BigQueryException upon failure
+   */
+  DatasetInfo getDataset(DatasetId datasetId, DatasetOption... options) throws BigQueryException;
+
+  /**
+   * Lists the project's datasets. This method returns partial information on each dataset
+   * ({@link DatasetInfo#datasetId()} ()}, {@link DatasetInfo#friendlyName()} and
+   * {@link DatasetInfo#id()}). To get complete information use either
+   * {@link #getDataset(String, DatasetOption...)} or
+   * {@link #getDataset(DatasetId, DatasetOption...)}.
+   *
+   * @throws BigQueryException upon failure
+   */
+  Page listDatasets(DatasetListOption... options) throws BigQueryException;
+
+  /**
+   * Deletes the requested dataset.
+   *
+   * @return {@code true} if dataset was deleted, {@code false} if it was not found.
+   * @throws BigQueryException upon failure
+   */
+  boolean delete(String datasetId, DatasetDeleteOption... options) throws BigQueryException;
+
+  /**
+   * Deletes the requested dataset.
+   *
+   * @return {@code true} if dataset was deleted, {@code false} if it was not found.
+   * @throws BigQueryException upon failure
+   */
+  boolean delete(DatasetId datasetId, DatasetDeleteOption... options) throws BigQueryException;
+
+  /**
+   * Deletes the requested table.
+   *
+   * @return {@code true} if table was deleted, {@code false} if it was not found.
+   * @throws BigQueryException upon failure
+   */
+  boolean delete(String datasetId, String tableId) throws BigQueryException;
+
+  /**
+   * Deletes the requested table.
+   *
+   * @return {@code true} if table was deleted, {@code false} if it was not found.
+   * @throws BigQueryException upon failure
+   */
+  boolean delete(TableId tableId) throws BigQueryException;
+
+  /**
+   * Updates dataset information.
+   *
+   * @throws BigQueryException upon failure
+   */
+  DatasetInfo update(DatasetInfo dataset, DatasetOption... options) throws BigQueryException;
+
+  /**
+   * Updates table information.
+   *
+   * @throws BigQueryException upon failure
+   */
+  BaseTableInfo update(BaseTableInfo table, TableOption... options) throws BigQueryException;
+
+  /**
+   * Returns the requested table or {@code null} if not found.
+   *
+   * @throws BigQueryException upon failure
+   */
+  BaseTableInfo getTable(String datasetId, String tableId, TableOption... options)
+      throws BigQueryException;
+
+  /**
+   * Returns the requested table or {@code null} if not found.
+   *
+   * @throws BigQueryException upon failure
+   */
+  BaseTableInfo getTable(TableId tableId, TableOption... options) throws BigQueryException;
+
+  /**
+   * Lists the tables in the dataset. This method returns partial information on each table
+   * ({@link BaseTableInfo#tableId()}, {@link BaseTableInfo#friendlyName()},
+   * {@link BaseTableInfo#id()} and {@link BaseTableInfo#type()}). To get complete information use
+   * either {@link #getTable(TableId, TableOption...)} or
+   * {@link #getTable(String, String, TableOption...)}.
+   *
+   * @throws BigQueryException upon failure
+   */
+  Page listTables(String datasetId, TableListOption... options)
+      throws BigQueryException;
+
+  /**
+   * Lists the tables in the dataset. This method returns partial information on each table
+   * ({@link BaseTableInfo#tableId()}, {@link BaseTableInfo#friendlyName()},
+   * {@link BaseTableInfo#id()} and {@link BaseTableInfo#type()}). To get complete information use
+   * either {@link #getTable(TableId, TableOption...)} or
+   * {@link #getTable(String, String, TableOption...)}.
+   *
+   * @throws BigQueryException upon failure
+   */
+  Page listTables(DatasetId datasetId, TableListOption... options)
+      throws BigQueryException;
+
+  /**
+   * Sends an insert all request.
+   *
+   * @throws BigQueryException upon failure
+   */
+  InsertAllResponse insertAll(InsertAllRequest request) throws BigQueryException;
+
+  /**
+   * Lists the table's rows.
+   *
+   * @throws BigQueryException upon failure
+   */
+  Page> listTableData(String datasetId, String tableId,
+      TableDataListOption... options) throws BigQueryException;
+
+  /**
+   * Lists the table's rows.
+   *
+   * @throws BigQueryException upon failure
+   */
+  Page> listTableData(TableId tableId, TableDataListOption... options)
+      throws BigQueryException;
+
+  /**
+   * Returns the requested job or {@code null} if not found.
+   *
+   * @throws BigQueryException upon failure
+   */
+  JobInfo getJob(String jobId, JobOption... options) throws BigQueryException;
+
+  /**
+   * Returns the requested job or {@code null} if not found.
+   *
+   * @throws BigQueryException upon failure
+   */
+  JobInfo getJob(JobId jobId, JobOption... options) throws BigQueryException;
+
+  /**
+   * Lists the dataset's tables.
+   *
+   * @throws BigQueryException upon failure
+   */
+  Page listJobs(JobListOption... options) throws BigQueryException;
+
+  /**
+   * Sends a job cancel request. This call will return immediately, and the client will need to poll
+   * for the job status to see if the cancel completed successfully.
+   *
+   * @return {@code true} if cancel was requested successfully, {@code false} if the job was not
+   *     found
+   * @throws BigQueryException upon failure
+   */
+  boolean cancel(String jobId) throws BigQueryException;
+
+  /**
+   * Sends a job cancel request. This call will return immediately. The client will need to poll
+   * for the job status using either {@link #getJob(JobId, JobOption...)} or
+   * {@link #getJob(String, JobOption...)}) to see if the cancel operation completed successfully.
+   *
+   * @return {@code true} if cancel was requested successfully, {@code false} if the job was not
+   *     found
+   * @throws BigQueryException upon failure
+   */
+  boolean cancel(JobId tableId) throws BigQueryException;
+
+  /**
+   * Runs the query associated to the request.
+   *
+   * @throws BigQueryException upon failure
+   */
+  QueryResponse query(QueryRequest request) throws BigQueryException;
+
+  /**
+   * Returns results of the query associated to the provided job.
+   *
+   * @throws BigQueryException upon failure
+   */
+  QueryResponse getQueryResults(JobId job, QueryResultsOption... options) throws BigQueryException;
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryFactory.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryFactory.java
index 2fc98125f4be..90e7bbccd483 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryFactory.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryFactory.java
@@ -16,7 +16,6 @@
 
 package com.google.gcloud.bigquery;
 
-
 import com.google.gcloud.ServiceFactory;
 
 /**
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
new file mode 100644
index 000000000000..02aa311d8cb4
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -0,0 +1,723 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.gcloud.RetryHelper.runWithRetries;
+
+import com.google.api.services.bigquery.model.Dataset;
+import com.google.api.services.bigquery.model.GetQueryResultsResponse;
+import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.Table;
+import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
+import com.google.api.services.bigquery.model.TableDataInsertAllRequest.Rows;
+import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
+import com.google.api.services.bigquery.model.TableReference;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.gcloud.BaseService;
+import com.google.gcloud.ExceptionHandler;
+import com.google.gcloud.ExceptionHandler.Interceptor;
+import com.google.gcloud.Page;
+import com.google.gcloud.PageImpl;
+import com.google.gcloud.RetryHelper;
+import com.google.gcloud.bigquery.InsertAllRequest.RowToInsert;
+import com.google.gcloud.spi.BigQueryRpc;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+final class BigQueryImpl extends BaseService implements BigQuery {
+
+  private static final Interceptor EXCEPTION_HANDLER_INTERCEPTOR = new Interceptor() {
+
+    private static final long serialVersionUID = -7478333733015750774L;
+
+    @Override
+    public RetryResult afterEval(Exception exception, RetryResult retryResult) {
+      return Interceptor.RetryResult.CONTINUE_EVALUATION;
+    }
+
+    @Override
+    public RetryResult beforeEval(Exception exception) {
+      if (exception instanceof BigQueryException) {
+        boolean retriable = ((BigQueryException) exception).retryable();
+        return retriable ? Interceptor.RetryResult.RETRY : Interceptor.RetryResult.NO_RETRY;
+      }
+      return Interceptor.RetryResult.CONTINUE_EVALUATION;
+    }
+  };
+  static final ExceptionHandler EXCEPTION_HANDLER = ExceptionHandler.builder()
+      .abortOn(RuntimeException.class).interceptor(EXCEPTION_HANDLER_INTERCEPTOR).build();
+
+  private abstract static class BasePageFetcher implements PageImpl.NextPageFetcher {
+
+    private static final long serialVersionUID = -338124488600215401L;
+
+    protected final Map requestOptions;
+    protected final BigQueryOptions serviceOptions;
+
+    BasePageFetcher(BigQueryOptions serviceOptions, String cursor,
+        Map optionMap) {
+      this.serviceOptions = serviceOptions;
+      ImmutableMap.Builder builder = ImmutableMap.builder();
+      if (cursor != null) {
+        builder.put(BigQueryRpc.Option.PAGE_TOKEN, cursor);
+      }
+      for (Map.Entry option : optionMap.entrySet()) {
+        if (option.getKey() != BigQueryRpc.Option.PAGE_TOKEN) {
+          builder.put(option.getKey(), option.getValue());
+        }
+      }
+      this.requestOptions = builder.build();
+    }
+  }
+
+  private static class DatasetPageFetcher extends BasePageFetcher {
+
+    private static final long serialVersionUID = 3030824397616608646L;
+
+    DatasetPageFetcher(BigQueryOptions serviceOptions, String cursor,
+        Map optionMap) {
+      super(serviceOptions, cursor, optionMap);
+    }
+
+    @Override
+    public Page nextPage() {
+      return listDatasets(serviceOptions, requestOptions);
+    }
+  }
+
+  private static class TablePageFetcher extends BasePageFetcher {
+
+    private static final long serialVersionUID = 5908129355985236115L;
+    private final String dataset;
+
+    TablePageFetcher(String dataset, BigQueryOptions serviceOptions, String cursor,
+        Map optionMap) {
+      super(serviceOptions, cursor, optionMap);
+      this.dataset = dataset;
+    }
+
+    @Override
+    public Page nextPage() {
+      return listTables(dataset, serviceOptions, requestOptions);
+    }
+  }
+
+  private static class JobPageFetcher extends BasePageFetcher {
+
+    private static final long serialVersionUID = -4984845360519279880L;
+
+    JobPageFetcher(BigQueryOptions serviceOptions, String cursor,
+        Map optionMap) {
+      super(serviceOptions, cursor, optionMap);
+    }
+
+    @Override
+    public Page nextPage() {
+      return listJobs(serviceOptions, requestOptions);
+    }
+  }
+
+  private static class TableDataPageFetcher extends BasePageFetcher> {
+
+    private static final long serialVersionUID = 1281938239570262432L;
+    private final TableId table;
+
+    TableDataPageFetcher(TableId table, BigQueryOptions serviceOptions, String cursor,
+        Map optionMap) {
+      super(serviceOptions, cursor, optionMap);
+      this.table = table;
+    }
+
+    @Override
+    public Page> nextPage() {
+      return listTableData(table, serviceOptions, requestOptions);
+    }
+  }
+
+  private static class QueryResultsPageFetcherImpl extends BasePageFetcher>
+      implements QueryResult.QueryResultsPageFetcher {
+
+    private static final long serialVersionUID = 6713948754731557486L;
+    private final JobId job;
+
+    QueryResultsPageFetcherImpl(JobId job, BigQueryOptions serviceOptions, String cursor,
+        Map optionMap) {
+      super(serviceOptions, cursor, optionMap);
+      this.job = job;
+    }
+
+    @Override
+    public QueryResult nextPage() {
+      return getQueryResults(job, serviceOptions, requestOptions).result();
+    }
+  }
+
+  private final BigQueryRpc bigQueryRpc;
+
+  BigQueryImpl(BigQueryOptions options) {
+    super(options);
+    bigQueryRpc = options.rpc();
+  }
+
+  @Override
+  public DatasetInfo create(DatasetInfo dataset, DatasetOption... options)
+      throws BigQueryException {
+    final Dataset datasetPb = setProjectId(dataset).toPb();
+    final Map optionsMap = optionMap(options);
+    try {
+      return DatasetInfo.fromPb(runWithRetries(new Callable() {
+        @Override
+        public Dataset call() {
+          return bigQueryRpc.create(datasetPb, optionsMap);
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER));
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public BaseTableInfo create(BaseTableInfo table, TableOption... options)
+      throws BigQueryException {
+    final Table tablePb = setProjectId(table).toPb();
+    final Map optionsMap = optionMap(options);
+    try {
+      return BaseTableInfo.fromPb(runWithRetries(new Callable() {
+        @Override
+        public Table call() {
+          return bigQueryRpc.create(tablePb, optionsMap);
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER));
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public JobInfo create(JobInfo job, JobOption... options) throws BigQueryException {
+    final Job jobPb = setProjectId(job).toPb();
+    final Map optionsMap = optionMap(options);
+    try {
+      return JobInfo.fromPb(runWithRetries(new Callable() {
+        @Override
+        public Job call() {
+          return bigQueryRpc.create(jobPb, optionsMap);
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER));
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public DatasetInfo getDataset(String datasetId, DatasetOption... options)
+      throws BigQueryException {
+    return getDataset(DatasetId.of(datasetId), options);
+  }
+
+  @Override
+  public DatasetInfo getDataset(final DatasetId datasetId, DatasetOption... options)
+      throws BigQueryException {
+    final Map optionsMap = optionMap(options);
+    try {
+      Dataset answer = runWithRetries(new Callable() {
+        @Override
+        public Dataset call() {
+          return bigQueryRpc.getDataset(datasetId.dataset(), optionsMap);
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER);
+      return answer == null ? null : DatasetInfo.fromPb(answer);
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public Page listDatasets(DatasetListOption... options) throws BigQueryException {
+    return listDatasets(options(), optionMap(options));
+  }
+
+  private static Page listDatasets(final BigQueryOptions serviceOptions,
+      final Map optionsMap) {
+    try {
+      BigQueryRpc.Tuple> result =
+          runWithRetries(new Callable>>() {
+            @Override
+            public BigQueryRpc.Tuple> call() {
+              return serviceOptions.rpc().listDatasets(optionsMap);
+            }
+          }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
+      String cursor = result.x();
+      return new PageImpl<>(new DatasetPageFetcher(serviceOptions, cursor, optionsMap), cursor,
+          Iterables.transform(result.y(), DatasetInfo.FROM_PB_FUNCTION));
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public boolean delete(String datasetId, DatasetDeleteOption... options) throws BigQueryException {
+    return delete(DatasetId.of(datasetId), options);
+  }
+
+  @Override
+  public boolean delete(final DatasetId datasetId, DatasetDeleteOption... options)
+      throws BigQueryException {
+    final Map optionsMap = optionMap(options);
+    try {
+      return runWithRetries(new Callable() {
+        @Override
+        public Boolean call() {
+          return bigQueryRpc.deleteDataset(datasetId.dataset(), optionsMap);
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER);
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public boolean delete(final String datasetId, final String tableId) throws BigQueryException {
+    return delete(TableId.of(datasetId, tableId));
+  }
+
+  @Override
+  public boolean delete(final TableId tableId) throws BigQueryException {
+    try {
+      return runWithRetries(new Callable() {
+        @Override
+        public Boolean call() {
+          return bigQueryRpc.deleteTable(tableId.dataset(), tableId.table());
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER);
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public DatasetInfo update(DatasetInfo dataset, DatasetOption... options)
+      throws BigQueryException {
+    final Dataset datasetPb = setProjectId(dataset).toPb();
+    final Map optionsMap = optionMap(options);
+    try {
+      return DatasetInfo.fromPb(runWithRetries(new Callable() {
+        @Override
+        public Dataset call() {
+          return bigQueryRpc.patch(datasetPb, optionsMap);
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER));
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public BaseTableInfo update(BaseTableInfo table, TableOption... options)
+      throws BigQueryException {
+    final Table tablePb = setProjectId(table).toPb();
+    final Map optionsMap = optionMap(options);
+    try {
+      return BaseTableInfo.fromPb(runWithRetries(new Callable
() {
+        @Override
+        public Table call() {
+          return bigQueryRpc.patch(tablePb, optionsMap);
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER));
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public BaseTableInfo getTable(final String datasetId, final String tableId,
+      TableOption... options) throws BigQueryException {
+    return getTable(TableId.of(datasetId, tableId), options);
+  }
+
+  @Override
+  public BaseTableInfo getTable(final TableId tableId, TableOption... options)
+      throws BigQueryException {
+    final Map optionsMap = optionMap(options);
+    try {
+      Table answer = runWithRetries(new Callable
() {
+        @Override
+        public Table call() {
+          return bigQueryRpc.getTable(tableId.dataset(), tableId.table(), optionsMap);
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER);
+      return answer == null ? null : BaseTableInfo.fromPb(answer);
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public Page listTables(String datasetId, TableListOption... options)
+      throws BigQueryException {
+    return listTables(datasetId, options(), optionMap(options));
+  }
+
+  @Override
+  public Page listTables(DatasetId datasetId, TableListOption... options)
+      throws BigQueryException {
+    return listTables(datasetId.dataset(), options(), optionMap(options));
+  }
+
+  private static Page listTables(final String datasetId, final BigQueryOptions
+      serviceOptions, final Map optionsMap) {
+    try {
+      BigQueryRpc.Tuple> result =
+          runWithRetries(new Callable>>() {
+            @Override
+            public BigQueryRpc.Tuple> call() {
+              return serviceOptions.rpc().listTables(datasetId, optionsMap);
+            }
+          }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
+      String cursor = result.x();
+      Iterable tables = Iterables.transform(result.y(),
+          BaseTableInfo.FROM_PB_FUNCTION);
+      return new PageImpl<>(new TablePageFetcher(datasetId, serviceOptions, cursor, optionsMap),
+          cursor, tables);
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public InsertAllResponse insertAll(InsertAllRequest request) throws BigQueryException {
+    final TableId tableId = request.table();
+    final TableDataInsertAllRequest requestPb = new TableDataInsertAllRequest();
+    requestPb.setIgnoreUnknownValues(request.ignoreUnknownValues());
+    requestPb.setSkipInvalidRows(request.skipInvalidRows());
+    List rowsPb = Lists.transform(request.rows(), new Function() {
+      @Override
+      public Rows apply(RowToInsert rowToInsert) {
+        return new Rows().setInsertId(rowToInsert.id()).setJson(rowToInsert.content());
+      }
+    });
+    requestPb.setRows(rowsPb);
+    try {
+      return InsertAllResponse.fromPb(runWithRetries(new Callable() {
+        @Override
+        public TableDataInsertAllResponse call() {
+          return bigQueryRpc.insertAll(tableId.dataset(), tableId.table(), requestPb);
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER));
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public Page> listTableData(String datasetId, String tableId,
+      TableDataListOption... options) throws BigQueryException {
+    return listTableData(TableId.of(datasetId, tableId), options(), optionMap(options));
+  }
+
+  @Override
+  public Page> listTableData(TableId tableId, TableDataListOption... options)
+      throws BigQueryException {
+    return listTableData(tableId, options(), optionMap(options));
+  }
+
+  private static Page> listTableData(final TableId tableId,
+      final BigQueryOptions serviceOptions, final Map optionsMap) {
+    try {
+      BigQueryRpc.Tuple> result =
+          runWithRetries(new Callable>>() {
+            @Override
+            public BigQueryRpc.Tuple> call() {
+              return serviceOptions.rpc()
+                  .listTableData(tableId.dataset(), tableId.table(), optionsMap);
+            }
+          }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
+      String cursor = result.x();
+      return new PageImpl<>(new TableDataPageFetcher(tableId, serviceOptions, cursor, optionsMap),
+          cursor, transformTableData(result.y()));
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  private static List> transformTableData(Iterable tableDataPb) {
+    return ImmutableList.copyOf(
+        Iterables.transform(tableDataPb != null ? tableDataPb : ImmutableList.of(),
+            new Function>() {
+              @Override
+              public List apply(TableRow rowPb) {
+                return Lists.transform(rowPb.getF(), FieldValue.FROM_PB_FUNCTION);
+              }
+            }));
+  }
+
+  @Override
+  public JobInfo getJob(final String jobId, JobOption... options) throws BigQueryException {
+    return getJob(JobId.of(jobId), options);
+  }
+
+  @Override
+  public JobInfo getJob(final JobId jobId, JobOption... options) throws BigQueryException {
+    final Map optionsMap = optionMap(options);
+    try {
+      Job answer = runWithRetries(new Callable() {
+        @Override
+        public Job call() {
+          return bigQueryRpc.getJob(jobId.job(), optionsMap);
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER);
+      return answer == null ? null : JobInfo.fromPb(answer);
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public Page listJobs(JobListOption... options) throws BigQueryException {
+    return listJobs(options(), optionMap(options));
+  }
+
+  private static Page listJobs(final BigQueryOptions serviceOptions,
+      final Map optionsMap) {
+    BigQueryRpc.Tuple> result =
+        runWithRetries(new Callable>>() {
+          @Override
+          public BigQueryRpc.Tuple> call() {
+            return serviceOptions.rpc().listJobs(optionsMap);
+          }
+        }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
+    String cursor = result.x();
+    Iterable jobs = Iterables.transform(result.y(), JobInfo.FROM_PB_FUNCTION);
+    return new PageImpl<>(new JobPageFetcher(serviceOptions, cursor, optionsMap), cursor, jobs);
+  }
+
+  @Override
+  public boolean cancel(String jobId) throws BigQueryException {
+    return cancel(JobId.of(jobId));
+  }
+
+  @Override
+  public boolean cancel(final JobId jobId) throws BigQueryException {
+    try {
+      return runWithRetries(new Callable() {
+        @Override
+        public Boolean call() {
+          return bigQueryRpc.cancel(jobId.job());
+        }
+      }, options().retryParams(), EXCEPTION_HANDLER);
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public QueryResponse query(final QueryRequest request) throws BigQueryException {
+    try {
+      com.google.api.services.bigquery.model.QueryResponse results =
+          runWithRetries(new Callable() {
+            @Override
+            public com.google.api.services.bigquery.model.QueryResponse call() {
+              return bigQueryRpc.query(setProjectId(request).toPb());
+            }
+          }, options().retryParams(), EXCEPTION_HANDLER);
+      QueryResponse.Builder builder = QueryResponse.builder();
+      JobId completeJobId = JobId.fromPb(results.getJobReference());
+      builder.jobId(completeJobId);
+      builder.jobComplete(results.getJobComplete());
+      List rowsPb = results.getRows();
+      if (results.getJobComplete()) {
+        builder.jobComplete(true);
+        QueryResult.Builder resultBuilder = transformQueryResults(completeJobId, rowsPb,
+            results.getPageToken(), options(), ImmutableMap.of());
+        resultBuilder.totalBytesProcessed(results.getTotalBytesProcessed());
+        resultBuilder.cacheHit(results.getCacheHit());
+        if (results.getSchema() != null) {
+          resultBuilder.schema(Schema.fromPb(results.getSchema()));
+        }
+        if (results.getTotalRows() != null) {
+          resultBuilder.totalRows(results.getTotalRows().longValue());
+        }
+        builder.result(resultBuilder.build());
+      }
+      if (results.getErrors() != null) {
+        builder.executionErrors(
+            Lists.transform(results.getErrors(), BigQueryError.FROM_PB_FUNCTION));
+      }
+      return builder.build();
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  @Override
+  public QueryResponse getQueryResults(JobId job, QueryResultsOption... options)
+      throws BigQueryException {
+    final Map optionsMap = optionMap(options);
+    return getQueryResults(job, options(), optionsMap);
+  }
+
+  private static QueryResponse getQueryResults(final JobId jobId,
+      final BigQueryOptions serviceOptions, final Map optionsMap) {
+    try {
+      GetQueryResultsResponse results =
+          runWithRetries(new Callable() {
+            @Override
+            public GetQueryResultsResponse call() {
+              return serviceOptions.rpc().getQueryResults(jobId.job(), optionsMap);
+            }
+          }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
+      QueryResponse.Builder builder = QueryResponse.builder();
+      JobId completeJobId = JobId.fromPb(results.getJobReference());
+      builder.jobId(completeJobId);
+      builder.etag(results.getEtag());
+      builder.jobComplete(results.getJobComplete());
+      List rowsPb = results.getRows();
+      if (results.getJobComplete()) {
+        QueryResult.Builder resultBuilder = transformQueryResults(completeJobId, rowsPb,
+            results.getPageToken(), serviceOptions, ImmutableMap.of());
+        resultBuilder.totalBytesProcessed(results.getTotalBytesProcessed());
+        resultBuilder.cacheHit(results.getCacheHit());
+        if (results.getSchema() != null) {
+          resultBuilder.schema(Schema.fromPb(results.getSchema()));
+        }
+        if (results.getTotalRows() != null) {
+          resultBuilder.totalRows(results.getTotalRows().longValue());
+        }
+        builder.result(resultBuilder.build());
+      }
+      if (results.getErrors() != null) {
+        builder.executionErrors(
+            Lists.transform(results.getErrors(), BigQueryError.FROM_PB_FUNCTION));
+      }
+      return builder.build();
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  private static QueryResult.Builder transformQueryResults(JobId jobId, List rowsPb,
+      String cursor, BigQueryOptions serviceOptions, Map optionsMap) {
+    QueryResultsPageFetcherImpl nextPageFetcher =
+        new QueryResultsPageFetcherImpl(jobId, serviceOptions, cursor, optionsMap);
+    return QueryResult.builder()
+        .pageFetcher(nextPageFetcher)
+        .cursor(cursor)
+        .results(transformTableData(rowsPb));
+  }
+
+  private Map optionMap(Option... options) {
+    Map optionMap = Maps.newEnumMap(BigQueryRpc.Option.class);
+    for (Option option : options) {
+      Object prev = optionMap.put(option.rpcOption(), option.value());
+      checkArgument(prev == null, "Duplicate option %s", option);
+    }
+    return optionMap;
+  }
+
+  private DatasetInfo setProjectId(DatasetInfo dataset) {
+    DatasetInfo.Builder datasetBuilder = dataset.toBuilder();
+    datasetBuilder.datasetId(setProjectId(dataset.datasetId()));
+    if (dataset.acl() != null) {
+      List acls = Lists.newArrayListWithCapacity(dataset.acl().size());
+      for (Acl acl : dataset.acl()) {
+        if (acl.entity().type() == Acl.Entity.Type.VIEW) {
+          Dataset.Access accessPb = acl.toPb();
+          TableReference viewReferencePb = accessPb.getView();
+          if (viewReferencePb.getProjectId() == null) {
+            viewReferencePb.setProjectId(options().projectId());
+          }
+          acls.add(new Acl(new Acl.View(TableId.fromPb(viewReferencePb))));
+        } else {
+          acls.add(acl);
+        }
+      }
+      datasetBuilder.acl(acls);
+    }
+    return datasetBuilder.build();
+  }
+
+  private DatasetId setProjectId(DatasetId dataset) {
+    return dataset.project() != null ? dataset
+        : DatasetId.of(options().projectId(), dataset.dataset());
+  }
+
+  private BaseTableInfo setProjectId(BaseTableInfo table) {
+    return table.toBuilder().tableId(setProjectId(table.tableId())).build();
+  }
+
+  private TableId setProjectId(TableId table) {
+    return table.project() != null ? table
+        : TableId.of(options().projectId(), table.dataset(), table.table());
+  }
+
+  private JobInfo setProjectId(JobInfo job) {
+    if (job instanceof CopyJobInfo) {
+      CopyJobInfo copyJob = (CopyJobInfo) job;
+      CopyJobInfo.Builder copyBuilder = copyJob.toBuilder();
+      copyBuilder.destinationTable(setProjectId(copyJob.destinationTable()));
+      copyBuilder.sourceTables(
+          Lists.transform(copyJob.sourceTables(), new Function() {
+            @Override
+            public TableId apply(TableId tableId) {
+              return setProjectId(tableId);
+            }
+          }));
+      return copyBuilder.build();
+    }
+    if (job instanceof QueryJobInfo) {
+      QueryJobInfo queryJob = (QueryJobInfo) job;
+      QueryJobInfo.Builder queryBuilder = queryJob.toBuilder();
+      if (queryJob.destinationTable() != null) {
+        queryBuilder.destinationTable(setProjectId(queryJob.destinationTable()));
+      }
+      if (queryJob.defaultDataset() != null) {
+        queryBuilder.defaultDataset(setProjectId(queryJob.defaultDataset()));
+      }
+      return queryBuilder.build();
+    }
+    if (job instanceof ExtractJobInfo) {
+      ExtractJobInfo extractJob = (ExtractJobInfo) job;
+      ExtractJobInfo.Builder extractBuilder = extractJob.toBuilder();
+      extractBuilder.sourceTable(setProjectId(extractJob.sourceTable()));
+      return extractBuilder.build();
+    }
+    if (job instanceof LoadJobInfo) {
+      LoadJobInfo loadJob = (LoadJobInfo) job;
+      LoadJobInfo.Builder loadBuilder = loadJob.toBuilder();
+      loadBuilder.destinationTable(setProjectId(loadJob.destinationTable()));
+      return loadBuilder.build();
+    }
+    return job;
+  }
+
+  private QueryRequest setProjectId(QueryRequest request) {
+    QueryRequest.Builder builder = request.toBuilder();
+    if (request.defaultDataset() != null) {
+      builder.defaultDataset(setProjectId(request.defaultDataset()));
+    }
+    return builder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryOptions.java
index 59a4b3229f68..71d43cfbe565 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryOptions.java
+++ b/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.DefaultBigQueryRpc;
 import com.google.gcloud.spi.BigQueryRpc;
 import com.google.gcloud.spi.BigQueryRpcFactory;
+import com.google.gcloud.spi.DefaultBigQueryRpc;
 
 import java.util.Set;
 
@@ -36,8 +36,7 @@ public static class DefaultBigqueryFactory implements BigQueryFactory {
 
     @Override
     public BigQuery create(BigQueryOptions options) {
-      // TODO(mziccard) return new BigqueryImpl(options);
-      return null;
+      return new BigQueryImpl(options);
     }
   }
 
@@ -47,8 +46,7 @@ public static class DefaultBigQueryRpcFactory implements BigQueryRpcFactory {
 
     @Override
     public BigQueryRpc create(BigQueryOptions options) {
-      // TODO(mziccard) return new DefaultBigqueryRpc(options);
-      return null;
+      return new DefaultBigQueryRpc(options);
     }
   }
 
@@ -106,6 +104,10 @@ public boolean equals(Object obj) {
     return baseEquals(other);
   }
 
+  public static BigQueryOptions defaultInstance() {
+    return builder().build();
+  }
+
   public static Builder builder() {
     return new Builder();
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Option.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Option.java
new file mode 100644
index 000000000000..d88820fe5a29
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Option.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.base.MoreObjects;
+import com.google.gcloud.spi.BigQueryRpc;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Base class for BigQuery operation option.
+ */
+class Option implements Serializable {
+
+  private static final long serialVersionUID = -6647817677804099207L;
+
+  private final BigQueryRpc.Option rpcOption;
+  private final Object value;
+
+  Option(BigQueryRpc.Option rpcOption, Object value) {
+    this.rpcOption = checkNotNull(rpcOption);
+    this.value = value;
+  }
+
+  BigQueryRpc.Option rpcOption() {
+    return rpcOption;
+  }
+
+  Object value() {
+    return value;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (!(obj instanceof Option)) {
+      return false;
+    }
+    Option other = (Option) obj;
+    return Objects.equals(rpcOption, other.rpcOption)
+        && Objects.equals(value, other.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(rpcOption, value);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("name", rpcOption.value())
+        .add("value", value)
+        .toString();
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
new file mode 100644
index 000000000000..4902ab9967d4
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -0,0 +1,982 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.eq;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import com.google.api.services.bigquery.model.Dataset;
+import com.google.api.services.bigquery.model.ErrorProto;
+import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.Table;
+import com.google.api.services.bigquery.model.TableCell;
+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.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.gcloud.AuthCredentials;
+import com.google.gcloud.Page;
+import com.google.gcloud.RetryParams;
+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 org.easymock.Capture;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+
+public class BigQueryImplTest {
+
+  private static final String PROJECT = "project";
+  private static final String DATASET = "dataset";
+  private static final String TABLE = "table";
+  private static final String JOB = "job";
+  private static final String OTHER_TABLE = "otherTable";
+  private static final String OTHER_DATASET = "otherDataset";
+  private static final List ACCESS_RULES = ImmutableList.of(
+      new Acl(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
+      new Acl(new Acl.View(TableId.of("dataset", "table")), Acl.Role.WRITER));
+  private static final List ACCESS_RULES_WITH_PROJECT = ImmutableList.of(
+      new Acl(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
+      new Acl(new Acl.View(TableId.of(PROJECT, "dataset", "table"))));
+  private static final DatasetInfo DATASET_INFO = DatasetInfo.builder(DATASET)
+      .acl(ACCESS_RULES)
+      .description("description")
+      .build();
+  private static final DatasetInfo DATASET_INFO_WITH_PROJECT = DatasetInfo.builder(PROJECT, DATASET)
+      .acl(ACCESS_RULES_WITH_PROJECT)
+      .description("description")
+      .build();
+  private static final DatasetInfo OTHER_DATASET_INFO = DatasetInfo.builder(PROJECT, OTHER_DATASET)
+      .acl(ACCESS_RULES)
+      .description("other description")
+      .build();
+  private static final TableId TABLE_ID = TableId.of(DATASET, TABLE);
+  private static final TableId OTHER_TABLE_ID = TableId.of(PROJECT, DATASET, OTHER_TABLE);
+  private static final TableId TABLE_ID_WITH_PROJECT = TableId.of(PROJECT, DATASET, TABLE);
+  private static final Field FIELD_SCHEMA1 =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
+          .description("FieldDescription1")
+          .build();
+  private static final Field FIELD_SCHEMA2 =
+      Field.builder("IntegerField", Field.Type.integer())
+          .mode(Field.Mode.REPEATED)
+          .description("FieldDescription2")
+          .build();
+  private static final Field FIELD_SCHEMA3 =
+      Field.builder("RecordField", Field.Type.record(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(Field.Mode.REQUIRED)
+          .description("FieldDescription3")
+          .build();
+  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
+  private static final BaseTableInfo TABLE_INFO = TableInfo.of(TABLE_ID, TABLE_SCHEMA);
+  private static final BaseTableInfo OTHER_TABLE_INFO = TableInfo.of(OTHER_TABLE_ID, TABLE_SCHEMA);
+  private static final BaseTableInfo TABLE_INFO_WITH_PROJECT =
+      TableInfo.of(TABLE_ID_WITH_PROJECT, TABLE_SCHEMA);
+  private static final JobInfo LOAD_JOB = LoadJobInfo.of(TABLE_ID, "URI");
+  private static final JobInfo LOAD_JOB_WITH_PROJECT = LoadJobInfo.of(TABLE_ID_WITH_PROJECT, "URI");
+  private static final JobInfo COMPLETE_LOAD_JOB = LoadJobInfo.builder(TABLE_ID_WITH_PROJECT, "URI")
+      .jobId(JobId.of(PROJECT, JOB))
+      .build();
+  private static final JobInfo COPY_JOB =
+      CopyJobInfo.of(TABLE_ID, ImmutableList.of(TABLE_ID, TABLE_ID));
+  private static final JobInfo COPY_JOB_WITH_PROJECT =
+      CopyJobInfo.of(TABLE_ID_WITH_PROJECT, ImmutableList.of(TABLE_ID_WITH_PROJECT,
+          TABLE_ID_WITH_PROJECT));
+  private static final JobInfo COMPLETE_COPY_JOB =
+      CopyJobInfo.builder(TABLE_ID_WITH_PROJECT, ImmutableList.of(TABLE_ID_WITH_PROJECT,
+          TABLE_ID_WITH_PROJECT))
+          .jobId(JobId.of(PROJECT, JOB))
+          .build();
+  private static final JobInfo QUERY_JOB = QueryJobInfo.builder("SQL")
+      .defaultDataset(DatasetId.of(DATASET))
+      .destinationTable(TABLE_ID)
+      .build();
+  private static final JobInfo QUERY_JOB_WITH_PROJECT = QueryJobInfo.builder("SQL")
+      .defaultDataset(DatasetId.of(PROJECT, DATASET))
+      .destinationTable(TABLE_ID_WITH_PROJECT)
+      .build();
+  private static final JobInfo COMPLETE_QUERY_JOB = QueryJobInfo.builder("SQL")
+      .defaultDataset(DatasetId.of(PROJECT, DATASET)).destinationTable(TABLE_ID_WITH_PROJECT)
+      .jobId(JobId.of(PROJECT, JOB))
+      .build();
+  private static final JobInfo EXTRACT_JOB = ExtractJobInfo.of(TABLE_ID, "URI");
+  private static final JobInfo EXTRACT_JOB_WITH_PROJECT =
+      ExtractJobInfo.of(TABLE_ID_WITH_PROJECT, "URI");
+  private static final JobInfo COMPLETE_EXTRACT_JOB =
+      ExtractJobInfo.builder(TABLE_ID_WITH_PROJECT, "URI")
+          .jobId(JobId.of(PROJECT, JOB))
+          .build();
+  private static final TableCell BOOLEAN_FIELD = new TableCell().setV("false");
+  private static final TableCell INTEGER_FIELD = new TableCell().setV("1");
+  private static final TableRow TABLE_ROW =
+      new TableRow().setF(ImmutableList.of(BOOLEAN_FIELD, INTEGER_FIELD));
+  private static final QueryRequest QUERY_REQUEST = QueryRequest.builder("SQL")
+      .maxResults(42L)
+      .useQueryCache(false)
+      .defaultDataset(DatasetId.of(DATASET))
+      .build();
+  private static final QueryRequest QUERY_REQUEST_WITH_PROJECT = QueryRequest.builder("SQL")
+      .maxResults(42L)
+      .useQueryCache(false)
+      .defaultDataset(DatasetId.of(PROJECT, DATASET))
+      .build();
+
+  // Empty BigQueryRpc options
+  private static final Map EMPTY_RPC_OPTIONS = ImmutableMap.of();
+
+  // Dataset options
+  private static final BigQuery.DatasetOption DATASET_OPTION_FIELDS =
+      BigQuery.DatasetOption.fields(BigQuery.DatasetField.ACCESS, BigQuery.DatasetField.ETAG);
+
+  // Dataset list options
+  private static final BigQuery.DatasetListOption DATASET_LIST_ALL =
+      BigQuery.DatasetListOption.all();
+  private static final BigQuery.DatasetListOption DATASET_LIST_PAGE_TOKEN =
+      BigQuery.DatasetListOption.startPageToken("cursor");
+  private static final Map DATASET_LIST_OPTIONS = ImmutableMap.of(
+      BigQueryRpc.Option.ALL_DATASETS, true,
+      BigQueryRpc.Option.PAGE_TOKEN, "cursor");
+
+  // Dataset delete options
+  private static final BigQuery.DatasetDeleteOption DATASET_DELETE_CONTENTS =
+      BigQuery.DatasetDeleteOption.deleteContents();
+  private static final Map DATASET_DELETE_OPTIONS = ImmutableMap.of(
+      BigQueryRpc.Option.DELETE_CONTENTS, true);
+
+  // Table options
+  private static final BigQuery.TableOption TABLE_OPTION_FIELDS =
+      BigQuery.TableOption.fields(BigQuery.TableField.SCHEMA, BigQuery.TableField.ETAG);
+
+  // Table list options
+  private static final BigQuery.TableListOption TABLE_LIST_MAX_RESULTS =
+      BigQuery.TableListOption.maxResults(42L);
+  private static final BigQuery.TableListOption TABLE_LIST_PAGE_TOKEN =
+      BigQuery.TableListOption.startPageToken("cursor");
+  private static final Map TABLE_LIST_OPTIONS = ImmutableMap.of(
+      BigQueryRpc.Option.MAX_RESULTS, 42L,
+      BigQueryRpc.Option.PAGE_TOKEN, "cursor");
+
+  // TableData list options
+  private static final BigQuery.TableDataListOption TABLE_DATA_LIST_MAX_RESULTS =
+      BigQuery.TableDataListOption.maxResults(42L);
+  private static final BigQuery.TableDataListOption TABLE_DATA_LIST_PAGE_TOKEN =
+      BigQuery.TableDataListOption.startPageToken("cursor");
+  private static final Map TABLE_DATA_LIST_OPTIONS = ImmutableMap.of(
+      BigQueryRpc.Option.MAX_RESULTS, 42L,
+      BigQueryRpc.Option.PAGE_TOKEN, "cursor");
+
+  // Job options
+  private static final BigQuery.JobOption JOB_OPTION_FIELDS =
+      BigQuery.JobOption.fields(BigQuery.JobField.USER_EMAIL);
+
+  // Job list options
+  private static final BigQuery.JobListOption JOB_LIST_OPTION_FIELD =
+      BigQuery.JobListOption.fields(BigQuery.JobField.STATISTICS);
+  private static final BigQuery.JobListOption JOB_LIST_ALL_USERS =
+      BigQuery.JobListOption.allUsers();
+  private static final BigQuery.JobListOption JOB_LIST_STATE_FILTER =
+      BigQuery.JobListOption.stateFilter(JobStatus.State.DONE, JobStatus.State.PENDING);
+  private static final Map JOB_LIST_OPTIONS = ImmutableMap.of(
+      BigQueryRpc.Option.ALL_USERS, true,
+      BigQueryRpc.Option.STATE_FILTER, ImmutableList.of("done", "pending"));
+
+  // Query Results options
+  private static final BigQuery.QueryResultsOption QUERY_RESULTS_OPTION_TIME =
+      BigQuery.QueryResultsOption.maxWaitTime(42L);
+  private static final BigQuery.QueryResultsOption QUERY_RESULTS_OPTION_INDEX =
+      BigQuery.QueryResultsOption.startIndex(1024L);
+  private static final Map QUERY_RESULTS_OPTIONS = ImmutableMap.of(
+      BigQueryRpc.Option.TIMEOUT, 42L,
+      BigQueryRpc.Option.START_INDEX, 1024L);
+
+  private BigQueryOptions options;
+  private BigQueryRpcFactory rpcFactoryMock;
+  private BigQueryRpc bigqueryRpcMock;
+  private BigQuery bigquery;
+
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
+
+  @Before
+  public void setUp() throws IOException, InterruptedException {
+    rpcFactoryMock = EasyMock.createMock(BigQueryRpcFactory.class);
+    bigqueryRpcMock = EasyMock.createMock(BigQueryRpc.class);
+    EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(BigQueryOptions.class)))
+        .andReturn(bigqueryRpcMock);
+    EasyMock.replay(rpcFactoryMock);
+    options = BigQueryOptions.builder()
+        .projectId(PROJECT)
+        .authCredentials(AuthCredentials.noCredentials())
+        .serviceRpcFactory(rpcFactoryMock)
+        .build();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    EasyMock.verify(rpcFactoryMock, bigqueryRpcMock);
+  }
+
+  @Test
+  public void testGetOptions() {
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    assertSame(options, bigquery.options());
+  }
+
+  @Test
+  public void testCreateDataset() {
+    EasyMock.expect(bigqueryRpcMock.create(DATASET_INFO_WITH_PROJECT.toPb(), EMPTY_RPC_OPTIONS))
+        .andReturn(DATASET_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    DatasetInfo dataset = bigquery.create(DATASET_INFO);
+    assertEquals(DATASET_INFO_WITH_PROJECT, dataset);
+  }
+
+  @Test
+  public void testCreateDatasetWithSelectedFields() {
+    Capture> capturedOptions = Capture.newInstance();
+    EasyMock.expect(
+        bigqueryRpcMock.create(eq(DATASET_INFO_WITH_PROJECT.toPb()), capture(capturedOptions)))
+        .andReturn(DATASET_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    DatasetInfo dataset = bigquery.create(DATASET_INFO, DATASET_OPTION_FIELDS);
+    String selector = (String) capturedOptions.getValue().get(DATASET_OPTION_FIELDS.rpcOption());
+    assertTrue(selector.contains("datasetReference"));
+    assertTrue(selector.contains("access"));
+    assertTrue(selector.contains("etag"));
+    assertEquals(28, selector.length());
+    assertEquals(DATASET_INFO_WITH_PROJECT, dataset);
+  }
+
+  @Test
+  public void testGetDataset() {
+    EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
+        .andReturn(DATASET_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    DatasetInfo dataset = bigquery.getDataset(DATASET);
+    assertEquals(DATASET_INFO_WITH_PROJECT, dataset);
+  }
+
+  @Test
+  public void testGetDatasetFromDatasetId() {
+    EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
+        .andReturn(DATASET_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    DatasetInfo dataset = bigquery.getDataset(DatasetId.of(PROJECT, DATASET));
+    assertEquals(DATASET_INFO_WITH_PROJECT, dataset);
+  }
+
+  @Test
+  public void testGetDatasetWithSelectedFields() {
+    Capture> capturedOptions = Capture.newInstance();
+    EasyMock.expect(bigqueryRpcMock.getDataset(eq(DATASET), capture(capturedOptions)))
+        .andReturn(DATASET_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    DatasetInfo dataset = bigquery.getDataset(DATASET, DATASET_OPTION_FIELDS);
+    String selector = (String) capturedOptions.getValue().get(DATASET_OPTION_FIELDS.rpcOption());
+    assertTrue(selector.contains("datasetReference"));
+    assertTrue(selector.contains("access"));
+    assertTrue(selector.contains("etag"));
+    assertEquals(28, selector.length());
+    assertEquals(DATASET_INFO_WITH_PROJECT, dataset);
+  }
+
+  @Test
+  public void testListDatasets() {
+    String cursor = "cursor";
+    ImmutableList datasetList = ImmutableList.of(DATASET_INFO_WITH_PROJECT,
+        OTHER_DATASET_INFO);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(datasetList, DatasetInfo.TO_PB_FUNCTION));
+    EasyMock.expect(bigqueryRpcMock.listDatasets(EMPTY_RPC_OPTIONS)).andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page page = bigquery.listDatasets();
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(datasetList.toArray(), Iterables.toArray(page.values(), DatasetInfo.class));
+  }
+
+  @Test
+  public void testListEmptyDatasets() {
+    ImmutableList datasets = ImmutableList.of();
+    Tuple> result = Tuple.>of(null, datasets);
+    EasyMock.expect(bigqueryRpcMock.listDatasets(EMPTY_RPC_OPTIONS)).andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page page = bigquery.listDatasets();
+    assertNull(page.nextPageCursor());
+    assertArrayEquals(ImmutableList.of().toArray(),
+        Iterables.toArray(page.values(), DatasetInfo.class));
+  }
+
+  @Test
+  public void testListDatasetsWithOptions() {
+    String cursor = "cursor";
+    ImmutableList datasetList = ImmutableList.of(DATASET_INFO_WITH_PROJECT,
+        OTHER_DATASET_INFO);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(datasetList, DatasetInfo.TO_PB_FUNCTION));
+    EasyMock.expect(bigqueryRpcMock.listDatasets(DATASET_LIST_OPTIONS)).andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page page = bigquery.listDatasets(DATASET_LIST_ALL, DATASET_LIST_PAGE_TOKEN);
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(datasetList.toArray(), Iterables.toArray(page.values(), DatasetInfo.class));
+  }
+
+  @Test
+  public void testDeleteDataset() {
+    EasyMock.expect(bigqueryRpcMock.deleteDataset(DATASET, EMPTY_RPC_OPTIONS)).andReturn(true);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    assertTrue(bigquery.delete(DATASET));
+  }
+
+  @Test
+  public void testDeleteDatasetFromDatasetId() {
+    EasyMock.expect(bigqueryRpcMock.deleteDataset(DATASET, EMPTY_RPC_OPTIONS)).andReturn(true);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    assertTrue(bigquery.delete(DatasetId.of(PROJECT, DATASET)));
+  }
+
+  @Test
+  public void testDeleteDatasetWithOptions() {
+    EasyMock.expect(bigqueryRpcMock.deleteDataset(DATASET, DATASET_DELETE_OPTIONS)).andReturn(true);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    assertTrue(bigquery.delete(DATASET, DATASET_DELETE_CONTENTS));
+  }
+
+  @Test
+  public void testUpdateDataset() {
+    DatasetInfo updatedDatasetInfo = DATASET_INFO.toBuilder().description("newDescription").build();
+    DatasetInfo updatedDatasetInfoWithProject = DATASET_INFO_WITH_PROJECT.toBuilder()
+        .description("newDescription")
+        .build();
+    EasyMock.expect(bigqueryRpcMock.patch(updatedDatasetInfoWithProject.toPb(), EMPTY_RPC_OPTIONS))
+        .andReturn(updatedDatasetInfoWithProject.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    DatasetInfo dataset = bigquery.update(updatedDatasetInfo);
+    assertEquals(updatedDatasetInfoWithProject, dataset);
+  }
+
+  @Test
+  public void testUpdateDatasetWithSelectedFields() {
+    Capture> capturedOptions = Capture.newInstance();
+    DatasetInfo updatedDatasetInfo = DATASET_INFO.toBuilder().description("newDescription").build();
+    DatasetInfo updatedDatasetInfoWithProject = DATASET_INFO_WITH_PROJECT.toBuilder()
+        .description("newDescription")
+        .build();
+    EasyMock.expect(
+        bigqueryRpcMock.patch(eq(updatedDatasetInfoWithProject.toPb()), capture(capturedOptions)))
+        .andReturn(updatedDatasetInfoWithProject.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    DatasetInfo dataset = bigquery.update(updatedDatasetInfo, DATASET_OPTION_FIELDS);
+    String selector = (String) capturedOptions.getValue().get(DATASET_OPTION_FIELDS.rpcOption());
+    assertTrue(selector.contains("datasetReference"));
+    assertTrue(selector.contains("access"));
+    assertTrue(selector.contains("etag"));
+    assertEquals(28, selector.length());
+    assertEquals(updatedDatasetInfoWithProject, dataset);
+  }
+
+  @Test
+  public void testCreateTable() {
+    EasyMock.expect(bigqueryRpcMock.create(TABLE_INFO_WITH_PROJECT.toPb(), EMPTY_RPC_OPTIONS))
+        .andReturn(TABLE_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    BaseTableInfo table = bigquery.create(TABLE_INFO);
+    assertEquals(TABLE_INFO_WITH_PROJECT, table);
+  }
+
+  @Test
+  public void testCreateTableWithSelectedFields() {
+    Capture> capturedOptions = Capture.newInstance();
+    EasyMock.expect(
+        bigqueryRpcMock.create(eq(TABLE_INFO_WITH_PROJECT.toPb()), capture(capturedOptions)))
+        .andReturn(TABLE_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    BaseTableInfo table = bigquery.create(TABLE_INFO, TABLE_OPTION_FIELDS);
+    String selector = (String) capturedOptions.getValue().get(TABLE_OPTION_FIELDS.rpcOption());
+    assertTrue(selector.contains("tableReference"));
+    assertTrue(selector.contains("schema"));
+    assertTrue(selector.contains("etag"));
+    assertEquals(31, selector.length());
+    assertEquals(TABLE_INFO_WITH_PROJECT, table);
+  }
+
+  @Test
+  public void testGetTable() {
+    EasyMock.expect(bigqueryRpcMock.getTable(DATASET, TABLE, EMPTY_RPC_OPTIONS))
+        .andReturn(TABLE_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    BaseTableInfo table = bigquery.getTable(DATASET, TABLE);
+    assertEquals(TABLE_INFO_WITH_PROJECT, table);
+  }
+
+  @Test
+  public void testGetTableFromTableId() {
+    EasyMock.expect(bigqueryRpcMock.getTable(DATASET, TABLE, EMPTY_RPC_OPTIONS))
+        .andReturn(TABLE_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    BaseTableInfo table = bigquery.getTable(TABLE_ID);
+    assertEquals(TABLE_INFO_WITH_PROJECT, table);
+  }
+
+  @Test
+  public void testGetTableWithSelectedFields() {
+    Capture> capturedOptions = Capture.newInstance();
+    EasyMock.expect(bigqueryRpcMock.getTable(eq(DATASET), eq(TABLE), capture(capturedOptions)))
+        .andReturn(TABLE_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    BaseTableInfo table = bigquery.getTable(TABLE_ID, TABLE_OPTION_FIELDS);
+    String selector = (String) capturedOptions.getValue().get(TABLE_OPTION_FIELDS.rpcOption());
+    assertTrue(selector.contains("tableReference"));
+    assertTrue(selector.contains("schema"));
+    assertTrue(selector.contains("etag"));
+    assertEquals(31, selector.length());
+    assertEquals(TABLE_INFO_WITH_PROJECT, table);
+  }
+
+  @Test
+  public void testListTables() {
+    String cursor = "cursor";
+    ImmutableList tableList = ImmutableList.of(TABLE_INFO_WITH_PROJECT,
+        OTHER_TABLE_INFO);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(tableList, BaseTableInfo.TO_PB_FUNCTION));
+    EasyMock.expect(bigqueryRpcMock.listTables(DATASET, EMPTY_RPC_OPTIONS)).andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page page = bigquery.listTables(DATASET);
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(tableList.toArray(), Iterables.toArray(page.values(), BaseTableInfo.class));
+  }
+
+  @Test
+  public void testListTablesFromDatasetId() {
+    String cursor = "cursor";
+    ImmutableList tableList = ImmutableList.of(TABLE_INFO_WITH_PROJECT,
+        OTHER_TABLE_INFO);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(tableList, BaseTableInfo.TO_PB_FUNCTION));
+    EasyMock.expect(bigqueryRpcMock.listTables(DATASET, EMPTY_RPC_OPTIONS)).andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page page = bigquery.listTables(DatasetId.of(PROJECT, DATASET));
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(tableList.toArray(), Iterables.toArray(page.values(), BaseTableInfo.class));
+  }
+
+  @Test
+  public void testListTablesWithOptions() {
+    String cursor = "cursor";
+    ImmutableList tableList = ImmutableList.of(TABLE_INFO_WITH_PROJECT,
+        OTHER_TABLE_INFO);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(tableList, BaseTableInfo.TO_PB_FUNCTION));
+    EasyMock.expect(bigqueryRpcMock.listTables(DATASET, TABLE_LIST_OPTIONS)).andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page page = bigquery.listTables(DATASET, TABLE_LIST_MAX_RESULTS,
+        TABLE_LIST_PAGE_TOKEN);
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(tableList.toArray(), Iterables.toArray(page.values(), BaseTableInfo.class));
+  }
+
+  @Test
+  public void testDeleteTable() {
+    EasyMock.expect(bigqueryRpcMock.deleteTable(DATASET, TABLE)).andReturn(true);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    assertTrue(bigquery.delete(DATASET, TABLE));
+  }
+
+  @Test
+  public void testDeleteTableFromTableId() {
+    EasyMock.expect(bigqueryRpcMock.deleteTable(DATASET, TABLE)).andReturn(true);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    assertTrue(bigquery.delete(TABLE_ID));
+  }
+
+  @Test
+  public void testUpdateTable() {
+    BaseTableInfo updatedTableInfo = TABLE_INFO.toBuilder().description("newDescription").build();
+    BaseTableInfo updatedTableInfoWithProject = TABLE_INFO_WITH_PROJECT.toBuilder()
+        .description("newDescription")
+        .build();
+    EasyMock.expect(bigqueryRpcMock.patch(updatedTableInfoWithProject.toPb(), EMPTY_RPC_OPTIONS))
+        .andReturn(updatedTableInfoWithProject.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    BaseTableInfo table = bigquery.update(updatedTableInfo);
+    assertEquals(updatedTableInfoWithProject, table);
+  }
+
+  @Test
+  public void testUpdateTableWithSelectedFields() {
+    Capture> capturedOptions = Capture.newInstance();
+    BaseTableInfo updatedTableInfo = TABLE_INFO.toBuilder().description("newDescription").build();
+    BaseTableInfo updatedTableInfoWithProject = TABLE_INFO_WITH_PROJECT.toBuilder()
+        .description("newDescription")
+        .build();
+    EasyMock.expect(bigqueryRpcMock.patch(eq(updatedTableInfoWithProject.toPb()),
+        capture(capturedOptions))).andReturn(updatedTableInfoWithProject.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    BaseTableInfo table = bigquery.update(updatedTableInfo, TABLE_OPTION_FIELDS);
+    String selector = (String) capturedOptions.getValue().get(TABLE_OPTION_FIELDS.rpcOption());
+    assertTrue(selector.contains("tableReference"));
+    assertTrue(selector.contains("schema"));
+    assertTrue(selector.contains("etag"));
+    assertEquals(31, selector.length());
+    assertEquals(updatedTableInfoWithProject, table);
+  }
+
+  @Test
+  public void testInsertAll() {
+    Map row1 = ImmutableMap.of("field", "value1");
+    Map row2 = ImmutableMap.of("field", "value2");
+    List rows = ImmutableList.of(
+        new RowToInsert("row1", row1),
+        new RowToInsert("row2", row2)
+    );
+    InsertAllRequest request = InsertAllRequest.builder(TABLE_ID).rows(rows).build();
+    TableDataInsertAllRequest requestPb = new TableDataInsertAllRequest().setRows(
+        Lists.transform(rows, new Function() {
+          @Override
+          public TableDataInsertAllRequest.Rows apply(RowToInsert rowToInsert) {
+            return new TableDataInsertAllRequest.Rows().setInsertId(rowToInsert.id())
+                .setJson(rowToInsert.content());
+          }
+        })
+    );
+    TableDataInsertAllResponse responsePb = new TableDataInsertAllResponse().setInsertErrors(
+        ImmutableList.of(new TableDataInsertAllResponse.InsertErrors().setIndex(0L).setErrors(
+            ImmutableList.of(new ErrorProto().setMessage("ErrorMessage")))));
+    EasyMock.expect(bigqueryRpcMock.insertAll(DATASET, TABLE, requestPb))
+        .andReturn(responsePb);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    InsertAllResponse response = bigquery.insertAll(request);
+    assertNotNull(response.errorsFor(0L));
+    assertNull(response.errorsFor(1L));
+    assertEquals(1, response.errorsFor(0L).size());
+    assertEquals("ErrorMessage", response.errorsFor(0L).get(0).message());
+  }
+
+  @Test
+  public void testListTableData() {
+    String cursor = "cursor";
+    com.google.api.services.bigquery.model.TableCell cell1 =
+        new com.google.api.services.bigquery.model.TableCell().setV("Value1");
+    com.google.api.services.bigquery.model.TableCell cell2 =
+        new com.google.api.services.bigquery.model.TableCell().setV("Value2");
+    ImmutableList> tableData = ImmutableList.of(
+        (List) ImmutableList.of(FieldValue.fromPb(cell1)),
+        ImmutableList.of(FieldValue.fromPb(cell2)));
+    Tuple> result =
+        Tuple.>of(cursor,
+            ImmutableList.of(
+                new com.google.api.services.bigquery.model.TableRow().setF(
+                    ImmutableList.of(new com.google.api.services.bigquery.model.TableCell()
+                        .setV("Value1"))),
+                new com.google.api.services.bigquery.model.TableRow().setF(
+                    ImmutableList.of(new com.google.api.services.bigquery.model.TableCell()
+                        .setV("Value2")))));
+    EasyMock.expect(bigqueryRpcMock.listTableData(DATASET, TABLE, EMPTY_RPC_OPTIONS))
+        .andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page> page = bigquery.listTableData(DATASET, TABLE);
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(tableData.toArray(), Iterables.toArray(page.values(), List.class));
+  }
+
+  @Test
+  public void testListTableDataFromTableId() {
+    String cursor = "cursor";
+    com.google.api.services.bigquery.model.TableCell cell1 =
+        new com.google.api.services.bigquery.model.TableCell().setV("Value1");
+    com.google.api.services.bigquery.model.TableCell cell2 =
+        new com.google.api.services.bigquery.model.TableCell().setV("Value2");
+    ImmutableList> tableData = ImmutableList.of(
+        (List) ImmutableList.of(FieldValue.fromPb(cell1)),
+        ImmutableList.of(FieldValue.fromPb(cell2)));
+    Tuple> result =
+        Tuple.>of(cursor,
+            ImmutableList.of(
+                new com.google.api.services.bigquery.model.TableRow().setF(
+                    ImmutableList.of(new com.google.api.services.bigquery.model.TableCell()
+                        .setV("Value1"))),
+                new com.google.api.services.bigquery.model.TableRow().setF(
+                    ImmutableList.of(new com.google.api.services.bigquery.model.TableCell()
+                        .setV("Value2")))));
+    EasyMock.expect(bigqueryRpcMock.listTableData(DATASET, TABLE, EMPTY_RPC_OPTIONS))
+        .andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page> page = bigquery.listTableData(TableId.of(DATASET, TABLE));
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(tableData.toArray(), Iterables.toArray(page.values(), List.class));
+  }
+
+  @Test
+  public void testListTableDataWithOptions() {
+    String cursor = "cursor";
+    com.google.api.services.bigquery.model.TableCell cell1 =
+        new com.google.api.services.bigquery.model.TableCell().setV("Value1");
+    com.google.api.services.bigquery.model.TableCell cell2 =
+        new com.google.api.services.bigquery.model.TableCell().setV("Value2");
+    ImmutableList> tableData = ImmutableList.of(
+        (List) ImmutableList.of(FieldValue.fromPb(cell1)),
+        ImmutableList.of(FieldValue.fromPb(cell2)));
+    Tuple> result =
+        Tuple.>of(cursor,
+            ImmutableList.of(
+                new com.google.api.services.bigquery.model.TableRow().setF(
+                    ImmutableList.of(new com.google.api.services.bigquery.model.TableCell()
+                        .setV("Value1"))),
+                new com.google.api.services.bigquery.model.TableRow().setF(
+                    ImmutableList.of(new com.google.api.services.bigquery.model.TableCell()
+                        .setV("Value2")))));
+    EasyMock.expect(bigqueryRpcMock.listTableData(DATASET, TABLE, TABLE_DATA_LIST_OPTIONS))
+        .andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page> page = bigquery.listTableData(DATASET, TABLE,
+        TABLE_DATA_LIST_MAX_RESULTS, TABLE_DATA_LIST_PAGE_TOKEN);
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(tableData.toArray(), Iterables.toArray(page.values(), List.class));
+  }
+
+  @Test
+  public void testCreateQueryJob() {
+    EasyMock.expect(bigqueryRpcMock.create(QUERY_JOB_WITH_PROJECT.toPb(), EMPTY_RPC_OPTIONS))
+        .andReturn(COMPLETE_QUERY_JOB.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    JobInfo job = bigquery.create(QUERY_JOB);
+    assertEquals(COMPLETE_QUERY_JOB, job);
+  }
+
+  @Test
+  public void testCreateLoadJob() {
+    EasyMock.expect(bigqueryRpcMock.create(LOAD_JOB_WITH_PROJECT.toPb(), EMPTY_RPC_OPTIONS))
+        .andReturn(COMPLETE_LOAD_JOB.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    JobInfo job = bigquery.create(LOAD_JOB);
+    assertEquals(COMPLETE_LOAD_JOB, job);
+  }
+
+  @Test
+  public void testCreateCopyJob() {
+    EasyMock.expect(bigqueryRpcMock.create(COPY_JOB_WITH_PROJECT.toPb(), EMPTY_RPC_OPTIONS))
+        .andReturn(COMPLETE_COPY_JOB.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    JobInfo job = bigquery.create(COPY_JOB);
+    assertEquals(COMPLETE_COPY_JOB, job);
+  }
+
+  @Test
+  public void testCreateExtractJob() {
+    EasyMock.expect(bigqueryRpcMock.create(EXTRACT_JOB_WITH_PROJECT.toPb(), EMPTY_RPC_OPTIONS))
+        .andReturn(COMPLETE_EXTRACT_JOB.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    JobInfo job = bigquery.create(EXTRACT_JOB);
+    assertEquals(COMPLETE_EXTRACT_JOB, job);
+  }
+
+  @Test
+  public void testCreateJobWithSelectedFields() {
+    Capture> capturedOptions = Capture.newInstance();
+    EasyMock.expect(
+        bigqueryRpcMock.create(eq(QUERY_JOB_WITH_PROJECT.toPb()), capture(capturedOptions)))
+        .andReturn(COMPLETE_QUERY_JOB.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    JobInfo job = bigquery.create(QUERY_JOB, JOB_OPTION_FIELDS);
+    assertEquals(COMPLETE_QUERY_JOB, job);
+    String selector = (String) capturedOptions.getValue().get(JOB_OPTION_FIELDS.rpcOption());
+    assertTrue(selector.contains("jobReference"));
+    assertTrue(selector.contains("configuration"));
+    assertTrue(selector.contains("user_email"));
+    assertEquals(37, selector.length());
+  }
+
+  @Test
+  public void testGetJob() {
+    EasyMock.expect(bigqueryRpcMock.getJob(JOB, EMPTY_RPC_OPTIONS))
+        .andReturn(COMPLETE_COPY_JOB.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    JobInfo job = bigquery.getJob(JOB);
+    assertEquals(COMPLETE_COPY_JOB, job);
+  }
+
+  @Test
+  public void testGetJobFromJobId() {
+    EasyMock.expect(bigqueryRpcMock.getJob(JOB, EMPTY_RPC_OPTIONS))
+        .andReturn(COMPLETE_COPY_JOB.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    JobInfo job = bigquery.getJob(JobId.of(PROJECT, JOB));
+    assertEquals(COMPLETE_COPY_JOB, job);
+  }
+
+  @Test
+  public void testListJobs() {
+    String cursor = "cursor";
+    ImmutableList jobList = ImmutableList.of(QUERY_JOB_WITH_PROJECT,
+        LOAD_JOB_WITH_PROJECT);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(jobList, new Function() {
+          @Override
+          public Job apply(JobInfo jobInfo) {
+            return jobInfo.toPb();
+          }
+        }));
+    EasyMock.expect(bigqueryRpcMock.listJobs(EMPTY_RPC_OPTIONS)).andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page page = bigquery.listJobs();
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(jobList.toArray(), Iterables.toArray(page.values(), JobInfo.class));
+  }
+
+  @Test
+  public void testListJobsWithOptions() {
+    String cursor = "cursor";
+    ImmutableList jobList = ImmutableList.of(QUERY_JOB_WITH_PROJECT,
+        LOAD_JOB_WITH_PROJECT);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(jobList, new Function() {
+          @Override
+          public Job apply(JobInfo jobInfo) {
+            return jobInfo.toPb();
+          }
+        }));
+    EasyMock.expect(bigqueryRpcMock.listJobs(JOB_LIST_OPTIONS)).andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page page = bigquery.listJobs(JOB_LIST_ALL_USERS, JOB_LIST_STATE_FILTER);
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(jobList.toArray(), Iterables.toArray(page.values(), JobInfo.class));
+  }
+
+  @Test
+  public void testListJobsWithSelectedFields() {
+    String cursor = "cursor";
+    Capture> capturedOptions = Capture.newInstance();
+    ImmutableList jobList = ImmutableList.of(QUERY_JOB_WITH_PROJECT,
+        LOAD_JOB_WITH_PROJECT);
+    Tuple> result =
+        Tuple.of(cursor, Iterables.transform(jobList, new Function() {
+          @Override
+          public Job apply(JobInfo jobInfo) {
+            return jobInfo.toPb();
+          }
+        }));
+    EasyMock.expect(bigqueryRpcMock.listJobs(capture(capturedOptions))).andReturn(result);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    Page page = bigquery.listJobs(JOB_LIST_OPTION_FIELD);
+    assertEquals(cursor, page.nextPageCursor());
+    assertArrayEquals(jobList.toArray(), Iterables.toArray(page.values(), JobInfo.class));
+    String selector = (String) capturedOptions.getValue().get(JOB_OPTION_FIELDS.rpcOption());
+    System.out.println(selector);
+    assertTrue(selector.contains("etag,jobs("));
+    assertTrue(selector.contains("configuration"));
+    assertTrue(selector.contains("jobReference"));
+    assertTrue(selector.contains("statistics"));
+    assertTrue(selector.contains("state,errorResult),nextPageToken"));
+    assertEquals(80, selector.length());
+  }
+
+  @Test
+  public void testCancelJob() {
+    EasyMock.expect(bigqueryRpcMock.cancel(JOB)).andReturn(true);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    assertTrue(bigquery.cancel(JOB));
+  }
+
+  @Test
+  public void testCancelJobFromJobId() {
+    EasyMock.expect(bigqueryRpcMock.cancel(JOB)).andReturn(true);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    assertTrue(bigquery.cancel(JobId.of(PROJECT, JOB)));
+  }
+
+  @Test
+  public void testQueryRequest() {
+    JobId queryJob = JobId.of(PROJECT, JOB);
+    com.google.api.services.bigquery.model.QueryResponse responsePb =
+        new com.google.api.services.bigquery.model.QueryResponse()
+            .setJobReference(queryJob.toPb())
+            .setJobComplete(false);
+    EasyMock.expect(bigqueryRpcMock.query(QUERY_REQUEST_WITH_PROJECT.toPb())).andReturn(responsePb);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    QueryResponse response = bigquery.query(QUERY_REQUEST);
+    assertEquals(queryJob, response.jobId());
+    assertEquals(false, response.jobComplete());
+    assertEquals(ImmutableList.of(), response.executionErrors());
+    assertFalse(response.hasErrors());
+    assertEquals(null, response.result());
+  }
+
+  @Test
+  public void testGetQueryResults() {
+    JobId queryJob = JobId.of(PROJECT, JOB);
+    com.google.api.services.bigquery.model.GetQueryResultsResponse responsePb =
+        new com.google.api.services.bigquery.model.GetQueryResultsResponse()
+            .setJobReference(queryJob.toPb())
+            .setRows(ImmutableList.of(TABLE_ROW))
+            .setJobComplete(true)
+            .setCacheHit(false)
+            .setPageToken("cursor")
+            .setTotalBytesProcessed(42L)
+            .setTotalRows(BigInteger.valueOf(1L));
+    EasyMock.expect(bigqueryRpcMock.getQueryResults(JOB, EMPTY_RPC_OPTIONS)).andReturn(responsePb);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    QueryResponse response = bigquery.getQueryResults(queryJob);
+    assertEquals(queryJob, response.jobId());
+    assertEquals(true, response.jobComplete());
+    assertEquals(false, response.result().cacheHit());
+    assertEquals(ImmutableList.of(), response.executionErrors());
+    assertFalse(response.hasErrors());
+    assertEquals(null, response.result().schema());
+    assertEquals(42L, response.result().totalBytesProcessed());
+    assertEquals(1L, response.result().totalRows());
+    for (List row : response.result().values()) {
+      assertEquals(false, row.get(0).booleanValue());
+      assertEquals(1L, row.get(1).longValue());
+    }
+    assertEquals("cursor", response.result().nextPageCursor());
+  }
+
+  @Test
+  public void testGetQueryResultsWithOptions() {
+    JobId queryJob = JobId.of(PROJECT, JOB);
+    com.google.api.services.bigquery.model.GetQueryResultsResponse responsePb =
+        new com.google.api.services.bigquery.model.GetQueryResultsResponse()
+            .setJobReference(queryJob.toPb())
+            .setRows(ImmutableList.of(TABLE_ROW))
+            .setJobComplete(true)
+            .setCacheHit(false)
+            .setPageToken("cursor")
+            .setTotalBytesProcessed(42L)
+            .setTotalRows(BigInteger.valueOf(1L));
+    EasyMock.expect(bigqueryRpcMock.getQueryResults(JOB, QUERY_RESULTS_OPTIONS))
+        .andReturn(responsePb);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    QueryResponse response = bigquery.getQueryResults(queryJob, QUERY_RESULTS_OPTION_TIME,
+        QUERY_RESULTS_OPTION_INDEX);
+    assertEquals(queryJob, response.jobId());
+    assertEquals(true, response.jobComplete());
+    assertEquals(false, response.result().cacheHit());
+    assertEquals(ImmutableList.of(), response.executionErrors());
+    assertFalse(response.hasErrors());
+    assertEquals(null, response.result().schema());
+    assertEquals(42L, response.result().totalBytesProcessed());
+    assertEquals(1L, response.result().totalRows());
+    for (List row : response.result().values()) {
+      assertEquals(false, row.get(0).booleanValue());
+      assertEquals(1L, row.get(1).longValue());
+    }
+    assertEquals("cursor", response.result().nextPageCursor());
+  }
+
+  @Test
+  public void testRetryableException() {
+    EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
+        .andThrow(new BigQueryException(500, "InternalError", true))
+        .andReturn(DATASET_INFO_WITH_PROJECT.toPb());
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
+    DatasetInfo dataset = bigquery.getDataset(DATASET);
+    assertEquals(DATASET_INFO_WITH_PROJECT, dataset);
+  }
+
+  @Test
+  public void testNonRetryableException() {
+    String exceptionMessage = "Not Implemented";
+    EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
+        .andThrow(new BigQueryException(501, exceptionMessage, false));
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
+    thrown.expect(BigQueryException.class);
+    thrown.expectMessage(exceptionMessage);
+    bigquery.getDataset(DatasetId.of(DATASET));
+  }
+
+  @Test
+  public void testRuntimeException() {
+    String exceptionMessage = "Artificial runtime exception";
+    EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
+        .andThrow(new RuntimeException(exceptionMessage));
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
+    thrown.expect(BigQueryException.class);
+    thrown.expectMessage(exceptionMessage);
+    bigquery.getDataset(DATASET);
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java
new file mode 100644
index 000000000000..1c717067ff1b
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.gcloud.spi.BigQueryRpc;
+
+import org.junit.Test;
+
+public class OptionTest {
+
+  @Test
+  public void testOption() {
+    Option option = new Option(BigQueryRpc.Option.PAGE_TOKEN, "token");
+    assertEquals(BigQueryRpc.Option.PAGE_TOKEN, option.rpcOption());
+    assertEquals("token", option.value());
+  }
+
+  @Test(expected=NullPointerException.class)
+  public void testIndexOutOfBoundsException() {
+    new Option(null, "token");
+  }
+}

From d6766367713f7043e9bb3b58b75fd3ba8f6679ce Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 16 Dec 2015 10:24:29 +0100
Subject: [PATCH 176/322] Fix minor errors - Add argument checks to bigquery
 operation options - Remove retry helper in insertAll - Fix javadoc errors,
 add javadoc to operation options - Better unit tests - Rename test in
 OptionTest - Add bigquery operation options to SerializationTest - Other
 minor

---
 .../com/google/gcloud/bigquery/BigQuery.java  | 83 ++++++++++++------
 .../google/gcloud/bigquery/BigQueryImpl.java  | 19 ++--
 .../gcloud/bigquery/BigQueryImplTest.java     | 86 ++++++++++++++++---
 .../google/gcloud/bigquery/OptionTest.java    |  2 +-
 .../gcloud/bigquery/SerializationTest.java    |  6 +-
 5 files changed, 140 insertions(+), 56 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
index 3a68a49c9003..da8f23e9a0ba 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
@@ -16,7 +16,10 @@
 
 package com.google.gcloud.bigquery;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.base.Function;
+import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -24,8 +27,8 @@
 import com.google.gcloud.Service;
 import com.google.gcloud.spi.BigQueryRpc;
 
-import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * An interface for Google Cloud BigQuery.
@@ -34,11 +37,17 @@
  */
 public interface BigQuery extends Service {
 
+  /**
+   * Fields of a BigQuery Dataset resource.
+   *
+   * @see Dataset
+   *     Resource
+   */
   enum DatasetField {
     ACCESS("access"),
     CREATION_TIME("creationTime"),
     DATASET_REFERENCE("datasetReference"),
-    DEFAULT_TABLE_EXPIRATION_MS("defaultTableLifetime"),
+    DEFAULT_TABLE_EXPIRATION_MS("defaultTableExpirationMsS"),
     DESCRIPTION("description"),
     ETAG("etag"),
     FRIENDLY_NAME("friendlyName"),
@@ -58,15 +67,21 @@ public String selector() {
     }
 
     static String selector(DatasetField... fields) {
-      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 1);
+      Set fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 1);
       fieldStrings.add(DATASET_REFERENCE.selector());
       for (DatasetField field : fields) {
         fieldStrings.add(field.selector());
       }
-      return com.google.common.base.Joiner.on(',').join(fieldStrings);
+      return Joiner.on(',').join(fieldStrings);
     }
   }
 
+  /**
+   * Fields of a BigQuery Table resource.
+   *
+   * @see Table
+   *     Resource
+   */
   enum TableField {
     CREATION_TIME("creationTime"),
     DESCRIPTION("description"),
@@ -97,16 +112,22 @@ public String selector() {
     }
 
     static String selector(TableField... fields) {
-      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
+      Set fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
       fieldStrings.add(TABLE_REFERENCE.selector());
       fieldStrings.add(TYPE.selector());
       for (TableField field : fields) {
         fieldStrings.add(field.selector());
       }
-      return com.google.common.base.Joiner.on(',').join(fieldStrings);
+      return Joiner.on(',').join(fieldStrings);
     }
   }
 
+  /**
+   * Fields of a BigQuery Job resource.
+   *
+   * @see Job Resource
+   *     
+   */
   enum JobField {
     CONFIGURATION("configuration"),
     ETAG("etag"),
@@ -128,13 +149,13 @@ public String selector() {
     }
 
     static String selector(JobField... fields) {
-      HashSet fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
+      Set fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
       fieldStrings.add(JOB_REFERENCE.selector());
       fieldStrings.add(CONFIGURATION.selector());
       for (JobField field : fields) {
         fieldStrings.add(field.selector());
       }
-      return com.google.common.base.Joiner.on(',').join(fieldStrings);
+      return Joiner.on(',').join(fieldStrings);
     }
   }
 
@@ -184,7 +205,7 @@ private DatasetOption(BigQueryRpc.Option option, Object value) {
 
     /**
      * Returns an option to specify the dataset's fields to be returned by the RPC call. If this
-     * option is not provided all dataset's fields are returned. {@code DatasetOption.fields}) can
+     * option is not provided all dataset's fields are returned. {@code DatasetOption.fields} can
      * be used to specify only the fields of interest. {@link DatasetInfo#datasetId()} is always
      * returned, even if not specified.
      */
@@ -228,6 +249,7 @@ private TableListOption(BigQueryRpc.Option option, Object value) {
      * Returns an option to specify the maximum number of tables to be returned.
      */
     public static TableListOption maxResults(long maxResults) {
+      checkArgument(maxResults >= 0);
       return new TableListOption(BigQueryRpc.Option.MAX_RESULTS, maxResults);
     }
 
@@ -252,7 +274,7 @@ private TableOption(BigQueryRpc.Option option, Object value) {
 
     /**
      * Returns an option to specify the table's fields to be returned by the RPC call. If this
-     * option is not provided all table's fields are returned. {@code TableOption.fields}) can be
+     * option is not provided all table's fields are returned. {@code TableOption.fields} can be
      * used to specify only the fields of interest. {@link BaseTableInfo#tableId()} and
      * {@link BaseTableInfo#type()} are always returned, even if not specified.
      */
@@ -276,6 +298,7 @@ private TableDataListOption(BigQueryRpc.Option option, Object value) {
      * Returns an option to specify the maximum number of rows to be returned.
      */
     public static TableDataListOption maxResults(long maxResults) {
+      checkArgument(maxResults >= 0);
       return new TableDataListOption(BigQueryRpc.Option.MAX_RESULTS, maxResults);
     }
 
@@ -291,6 +314,7 @@ public static TableDataListOption startPageToken(String pageToken) {
      * data.
      */
     public static TableDataListOption startIndex(long index) {
+      checkArgument(index >= 0);
       return new TableDataListOption(BigQueryRpc.Option.START_INDEX, index);
     }
   }
@@ -314,14 +338,14 @@ public static JobListOption allUsers() {
     }
 
     /**
-     * Returns an option to list only jobs that match the provided filters.
+     * Returns an option to list only jobs that match the provided state filters.
      */
     public static JobListOption stateFilter(JobStatus.State... stateFilters) {
       List stringFilters = Lists.transform(ImmutableList.copyOf(stateFilters),
           new Function() {
             @Override
             public String apply(JobStatus.State state) {
-              return state.toString().toLowerCase();
+              return state.name().toLowerCase();
             }
           });
       return new JobListOption(BigQueryRpc.Option.STATE_FILTER, stringFilters);
@@ -331,6 +355,7 @@ public String apply(JobStatus.State state) {
      * Returns an option to specify the maximum number of jobs to be returned.
      */
     public static JobListOption maxResults(long maxResults) {
+      checkArgument(maxResults >= 0);
       return new JobListOption(BigQueryRpc.Option.MAX_RESULTS, maxResults);
     }
 
@@ -343,7 +368,7 @@ public static JobListOption startPageToken(String pageToken) {
 
     /**
      * Returns an option to specify the job's fields to be returned by the RPC call. If this option
-     * is not provided all job's fields are returned. {@code JobOption.fields()}) can be used to
+     * is not provided all job's fields are returned. {@code JobOption.fields()} can be used to
      * specify only the fields of interest. {@link JobInfo#jobId()}, {@link JobStatus#state()},
      * {@link JobStatus#error()} as well as type-specific configuration (e.g.
      * {@link QueryJobInfo#query()} for Query Jobs) are always returned, even if not specified.
@@ -370,7 +395,7 @@ private JobOption(BigQueryRpc.Option option, Object value) {
 
     /**
      * Returns an option to specify the job's fields to be returned by the RPC call. If this option
-     * is not provided all job's fields are returned. {@code JobOption.fields}) can be used to
+     * is not provided all job's fields are returned. {@code JobOption.fields()} can be used to
      * specify only the fields of interest. {@link JobInfo#jobId()} as well as type-specific
      * configuration (e.g. {@link QueryJobInfo#query()} for Query Jobs) are always returned, even if
      * not specified.
@@ -395,21 +420,23 @@ private QueryResultsOption(BigQueryRpc.Option option, Object value) {
      * Returns an option to specify the maximum number of rows to be returned.
      */
     public static QueryResultsOption maxResults(long maxResults) {
+      checkArgument(maxResults >= 0);
       return new QueryResultsOption(BigQueryRpc.Option.MAX_RESULTS, maxResults);
     }
 
     /**
-     * Returns an option to specify the page token from which to start listing query results.
+     * Returns an option to specify the page token from which to start getting query results.
      */
     public static QueryResultsOption startPageToken(String pageToken) {
       return new QueryResultsOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
     }
 
     /**
-     * Returns an option that sets the zero-based index of the row from which to start listing query
+     * Returns an option that sets the zero-based index of the row from which to start getting query
      * results.
      */
-    public static QueryResultsOption startIndex(Long startIndex) {
+    public static QueryResultsOption startIndex(long startIndex) {
+      checkArgument(startIndex >= 0);
       return new QueryResultsOption(BigQueryRpc.Option.START_INDEX, startIndex);
     }
 
@@ -418,7 +445,8 @@ public static QueryResultsOption startIndex(Long startIndex) {
      * before returning. Default is 10 seconds. If the timeout passes before the job completes,
      * {@link QueryResponse#jobComplete()} will be {@code false}.
      */
-    public static QueryResultsOption maxWaitTime(Long maxWaitTime) {
+    public static QueryResultsOption maxWaitTime(long maxWaitTime) {
+      checkArgument(maxWaitTime >= 0);
       return new QueryResultsOption(BigQueryRpc.Option.TIMEOUT, maxWaitTime);
     }
   }
@@ -460,7 +488,7 @@ public static QueryResultsOption maxWaitTime(Long maxWaitTime) {
 
   /**
    * Lists the project's datasets. This method returns partial information on each dataset
-   * ({@link DatasetInfo#datasetId()} ()}, {@link DatasetInfo#friendlyName()} and
+   * ({@link DatasetInfo#datasetId()}, {@link DatasetInfo#friendlyName()} and
    * {@link DatasetInfo#id()}). To get complete information use either
    * {@link #getDataset(String, DatasetOption...)} or
    * {@link #getDataset(DatasetId, DatasetOption...)}.
@@ -592,15 +620,16 @@ Page> listTableData(TableId tableId, TableDataListOption... opt
   JobInfo getJob(JobId jobId, JobOption... options) throws BigQueryException;
 
   /**
-   * Lists the dataset's tables.
+   * Lists the jobs.
    *
    * @throws BigQueryException upon failure
    */
   Page listJobs(JobListOption... options) throws BigQueryException;
 
   /**
-   * Sends a job cancel request. This call will return immediately, and the client will need to poll
-   * for the job status to see if the cancel completed successfully.
+   * Sends a job cancel request. This call will return immediately. The job status can then be
+   * checked using either {@link #getJob(JobId, JobOption...)} or
+   * {@link #getJob(String, JobOption...)}).
    *
    * @return {@code true} if cancel was requested successfully, {@code false} if the job was not
    *     found
@@ -609,9 +638,9 @@ Page> listTableData(TableId tableId, TableDataListOption... opt
   boolean cancel(String jobId) throws BigQueryException;
 
   /**
-   * Sends a job cancel request. This call will return immediately. The client will need to poll
-   * for the job status using either {@link #getJob(JobId, JobOption...)} or
-   * {@link #getJob(String, JobOption...)}) to see if the cancel operation completed successfully.
+   * Sends a job cancel request. This call will return immediately. The job status can then be
+   * checked using either {@link #getJob(JobId, JobOption...)} or
+   * {@link #getJob(String, JobOption...)}).
    *
    * @return {@code true} if cancel was requested successfully, {@code false} if the job was not
    *     found
@@ -620,14 +649,14 @@ Page> listTableData(TableId tableId, TableDataListOption... opt
   boolean cancel(JobId tableId) throws BigQueryException;
 
   /**
-   * Runs the query associated to the request.
+   * Runs the query associated with the request.
    *
    * @throws BigQueryException upon failure
    */
   QueryResponse query(QueryRequest request) throws BigQueryException;
 
   /**
-   * Returns results of the query associated to the provided job.
+   * Returns results of the query associated with the provided job.
    *
    * @throws BigQueryException upon failure
    */
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
index 02aa311d8cb4..e2f8f890c6a3 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -25,7 +25,6 @@
 import com.google.api.services.bigquery.model.Table;
 import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
 import com.google.api.services.bigquery.model.TableDataInsertAllRequest.Rows;
-import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
 import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.TableRow;
 import com.google.common.base.Function;
@@ -300,7 +299,7 @@ public Boolean call() {
   }
 
   @Override
-  public boolean delete(final String datasetId, final String tableId) throws BigQueryException {
+  public boolean delete(String datasetId, String tableId) throws BigQueryException {
     return delete(TableId.of(datasetId, tableId));
   }
 
@@ -420,16 +419,8 @@ public Rows apply(RowToInsert rowToInsert) {
       }
     });
     requestPb.setRows(rowsPb);
-    try {
-      return InsertAllResponse.fromPb(runWithRetries(new Callable() {
-        @Override
-        public TableDataInsertAllResponse call() {
-          return bigQueryRpc.insertAll(tableId.dataset(), tableId.table(), requestPb);
-        }
-      }, options().retryParams(), EXCEPTION_HANDLER));
-    } catch (RetryHelper.RetryHelperException e) {
-      throw BigQueryException.translateAndThrow(e);
-    }
+    return InsertAllResponse.fromPb(
+        bigQueryRpc.insertAll(tableId.dataset(), tableId.table(), requestPb));
   }
 
   @Override
@@ -475,7 +466,7 @@ public List apply(TableRow rowPb) {
   }
 
   @Override
-  public JobInfo getJob(final String jobId, JobOption... options) throws BigQueryException {
+  public JobInfo getJob(String jobId, JobOption... options) throws BigQueryException {
     return getJob(JobId.of(jobId), options);
   }
 
@@ -575,7 +566,7 @@ public com.google.api.services.bigquery.model.QueryResponse call() {
   @Override
   public QueryResponse getQueryResults(JobId job, QueryResultsOption... options)
       throws BigQueryException {
-    final Map optionsMap = optionMap(options);
+    Map optionsMap = optionMap(options);
     return getQueryResults(job, options(), optionsMap);
   }
 
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index 4902ab9967d4..c9c46e0a632d 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -55,7 +55,6 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import java.io.IOException;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Map;
@@ -170,9 +169,12 @@ public class BigQueryImplTest {
       BigQuery.DatasetListOption.all();
   private static final BigQuery.DatasetListOption DATASET_LIST_PAGE_TOKEN =
       BigQuery.DatasetListOption.startPageToken("cursor");
+  private static final BigQuery.DatasetListOption DATASET_LIST_MAX_RESULTS =
+      BigQuery.DatasetListOption.maxResults(42L);
   private static final Map DATASET_LIST_OPTIONS = ImmutableMap.of(
       BigQueryRpc.Option.ALL_DATASETS, true,
-      BigQueryRpc.Option.PAGE_TOKEN, "cursor");
+      BigQueryRpc.Option.PAGE_TOKEN, "cursor",
+      BigQueryRpc.Option.MAX_RESULTS, 42L);
 
   // Dataset delete options
   private static final BigQuery.DatasetDeleteOption DATASET_DELETE_CONTENTS =
@@ -198,9 +200,12 @@ public class BigQueryImplTest {
       BigQuery.TableDataListOption.maxResults(42L);
   private static final BigQuery.TableDataListOption TABLE_DATA_LIST_PAGE_TOKEN =
       BigQuery.TableDataListOption.startPageToken("cursor");
+  private static final BigQuery.TableDataListOption TABLE_DATA_LIST_START_INDEX =
+      BigQuery.TableDataListOption.startIndex(0L);
   private static final Map TABLE_DATA_LIST_OPTIONS = ImmutableMap.of(
       BigQueryRpc.Option.MAX_RESULTS, 42L,
-      BigQueryRpc.Option.PAGE_TOKEN, "cursor");
+      BigQueryRpc.Option.PAGE_TOKEN, "cursor",
+      BigQueryRpc.Option.START_INDEX, 0L);
 
   // Job options
   private static final BigQuery.JobOption JOB_OPTION_FIELDS =
@@ -213,18 +218,30 @@ public class BigQueryImplTest {
       BigQuery.JobListOption.allUsers();
   private static final BigQuery.JobListOption JOB_LIST_STATE_FILTER =
       BigQuery.JobListOption.stateFilter(JobStatus.State.DONE, JobStatus.State.PENDING);
+  private static final BigQuery.JobListOption JOB_LIST_PAGE_TOKEN =
+      BigQuery.JobListOption.startPageToken("cursor");
+  private static final BigQuery.JobListOption JOB_LIST_MAX_RESULTS =
+      BigQuery.JobListOption.maxResults(42L);
   private static final Map JOB_LIST_OPTIONS = ImmutableMap.of(
       BigQueryRpc.Option.ALL_USERS, true,
-      BigQueryRpc.Option.STATE_FILTER, ImmutableList.of("done", "pending"));
+      BigQueryRpc.Option.STATE_FILTER, ImmutableList.of("done", "pending"),
+      BigQueryRpc.Option.PAGE_TOKEN, "cursor",
+      BigQueryRpc.Option.MAX_RESULTS, 42L);
 
   // Query Results options
   private static final BigQuery.QueryResultsOption QUERY_RESULTS_OPTION_TIME =
       BigQuery.QueryResultsOption.maxWaitTime(42L);
   private static final BigQuery.QueryResultsOption QUERY_RESULTS_OPTION_INDEX =
       BigQuery.QueryResultsOption.startIndex(1024L);
+  private static final BigQuery.QueryResultsOption QUERY_RESULTS_OPTION_PAGE_TOKEN =
+      BigQuery.QueryResultsOption.startPageToken("cursor");
+  private static final BigQuery.QueryResultsOption QUERY_RESULTS_OPTION_MAX_RESULTS =
+      BigQuery.QueryResultsOption.maxResults(0L);
   private static final Map QUERY_RESULTS_OPTIONS = ImmutableMap.of(
       BigQueryRpc.Option.TIMEOUT, 42L,
-      BigQueryRpc.Option.START_INDEX, 1024L);
+      BigQueryRpc.Option.START_INDEX, 1024L,
+      BigQueryRpc.Option.PAGE_TOKEN, "cursor",
+      BigQueryRpc.Option.MAX_RESULTS, 0L);
 
   private BigQueryOptions options;
   private BigQueryRpcFactory rpcFactoryMock;
@@ -235,7 +252,7 @@ public class BigQueryImplTest {
   public ExpectedException thrown = ExpectedException.none();
 
   @Before
-  public void setUp() throws IOException, InterruptedException {
+  public void setUp() {
     rpcFactoryMock = EasyMock.createMock(BigQueryRpcFactory.class);
     bigqueryRpcMock = EasyMock.createMock(BigQueryRpc.class);
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(BigQueryOptions.class)))
@@ -249,7 +266,7 @@ public void setUp() throws IOException, InterruptedException {
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     EasyMock.verify(rpcFactoryMock, bigqueryRpcMock);
   }
 
@@ -361,7 +378,8 @@ public void testListDatasetsWithOptions() {
     EasyMock.expect(bigqueryRpcMock.listDatasets(DATASET_LIST_OPTIONS)).andReturn(result);
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
-    Page page = bigquery.listDatasets(DATASET_LIST_ALL, DATASET_LIST_PAGE_TOKEN);
+    Page page = bigquery.listDatasets(DATASET_LIST_ALL, DATASET_LIST_PAGE_TOKEN,
+        DATASET_LIST_MAX_RESULTS);
     assertEquals(cursor, page.nextPageCursor());
     assertArrayEquals(datasetList.toArray(), Iterables.toArray(page.values(), DatasetInfo.class));
   }
@@ -592,7 +610,11 @@ public void testInsertAll() {
         new RowToInsert("row1", row1),
         new RowToInsert("row2", row2)
     );
-    InsertAllRequest request = InsertAllRequest.builder(TABLE_ID).rows(rows).build();
+    InsertAllRequest request = InsertAllRequest.builder(TABLE_ID)
+        .rows(rows)
+        .skipInvalidRows(false)
+        .ignoreUnknownValues(true)
+        .build();
     TableDataInsertAllRequest requestPb = new TableDataInsertAllRequest().setRows(
         Lists.transform(rows, new Function() {
           @Override
@@ -601,7 +623,7 @@ public TableDataInsertAllRequest.Rows apply(RowToInsert rowToInsert) {
                 .setJson(rowToInsert.content());
           }
         })
-    );
+    ).setSkipInvalidRows(false).setIgnoreUnknownValues(true);
     TableDataInsertAllResponse responsePb = new TableDataInsertAllResponse().setInsertErrors(
         ImmutableList.of(new TableDataInsertAllResponse.InsertErrors().setIndex(0L).setErrors(
             ImmutableList.of(new ErrorProto().setMessage("ErrorMessage")))));
@@ -696,7 +718,7 @@ public void testListTableDataWithOptions() {
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
     Page> page = bigquery.listTableData(DATASET, TABLE,
-        TABLE_DATA_LIST_MAX_RESULTS, TABLE_DATA_LIST_PAGE_TOKEN);
+        TABLE_DATA_LIST_MAX_RESULTS, TABLE_DATA_LIST_PAGE_TOKEN, TABLE_DATA_LIST_START_INDEX);
     assertEquals(cursor, page.nextPageCursor());
     assertArrayEquals(tableData.toArray(), Iterables.toArray(page.values(), List.class));
   }
@@ -813,7 +835,8 @@ public Job apply(JobInfo jobInfo) {
     EasyMock.expect(bigqueryRpcMock.listJobs(JOB_LIST_OPTIONS)).andReturn(result);
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
-    Page page = bigquery.listJobs(JOB_LIST_ALL_USERS, JOB_LIST_STATE_FILTER);
+    Page page = bigquery.listJobs(JOB_LIST_ALL_USERS, JOB_LIST_STATE_FILTER,
+        JOB_LIST_PAGE_TOKEN, JOB_LIST_MAX_RESULTS);
     assertEquals(cursor, page.nextPageCursor());
     assertArrayEquals(jobList.toArray(), Iterables.toArray(page.values(), JobInfo.class));
   }
@@ -874,6 +897,8 @@ public void testQueryRequest() {
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
     QueryResponse response = bigquery.query(QUERY_REQUEST);
+    assertNull(response.etag());
+    assertNull(response.result());
     assertEquals(queryJob, response.jobId());
     assertEquals(false, response.jobComplete());
     assertEquals(ImmutableList.of(), response.executionErrors());
@@ -881,11 +906,44 @@ public void testQueryRequest() {
     assertEquals(null, response.result());
   }
 
+  @Test
+  public void testQueryRequestCompleted() {
+    JobId queryJob = JobId.of(PROJECT, JOB);
+    com.google.api.services.bigquery.model.QueryResponse responsePb =
+        new com.google.api.services.bigquery.model.QueryResponse()
+            .setJobReference(queryJob.toPb())
+            .setRows(ImmutableList.of(TABLE_ROW))
+            .setJobComplete(true)
+            .setCacheHit(false)
+            .setPageToken("cursor")
+            .setTotalBytesProcessed(42L)
+            .setTotalRows(BigInteger.valueOf(1L));
+    EasyMock.expect(bigqueryRpcMock.query(QUERY_REQUEST_WITH_PROJECT.toPb())).andReturn(responsePb);
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    QueryResponse response = bigquery.query(QUERY_REQUEST);
+    assertNull(response.etag());
+    assertEquals(queryJob, response.jobId());
+    assertEquals(true, response.jobComplete());
+    assertEquals(false, response.result().cacheHit());
+    assertEquals(ImmutableList.of(), response.executionErrors());
+    assertFalse(response.hasErrors());
+    assertEquals(null, response.result().schema());
+    assertEquals(42L, response.result().totalBytesProcessed());
+    assertEquals(1L, response.result().totalRows());
+    for (List row : response.result().values()) {
+      assertEquals(false, row.get(0).booleanValue());
+      assertEquals(1L, row.get(1).longValue());
+    }
+    assertEquals("cursor", response.result().nextPageCursor());
+  }
+
   @Test
   public void testGetQueryResults() {
     JobId queryJob = JobId.of(PROJECT, JOB);
     com.google.api.services.bigquery.model.GetQueryResultsResponse responsePb =
         new com.google.api.services.bigquery.model.GetQueryResultsResponse()
+            .setEtag("etag")
             .setJobReference(queryJob.toPb())
             .setRows(ImmutableList.of(TABLE_ROW))
             .setJobComplete(true)
@@ -897,6 +955,7 @@ public void testGetQueryResults() {
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
     QueryResponse response = bigquery.getQueryResults(queryJob);
+    assertEquals("etag", response.etag());
     assertEquals(queryJob, response.jobId());
     assertEquals(true, response.jobComplete());
     assertEquals(false, response.result().cacheHit());
@@ -929,7 +988,8 @@ public void testGetQueryResultsWithOptions() {
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
     QueryResponse response = bigquery.getQueryResults(queryJob, QUERY_RESULTS_OPTION_TIME,
-        QUERY_RESULTS_OPTION_INDEX);
+        QUERY_RESULTS_OPTION_INDEX, QUERY_RESULTS_OPTION_MAX_RESULTS,
+        QUERY_RESULTS_OPTION_PAGE_TOKEN);
     assertEquals(queryJob, response.jobId());
     assertEquals(true, response.jobComplete());
     assertEquals(false, response.result().cacheHit());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java
index 1c717067ff1b..d337f5a67849 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java
@@ -32,7 +32,7 @@ public void testOption() {
   }
 
   @Test(expected=NullPointerException.class)
-  public void testIndexOutOfBoundsException() {
+  public void testNullRpcOption() {
     new Option(null, "token");
   }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 3576769f4007..3766ef493064 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -233,7 +233,11 @@ public void testModelAndRequests() throws Exception {
         TABLE_SCHEMA, TABLE_INFO, VIEW_INFO, EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION,
         JOB_STATISTICS, EXTRACT_STATISTICS, LOAD_STATISTICS, QUERY_STATISTICS, BIGQUERY_ERROR,
         JOB_STATUS, JOB_ID, COPY_JOB, EXTRACT_JOB, LOAD_JOB, QUERY_JOB, INSERT_ALL_REQUEST,
-        INSERT_ALL_RESPONSE, FIELD_VALUE, QUERY_REQUEST, QUERY_RESPONSE};
+        INSERT_ALL_RESPONSE, FIELD_VALUE, QUERY_REQUEST, QUERY_RESPONSE,
+        BigQuery.DatasetOption.fields(), BigQuery.DatasetDeleteOption.deleteContents(),
+        BigQuery.DatasetListOption.all(), BigQuery.TableOption.fields(),
+        BigQuery.TableListOption.maxResults(42L), BigQuery.JobOption.fields(),
+        BigQuery.JobListOption.allUsers()};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);

From e91f47b893db5a07b11c6d21299ae9a87165af7e Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 17 Dec 2015 11:51:21 +0100
Subject: [PATCH 177/322] Make checkstyle happy, fix minor issues, add better
 javadoc

---
 .../java/com/google/gcloud/bigquery/Acl.java  | 36 ++++++++++---------
 .../google/gcloud/bigquery/BaseTableInfo.java |  9 +++--
 .../google/gcloud/bigquery/CsvOptions.java    |  3 ++
 .../com/google/gcloud/bigquery/DatasetId.java |  6 ++--
 .../google/gcloud/bigquery/DatasetInfo.java   |  4 +--
 .../gcloud/bigquery/ExternalTableInfo.java    |  6 ++--
 .../com/google/gcloud/bigquery/Field.java     |  8 ++---
 .../com/google/gcloud/bigquery/JobId.java     |  4 +--
 .../com/google/gcloud/bigquery/JobInfo.java   |  2 +-
 .../google/gcloud/bigquery/QueryRequest.java  | 29 ++++++++++++++-
 .../google/gcloud/bigquery/QueryResponse.java |  7 ++--
 .../com/google/gcloud/bigquery/Schema.java    |  4 +--
 .../com/google/gcloud/bigquery/TableId.java   |  2 +-
 .../com/google/gcloud/bigquery/TableInfo.java |  6 ++--
 .../gcloud/bigquery/UserDefinedFunction.java  |  5 +--
 .../com/google/gcloud/bigquery/ViewInfo.java  | 14 ++++----
 .../google/gcloud/bigquery/TableInfoTest.java |  6 ++--
 17 files changed, 94 insertions(+), 57 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
index 610f818e6cb9..df6beef865ca 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
@@ -48,10 +48,12 @@ public enum Role {
      * Can read, query, copy or export tables in the dataset.
      */
     READER,
+
     /**
      * Same as {@link #READER} plus can edit or append data in the dataset.
      */
     WRITER,
+
     /**
      * Same as {@link #WRITER} plus can update and delete the dataset.
      */
@@ -61,7 +63,7 @@ public enum Role {
   /**
    * Base class for BigQuery entities that can be grant access to the dataset.
    */
-  public static abstract class Entity implements Serializable {
+  public abstract static class Entity implements Serializable {
 
     private static final long serialVersionUID = 8111776788607959944L;
 
@@ -132,14 +134,14 @@ public String domain() {
     }
 
     @Override
-    public boolean equals(Object o) {
-      if (this == o) {
+    public boolean equals(Object obj) {
+      if (this == obj) {
         return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if (obj == null || getClass() != obj.getClass()) {
         return false;
       }
-      Domain domainEntity = (Domain) o;
+      Domain domainEntity = (Domain) obj;
       return Objects.equals(type(), domainEntity.type())
           && Objects.equals(domain, domainEntity.domain());
     }
@@ -196,14 +198,14 @@ public String identifier() {
     }
 
     @Override
-    public boolean equals(Object o) {
-      if (this == o) {
+    public boolean equals(Object obj) {
+      if (this == obj) {
         return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if (obj == null || getClass() != obj.getClass()) {
         return false;
       }
-      Group group = (Group) o;
+      Group group = (Group) obj;
       return Objects.equals(type(), group.type()) && Objects.equals(identifier, group.identifier);
     }
 
@@ -288,14 +290,14 @@ public String email() {
     }
 
     @Override
-    public boolean equals(Object o) {
-      if (this == o) {
+    public boolean equals(Object obj) {
+      if (this == obj) {
         return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if (obj == null || getClass() != obj.getClass()) {
         return false;
       }
-      User user = (User) o;
+      User user = (User) obj;
       return Objects.equals(type(), user.type()) && Objects.equals(email, user.email);
     }
 
@@ -341,14 +343,14 @@ public TableId id() {
     }
 
     @Override
-    public boolean equals(Object o) {
-      if (this == o) {
+    public boolean equals(Object obj) {
+      if (this == obj) {
         return true;
       }
-      if (o == null || getClass() != o.getClass()) {
+      if (obj == null || getClass() != obj.getClass()) {
         return false;
       }
-      View view = (View) o;
+      View view = (View) obj;
       return Objects.equals(type(), view.type()) && Objects.equals(id, view.id);
     }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
index 8845179b31c5..eedb78381b59 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
@@ -24,6 +24,7 @@
 import com.google.api.services.bigquery.model.Table;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 
 import java.io.Serializable;
 import java.math.BigInteger;
@@ -63,12 +64,14 @@ public enum Type {
      * A normal BigQuery table.
      */
     TABLE,
+
     /**
      * A virtual table defined by a SQL query.
      *
      * @see Views
      */
     VIEW,
+
     /**
      * A BigQuery table backed by external data.
      *
@@ -137,7 +140,7 @@ public boolean equals(Object obj) {
           && Objects.equals(toPb(), ((StreamingBuffer) obj).toPb());
     }
 
-    public Streamingbuffer toPb() {
+    Streamingbuffer toPb() {
       return new Streamingbuffer()
           .setEstimatedBytes(BigInteger.valueOf(estimatedBytes))
           .setEstimatedRows(BigInteger.valueOf(estimatedRows))
@@ -165,7 +168,7 @@ static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
   private final Long expirationTime;
   private final Long lastModifiedTime;
 
-  public static abstract class Builder> {
+  public abstract static class Builder> {
 
     private String etag;
     private String id;
@@ -429,7 +432,7 @@ public Long lastModifiedTime() {
    */
   public abstract Builder toBuilder();
 
-  protected MoreObjects.ToStringHelper toStringHelper() {
+  ToStringHelper toStringHelper() {
     return MoreObjects.toStringHelper(this)
         .add("tableId", tableId)
         .add("type", type)
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
index 40655e2c0c36..274ef5678a8a 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
@@ -190,6 +190,9 @@ public Integer skipLeadingRows() {
     return skipLeadingRows;
   }
 
+  /**
+   * Returns a builder for the {@code CsvOptions} object.
+   */
   public Builder toBuilder() {
     return new Builder()
         .allowJaggedRows(allowJaggedRows)
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
index b0da5603d929..942322ea51d3 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
@@ -34,7 +34,7 @@ public class DatasetId implements Serializable {
   private final String dataset;
 
   /**
-   * Returns project's user-defined id
+   * Returns project's user-defined id.
    */
   public String project() {
     return project;
@@ -81,11 +81,11 @@ public String toString() {
     return toPb().toString();
   }
 
-  public DatasetReference toPb() {
+  DatasetReference toPb() {
     return new DatasetReference().setProjectId(project).setDatasetId(dataset);
   }
 
-  public static DatasetId fromPb(DatasetReference datasetRef) {
+  static DatasetId fromPb(DatasetReference datasetRef) {
     return new DatasetId(
         datasetRef.getProjectId(),
         datasetRef.getDatasetId());
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
index 773c314f8060..95897ba3a801 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
@@ -384,8 +384,8 @@ static DatasetInfo fromPb(Dataset datasetPb) {
       builder.acl(Lists.transform(datasetPb.getAccess(),
           new Function() {
             @Override
-            public Acl apply(Dataset.Access f) {
-              return Acl.fromPb(f);
+            public Acl apply(Dataset.Access accessPb) {
+              return Acl.fromPb(accessPb);
             }
           }));
     }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
index 775a0294db77..4bdd1e4159db 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
@@ -19,7 +19,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.services.bigquery.model.Table;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 
 /**
  * Google BigQuery External Table information. BigQuery's external tables are tables whose data
@@ -100,7 +100,7 @@ private ExternalTableInfo(Builder builder) {
    */
   public ExternalDataConfiguration configuration() {
     return configuration;
-  };
+  }
 
   /**
    * Returns information on the table's streaming buffer if any exists. Returns {@code null} if no
@@ -119,7 +119,7 @@ public Builder toBuilder() {
   }
 
   @Override
-  protected MoreObjects.ToStringHelper toStringHelper() {
+  ToStringHelper toStringHelper() {
     return super.toStringHelper()
         .add("configuration", configuration)
         .add("streamingBuffer", streamingBuffer);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
index 54fdb9f50329..55fae44c5eed 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
@@ -32,10 +32,10 @@
 import java.util.Objects;
 
 /**
- * Google BigQuery Table field. A table field has a name, a value, a mode and possibly a description.
- * Supported types are: {@link Type#integer()}, {@link Type#bool()}, {@link Type#string()},
- * {@link Type#floatingPoint()}, {@link Type#timestamp()} and {@link Type#record(Field...)}. One or
- * more fields form a table's schema.
+ * Google BigQuery Table field. A table field has a name, a value, a mode and possibly a
+ * description. Supported types are: {@link Type#integer()}, {@link Type#bool()},
+ * {@link Type#string()}, {@link Type#floatingPoint()}, {@link Type#timestamp()} and
+ * {@link Type#record(Field...)}. One or more fields form a table's schema.
  */
 public class Field implements Serializable {
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java
index 43f54a0502aa..898c894f9a21 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java
@@ -47,9 +47,9 @@ public String job() {
     return job;
   }
 
-  private JobId(String project, String dataset) {
+  private JobId(String project, String job) {
     this.project = project;
-    this.job = dataset;
+    this.job = job;
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
index 317f7cc0bde5..6d7efc147d25 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -241,7 +241,7 @@ public String userEmail() {
 
   ToStringHelper toStringHelper() {
     return MoreObjects.toStringHelper(this)
-        .add("jobId", jobId)
+        .add("job", jobId)
         .add("status", status)
         .add("statistics", statistics)
         .add("userEmail", userEmail)
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
index d64994e69c76..5ef68d7b9e15 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
@@ -27,7 +27,34 @@
  * Google Cloud BigQuery Query Request. This class can be used to run a BigQuery SQL query and
  * return results if the query completes within a specified timeout. The query results are saved to
  * a temporary table that is deleted approximately 24 hours after the query is run. The query is run
- * through a BigQuery Job whose identity can be accessed via {@link QueryResponse#jobId()}.
+ * through a BigQuery Job whose identity can be accessed via {@link QueryResponse#jobId()}. If the
+ * query does not complete within the provided {@link Builder#maxWaitTime(Long)} the response
+ * returned by {@link BigQuery#query(QueryRequest)} will have {@link QueryResponse#jobComplete()}
+ * set to {@code false} and {@link QueryResponse#result()} set to {@code null}. To obtain query
+ * results you can use {@link BigQuery#getQueryResults(JobId, BigQuery.QueryResultsOption...)} until
+ * {@link QueryResponse#jobComplete()} returns {@code true}.
+ *
+ * 
Example usage of a query request:
+ * 
    {@code
+ *    QueryRequest request = QueryRequest.builder("SELECT field FROM table")
+ *      .defaultDataset(DatasetId.of("dataset"))
+ *      .maxWaitTime(60000L)
+ *      .maxResults(1000L)
+ *      .build();
+ *    QueryResponse response = bigquery.query(request);
+ *    while (!response.jobComplete()) {
+ *      Thread.sleep(1000);
+ *      response = bigquery.getQueryResults(response.jobId());
+ *    }
+ *    List executionErrors = response.executionErrors();
+ *    // look for errors in executionErrors
+ *    QueryResult result = response.result();
+ *    Iterator> rowIterator = result.iterateAll();
+ *    while(rowIterator.hasNext()) {
+ *      List row = rowIterator.next();
+ *      // do something with row
+ *    }
+ * }

  *
  * @see Query
  * @see Query Reference
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
index b7bd5dc0efd0..8ef8351d9e1a 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
@@ -24,15 +24,16 @@
 import java.util.Objects;
 
 /**
- * Google Cloud BigQuery Query Response. This class contains the results of a Query Job or of a
- * Query Request.
+ * Google Cloud BigQuery Query Response. This class contains the results of a Query Job
+ * ({@link BigQuery#getQueryResults(JobId, BigQuery.QueryResultsOption...)}) or of a
+ * Query Request ({@link BigQuery#query(QueryRequest)}).
  *
  * 
Example usage of a query response:
  * 
    {@code
  *    QueryResponse response = bigquery.query(request);
  *    while (!response.jobComplete()) {
- *      response = bigquery.getQueryResults(response.jobId());
  *      Thread.sleep(1000);
+ *      response = bigquery.getQueryResults(response.jobId());
  *    }
  *    List executionErrors = response.executionErrors();
  *    // look for errors in executionErrors
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
index 0ac6e1b84ade..787bb0d7f35f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
@@ -96,8 +96,8 @@ public Schema build() {
   }
 
   private Schema(Builder builder) {
-    this.fields = builder.fields != null ? ImmutableList.copyOf(builder.fields) :
-        ImmutableList.of();
+    this.fields = builder.fields != null ? ImmutableList.copyOf(builder.fields)
+        : ImmutableList.of();
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
index 6747dbf9923f..7a4e0bbb38b4 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
@@ -50,7 +50,7 @@ public TableReference apply(TableId tableId) {
   private final String table;
 
   /**
-   * Returns project's user-defined id
+   * Returns project's user-defined id.
    */
   public String project() {
     return project;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index 6594a3f25a67..74dc487825c6 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -17,7 +17,7 @@
 package com.google.gcloud.bigquery;
 
 import com.google.api.services.bigquery.model.Table;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 
 /**
  * A Google BigQuery Table information. A BigQuery table is a standard, two-dimensional table with
@@ -110,7 +110,7 @@ public static Builder builder(TableId tableId, Schema schema) {
   }
 
   /**
-   * Creates BigQuery table given its type
+   * Creates BigQuery table given its type.
    *
    * @param tableId table id
    * @param schema the schema of the table
@@ -128,7 +128,7 @@ public Builder toBuilder() {
   }
 
   @Override
-  protected MoreObjects.ToStringHelper toStringHelper() {
+  ToStringHelper toStringHelper() {
     return super.toStringHelper()
         .add("location", location)
         .add("streamingBuffer", streamingBuffer);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java
index 931c1eaf024a..2135e0ddc941 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/UserDefinedFunction.java
@@ -13,7 +13,8 @@
  * and produces zero or more rows as output. The output can potentially have a different schema than
  * the input.
  *
- * @see User-Defined Functions
+ * @see User-Defined Functions
+ *     
  */
 public abstract class UserDefinedFunction implements Serializable {
 
@@ -137,7 +138,7 @@ public static UserDefinedFunction fromUri(String functionDefinition) {
     return new UriFunction(functionDefinition);
   }
 
-  public static UserDefinedFunction fromPb(
+  static UserDefinedFunction fromPb(
       com.google.api.services.bigquery.model.UserDefinedFunctionResource pb) {
     if (pb.getInlineCode() != null) {
       return new InlineFunction(pb.getInlineCode());
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
index 01e07663b363..771a7a679c11 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
@@ -20,7 +20,7 @@
 
 import com.google.api.services.bigquery.model.Table;
 import com.google.api.services.bigquery.model.ViewDefinition;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
@@ -76,8 +76,8 @@ public Builder query(String query) {
     /**
      * Sets user defined functions that can be used by {@link #query()}.
      *
-     * @see User-Defined Functions
-     *     
+     * @see User-Defined
+     *     Functions
      */
     public Builder userDefinedFunctions(List userDefinedFunctions) {
       this.userDefinedFunctions = ImmutableList.copyOf(checkNotNull(userDefinedFunctions));
@@ -87,8 +87,8 @@ public Builder userDefinedFunctions(List userDefinedFunctio
     /**
      * Sets user defined functions that can be used by {@link #query()}.
      *
-     * @see User-Defined Functions
-     *     
+     * @see User-Defined
+     *     Functions
      */
     public Builder userDefinedFunctions(UserDefinedFunction... userDefinedFunctions) {
       this.userDefinedFunctions = ImmutableList.copyOf(userDefinedFunctions);
@@ -115,7 +115,7 @@ private ViewInfo(Builder builder) {
    */
   public String query() {
     return query;
-  };
+  }
 
   /**
    * Returns user defined functions that can be used by {@link #query()}. Returns {@code null} if
@@ -137,7 +137,7 @@ public Builder toBuilder() {
   }
 
   @Override
-  protected MoreObjects.ToStringHelper toStringHelper() {
+  ToStringHelper toStringHelper() {
     return super.toStringHelper()
         .add("query", query)
         .add("userDefinedFunctions", userDefinedFunctions);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
index f9e073906578..e32ee2516b6b 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
@@ -98,8 +98,8 @@ public class TableInfoTest {
           .selfLink(SELF_LINK)
           .streamingBuffer(STREAMING_BUFFER)
           .build();
-  private static List USER_DEFINED_FUNCTIONS = ImmutableList.of(
-      UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
+  private static final List USER_DEFINED_FUNCTIONS =
+      ImmutableList.of(UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
   private static final ViewInfo VIEW_INFO =
       ViewInfo.builder(TABLE_ID, VIEW_QUERY, USER_DEFINED_FUNCTIONS)
           .creationTime(CREATION_TIME)
@@ -190,7 +190,7 @@ public void testBuilder() {
 
   @Test
   public void testToAndFromPb() {
-    assertTrue(BaseTableInfo.fromPb(TABLE_INFO.toPb()) instanceof BaseTableInfo);
+    assertTrue(BaseTableInfo.fromPb(TABLE_INFO.toPb()) instanceof TableInfo);
     compareTableInfo(TABLE_INFO, BaseTableInfo.fromPb(TABLE_INFO.toPb()));
     assertTrue(BaseTableInfo.fromPb(VIEW_INFO.toPb()) instanceof ViewInfo);
     compareViewInfo(VIEW_INFO, BaseTableInfo.fromPb(VIEW_INFO.toPb()));

From f569bddb8405cd485ce57206574af1f1eedc899b Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 17 Dec 2015 12:05:05 +0100
Subject: [PATCH 178/322] Move StreamingBuffer to TableInfo, remove
 streamingBuffer from ExternalTableInfo

---
 .../google/gcloud/bigquery/BaseTableInfo.java | 74 -----------------
 .../gcloud/bigquery/ExternalTableInfo.java    | 35 ++------
 .../google/gcloud/bigquery/QueryRequest.java  |  3 +-
 .../com/google/gcloud/bigquery/TableInfo.java | 79 +++++++++++++++++++
 .../google/gcloud/spi/DefaultBigQueryRpc.java |  4 +-
 .../google/gcloud/bigquery/OptionTest.java    |  2 +-
 .../gcloud/bigquery/QueryResultTest.java      |  4 +-
 .../gcloud/bigquery/SerializationTest.java    |  5 +-
 .../google/gcloud/bigquery/TableInfoTest.java |  6 +-
 9 files changed, 94 insertions(+), 118 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
index eedb78381b59..16d2af6f4580 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
@@ -20,7 +20,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.client.util.Data;
-import com.google.api.services.bigquery.model.Streamingbuffer;
 import com.google.api.services.bigquery.model.Table;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
@@ -81,79 +80,6 @@ public enum Type {
     EXTERNAL
   }
 
-  /**
-   * Google BigQuery Table's Streaming Buffer information. This class contains information on a
-   * table's streaming buffer as the estimated size in number of rows/bytes.
-   */
-  public static class StreamingBuffer implements Serializable {
-
-    private static final long serialVersionUID = -6713971364725267597L;
-    private final long estimatedRows;
-    private final long estimatedBytes;
-    private final long oldestEntryTime;
-
-    StreamingBuffer(long estimatedRows, long estimatedBytes, long oldestEntryTime) {
-      this.estimatedRows = estimatedRows;
-      this.estimatedBytes = estimatedBytes;
-      this.oldestEntryTime = oldestEntryTime;
-    }
-
-    /**
-     * Returns a lower-bound estimate of the number of rows currently in the streaming buffer.
-     */
-    public long estimatedRows() {
-      return estimatedRows;
-    }
-
-    /**
-     * Returns a lower-bound estimate of the number of bytes currently in the streaming buffer.
-     */
-    public long estimatedBytes() {
-      return estimatedBytes;
-    }
-
-    /**
-     * Returns the timestamp of the oldest entry in the streaming buffer, in milliseconds since
-     * epoch.
-     */
-    public long oldestEntryTime() {
-      return oldestEntryTime;
-    }
-
-    @Override
-    public String toString() {
-      return MoreObjects.toStringHelper(this)
-          .add("estimatedRows", estimatedRows)
-          .add("estimatedBytes", estimatedBytes)
-          .add("oldestEntryTime", oldestEntryTime)
-          .toString();
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(estimatedRows, estimatedBytes, oldestEntryTime);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      return obj instanceof StreamingBuffer
-          && Objects.equals(toPb(), ((StreamingBuffer) obj).toPb());
-    }
-
-    Streamingbuffer toPb() {
-      return new Streamingbuffer()
-          .setEstimatedBytes(BigInteger.valueOf(estimatedBytes))
-          .setEstimatedRows(BigInteger.valueOf(estimatedRows))
-          .setOldestEntryTime(BigInteger.valueOf(oldestEntryTime));
-    }
-
-    static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
-      return new StreamingBuffer(streamingBufferPb.getEstimatedRows().longValue(),
-          streamingBufferPb.getEstimatedBytes().longValue(),
-          streamingBufferPb.getOldestEntryTime().longValue());
-    }
-  }
-
   private final String etag;
   private final String id;
   private final String selfLink;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
index 4bdd1e4159db..177f8a7db2b8 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
@@ -26,27 +26,24 @@
  * reside outside of BigQuery but can be queried as normal BigQuery tables. External tables are
  * experimental and might be subject to change or removed.
  *
- * @see Federated Data
- *     Sources
+ * @see Federated Data Sources
+ *     
  */
 public class ExternalTableInfo extends BaseTableInfo {
 
   private static final long serialVersionUID = -5893406738246214865L;
 
   private final ExternalDataConfiguration configuration;
-  private final StreamingBuffer streamingBuffer;
 
   public static final class Builder extends BaseTableInfo.Builder {
 
     private ExternalDataConfiguration configuration;
-    private StreamingBuffer streamingBuffer;
 
     private Builder() {}
 
     private Builder(ExternalTableInfo tableInfo) {
       super(tableInfo);
       this.configuration = tableInfo.configuration;
-      this.streamingBuffer = tableInfo.streamingBuffer;
     }
 
     protected Builder(Table tablePb) {
@@ -55,9 +52,6 @@ protected Builder(Table tablePb) {
         this.configuration =
             ExternalDataConfiguration.fromPb(tablePb.getExternalDataConfiguration());
       }
-      if (tablePb.getStreamingBuffer() != null) {
-        this.streamingBuffer = StreamingBuffer.fromPb(tablePb.getStreamingBuffer());
-      }
     }
 
     /**
@@ -71,11 +65,6 @@ public Builder configuration(ExternalDataConfiguration configuration) {
       return self();
     }
 
-    Builder streamingBuffer(StreamingBuffer streamingBuffer) {
-      this.streamingBuffer = streamingBuffer;
-      return self();
-    }
-
     /**
      * Creates a {@code ExternalTableInfo} object.
      */
@@ -88,28 +77,19 @@ public ExternalTableInfo build() {
   private ExternalTableInfo(Builder builder) {
     super(builder);
     this.configuration = builder.configuration;
-    this.streamingBuffer = builder.streamingBuffer;
   }
 
   /**
    * Returns the data format, location and other properties of a table stored outside of BigQuery.
    * This property is experimental and might be subject to change or removed.
    *
-   * @see Federated Data
-   *     Sources
+   * @see Federated Data Sources
+   *     
    */
   public ExternalDataConfiguration configuration() {
     return configuration;
   }
 
-  /**
-   * Returns information on the table's streaming buffer if any exists. Returns {@code null} if no
-   * streaming buffer exists.
-   */
-  public StreamingBuffer streamingBuffer() {
-    return streamingBuffer;
-  }
-
   /**
    * Returns a builder for the {@code ExternalTableInfo} object.
    */
@@ -120,18 +100,13 @@ public Builder toBuilder() {
 
   @Override
   ToStringHelper toStringHelper() {
-    return super.toStringHelper()
-        .add("configuration", configuration)
-        .add("streamingBuffer", streamingBuffer);
+    return super.toStringHelper().add("configuration", configuration);
   }
 
   @Override
   Table toPb() {
     Table tablePb = super.toPb();
     tablePb.setExternalDataConfiguration(configuration.toPb());
-    if (streamingBuffer != null) {
-      tablePb.setStreamingBuffer(streamingBuffer.toPb());
-    }
     return tablePb;
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
index 5ef68d7b9e15..0c0cf3de761d 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
@@ -28,7 +28,7 @@
  * return results if the query completes within a specified timeout. The query results are saved to
  * a temporary table that is deleted approximately 24 hours after the query is run. The query is run
  * through a BigQuery Job whose identity can be accessed via {@link QueryResponse#jobId()}. If the
- * query does not complete within the provided {@link Builder#maxWaitTime(Long)} the response
+ * query does not complete within the provided {@link Builder#maxWaitTime(Long)}, the response
  * returned by {@link BigQuery#query(QueryRequest)} will have {@link QueryResponse#jobComplete()}
  * set to {@code false} and {@link QueryResponse#result()} set to {@code null}. To obtain query
  * results you can use {@link BigQuery#getQueryResults(JobId, BigQuery.QueryResultsOption...)} until
@@ -36,6 +36,7 @@
  *
  * 
Example usage of a query request:
  * 
    {@code
+ *    // Substitute "field", "table" and "dataset" with real field, table and dataset identifiers
  *    QueryRequest request = QueryRequest.builder("SELECT field FROM table")
  *      .defaultDataset(DatasetId.of("dataset"))
  *      .maxWaitTime(60000L)
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index 74dc487825c6..7b47f4df8f19 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -16,9 +16,15 @@
 
 package com.google.gcloud.bigquery;
 
+import com.google.api.services.bigquery.model.Streamingbuffer;
 import com.google.api.services.bigquery.model.Table;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Objects;
+
 /**
  * A Google BigQuery Table information. A BigQuery table is a standard, two-dimensional table with
  * individual records organized in rows, and a data type assigned to each column (also called a
@@ -34,6 +40,79 @@ public class TableInfo extends BaseTableInfo {
   private final String location;
   private final StreamingBuffer streamingBuffer;
 
+  /**
+   * Google BigQuery Table's Streaming Buffer information. This class contains information on a
+   * table's streaming buffer as the estimated size in number of rows/bytes.
+   */
+  public static class StreamingBuffer implements Serializable {
+
+    private static final long serialVersionUID = -6713971364725267597L;
+    private final long estimatedRows;
+    private final long estimatedBytes;
+    private final long oldestEntryTime;
+
+    StreamingBuffer(long estimatedRows, long estimatedBytes, long oldestEntryTime) {
+      this.estimatedRows = estimatedRows;
+      this.estimatedBytes = estimatedBytes;
+      this.oldestEntryTime = oldestEntryTime;
+    }
+
+    /**
+     * Returns a lower-bound estimate of the number of rows currently in the streaming buffer.
+     */
+    public long estimatedRows() {
+      return estimatedRows;
+    }
+
+    /**
+     * Returns a lower-bound estimate of the number of bytes currently in the streaming buffer.
+     */
+    public long estimatedBytes() {
+      return estimatedBytes;
+    }
+
+    /**
+     * Returns the timestamp of the oldest entry in the streaming buffer, in milliseconds since
+     * epoch.
+     */
+    public long oldestEntryTime() {
+      return oldestEntryTime;
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("estimatedRows", estimatedRows)
+          .add("estimatedBytes", estimatedBytes)
+          .add("oldestEntryTime", oldestEntryTime)
+          .toString();
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(estimatedRows, estimatedBytes, oldestEntryTime);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj instanceof StreamingBuffer
+          && Objects.equals(toPb(), ((StreamingBuffer) obj).toPb());
+    }
+
+    Streamingbuffer toPb() {
+      return new Streamingbuffer()
+          .setEstimatedBytes(BigInteger.valueOf(estimatedBytes))
+          .setEstimatedRows(BigInteger.valueOf(estimatedRows))
+          .setOldestEntryTime(BigInteger.valueOf(oldestEntryTime));
+    }
+
+    static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
+      return new StreamingBuffer(streamingBufferPb.getEstimatedRows().longValue(),
+          streamingBufferPb.getEstimatedBytes().longValue(),
+          streamingBufferPb.getOldestEntryTime().longValue());
+    }
+  }
+
   public static final class Builder extends BaseTableInfo.Builder {
 
     private String location;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
index ffaa787fb1d8..74d1c038a6bc 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -122,8 +122,8 @@ public Tuple> listDatasets(Map options)
           .execute();
       Iterable datasets = datasetsList.getDatasets();
       return Tuple.of(datasetsList.getNextPageToken(),
-          Iterables.transform(datasets != null ? datasets :
-              ImmutableList.of(),
+          Iterables.transform(datasets != null ? datasets
+              : ImmutableList.of(),
               new Function() {
                 @Override
                 public Dataset apply(DatasetList.Datasets datasetPb) {
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java
index d337f5a67849..225fc284b203 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/OptionTest.java
@@ -31,7 +31,7 @@ public void testOption() {
     assertEquals("token", option.value());
   }
 
-  @Test(expected=NullPointerException.class)
+  @Test(expected = NullPointerException.class)
   public void testNullRpcOption() {
     new Option(null, "token");
   }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResultTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResultTest.java
index db2432753b52..b6810ed93143 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResultTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResultTest.java
@@ -16,14 +16,14 @@
 
 package com.google.gcloud.bigquery;
 
+import static org.junit.Assert.assertEquals;
+
 import com.google.common.collect.ImmutableList;
 
 import org.junit.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-
 public class QueryResultTest {
 
   private static final String CURSOR = "cursor";
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 3766ef493064..bbd244367a20 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -23,6 +23,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.RetryParams;
+import com.google.gcloud.bigquery.TableInfo.StreamingBuffer;
 
 import org.junit.Test;
 
@@ -94,8 +95,7 @@ public class SerializationTest {
           .description("FieldDescription3")
           .build();
   private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
-  private static final BaseTableInfo.StreamingBuffer STREAMING_BUFFER =
-      new BaseTableInfo.StreamingBuffer(1L, 2L, 3L);
+  private static final StreamingBuffer STREAMING_BUFFER = new StreamingBuffer(1L, 2L, 3L);
   private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
   private static final ExternalDataConfiguration EXTERNAL_DATA_CONFIGURATION =
       ExternalDataConfiguration.builder(SOURCE_URIS, TABLE_SCHEMA, CSV_OPTIONS)
@@ -128,7 +128,6 @@ public class SerializationTest {
           .description(DESCRIPTION)
           .etag(ETAG)
           .id(ID)
-          .streamingBuffer(STREAMING_BUFFER)
           .build();
   private static final JobStatistics JOB_STATISTICS = JobStatistics.builder()
           .creationTime(1L)
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
index e32ee2516b6b..c636a31ad1ff 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
-import com.google.gcloud.bigquery.BaseTableInfo.StreamingBuffer;
+import com.google.gcloud.bigquery.TableInfo.StreamingBuffer;
 
 import org.junit.Test;
 
@@ -46,7 +46,6 @@ public class TableInfoTest {
   private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
   private static final String VIEW_QUERY = "VIEW QUERY";
   private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
-  private static final String SOURCE_FORMAT = "CSV";
   private static final Integer MAX_BAD_RECORDS = 42;
   private static final Boolean IGNORE_UNKNOWN_VALUES = true;
   private static final String COMPRESSION = "GZIP";
@@ -96,7 +95,6 @@ public class TableInfoTest {
           .numBytes(NUM_BYTES)
           .numRows(NUM_ROWS)
           .selfLink(SELF_LINK)
-          .streamingBuffer(STREAMING_BUFFER)
           .build();
   private static final List USER_DEFINED_FUNCTIONS =
       ImmutableList.of(UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
@@ -184,7 +182,6 @@ public void testBuilder() {
     assertEquals(NUM_BYTES, EXTERNAL_TABLE_INFO.numBytes());
     assertEquals(NUM_ROWS, EXTERNAL_TABLE_INFO.numRows());
     assertEquals(SELF_LINK, EXTERNAL_TABLE_INFO.selfLink());
-    assertEquals(STREAMING_BUFFER, EXTERNAL_TABLE_INFO.streamingBuffer());
     assertEquals(BaseTableInfo.Type.EXTERNAL, EXTERNAL_TABLE_INFO.type());
   }
 
@@ -235,6 +232,5 @@ private void compareExternalTableInfo(ExternalTableInfo expected, ExternalTableI
     compareBaseTableInfo(expected, value);
     assertEquals(expected, value);
     assertEquals(expected.configuration(), value.configuration());
-    assertEquals(expected.streamingBuffer(), value.streamingBuffer());
   }
 }

From a08e7bb7e091e8871097925bb54cde57082768b0 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 18 Dec 2015 10:00:32 +0100
Subject: [PATCH 179/322] Change poms and code to match with master udpates

---
 gcloud-java-bigquery/pom.xml                               | 2 +-
 .../java/com/google/gcloud/bigquery/BigQueryImplTest.java  | 7 +++----
 .../java/com/google/gcloud/bigquery/SerializationTest.java | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/gcloud-java-bigquery/pom.xml b/gcloud-java-bigquery/pom.xml
index f4d459ab82f7..7b749097869f 100644
--- a/gcloud-java-bigquery/pom.xml
+++ b/gcloud-java-bigquery/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.0.11-SNAPSHOT
+    0.1.1-SNAPSHOT
   
   
     gcloud-java-bigquery
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index c9c46e0a632d..85c67b36b1c4 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -260,7 +260,6 @@ public void setUp() {
     EasyMock.replay(rpcFactoryMock);
     options = BigQueryOptions.builder()
         .projectId(PROJECT)
-        .authCredentials(AuthCredentials.noCredentials())
         .serviceRpcFactory(rpcFactoryMock)
         .build();
   }
@@ -1011,7 +1010,7 @@ public void testRetryableException() {
         .andThrow(new BigQueryException(500, "InternalError", true))
         .andReturn(DATASET_INFO_WITH_PROJECT.toPb());
     EasyMock.replay(bigqueryRpcMock);
-    bigquery = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
+    bigquery = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
     DatasetInfo dataset = bigquery.getDataset(DATASET);
     assertEquals(DATASET_INFO_WITH_PROJECT, dataset);
   }
@@ -1022,7 +1021,7 @@ public void testNonRetryableException() {
     EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
         .andThrow(new BigQueryException(501, exceptionMessage, false));
     EasyMock.replay(bigqueryRpcMock);
-    bigquery = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
+    bigquery = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
     thrown.expect(BigQueryException.class);
     thrown.expectMessage(exceptionMessage);
     bigquery.getDataset(DatasetId.of(DATASET));
@@ -1034,7 +1033,7 @@ public void testRuntimeException() {
     EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
         .andThrow(new RuntimeException(exceptionMessage));
     EasyMock.replay(bigqueryRpcMock);
-    bigquery = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
+    bigquery = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
     thrown.expect(BigQueryException.class);
     thrown.expectMessage(exceptionMessage);
     bigquery.getDataset(DATASET);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index bbd244367a20..8c80bddbfefb 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -218,8 +218,8 @@ public void testServiceOptions() throws Exception {
 
     options = options.toBuilder()
         .projectId("p2")
-        .retryParams(RetryParams.getDefaultInstance())
-        .authCredentials(AuthCredentials.noCredentials())
+        .retryParams(RetryParams.defaultInstance())
+        .authCredentials(null)
         .build();
     serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);

From 6bc4f2c26bfd873864ac5fc436e8152cd304595f Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 18 Dec 2015 21:57:02 +0100
Subject: [PATCH 180/322] Add integration test - Add RemoteBigQueryHelper to
 help writing tests against BigQuery (with docs and tests) - Add integration
 tests (ITBigQueryTest - Add gcloud-java-storage as a test dependency - Update
 bigquery dependency

---
 gcloud-java-bigquery/pom.xml                  |   8 +-
 .../testing/RemoteBigQueryHelper.java         | 156 ++++
 .../gcloud/bigquery/testing/package-info.java |  37 +
 .../gcloud/bigquery/ITBigQueryTest.java       | 782 ++++++++++++++++++
 .../bigquery/RemoteBigQueryHelperTest.java    | 111 +++
 5 files changed, 1093 insertions(+), 1 deletion(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/package-info.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/RemoteBigQueryHelperTest.java

diff --git a/gcloud-java-bigquery/pom.xml b/gcloud-java-bigquery/pom.xml
index 7b749097869f..2f22fad6fea8 100644
--- a/gcloud-java-bigquery/pom.xml
+++ b/gcloud-java-bigquery/pom.xml
@@ -22,10 +22,16 @@
       gcloud-java-core
       ${project.version}
     
+    
+      ${project.groupId}
+      gcloud-java-storage
+      ${project.version}
+      test
+    
     
       com.google.apis
       google-api-services-bigquery
-      v2-rev244-1.20.0
+      v2-rev254-1.21.0
       compile
       
 	
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java
new file mode 100644
index 000000000000..fa3016e739d0
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery.testing;
+
+import com.google.gcloud.AuthCredentials;
+import com.google.gcloud.RetryParams;
+import com.google.gcloud.bigquery.BigQuery;
+import com.google.gcloud.bigquery.BigQueryException;
+import com.google.gcloud.bigquery.BigQueryOptions;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility to create a remote BigQuery configuration for testing.
+ */
+public class RemoteBigQueryHelper {
+
+  private static final Logger log = Logger.getLogger(RemoteBigQueryHelper.class.getName());
+  private static final String DATASET_NAME_PREFIX = "gcloud_test_dataset_temp_";
+  private final BigQueryOptions options;
+
+  private RemoteBigQueryHelper(BigQueryOptions options) {
+    this.options = options;
+  }
+
+  /**
+   * Returns a {@link BigQueryOptions} object to be used for testing.
+   */
+  public BigQueryOptions options() {
+    return options;
+  }
+
+  /**
+   * Deletes a dataset, even if non-empty.
+   *
+   * @param bigquery the BigQuery service to be used to issue the delete request
+   * @param dataset the dataset to be deleted
+   * @return {@code true} if deletion succeeded, {@code false} if the dataset was not found.
+   * @throws BigQueryException upon failure
+   */
+  public static boolean forceDelete(BigQuery bigquery, String dataset) {
+    return bigquery.delete(dataset, BigQuery.DatasetDeleteOption.deleteContents());
+  }
+
+  /**
+   * Returns a dataset name generated using a random UUID.
+   */
+  public static String generateDatasetName() {
+    return DATASET_NAME_PREFIX + UUID.randomUUID().toString().replace('-', '_');
+  }
+
+  /**
+   * Creates a {@code RemoteBigQueryHelper} object for the given project id and JSON key input
+   * stream.
+   *
+   * @param projectId id of the project to be used for running the tests
+   * @param keyStream input stream for a JSON key
+   * @return A {@code RemoteBigQueryHelper} object for the provided options.
+   * @throws BigQueryHelperException if {@code keyStream} is not a valid JSON key stream
+   */
+  public static RemoteBigQueryHelper create(String projectId, InputStream keyStream)
+      throws BigQueryHelperException {
+    try {
+      BigQueryOptions bigqueryOptions = BigQueryOptions.builder()
+          .authCredentials(AuthCredentials.createForJson(keyStream))
+          .projectId(projectId)
+          .retryParams(retryParams())
+          .connectTimeout(60000)
+          .readTimeout(60000)
+          .build();
+      return new RemoteBigQueryHelper(bigqueryOptions);
+    } catch (IOException ex) {
+      if (log.isLoggable(Level.WARNING)) {
+        log.log(Level.WARNING, ex.getMessage());
+      }
+      throw BigQueryHelperException.translate(ex);
+    }
+  }
+
+  /**
+   * Creates a {@code RemoteBigQueryHelper} object for the given project id and JSON key path.
+   *
+   * @param projectId id of the project to be used for running the tests
+   * @param keyPath path to the JSON key to be used for running the tests
+   * @return A {@code RemoteBigQueryHelper} object for the provided options.
+   * @throws BigQueryHelperException if the file pointed by {@code keyPath} does not exist
+   */
+  public static RemoteBigQueryHelper create(String projectId, String keyPath)
+      throws BigQueryHelperException {
+    try {
+      InputStream keyFileStream = new FileInputStream(keyPath);
+      return create(projectId, keyFileStream);
+    } catch (FileNotFoundException ex) {
+      if (log.isLoggable(Level.WARNING)) {
+        log.log(Level.WARNING, ex.getMessage());
+      }
+      throw BigQueryHelperException.translate(ex);
+    }
+  }
+
+  /**
+   * Creates a {@code RemoteBigQueryHelper} object using default project id and authentication
+   * credentials.
+   */
+  public static RemoteBigQueryHelper create() {
+    BigQueryOptions bigqueryOptions = BigQueryOptions.builder()
+        .retryParams(retryParams())
+        .connectTimeout(60000)
+        .readTimeout(60000)
+        .build();
+    return new RemoteBigQueryHelper(bigqueryOptions);
+  }
+
+  private static RetryParams retryParams() {
+    return RetryParams.builder()
+        .retryMaxAttempts(10)
+        .retryMinAttempts(6)
+        .maxRetryDelayMillis(30000)
+        .totalRetryPeriodMillis(120000)
+        .initialRetryDelayMillis(250)
+        .build();
+  }
+
+  public static class BigQueryHelperException extends RuntimeException {
+
+    private static final long serialVersionUID = 3984993496060055562L;
+
+    public BigQueryHelperException(String message, Throwable cause) {
+      super(message, cause);
+    }
+
+    public static BigQueryHelperException translate(Exception ex) {
+      return new BigQueryHelperException(ex.getMessage(), ex);
+    }
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/package-info.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/package-info.java
new file mode 100644
index 000000000000..0ba7d461b682
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/package-info.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 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.
+ */
+
+/**
+ * A testing helper for Google BigQuery.
+ *
+ * 
A simple usage example:
+ * 
Before the test:
+ * 
 {@code
+ * RemoteBigQueryHelper bigqueryHelper = RemoteBigQueryHelper.create();
+ * BigQuery bigquery = bigqueryHelper.options().service();
+ * String dataset = RemoteBigQueryHelper.generateDatasetName();
+ * bigquery.create(DatasetInfo.builder(dataset).build());
+ * } 

+ *
+ * 
After the test:
+ * 
 {@code
+ * RemoteBigQueryHelper.forceDelete(bigquery, DATASET);
+ * }

+ *
+ * @see 
+ *     gcloud-java tools for testing
+ */
+package com.google.gcloud.bigquery.testing;
\ No newline at end of file
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
new file mode 100644
index 000000000000..0640839124be
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -0,0 +1,782 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.Page;
+import com.google.gcloud.bigquery.BigQuery.DatasetOption;
+import com.google.gcloud.bigquery.BigQuery.JobListOption;
+import com.google.gcloud.bigquery.BigQuery.JobOption;
+import com.google.gcloud.bigquery.BigQuery.TableOption;
+import com.google.gcloud.bigquery.testing.RemoteBigQueryHelper;
+import com.google.gcloud.storage.BlobInfo;
+import com.google.gcloud.storage.BucketInfo;
+import com.google.gcloud.storage.Storage;
+import com.google.gcloud.storage.testing.RemoteGcsHelper;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class ITBigQueryTest {
+
+  private static final Logger log = Logger.getLogger(ITBigQueryTest.class.getName());
+  private static final String DATASET = RemoteBigQueryHelper.generateDatasetName();
+  private static final String DESCRIPTION = "Test dataset";
+  private static final String OTHER_DATASET = RemoteBigQueryHelper.generateDatasetName();
+  private static final Field TIMESTAMP_FIELD_SCHEMA =
+      Field.builder("TimestampField", Field.Type.timestamp())
+          .mode(Field.Mode.NULLABLE)
+          .description("TimestampDescription")
+          .build();
+  private static final Field STRING_FIELD_SCHEMA =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
+          .description("StringDescription")
+          .build();
+  private static final Field INTEGER_FIELD_SCHEMA =
+      Field.builder("IntegerField", Field.Type.integer())
+          .mode(Field.Mode.REPEATED)
+          .description("IntegerDescription")
+          .build();
+  private static final Field BOOLEAN_FIELD_SCHEMA =
+      Field.builder("BooleanField", Field.Type.bool())
+          .mode(Field.Mode.NULLABLE)
+          .description("BooleanDescription")
+          .build();
+  private static final Field RECORD_FIELD_SCHEMA =
+      Field.builder("RecordField", Field.Type.record(TIMESTAMP_FIELD_SCHEMA,
+          STRING_FIELD_SCHEMA, INTEGER_FIELD_SCHEMA, BOOLEAN_FIELD_SCHEMA))
+          .mode(Field.Mode.REQUIRED)
+          .description("RecordDescription")
+          .build();
+  private static final Schema TABLE_SCHEMA = Schema.of(TIMESTAMP_FIELD_SCHEMA, STRING_FIELD_SCHEMA,
+      INTEGER_FIELD_SCHEMA, BOOLEAN_FIELD_SCHEMA, RECORD_FIELD_SCHEMA);
+  private static final Schema SIMPLE_SCHEMA = Schema.of(STRING_FIELD_SCHEMA);
+  private static final Schema QUERY_RESULT_SCHEMA = Schema.builder()
+      .addField(Field.builder("TimestampField", Field.Type.timestamp())
+          .mode(Field.Mode.NULLABLE)
+          .build())
+      .addField(Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
+          .build())
+      .addField(Field.builder("BooleanField", Field.Type.bool())
+          .mode(Field.Mode.NULLABLE)
+          .build())
+      .build();
+  private static final String LOAD_FILE = "load.csv";
+  private static final String JSON_LOAD_FILE = "load.json";
+  private static final String EXTRACT_FILE = "extract.csv";
+  private static final String BUCKET = RemoteGcsHelper.generateBucketName();
+  private static final TableId TABLE_ID = TableId.of(DATASET, "testing_table");
+  private static final String CSV_CONTENT = "StringValue1\nStringValue2\n";
+  private static final String JSON_CONTENT = "{"
+      + "\"TimestampField\": \"2014-08-19 07:41:35.220 -05:00\","
+      + "\"StringField\": \"stringValue\","
+      + "\"IntegerField\": [\"0\", \"1\"],"
+      + "\"BooleanField\": \"false\","
+      + "\"RecordField\": {"
+      + "\"TimestampField\": \"1969-07-20 20:18:04 UTC\","
+      + "\"StringField\": null,"
+      + "\"IntegerField\": [\"1\",\"0\"],"
+      + "\"BooleanField\": \"true\""
+      + "}"
+      + "}\n"
+      + "{"
+      + "\"TimestampField\": \"2014-08-19 07:41:35.220 -05:00\","
+      + "\"StringField\": \"stringValue\","
+      + "\"IntegerField\": [\"0\", \"1\"],"
+      + "\"BooleanField\": \"false\","
+      + "\"RecordField\": {"
+      + "\"TimestampField\": \"1969-07-20 20:18:04 UTC\","
+      + "\"StringField\": null,"
+      + "\"IntegerField\": [\"1\",\"0\"],"
+      + "\"BooleanField\": \"true\""
+      + "}"
+      + "}";
+
+  private static BigQuery bigquery;
+  private static Storage storage;
+
+  @BeforeClass
+  public static void beforeClass() throws IOException, InterruptedException {
+    RemoteBigQueryHelper bigqueryHelper = RemoteBigQueryHelper.create();
+    RemoteGcsHelper gcsHelper = RemoteGcsHelper.create();
+    bigquery = bigqueryHelper.options().service();
+    storage = gcsHelper.options().service();
+    storage.create(BucketInfo.of(BUCKET));
+    storage.create(BlobInfo.builder(BUCKET, LOAD_FILE).contentType("text/plain").build(),
+        CSV_CONTENT.getBytes(StandardCharsets.UTF_8));
+    storage.create(BlobInfo.builder(BUCKET, JSON_LOAD_FILE).contentType("application/json").build(),
+        JSON_CONTENT.getBytes(StandardCharsets.UTF_8));
+    DatasetInfo info = DatasetInfo.builder(DATASET).description(DESCRIPTION).build();
+    bigquery.create(info);
+    JobInfo job = LoadJobInfo.builder(TABLE_ID, "gs://" + BUCKET + "/" + JSON_LOAD_FILE)
+        .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
+        .schema(TABLE_SCHEMA)
+        .formatOptions(FormatOptions.json())
+        .build();
+    job = bigquery.create(job);
+    while (job.status().state() != JobStatus.State.DONE) {
+      Thread.sleep(1000);
+      job = bigquery.getJob(job.jobId());
+    }
+    assertNull(job.status().error());
+  }
+
+  @AfterClass
+  public static void afterClass() throws ExecutionException, InterruptedException {
+    if (bigquery != null) {
+      RemoteBigQueryHelper.forceDelete(bigquery, DATASET);
+    }
+    if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 10, TimeUnit.SECONDS)) {
+      if (log.isLoggable(Level.WARNING)) {
+        log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);
+      }
+    }
+  }
+
+  @Test
+  public void testGetDataset() {
+    DatasetInfo dataset = bigquery.getDataset(DATASET);
+    assertEquals(bigquery.options().projectId(), dataset.datasetId().project());
+    assertEquals(DATASET, dataset.datasetId().dataset());
+    assertEquals(DESCRIPTION, dataset.description());
+    assertNotNull(dataset.acl());
+    assertNotNull(dataset.etag());
+    assertNotNull(dataset.id());
+    assertNotNull(dataset.lastModified());
+    assertNotNull(dataset.selfLink());
+  }
+
+  @Test
+  public void testGetDatasetWithSelectedFields() {
+    DatasetInfo dataset = bigquery.getDataset(DATASET,
+        DatasetOption.fields(BigQuery.DatasetField.CREATION_TIME));
+    assertEquals(bigquery.options().projectId(), dataset.datasetId().project());
+    assertEquals(DATASET, dataset.datasetId().dataset());
+    assertNotNull(dataset.creationTime());
+    assertNull(dataset.description());
+    assertNull(dataset.defaultTableLifetime());
+    assertNull(dataset.acl());
+    assertNull(dataset.etag());
+    assertNull(dataset.friendlyName());
+    assertNull(dataset.id());
+    assertNull(dataset.lastModified());
+    assertNull(dataset.location());
+    assertNull(dataset.selfLink());
+  }
+
+  @Test
+  public void testUpdateDataset() {
+    DatasetInfo dataset = bigquery.create(DatasetInfo.builder(OTHER_DATASET)
+        .description("Some Description")
+        .build());
+    assertNotNull(dataset);
+    assertEquals(bigquery.options().projectId(), dataset.datasetId().project());
+    assertEquals(OTHER_DATASET, dataset.datasetId().dataset());
+    assertEquals("Some Description", dataset.description());
+    DatasetInfo updatedDataset =
+        bigquery.update(dataset.toBuilder().description("Updated Description").build());
+    assertEquals("Updated Description", updatedDataset.description());
+    assertTrue(bigquery.delete(OTHER_DATASET));
+  }
+
+  @Test
+  public void testUpdateDatasetWithSelectedFields() {
+    DatasetInfo dataset = bigquery.create(DatasetInfo.builder(OTHER_DATASET)
+        .description("Some Description")
+        .build());
+    assertNotNull(dataset);
+    assertEquals(bigquery.options().projectId(), dataset.datasetId().project());
+    assertEquals(OTHER_DATASET, dataset.datasetId().dataset());
+    assertEquals("Some Description", dataset.description());
+    DatasetInfo updatedDataset =
+        bigquery.update(dataset.toBuilder().description("Updated Description").build(),
+            DatasetOption.fields(BigQuery.DatasetField.DESCRIPTION));
+    assertEquals("Updated Description", updatedDataset.description());
+    assertNull(updatedDataset.creationTime());
+    assertNull(updatedDataset.defaultTableLifetime());
+    assertNull(updatedDataset.acl());
+    assertNull(updatedDataset.etag());
+    assertNull(updatedDataset.friendlyName());
+    assertNull(updatedDataset.id());
+    assertNull(updatedDataset.lastModified());
+    assertNull(updatedDataset.location());
+    assertNull(updatedDataset.selfLink());
+    assertTrue(bigquery.delete(OTHER_DATASET));
+  }
+
+  @Test
+  public void testCreateAndGetTable() {
+    String tableName = "test_create_and_get_table";
+    TableId tableId = TableId.of(DATASET, tableName);
+    BaseTableInfo createdTableInfo = bigquery.create(TableInfo.of(tableId, TABLE_SCHEMA));
+    assertNotNull(createdTableInfo);
+    assertEquals(DATASET, createdTableInfo.tableId().dataset());
+    assertEquals(tableName, createdTableInfo.tableId().table());
+    BaseTableInfo remoteTableInfo = bigquery.getTable(DATASET, tableName);
+    assertNotNull(remoteTableInfo);
+    assertTrue(remoteTableInfo instanceof TableInfo);
+    assertEquals(createdTableInfo.tableId(), remoteTableInfo.tableId());
+    assertEquals(BaseTableInfo.Type.TABLE, remoteTableInfo.type());
+    assertEquals(TABLE_SCHEMA, remoteTableInfo.schema());
+    assertNotNull(remoteTableInfo.creationTime());
+    assertNotNull(remoteTableInfo.lastModifiedTime());
+    assertNotNull(remoteTableInfo.numBytes());
+    assertNotNull(remoteTableInfo.numRows());
+    assertTrue(bigquery.delete(DATASET, tableName));
+  }
+
+  @Test
+  public void testCreateAndGetTableWithSelectedField() {
+    String tableName = "test_create_and_get_selected_fields_table";
+    TableId tableId = TableId.of(DATASET, tableName);
+    BaseTableInfo createdTableInfo = bigquery.create(TableInfo.of(tableId, TABLE_SCHEMA));
+    assertNotNull(createdTableInfo);
+    assertEquals(DATASET, createdTableInfo.tableId().dataset());
+    assertEquals(tableName, createdTableInfo.tableId().table());
+    BaseTableInfo remoteTableInfo = bigquery.getTable(DATASET, tableName,
+        TableOption.fields(BigQuery.TableField.CREATION_TIME));
+    assertNotNull(remoteTableInfo);
+    assertTrue(remoteTableInfo instanceof TableInfo);
+    assertEquals(createdTableInfo.tableId(), remoteTableInfo.tableId());
+    assertEquals(BaseTableInfo.Type.TABLE, remoteTableInfo.type());
+    assertNotNull(remoteTableInfo.creationTime());
+    assertNull(remoteTableInfo.schema());
+    assertNull(remoteTableInfo.lastModifiedTime());
+    assertNull(remoteTableInfo.numBytes());
+    assertNull(remoteTableInfo.numRows());
+    assertTrue(bigquery.delete(DATASET, tableName));
+  }
+
+  @Test
+  public void testCreateExternalTable() throws InterruptedException {
+    String tableName = "test_create_external_table";
+    TableId tableId = TableId.of(DATASET, tableName);
+    ExternalDataConfiguration externalDataConfiguration = ExternalDataConfiguration.of(
+        "gs://" + BUCKET + "/" + JSON_LOAD_FILE, TABLE_SCHEMA, FormatOptions.json());
+    BaseTableInfo tableInfo = ExternalTableInfo.of(tableId, externalDataConfiguration);
+    BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
+    assertNotNull(createdTableInfo);
+    assertEquals(DATASET, createdTableInfo.tableId().dataset());
+    assertEquals(tableName, createdTableInfo.tableId().table());
+    BaseTableInfo remoteTableInfo = bigquery.getTable(DATASET, tableName);
+    assertNotNull(remoteTableInfo);
+    assertTrue(remoteTableInfo instanceof ExternalTableInfo);
+    assertEquals(createdTableInfo.tableId(), remoteTableInfo.tableId());
+    assertEquals(TABLE_SCHEMA, remoteTableInfo.schema());
+    QueryRequest request = QueryRequest.builder(
+        "SELECT TimestampField, StringField, IntegerField, BooleanField FROM " + DATASET + "." +
+            tableName)
+        .defaultDataset(DatasetId.of(DATASET))
+        .maxWaitTime(60000L)
+        .maxResults(1000L)
+        .build();
+    QueryResponse response = bigquery.query(request);
+    while (!response.jobComplete()) {
+      response = bigquery.getQueryResults(response.jobId());
+      Thread.sleep(1000);
+    }
+    long integerValue = 0;
+    int rowCount = 0;
+    for (List row : response.result().values()) {
+      FieldValue timestampCell = row.get(0);
+      FieldValue stringCell = row.get(1);
+      FieldValue integerCell = row.get(2);
+      FieldValue booleanCell = row.get(3);
+      assertEquals(FieldValue.Attribute.PRIMITIVE, timestampCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, stringCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, integerCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, booleanCell.attribute());
+      assertEquals(1408452095220000L, timestampCell.timestampValue());
+      assertEquals("stringValue", stringCell.stringValue());
+      assertEquals(integerValue, integerCell.longValue());
+      assertEquals(false, booleanCell.booleanValue());
+      integerValue = ~integerValue & 0x1;
+      rowCount++;
+    }
+    assertEquals(4, rowCount);
+    assertTrue(bigquery.delete(DATASET, tableName));
+  }
+
+  @Test
+  public void testCreateViewTable() throws InterruptedException {
+    String tableName = "test_create_view_table";
+    TableId tableId = TableId.of(DATASET, tableName);
+    BaseTableInfo tableInfo = ViewInfo.of(tableId,
+        "SELECT TimestampField, StringField, BooleanField FROM " + DATASET + "."
+            + TABLE_ID.table());
+    BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
+    assertNotNull(createdTableInfo);
+    assertEquals(DATASET, createdTableInfo.tableId().dataset());
+    assertEquals(tableName, createdTableInfo.tableId().table());
+    BaseTableInfo remoteTableInfo = bigquery.getTable(DATASET, tableName);
+    assertNotNull(remoteTableInfo);
+    assertEquals(createdTableInfo.tableId(), remoteTableInfo.tableId());
+    assertTrue(remoteTableInfo instanceof ViewInfo);
+    Schema expectedSchema = Schema.builder()
+        .addField(
+            Field.builder("TimestampField", Field.Type.timestamp())
+                .mode(Field.Mode.NULLABLE)
+                .build())
+        .addField(
+            Field.builder("StringField", Field.Type.string())
+                .mode(Field.Mode.NULLABLE)
+                .build())
+        .addField(
+            Field.builder("BooleanField", Field.Type.bool())
+                .mode(Field.Mode.NULLABLE)
+                .build())
+        .build();
+    assertEquals(expectedSchema, remoteTableInfo.schema());
+    QueryRequest request = QueryRequest.builder("SELECT * FROM " + tableName)
+        .defaultDataset(DatasetId.of(DATASET))
+        .maxWaitTime(60000L)
+        .maxResults(1000L)
+        .build();
+    QueryResponse response = bigquery.query(request);
+    while (!response.jobComplete()) {
+      response = bigquery.getQueryResults(response.jobId());
+      Thread.sleep(1000);
+    }
+    int rowCount = 0;
+    for (List row : response.result().values()) {
+      FieldValue timestampCell = row.get(0);
+      FieldValue stringCell = row.get(1);
+      FieldValue booleanCell = row.get(2);
+      assertEquals(FieldValue.Attribute.PRIMITIVE, timestampCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, stringCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, booleanCell.attribute());
+      assertEquals(1408452095220000L, timestampCell.timestampValue());
+      assertEquals("stringValue", stringCell.stringValue());
+      assertEquals(false, booleanCell.booleanValue());
+      rowCount++;
+    }
+    assertEquals(2, rowCount);
+    assertTrue(bigquery.delete(DATASET, tableName));
+  }
+
+  @Test
+  public void testListTables() {
+    String tableName = "test_list_tables";
+    BaseTableInfo tableInfo = TableInfo.of(TableId.of(DATASET, tableName), TABLE_SCHEMA);
+    BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
+    assertNotNull(createdTableInfo);
+    Page tables = bigquery.listTables(DATASET);
+    boolean found = false;
+    Iterator tableIterator = tables.values().iterator();
+    while (tableIterator.hasNext() && !found) {
+      if (tableIterator.next().tableId().equals(createdTableInfo.tableId())) {
+        found = true;
+      }
+    }
+    assertTrue(found);
+    assertTrue(bigquery.delete(DATASET, tableName));
+  }
+
+  @Test
+  public void testUdpateTable() {
+    String tableName = "test_update_table";
+    BaseTableInfo tableInfo = TableInfo.of(TableId.of(DATASET, tableName), TABLE_SCHEMA);
+    BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
+    assertNotNull(createdTableInfo);
+    BaseTableInfo updatedTableInfo = bigquery.update(tableInfo.toBuilder()
+        .description("newDescription").build());
+    assertEquals(DATASET, updatedTableInfo.tableId().dataset());
+    assertEquals(tableName, updatedTableInfo.tableId().table());
+    assertEquals(TABLE_SCHEMA, updatedTableInfo.schema());
+    assertEquals("newDescription", updatedTableInfo.description());
+    assertTrue(bigquery.delete(DATASET, tableName));
+  }
+
+  @Test
+  public void testUdpateTableWithSelectedFields() {
+    String tableName = "test_update_with_selected_fields_table";
+    BaseTableInfo tableInfo = TableInfo.of(TableId.of(DATASET, tableName), TABLE_SCHEMA);
+    BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
+    assertNotNull(createdTableInfo);
+    BaseTableInfo updatedTableInfo = bigquery.update(tableInfo.toBuilder().description("newDescr")
+        .build(), TableOption.fields(BigQuery.TableField.DESCRIPTION));
+    assertTrue(updatedTableInfo instanceof TableInfo);
+    assertEquals(DATASET, updatedTableInfo.tableId().dataset());
+    assertEquals(tableName, updatedTableInfo.tableId().table());
+    assertEquals("newDescr", updatedTableInfo.description());
+    assertNull(updatedTableInfo.schema());
+    assertNull(updatedTableInfo.lastModifiedTime());
+    assertNull(updatedTableInfo.numBytes());
+    assertNull(updatedTableInfo.numRows());
+    assertTrue(bigquery.delete(DATASET, tableName));
+  }
+
+  @Test
+  public void testInsertAll() {
+    String tableName = "test_insert_all_table";
+    BaseTableInfo tableInfo = TableInfo.of(TableId.of(DATASET, tableName), TABLE_SCHEMA);
+    assertNotNull(bigquery.create(tableInfo));
+    InsertAllRequest request = InsertAllRequest.builder(tableInfo.tableId())
+        .addRow(ImmutableMap.of(
+            "TimestampField", "2014-08-19 07:41:35.220 -05:00",
+            "StringField", "stringValue",
+            "IntegerField", ImmutableList.of(0, 1),
+            "BooleanField", false,
+            "RecordField", ImmutableMap.of(
+                "TimestampField", "1969-07-20 20:18:04 UTC",
+                "IntegerField", ImmutableList.of(1, 0),
+                "BooleanField", true)))
+        .addRow(ImmutableMap.of(
+            "TimestampField", "2014-08-19 07:41:35.220 -05:00",
+            "StringField", "stringValue",
+            "IntegerField", ImmutableList.of(0, 1),
+            "BooleanField", false,
+            "RecordField", ImmutableMap.of(
+                "TimestampField", "1969-07-20 20:18:04 UTC",
+                "IntegerField", ImmutableList.of(1, 0),
+                "BooleanField", true)))
+        .build();
+    InsertAllResponse response = bigquery.insertAll(request);
+    assertFalse(response.hasErrors());
+    assertEquals(0, response.insertErrors().size());
+    assertTrue(bigquery.delete(TableId.of(DATASET, tableName)));
+  }
+
+  @Test
+  public void testInsertAllWithErrors() {
+    String tableName = "test_insert_all_with_errors_table";
+    BaseTableInfo tableInfo = TableInfo.of(TableId.of(DATASET, tableName), TABLE_SCHEMA);
+    assertNotNull(bigquery.create(tableInfo));
+    InsertAllRequest request = InsertAllRequest.builder(tableInfo.tableId())
+        .addRow(ImmutableMap.of(
+            "TimestampField", "2014-08-19 07:41:35.220 -05:00",
+            "StringField", "stringValue",
+            "IntegerField", ImmutableList.of(0, 1),
+            "BooleanField", false,
+            "RecordField", ImmutableMap.of(
+                "TimestampField", "1969-07-20 20:18:04 UTC",
+                "IntegerField", ImmutableList.of(1, 0),
+                "BooleanField", true)))
+        .addRow(ImmutableMap.of(
+            "TimestampField", "invalidDate",
+            "StringField", "stringValue",
+            "IntegerField", ImmutableList.of(0, 1),
+            "BooleanField", false,
+            "RecordField", ImmutableMap.of(
+                "TimestampField", "1969-07-20 20:18:04 UTC",
+                "IntegerField", ImmutableList.of(1, 0),
+                "BooleanField", true)))
+        .addRow(ImmutableMap.of(
+            "TimestampField", "1969-07-20 20:18:04 UTC",
+            "StringField", "stringValue",
+            "IntegerField", ImmutableList.of(0, 1),
+            "BooleanField", false))
+        .skipInvalidRows(true)
+        .build();
+    InsertAllResponse response = bigquery.insertAll(request);
+    assertTrue(response.hasErrors());
+    assertEquals(2, response.insertErrors().size());
+    assertNotNull(response.errorsFor(1L));
+    assertNotNull(response.errorsFor(2L));
+    assertTrue(bigquery.delete(TableId.of(DATASET, tableName)));
+  }
+
+  @Test
+  public void testListAllTableData() {
+    Page> rows = bigquery.listTableData(TABLE_ID);
+    int rowCount = 0;
+    for (List row : rows.values()) {
+      FieldValue timestampCell = row.get(0);
+      FieldValue stringCell = row.get(1);
+      FieldValue integerCell = row.get(2);
+      FieldValue booleanCell = row.get(3);
+      FieldValue recordCell = row.get(4);
+      assertEquals(FieldValue.Attribute.PRIMITIVE, timestampCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, stringCell.attribute());
+      assertEquals(FieldValue.Attribute.REPEATED, integerCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, booleanCell.attribute());
+      assertEquals(FieldValue.Attribute.RECORD, recordCell.attribute());
+      assertEquals(1408452095220000L, timestampCell.timestampValue());
+      assertEquals("stringValue", stringCell.stringValue());
+      assertEquals(0, integerCell.repeatedValue().get(0).longValue());
+      assertEquals(1, integerCell.repeatedValue().get(1).longValue());
+      assertEquals(false, booleanCell.booleanValue());
+      assertEquals(-14182916000000L, recordCell.recordValue().get(0).timestampValue());
+      assertTrue(recordCell.recordValue().get(1).isNull());
+      assertEquals(1, recordCell.recordValue().get(2).repeatedValue().get(0).longValue());
+      assertEquals(0, recordCell.recordValue().get(2).repeatedValue().get(1).longValue());
+      assertEquals(true, recordCell.recordValue().get(3).booleanValue());
+      rowCount++;
+    }
+    assertEquals(2, rowCount);
+  }
+
+  @Test
+  public void testQuery() throws InterruptedException {
+    String query = new StringBuilder()
+        .append("SELECT TimestampField, StringField, BooleanField FROM ")
+        .append(TABLE_ID.table())
+        .toString();
+    QueryRequest request = QueryRequest.builder(query)
+        .defaultDataset(DatasetId.of(DATASET))
+        .maxWaitTime(60000L)
+        .maxResults(1000L)
+        .build();
+    QueryResponse response = bigquery.query(request);
+    while (!response.jobComplete()) {
+      Thread.sleep(1000);
+      response = bigquery.getQueryResults(response.jobId());
+    }
+    assertEquals(QUERY_RESULT_SCHEMA, response.result().schema());
+    int rowCount = 0;
+    for (List row : response.result().values()) {
+      FieldValue timestampCell = row.get(0);
+      FieldValue stringCell = row.get(1);
+      FieldValue booleanCell = row.get(2);
+      assertEquals(FieldValue.Attribute.PRIMITIVE, timestampCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, stringCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, booleanCell.attribute());
+      assertEquals(1408452095220000L, timestampCell.timestampValue());
+      assertEquals("stringValue", stringCell.stringValue());
+      assertEquals(false, booleanCell.booleanValue());
+      rowCount++;
+    }
+    assertEquals(2, rowCount);
+  }
+
+  @Test
+  public void testListJobs() {
+    Page jobs = bigquery.listJobs();
+    for (JobInfo job : jobs.values()) {
+      assertNotNull(job.jobId());
+      assertNotNull(job.statistics());
+      assertNotNull(job.status());
+      assertNotNull(job.userEmail());
+      assertNotNull(job.id());
+    }
+  }
+
+  @Test
+  public void testListJobsWithSelectedFields() {
+    Page jobs = bigquery.listJobs(JobListOption.fields(BigQuery.JobField.USER_EMAIL));
+    for (JobInfo job : jobs.values()) {
+      assertNotNull(job.jobId());
+      assertNotNull(job.status());
+      assertNotNull(job.userEmail());
+      assertNull(job.statistics());
+      assertNull(job.id());
+    }
+  }
+
+  @Test
+  public void testCreateAndGetJob() throws InterruptedException {
+    String sourceTableName = "test_create_and_get_job_source_table";
+    String destinationTableName = "test_create_and_get_job_destination_table";
+    TableId sourceTable = TableId.of(DATASET, sourceTableName);
+    BaseTableInfo tableInfo = TableInfo.of(sourceTable, SIMPLE_SCHEMA);
+    BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
+    assertNotNull(createdTableInfo);
+    assertEquals(DATASET, createdTableInfo.tableId().dataset());
+    assertEquals(sourceTableName, createdTableInfo.tableId().table());
+    TableId destinationTable = TableId.of(DATASET, destinationTableName);
+    JobInfo job = CopyJobInfo.of(destinationTable, sourceTable);
+    CopyJobInfo createdJob = (CopyJobInfo) bigquery.create(job);
+    CopyJobInfo remoteJob = (CopyJobInfo) bigquery.getJob(createdJob.jobId());
+    assertEquals(createdJob.jobId(), remoteJob.jobId());
+    assertEquals(createdJob.sourceTables(), remoteJob.sourceTables());
+    assertEquals(createdJob.destinationTable(), remoteJob.destinationTable());
+    assertEquals(createdJob.createDisposition(), remoteJob.createDisposition());
+    assertEquals(createdJob.writeDisposition(), remoteJob.writeDisposition());
+    assertNotNull(remoteJob.etag());
+    assertNotNull(remoteJob.statistics());
+    assertNotNull(remoteJob.status());
+    assertEquals(createdJob.selfLink(), remoteJob.selfLink());
+    assertEquals(createdJob.userEmail(), remoteJob.userEmail());
+    assertTrue(bigquery.delete(DATASET, sourceTableName));
+    assertTrue(bigquery.delete(DATASET, destinationTableName));
+  }
+
+  @Test
+  public void testCreateAndGetJobWithSelectedFields() throws InterruptedException {
+    String sourceTableName = "test_create_and_get_job_with_selected_fields_source_table";
+    String destinationTableName = "test_create_and_get_job_with_selected_fields_destination_table";
+    TableId sourceTable = TableId.of(DATASET, sourceTableName);
+    BaseTableInfo tableInfo = TableInfo.of(sourceTable, SIMPLE_SCHEMA);
+    BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
+    assertNotNull(createdTableInfo);
+    assertEquals(DATASET, createdTableInfo.tableId().dataset());
+    assertEquals(sourceTableName, createdTableInfo.tableId().table());
+    TableId destinationTable = TableId.of(DATASET, destinationTableName);
+    JobInfo job = CopyJobInfo.of(destinationTable, sourceTable);
+    CopyJobInfo createdJob = (CopyJobInfo) bigquery.create(job,
+        JobOption.fields(BigQuery.JobField.ETAG));
+    assertNotNull(createdJob.jobId());
+    assertNotNull(createdJob.sourceTables());
+    assertNotNull(createdJob.destinationTable());
+    assertNotNull(createdJob.etag());
+    assertNull(createdJob.statistics());
+    assertNull(createdJob.status());
+    assertNull(createdJob.selfLink());
+    assertNull(createdJob.userEmail());
+    CopyJobInfo remoteJob = (CopyJobInfo) bigquery.getJob(createdJob.jobId(),
+        JobOption.fields(BigQuery.JobField.ETAG));
+    assertEquals(createdJob.jobId(), remoteJob.jobId());
+    assertEquals(createdJob.sourceTables(), remoteJob.sourceTables());
+    assertEquals(createdJob.destinationTable(), remoteJob.destinationTable());
+    assertEquals(createdJob.createDisposition(), remoteJob.createDisposition());
+    assertEquals(createdJob.writeDisposition(), remoteJob.writeDisposition());
+    assertNotNull(remoteJob.etag());
+    assertNull(remoteJob.statistics());
+    assertNull(remoteJob.status());
+    assertNull(remoteJob.selfLink());
+    assertNull(remoteJob.userEmail());
+    assertTrue(bigquery.delete(DATASET, sourceTableName));
+    assertTrue(bigquery.delete(DATASET, destinationTableName));
+  }
+
+  @Test
+  public void testCopyJob() throws InterruptedException {
+    String sourceTableName = "test_copy_job_source_table";
+    String destinationTableName = "test_copy_job_destination_table";
+    TableId sourceTable = TableId.of(DATASET, sourceTableName);
+    BaseTableInfo tableInfo = TableInfo.of(sourceTable, SIMPLE_SCHEMA);
+    BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
+    assertNotNull(createdTableInfo);
+    assertEquals(DATASET, createdTableInfo.tableId().dataset());
+    assertEquals(sourceTableName, createdTableInfo.tableId().table());
+    TableId destinationTable = TableId.of(DATASET, destinationTableName);
+    JobInfo job = CopyJobInfo.of(destinationTable, sourceTable);
+    JobInfo remoteJob = bigquery.create(job);
+    while (remoteJob.status().state() != JobStatus.State.DONE) {
+      Thread.sleep(1000);
+      remoteJob = bigquery.getJob(remoteJob.jobId());
+    }
+    assertNull(remoteJob.status().error());
+    BaseTableInfo remoteTableInfo = bigquery.getTable(DATASET, destinationTableName);
+    assertNotNull(remoteTableInfo);
+    assertEquals(destinationTable.dataset(), remoteTableInfo.tableId().dataset());
+    assertEquals(destinationTableName, remoteTableInfo.tableId().table());
+    assertEquals(SIMPLE_SCHEMA, remoteTableInfo.schema());
+    assertTrue(bigquery.delete(DATASET, sourceTableName));
+    assertTrue(bigquery.delete(DATASET, destinationTableName));
+  }
+
+  @Test
+  public void testQueryJob() throws InterruptedException {
+    String tableName = "test_query_job_table";
+    String query = new StringBuilder()
+        .append("SELECT TimestampField, StringField, BooleanField FROM ")
+        .append(TABLE_ID.table())
+        .toString();
+    TableId destinationTable = TableId.of(DATASET, tableName);
+    QueryJobInfo job = QueryJobInfo.builder(query)
+        .defaultDataset(DatasetId.of(DATASET))
+        .destinationTable(destinationTable)
+        .build();
+    JobInfo remoteJob = bigquery.create(job);
+    while (remoteJob.status().state() != JobStatus.State.DONE) {
+      Thread.sleep(1000);
+      remoteJob = bigquery.getJob(remoteJob.jobId());
+    }
+    assertNull(remoteJob.status().error());
+
+    QueryResponse response = bigquery.getQueryResults(remoteJob.jobId());
+    while (!response.jobComplete()) {
+      Thread.sleep(1000);
+      response = bigquery.getQueryResults(response.jobId());
+    }
+    assertFalse(response.hasErrors());
+    assertEquals(QUERY_RESULT_SCHEMA, response.result().schema());
+    int rowCount = 0;
+    for (List row : response.result().values()) {
+      FieldValue timestampCell = row.get(0);
+      FieldValue stringCell = row.get(1);
+      FieldValue booleanCell = row.get(2);
+      assertEquals(FieldValue.Attribute.PRIMITIVE, timestampCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, stringCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, booleanCell.attribute());
+      assertEquals(1408452095220000L, timestampCell.timestampValue());
+      assertEquals("stringValue", stringCell.stringValue());
+      assertEquals(false, booleanCell.booleanValue());
+      rowCount++;
+    }
+    assertEquals(2, rowCount);
+    assertTrue(bigquery.delete(DATASET, tableName));
+  }
+
+
+  @Test
+  public void testExtract() throws InterruptedException {
+    String tableName = "test_export_job_table";
+    TableId destinationTable = TableId.of(DATASET, tableName);
+    JobInfo remoteJob = bigquery.create(
+        LoadJobInfo.builder(destinationTable, "gs://" + BUCKET + "/" + LOAD_FILE)
+            .schema(SIMPLE_SCHEMA)
+            .build());
+    while (remoteJob.status().state() != JobStatus.State.DONE) {
+      Thread.sleep(1000);
+      remoteJob = bigquery.getJob(remoteJob.jobId());
+    }
+    assertNull(remoteJob.status().error());
+
+    ExtractJobInfo extractJob =
+        ExtractJobInfo.builder(destinationTable, "gs://" + BUCKET + "/" + EXTRACT_FILE)
+          .printHeader(false)
+          .build();
+    remoteJob = bigquery.create(extractJob);
+    while (remoteJob.status().state() != JobStatus.State.DONE) {
+      Thread.sleep(1000);
+      remoteJob = bigquery.getJob(remoteJob.jobId());
+    }
+    assertNull(remoteJob.status().error());
+    assertEquals(CSV_CONTENT,
+        new String(storage.readAllBytes(BUCKET, EXTRACT_FILE), StandardCharsets.UTF_8));
+    assertTrue(bigquery.delete(DATASET, tableName));
+  }
+
+  @Test
+  public void testCancelJob() throws InterruptedException {
+    String destinationTableName = "test_cancel_query_job_table";
+    String query = "SELECT TimestampField, StringField, BooleanField FROM " + TABLE_ID.table();
+    TableId destinationTable = TableId.of(DATASET, destinationTableName);
+    QueryJobInfo job = QueryJobInfo.builder(query)
+        .defaultDataset(DatasetId.of(DATASET))
+        .destinationTable(destinationTable)
+        .build();
+    JobInfo remoteJob = bigquery.create(job);
+    assertTrue(bigquery.cancel(remoteJob.jobId()));
+    while (remoteJob.status().state() != JobStatus.State.DONE) {
+      Thread.sleep(1000);
+      remoteJob = bigquery.getJob(remoteJob.jobId());
+    }
+    assertNull(remoteJob.status().error());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/RemoteBigQueryHelperTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/RemoteBigQueryHelperTest.java
new file mode 100644
index 000000000000..13f2cc46f6cd
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/RemoteBigQueryHelperTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.google.gcloud.bigquery.BigQuery.DatasetDeleteOption;
+import com.google.gcloud.bigquery.testing.RemoteBigQueryHelper;
+
+import org.easymock.EasyMock;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+
+public class RemoteBigQueryHelperTest {
+
+  private static final String DATASET_NAME = "dataset-name";
+  private static final String PROJECT_ID = "project-id";
+  private static final String JSON_KEY = "{\n"
+      + "  \"private_key_id\": \"somekeyid\",\n"
+      + "  \"private_key\": \"-----BEGIN PRIVATE KEY-----\\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggS"
+      + "kAgEAAoIBAQC+K2hSuFpAdrJI\\nnCgcDz2M7t7bjdlsadsasad+fvRSW6TjNQZ3p5LLQY1kSZRqBqylRkzteMOyHg"
+      + "aR\\n0Pmxh3ILCND5men43j3h4eDbrhQBuxfEMalkG92sL+PNQSETY2tnvXryOvmBRwa/\\nQP/9dJfIkIDJ9Fw9N4"
+      + "Bhhhp6mCcRpdQjV38H7JsyJ7lih/oNjECgYAt\\nknddadwkwewcVxHFhcZJO+XWf6ofLUXpRwiTZakGMn8EE1uVa2"
+      + "LgczOjwWHGi99MFjxSer5m9\\n1tCa3/KEGKiS/YL71JvjwX3mb+cewlkcmweBKZHM2JPTk0ZednFSpVZMtycjkbLa"
+      + "\\ndYOS8V85AgMBewECggEBAKksaldajfDZDV6nGqbFjMiizAKJolr/M3OQw16K6o3/\\n0S31xIe3sSlgW0+UbYlF"
+      + "4U8KifhManD1apVSC3csafaspP4RZUHFhtBywLO9pR5c\\nr6S5aLp+gPWFyIp1pfXbWGvc5VY/v9x7ya1VEa6rXvL"
+      + "sKupSeWAW4tMj3eo/64ge\\nsdaceaLYw52KeBYiT6+vpsnYrEkAHO1fF/LavbLLOFJmFTMxmsNaG0tuiJHgjshB\\"
+      + "n82DpMCbXG9YcCgI/DbzuIjsdj2JC1cascSP//3PmefWysucBQe7Jryb6NQtASmnv\\nCdDw/0jmZTEjpe4S1lxfHp"
+      + "lAhHFtdgYTvyYtaLZiVVkCgYEA8eVpof2rceecw/I6\\n5ng1q3Hl2usdWV/4mZMvR0fOemacLLfocX6IYxT1zA1FF"
+      + "JlbXSRsJMf/Qq39mOR2\\nSpW+hr4jCoHeRVYLgsbggtrevGmILAlNoqCMpGZ6vDmJpq6ECV9olliDvpPgWOP+\\nm"
+      + "YPDreFBGxWvQrADNbRt2dmGsrsCgYEAyUHqB2wvJHFqdmeBsaacewzV8x9WgmeX\\ngUIi9REwXlGDW0Mz50dxpxcK"
+      + "CAYn65+7TCnY5O/jmL0VRxU1J2mSWyWTo1C+17L0\\n3fUqjxL1pkefwecxwecvC+gFFYdJ4CQ/MHHXU81Lwl1iWdF"
+      + "Cd2UoGddYaOF+KNeM\\nHC7cmqra+JsCgYEAlUNywzq8nUg7282E+uICfCB0LfwejuymR93CtsFgb7cRd6ak\\nECR"
+      + "8FGfCpH8ruWJINllbQfcHVCX47ndLZwqv3oVFKh6pAS/vVI4dpOepP8++7y1u\\ncoOvtreXCX6XqfrWDtKIvv0vjl"
+      + "HBhhhp6mCcRpdQjV38H7JsyJ7lih/oNjECgYAt\\nkndj5uNl5SiuVxHFhcZJO+XWf6ofLUregtevZakGMn8EE1uVa"
+      + "2AY7eafmoU/nZPT\\n00YB0TBATdCbn/nBSuKDESkhSg9s2GEKQZG5hBmL5uCMfo09z3SfxZIhJdlerreP\\nJ7gSi"
+      + "dI12N+EZxYd4xIJh/HFDgp7RRO87f+WJkofMQKBgGTnClK1VMaCRbJZPriw\\nEfeFCoOX75MxKwXs6xgrw4W//AYG"
+      + "GUjDt83lD6AZP6tws7gJ2IwY/qP7+lyhjEqN\\nHtfPZRGFkGZsdaksdlaksd323423d+15/UvrlRSFPNj1tWQmNKk"
+      + "XyRDW4IG1Oa2p\\nrALStNBx5Y9t0/LQnFI4w3aG\\n-----END PRIVATE KEY-----\\n\",\n"
+      + "  \"client_email\": \"someclientid@developer.gserviceaccount.com\",\n"
+      + "  \"client_id\": \"someclientid.apps.googleusercontent.com\",\n"
+      + "  \"type\": \"service_account\"\n"
+      + "}";
+  private static final InputStream JSON_KEY_STREAM = new ByteArrayInputStream(JSON_KEY.getBytes());
+  private static String keyPath = "/does/not/exist/key." + UUID.randomUUID().toString() + ".json";
+
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
+
+  @BeforeClass
+  public static void beforeClass() {
+    while (Files.exists(Paths.get(JSON_KEY))) {
+      keyPath = "/does/not/exist/key." + UUID.randomUUID().toString() + ".json";
+    }
+  }
+
+  @Test
+  public void testForceDelete() throws InterruptedException, ExecutionException {
+    BigQuery bigqueryMock = EasyMock.createMock(BigQuery.class);
+    EasyMock.expect(bigqueryMock.delete(DATASET_NAME, DatasetDeleteOption.deleteContents()))
+        .andReturn(true);
+    EasyMock.replay(bigqueryMock);
+    assertTrue(RemoteBigQueryHelper.forceDelete(bigqueryMock, DATASET_NAME));
+    EasyMock.verify(bigqueryMock);
+  }
+
+  @Test
+  public void testCreateFromStream() {
+    RemoteBigQueryHelper helper = RemoteBigQueryHelper.create(PROJECT_ID, JSON_KEY_STREAM);
+    BigQueryOptions options = helper.options();
+    assertEquals(PROJECT_ID, options.projectId());
+    assertEquals(60000, options.connectTimeout());
+    assertEquals(60000, options.readTimeout());
+    assertEquals(10, options.retryParams().retryMaxAttempts());
+    assertEquals(6, options.retryParams().retryMinAttempts());
+    assertEquals(30000, options.retryParams().maxRetryDelayMillis());
+    assertEquals(120000, options.retryParams().totalRetryPeriodMillis());
+    assertEquals(250, options.retryParams().initialRetryDelayMillis());
+  }
+
+  @Test
+  public void testCreateNoKey() {
+    thrown.expect(RemoteBigQueryHelper.BigQueryHelperException.class);
+    thrown.expectMessage(keyPath + " (No such file or directory)");
+    RemoteBigQueryHelper.create(PROJECT_ID, keyPath);
+  }
+}

From e46ce4f03572343c959782a37da8406c60a93c97 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 18 Dec 2015 22:37:05 +0100
Subject: [PATCH 181/322] Add BigQuery module to main pom

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 5b11a09fb382..8aedae4ec3b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
     gcloud-java-storage
     gcloud-java
     gcloud-java-examples
+    gcloud-java-bigquery
   
   
     

From ba8acf16db3b8915f382dcc6263620c0b2b20e0e Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 18 Dec 2015 23:25:29 +0100
Subject: [PATCH 182/322] Few minor fixes and make java8 happy

---
 .../src/main/java/com/google/gcloud/bigquery/Acl.java         | 4 ++--
 .../src/main/java/com/google/gcloud/bigquery/JobStatus.java   | 2 +-
 .../main/java/com/google/gcloud/bigquery/QueryJobInfo.java    | 4 ++--
 .../src/main/java/com/google/gcloud/bigquery/TableInfo.java   | 2 +-
 .../java/com/google/gcloud/bigquery/testing/package-info.java | 3 ++-
 .../java/com/google/gcloud/bigquery/BigQueryImplTest.java     | 1 -
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
index df6beef865ca..2a042c108e00 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
@@ -163,8 +163,8 @@ Access toPb() {
   }
 
   /**
-   * Class for a BigQuery Group entity. Objects of this class represent a group to grante access to.
-   * A Group entity can be created given the group's email or can be a special group:
+   * Class for a BigQuery Group entity. Objects of this class represent a group to granted access
+   * to. A Group entity can be created given the group's email or can be a special group:
    * {@link #ofProjectOwners()}, {@link #ofProjectReaders()}, {@link #ofProjectWriters()} or
    * {@link #ofAllAuthenticatedUsers()}.
    */
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java
index 9d780e5dc003..738a644a5dde 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java
@@ -56,7 +56,7 @@ public enum State {
   /**
    * Returns the state of the job. A {@link State#PENDING} job is waiting to be executed. A
    * {@link State#RUNNING} is being executed. A {@link State#DONE} job has completed either
-   * suceeding or failing. If failed {@link #error()} will be non-null.
+   * succeeding or failing. If failed {@link #error()} will be non-null.
    */
   public State state() {
     return state;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
index 9b6becdb75c3..dd09d7010a50 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
@@ -239,7 +239,7 @@ public Builder priority(Priority priority) {
      * the query is allowed to create large results at a slight cost in performance. If {@code true}
      * {@link Builder#destinationTable(TableId)} must be provided.
      *
-     * @see 
      *     Returning Large Query Results
      */
     public Builder allowLargeResults(Boolean allowLargeResults) {
@@ -309,7 +309,7 @@ private QueryJobInfo(Builder builder) {
    * the query is allowed to create large results at a slight cost in performance.
    * the query is allowed to create large results at a slight cost in performance.
    *
-   * @see 
    *     Returning Large Query Results
    */
   public Boolean allowLargeResults() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index 7b47f4df8f19..05fb6908a51b 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -194,7 +194,7 @@ public static Builder builder(TableId tableId, Schema schema) {
    * @param tableId table id
    * @param schema the schema of the table
    */
-  public static BaseTableInfo of(TableId tableId, Schema schema) {
+  public static TableInfo of(TableId tableId, Schema schema) {
     return builder(tableId, schema).build();
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/package-info.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/package-info.java
index 0ba7d461b682..9ca792ecd77d 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/package-info.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/package-info.java
@@ -18,6 +18,7 @@
  * A testing helper for Google BigQuery.
  *
  * 
A simple usage example:
+ *
  * 
Before the test:
  * 
 {@code
  * RemoteBigQueryHelper bigqueryHelper = RemoteBigQueryHelper.create();
@@ -34,4 +35,4 @@
  * @see 
  *     gcloud-java tools for testing
  */
-package com.google.gcloud.bigquery.testing;
\ No newline at end of file
+package com.google.gcloud.bigquery.testing;
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index 85c67b36b1c4..70c05bc56f59 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -39,7 +39,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.Page;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.bigquery.InsertAllRequest.RowToInsert;

From 7eee5287d898277f8f78a5afa51a0f9e80a511aa Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 21 Dec 2015 07:44:46 +0100
Subject: [PATCH 183/322] Minor fixes to RemoteBigQueryHelper - Remove
 RemoteBigQueryHelper.create(String, String) - Add javadoc to
 RemoteBigQueryHelper to document retry options - Add global timeout of
 5minutes to each of the BigQuery ITs - Remove print from BigQueryImplTest and
 other nits

---
 .../testing/RemoteBigQueryHelper.java         | 32 +++++--------------
 .../gcloud/bigquery/BigQueryImplTest.java     |  1 -
 .../gcloud/bigquery/ITBigQueryTest.java       |  6 +++-
 .../bigquery/RemoteBigQueryHelperTest.java    | 20 ------------
 4 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java
index fa3016e739d0..22fa62a7b86e 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java
@@ -22,8 +22,6 @@
 import com.google.gcloud.bigquery.BigQueryException;
 import com.google.gcloud.bigquery.BigQueryOptions;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.UUID;
@@ -31,7 +29,14 @@
 import java.util.logging.Logger;
 
 /**
- * Utility to create a remote BigQuery configuration for testing.
+ * Utility to create a remote BigQuery configuration for testing. BigQuery options can be obtained
+ * via the {@link #options()} method. Returned options have custom
+ * {@link BigQueryOptions#retryParams()}: {@link RetryParams#retryMaxAttempts()} is {@code 10},
+ * {@link RetryParams#retryMinAttempts()} is {@code 6}, {@link RetryParams#maxRetryDelayMillis()} is
+ * {@code 30000}, {@link RetryParams#totalRetryPeriodMillis()} is {@code 120000} and
+ * {@link RetryParams#initialRetryDelayMillis()} is {@code 250}.
+ * {@link BigQueryOptions#connectTimeout()} and {@link BigQueryOptions#readTimeout()} are both set
+ * to {@code 60000}.
  */
 public class RemoteBigQueryHelper {
 
@@ -97,27 +102,6 @@ public static RemoteBigQueryHelper create(String projectId, InputStream keyStrea
     }
   }
 
-  /**
-   * Creates a {@code RemoteBigQueryHelper} object for the given project id and JSON key path.
-   *
-   * @param projectId id of the project to be used for running the tests
-   * @param keyPath path to the JSON key to be used for running the tests
-   * @return A {@code RemoteBigQueryHelper} object for the provided options.
-   * @throws BigQueryHelperException if the file pointed by {@code keyPath} does not exist
-   */
-  public static RemoteBigQueryHelper create(String projectId, String keyPath)
-      throws BigQueryHelperException {
-    try {
-      InputStream keyFileStream = new FileInputStream(keyPath);
-      return create(projectId, keyFileStream);
-    } catch (FileNotFoundException ex) {
-      if (log.isLoggable(Level.WARNING)) {
-        log.log(Level.WARNING, ex.getMessage());
-      }
-      throw BigQueryHelperException.translate(ex);
-    }
-  }
-
   /**
    * Creates a {@code RemoteBigQueryHelper} object using default project id and authentication
    * credentials.
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index 70c05bc56f59..ecd9b23c1eb1 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -859,7 +859,6 @@ public Job apply(JobInfo jobInfo) {
     assertEquals(cursor, page.nextPageCursor());
     assertArrayEquals(jobList.toArray(), Iterables.toArray(page.values(), JobInfo.class));
     String selector = (String) capturedOptions.getValue().get(JOB_OPTION_FIELDS.rpcOption());
-    System.out.println(selector);
     assertTrue(selector.contains("etag,jobs("));
     assertTrue(selector.contains("configuration"));
     assertTrue(selector.contains("jobReference"));
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index 0640839124be..caff9dd510d1 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -37,7 +37,9 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.Timeout;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -128,6 +130,9 @@ public class ITBigQueryTest {
   private static BigQuery bigquery;
   private static Storage storage;
 
+  @Rule
+  public Timeout globalTimeout = Timeout.seconds(300);
+
   @BeforeClass
   public static void beforeClass() throws IOException, InterruptedException {
     RemoteBigQueryHelper bigqueryHelper = RemoteBigQueryHelper.create();
@@ -732,7 +737,6 @@ public void testQueryJob() throws InterruptedException {
     assertTrue(bigquery.delete(DATASET, tableName));
   }
 
-
   @Test
   public void testExtract() throws InterruptedException {
     String tableName = "test_export_job_table";
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/RemoteBigQueryHelperTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/RemoteBigQueryHelperTest.java
index 13f2cc46f6cd..62a88c1860cd 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/RemoteBigQueryHelperTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/RemoteBigQueryHelperTest.java
@@ -23,16 +23,12 @@
 import com.google.gcloud.bigquery.testing.RemoteBigQueryHelper;
 
 import org.easymock.EasyMock;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
 public class RemoteBigQueryHelperTest {
@@ -66,18 +62,9 @@ public class RemoteBigQueryHelperTest {
       + "  \"type\": \"service_account\"\n"
       + "}";
   private static final InputStream JSON_KEY_STREAM = new ByteArrayInputStream(JSON_KEY.getBytes());
-  private static String keyPath = "/does/not/exist/key." + UUID.randomUUID().toString() + ".json";
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
-
-  @BeforeClass
-  public static void beforeClass() {
-    while (Files.exists(Paths.get(JSON_KEY))) {
-      keyPath = "/does/not/exist/key." + UUID.randomUUID().toString() + ".json";
-    }
-  }
-
   @Test
   public void testForceDelete() throws InterruptedException, ExecutionException {
     BigQuery bigqueryMock = EasyMock.createMock(BigQuery.class);
@@ -101,11 +88,4 @@ public void testCreateFromStream() {
     assertEquals(120000, options.retryParams().totalRetryPeriodMillis());
     assertEquals(250, options.retryParams().initialRetryDelayMillis());
   }
-
-  @Test
-  public void testCreateNoKey() {
-    thrown.expect(RemoteBigQueryHelper.BigQueryHelperException.class);
-    thrown.expectMessage(keyPath + " (No such file or directory)");
-    RemoteBigQueryHelper.create(PROJECT_ID, keyPath);
-  }
 }

From 4899c2711fc266d41c9f4f7535b6919cb5afc5a4 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 2 Nov 2015 08:02:55 -0800
Subject: [PATCH 184/322] Create packages for resource manager and outline spi
 layer.

---
 gcloud-java-resourcemanager/README.md         |  79 ++++++++++++++
 gcloud-java-resourcemanager/pom.xml           |  44 ++++++++
 .../resourcemanager/ResourceManager.java      |  31 ++++++
 .../ResourceManagerException.java             |  65 +++++++++++
 .../ResourceManagerFactory.java               |  25 +++++
 .../ResourceManagerOptions.java               | 101 ++++++++++++++++++
 .../gcloud/resourcemanager/package-info.java  |  23 ++++
 .../google/gcloud/spi/ResourceManagerRpc.java |  69 ++++++++++++
 .../gcloud/spi/ResourceManagerRpcFactory.java |  27 +++++
 9 files changed, 464 insertions(+)
 create mode 100644 gcloud-java-resourcemanager/README.md
 create mode 100644 gcloud-java-resourcemanager/pom.xml
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerFactory.java
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpcFactory.java

diff --git a/gcloud-java-resourcemanager/README.md b/gcloud-java-resourcemanager/README.md
new file mode 100644
index 000000000000..11c505c14920
--- /dev/null
+++ b/gcloud-java-resourcemanager/README.md
@@ -0,0 +1,79 @@
+Google Cloud Java Client for Resource Manager
+=============================================
+
+Java idiomatic client for [Google Cloud Resource Manager] (https://cloud.google.com/resource-manager/).
+
+[![Build Status](https://travis-ci.org/GoogleCloudPlatform/gcloud-java.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/gcloud-java)
+[![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/gcloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/gcloud-java?branch=master)
+
+
+
+-  [Homepage] (https://googlecloudplatform.github.io/gcloud-java/)
+
+
+
+> Note: This client is a work-in-progress, and may occasionally
+> make backwards-incompatible changes.
+
+Quickstart
+----------
+This library is currently under development and will be available soon!
+
+
+
+
+Authentication
+--------------
+
+See the [Authentication](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) section in the base directory's README.
+
+About Google Cloud Resource Manager
+-----------------------------------
+
+Google [Cloud Resource Manager][cloud-resourcemanager] provides a programmatic way to manage your Google Cloud Platform projects.  Google Cloud Resource Manager is currently in beta and may occasionally make backwards incompatible changes.
+
+Be sure to activate the Google Cloud Resource Manager API on the Developer's Console to use Resource Manager from your project.
+
+See the ``gcloud-java`` API [Resource Manager documentation][resourcemanager-api] to learn how to interact
+with the Cloud Resource Manager using this client Library.
+
+
+
+Java Versions
+-------------
+
+Java 7 or above is required for using this client.
+
+
+
+Versioning
+----------
+
+This library follows [Semantic Versioning] (http://semver.org/).
+
+It is currently in major version zero (``0.y.z``), which means that anything
+may change at any time and the public API should not be considered
+stable.
+
+Contributing
+------------
+
+Contributions to this library are always welcome and highly encouraged.
+
+See [CONTRIBUTING] for more information on how to get started.
+
+License
+-------
+
+Apache 2.0 - See [LICENSE] for more information.
+
+
+[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
+[LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
+[TESTING]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/TESTING.md#testing-code-that-uses-resource-manager
+[cloud-platform]: https://cloud.google.com/
+[cloud-resourcemanager]: https://cloud.google.com/resource-manager/docs
+[resourcemanager-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/resourcemanager/package-summary.html
+
diff --git a/gcloud-java-resourcemanager/pom.xml b/gcloud-java-resourcemanager/pom.xml
new file mode 100644
index 000000000000..4a4899231177
--- /dev/null
+++ b/gcloud-java-resourcemanager/pom.xml
@@ -0,0 +1,44 @@
+
+
+  4.0.0
+  com.google.gcloud
+  gcloud-java-resourcemanager
+  jar
+  GCloud Java resource manager
+  
+    Java idiomatic client for Google Cloud Resource Manager.
+  
+  
+    com.google.gcloud
+    gcloud-java-pom
+    0.0.11-SNAPSHOT
+  
+  
+    gcloud-java-resourcemanager
+  
+  
+    
+      ${project.groupId}
+      gcloud-java-core
+      ${project.version}
+    
+    
+      com.google.apis
+      google-api-services-cloudresourcemanager
+      v1beta1-rev6-1.19.0
+      compile
+    
+    
+      junit
+      junit
+      4.12
+      test
+    
+    
+      org.easymock
+      easymock
+      3.3
+      test
+    
+  
+
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
new file mode 100644
index 000000000000..8a9966faa653
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import com.google.gcloud.Service;
+
+/**
+ * An interface for Google Cloud Resource Manager.
+ *
+ * @see Google Cloud Resource Manager
+ */
+public interface ResourceManager extends Service {
+
+  public static final String DEFAULT_CONTENT_TYPE = "application/octet-stream";
+
+  // TODO(ajaykannan): Fix me! Add in missing methods.
+}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
new file mode 100644
index 000000000000..e136db8fd339
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import com.google.gcloud.RetryHelper.RetryHelperException;
+import com.google.gcloud.RetryHelper.RetryInterruptedException;
+
+/**
+ * Resource Manager service exception.
+ *
+ * @see Google Cloud
+ *      Resource Manager error codes
+ */
+public class ResourceManagerException extends RuntimeException {
+
+  private static final long serialVersionUID = 6841689911565501705L;
+  private static final int UNKNOWN_CODE = -1;
+
+  private final int code;
+  private final boolean retryable;
+
+  public ResourceManagerException(int code, String message, boolean retryable) {
+    super(message);
+    this.code = code;
+    this.retryable = retryable;
+  }
+
+  /**
+   * Returns the code associated with this exception.
+   */
+  public int code() {
+    return code;
+  }
+
+  public boolean retryable() {
+    return retryable;
+  }
+
+  /**
+   * Translate RetryHelperException to the ResourceManagerException that caused the error. This
+   * method will always throw an exception.
+   *
+   * @throws ResourceManagerException when {@code ex} was caused by a {@code
+   * ResourceManagerException}
+   * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
+   */
+  static ResourceManagerException translateAndThrow(RetryHelperException ex) {
+    throw new ResourceManagerException(UNKNOWN_CODE, ex.getMessage(), false);
+        // TODO(ajaykannan): Fix me!
+  }
+}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerFactory.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerFactory.java
new file mode 100644
index 000000000000..256fc321e4e1
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerFactory.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import com.google.gcloud.ServiceFactory;
+
+/**
+ * An interface for ResourceManager factories.
+ */
+public interface ResourceManagerFactory
+    extends ServiceFactory {}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
new file mode 100644
index 000000000000..e43609be95c1
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.gcloud.ServiceOptions;
+import com.google.gcloud.spi.ResourceManagerRpc;
+import com.google.gcloud.spi.ResourceManagerRpcFactory;
+
+import java.util.Set;
+
+public class ResourceManagerOptions
+    extends ServiceOptions {
+
+  private static final long serialVersionUID = 538303101192527452L;
+  private static final String GCRM_SCOPE = "https://www.googleapis.com/auth/cloud-platform";
+  private static final Set SCOPES = ImmutableSet.of(GCRM_SCOPE);
+
+  public static class DefaultResourceManagerFactory implements ResourceManagerFactory {
+    private static final ResourceManagerFactory INSTANCE = new DefaultResourceManagerFactory();
+
+    @Override
+    public ResourceManager create(ResourceManagerOptions options) {
+      // return new ResourceManagerImpl(options);
+      return null; // TODO(ajaykannan): Fix me!
+    }
+  }
+
+  public static class DefaultResourceManagerRpcFactory implements ResourceManagerRpcFactory {
+    private static final ResourceManagerRpcFactory INSTANCE =
+        new DefaultResourceManagerRpcFactory();
+
+    @Override
+    public ResourceManagerRpc create(ResourceManagerOptions options) {
+      // return new DefaultResourceManagerRpc(options);
+      return null; // TODO(ajaykannan): Fix me!
+    }
+  }
+
+  public static class Builder extends ServiceOptions.Builder {
+
+    private Builder() {}
+
+    private Builder(ResourceManagerOptions options) {
+      super(options);
+    }
+
+    @Override
+    public ResourceManagerOptions build() {
+      return new ResourceManagerOptions(this);
+    }
+  }
+
+  private ResourceManagerOptions(Builder builder) {
+    super(ResourceManagerFactory.class, ResourceManagerRpcFactory.class, builder);
+  }
+
+  @Override
+  protected ResourceManagerFactory defaultServiceFactory() {
+    return DefaultResourceManagerFactory.INSTANCE;
+  }
+
+  @Override
+  protected ResourceManagerRpcFactory defaultRpcFactory() {
+    return DefaultResourceManagerRpcFactory.INSTANCE;
+  }
+
+  @Override
+  protected Set scopes() {
+    return SCOPES;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ResourceManagerOptions && baseEquals((ResourceManagerOptions) obj);
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java
new file mode 100644
index 000000000000..3beaa0967443
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 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.
+ */
+
+/**
+ * A client to Google Cloud Resource Manager.
+ * //TODO(ajaykannan): add code example
+ * @see Google Cloud Resource Manager
+ */
+
+package com.google.gcloud.resourcemanager;
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
new file mode 100644
index 000000000000..492b18a96c8a
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.spi;
+
+import com.google.api.services.cloudresourcemanager.model.Policy;
+import com.google.api.services.cloudresourcemanager.model.Project;
+import com.google.gcloud.resourcemanager.ResourceManagerException;
+
+import java.util.List;
+
+public interface ResourceManagerRpc {
+
+  class Tuple {
+    private final X x;
+    private final Y y;
+
+    private Tuple(X x, Y y) {
+      this.x = x;
+      this.y = y;
+    }
+
+    public static  Tuple of(X x, Y y) {
+      return new Tuple<>(x, y);
+    }
+
+    public X x() {
+      return x;
+    }
+
+    public Y y() {
+      return y;
+    }
+  }
+
+  Project create(Project project) throws ResourceManagerException;
+
+  void delete(String projectId) throws ResourceManagerException;
+
+  Project get(String projectId) throws ResourceManagerException;
+
+  Tuple> list() throws ResourceManagerException;
+
+  Tuple> list(String filter) throws ResourceManagerException;
+
+  void undelete(String projectId) throws ResourceManagerException;
+
+  Project update(String projectId, Project project) throws ResourceManagerException;
+
+  Policy getIamPolicy(String projectId) throws ResourceManagerException;
+
+  void setIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
+
+  List testIamPermissions(String projectId, List permissions)
+      throws ResourceManagerException;
+}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpcFactory.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpcFactory.java
new file mode 100644
index 000000000000..c2c607c0c205
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpcFactory.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.spi;
+
+import com.google.gcloud.resourcemanager.ResourceManagerOptions;
+
+/**
+ * An interface for Resource Manager RPC factory.
+ * Implementation will be loaded via {@link java.util.ServiceLoader}.
+ */
+public interface ResourceManagerRpcFactory
+    extends ServiceRpcFactory {
+}

From 3687cb16aec0347bad882da69bc961740b118ea3 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 2 Nov 2015 17:08:59 -0800
Subject: [PATCH 185/322] Fixes to the ResourceManagerRpc layer, and also add
 resource manager to pom files

spi api fixes
---
 .../google/gcloud/spi/ResourceManagerRpc.java | 34 ++++++++++++++++---
 gcloud-java/pom.xml                           |  5 +++
 pom.xml                                       |  1 +
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
index 492b18a96c8a..527e448521ed 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
@@ -46,15 +46,41 @@ public Y y() {
     }
   }
 
+  public class ListOptions {
+    private List filters;
+    private String pageToken;
+
+    private static final ListOptions DEFAULT_INSTANCE = new ListOptions(null, null);
+
+    ListOptions(List filters, String pageToken) {
+      this.filters = filters;
+      this.pageToken = pageToken;
+    }
+
+    public static ListOptions getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static ListOptions createListOption(List filters, String pageToken) {
+      return new ListOptions(filters, pageToken);
+    }
+
+    public String pageToken() {
+      return pageToken;
+    }
+
+    public List filters() {
+      return filters;
+    }
+  }
+
   Project create(Project project) throws ResourceManagerException;
 
   void delete(String projectId) throws ResourceManagerException;
 
   Project get(String projectId) throws ResourceManagerException;
 
-  Tuple> list() throws ResourceManagerException;
-
-  Tuple> list(String filter) throws ResourceManagerException;
+  Tuple> list(ListOptions listOptions) throws ResourceManagerException;
 
   void undelete(String projectId) throws ResourceManagerException;
 
@@ -64,6 +90,6 @@ public Y y() {
 
   void setIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
 
-  List testIamPermissions(String projectId, List permissions)
+  boolean hasPermissions(String projectId, List permissions)
       throws ResourceManagerException;
 }
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 7d8e251b54fb..655ef8f70e62 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -24,6 +24,11 @@
       gcloud-java-datastore
       ${project.version}
     
+    
+      ${project.groupId}
+      gcloud-java-resourcemanager
+      ${project.version}
+    
     
       ${project.groupId}
       gcloud-java-storage
diff --git a/pom.xml b/pom.xml
index 5b11a09fb382..7d1751ee179d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
   
     gcloud-java-core
     gcloud-java-datastore
+    gcloud-java-resourcemanager
     gcloud-java-storage
     gcloud-java
     gcloud-java-examples

From 3892eedce3ca670eb5a8f2e83e914264c0406b2e Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 3 Nov 2015 08:36:02 -0800
Subject: [PATCH 186/322] minor changes to ResourceManagerRpc

---
 .../google/gcloud/spi/ResourceManagerRpc.java | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
index 527e448521ed..285d4e887e14 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
@@ -16,14 +16,27 @@
 
 package com.google.gcloud.spi;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.api.services.cloudresourcemanager.model.Policy;
 import com.google.api.services.cloudresourcemanager.model.Project;
 import com.google.gcloud.resourcemanager.ResourceManagerException;
 
+import java.util.Collections;
 import java.util.List;
 
 public interface ResourceManagerRpc {
 
+  public enum Permission {
+    CREATE,
+    DELETE,
+    GET,
+    LIST,
+    UPDATE,
+    GET_IAM_POLICY,
+    SET_IAM_POLICY;
+  }
+
   class Tuple {
     private final X x;
     private final Y y;
@@ -49,20 +62,24 @@ public Y y() {
   public class ListOptions {
     private List filters;
     private String pageToken;
+    private int pageSize;
 
-    private static final ListOptions DEFAULT_INSTANCE = new ListOptions(null, null);
+    private static final ListOptions DEFAULT_INSTANCE =
+        new ListOptions(Collections.emptyList(), null, -1);
 
-    ListOptions(List filters, String pageToken) {
-      this.filters = filters;
+    ListOptions(List filters, String pageToken, int pageSize) {
+      this.filters = checkNotNull(filters);
       this.pageToken = pageToken;
+      this.pageSize = pageSize;
     }
 
     public static ListOptions getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    public static ListOptions createListOption(List filters, String pageToken) {
-      return new ListOptions(filters, pageToken);
+    public static ListOptions createListOption(
+        List filters, String pageToken, int pageSize) {
+      return new ListOptions(filters, pageToken, pageSize);
     }
 
     public String pageToken() {
@@ -72,6 +89,10 @@ public String pageToken() {
     public List filters() {
       return filters;
     }
+
+    public int pageSize() {
+      return pageSize;
+    }
   }
 
   Project create(Project project) throws ResourceManagerException;
@@ -90,6 +111,6 @@ public List filters() {
 
   void setIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
 
-  boolean hasPermissions(String projectId, List permissions)
+  List hasPermissions(String projectId, List permissions)
       throws ResourceManagerException;
 }

From a60f7d16050a4a639af80697e1d5c6c6d2dc4601 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 3 Nov 2015 09:32:36 -0800
Subject: [PATCH 187/322] Style updates to ResourceManagerRpc

---
 .../java/com/google/gcloud/spi/ResourceManagerRpc.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
index 285d4e887e14..de412b87278e 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
@@ -20,6 +20,7 @@
 
 import com.google.api.services.cloudresourcemanager.model.Policy;
 import com.google.api.services.cloudresourcemanager.model.Project;
+import com.google.common.collect.ImmutableList;
 import com.google.gcloud.resourcemanager.ResourceManagerException;
 
 import java.util.Collections;
@@ -34,7 +35,7 @@ public enum Permission {
     LIST,
     UPDATE,
     GET_IAM_POLICY,
-    SET_IAM_POLICY;
+    SET_IAM_POLICY
   }
 
   class Tuple {
@@ -68,7 +69,7 @@ public class ListOptions {
         new ListOptions(Collections.emptyList(), null, -1);
 
     ListOptions(List filters, String pageToken, int pageSize) {
-      this.filters = checkNotNull(filters);
+      this.filters = checkNotNull(ImmutableList.copyOf(filters));
       this.pageToken = pageToken;
       this.pageSize = pageSize;
     }
@@ -105,7 +106,7 @@ public int pageSize() {
 
   void undelete(String projectId) throws ResourceManagerException;
 
-  Project update(String projectId, Project project) throws ResourceManagerException;
+  Project update(Project project) throws ResourceManagerException;
 
   Policy getIamPolicy(String projectId) throws ResourceManagerException;
 
@@ -113,4 +114,6 @@ public int pageSize() {
 
   List hasPermissions(String projectId, List permissions)
       throws ResourceManagerException;
+
+  // TODO(ajaykannan): implement "Organization" functionality when available
 }

From c69af1acb3ee4cb24876f1444540c5b543e40c0c Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 3 Nov 2015 10:20:18 -0800
Subject: [PATCH 188/322] add return values to delete, undelete, and
 setIamPolicy

---
 .../google/gcloud/spi/ResourceManagerRpc.java | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
index de412b87278e..7511114a4500 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
@@ -38,6 +38,22 @@ public enum Permission {
     SET_IAM_POLICY
   }
 
+  public enum DeleteResult {
+    SUCCESS,
+    ALREADY_DELETED
+  }
+
+  public enum UndeleteResult {
+    SUCCESS,
+    DELETE_IN_PROGRESS,
+    GONE
+  }
+
+  public enum SetIamPolicyResult {
+    SUCCESS,
+    ETAG_NOT_MATCH
+  }
+
   class Tuple {
     private final X x;
     private final Y y;
@@ -98,19 +114,19 @@ public int pageSize() {
 
   Project create(Project project) throws ResourceManagerException;
 
-  void delete(String projectId) throws ResourceManagerException;
+  DeleteResult delete(String projectId) throws ResourceManagerException;
 
   Project get(String projectId) throws ResourceManagerException;
 
   Tuple> list(ListOptions listOptions) throws ResourceManagerException;
 
-  void undelete(String projectId) throws ResourceManagerException;
+  UndeleteResult undelete(String projectId) throws ResourceManagerException;
 
   Project update(Project project) throws ResourceManagerException;
 
   Policy getIamPolicy(String projectId) throws ResourceManagerException;
 
-  void setIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
+  SetIamPolicyResult setIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
 
   List hasPermissions(String projectId, List permissions)
       throws ResourceManagerException;

From 249fae8f180a61e7a4ef619169c62d45a90b8076 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 4 Nov 2015 13:00:26 -0800
Subject: [PATCH 189/322] Remove spi result enums, change 'update/set'
 terminology to 'replace'

---
 .../google/gcloud/spi/ResourceManagerRpc.java | 30 +++++--------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
index 7511114a4500..1223627bbfcb 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
@@ -33,25 +33,9 @@ public enum Permission {
     DELETE,
     GET,
     LIST,
-    UPDATE,
+    REPLACE,
     GET_IAM_POLICY,
-    SET_IAM_POLICY
-  }
-
-  public enum DeleteResult {
-    SUCCESS,
-    ALREADY_DELETED
-  }
-
-  public enum UndeleteResult {
-    SUCCESS,
-    DELETE_IN_PROGRESS,
-    GONE
-  }
-
-  public enum SetIamPolicyResult {
-    SUCCESS,
-    ETAG_NOT_MATCH
+    REPLACE_IAM_POLICY
   }
 
   class Tuple {
@@ -114,22 +98,22 @@ public int pageSize() {
 
   Project create(Project project) throws ResourceManagerException;
 
-  DeleteResult delete(String projectId) throws ResourceManagerException;
+  void delete(String projectId) throws ResourceManagerException;
 
   Project get(String projectId) throws ResourceManagerException;
 
   Tuple> list(ListOptions listOptions) throws ResourceManagerException;
 
-  UndeleteResult undelete(String projectId) throws ResourceManagerException;
+  void undelete(String projectId) throws ResourceManagerException;
 
-  Project update(Project project) throws ResourceManagerException;
+  Project replace(Project project) throws ResourceManagerException;
 
   Policy getIamPolicy(String projectId) throws ResourceManagerException;
 
-  SetIamPolicyResult setIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
+  boolean replaceIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
 
   List hasPermissions(String projectId, List permissions)
       throws ResourceManagerException;
 
-  // TODO(ajaykannan): implement "Organization" functionality when available
+  // TODO(ajaykannan): implement "Organization" functionality when available (issue #319)
 }

From 65a6240d9dda87434786e016e3cc2cd4d5d26f53 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 12 Nov 2015 14:11:56 -0800
Subject: [PATCH 190/322] Project, ProjectInfo, Policy, and ResourceId classes
 added.

---
 .../google/gcloud/resourcemanager/Policy.java | 389 ++++++++++++++++++
 .../gcloud/resourcemanager/Project.java       |  96 +++++
 .../gcloud/resourcemanager/ProjectInfo.java   | 238 +++++++++++
 .../gcloud/resourcemanager/ResourceId.java    |  82 ++++
 .../resourcemanager/ResourceManager.java      |  80 +++-
 .../ResourceManagerException.java             |  23 +-
 .../ResourceManagerOptions.java               |   5 +
 .../google/gcloud/spi/ResourceManagerRpc.java |  27 +-
 .../gcloud/resourcemanager/PolicyTest.java    | 108 +++++
 .../resourcemanager/ProjectInfoTest.java      |  73 ++++
 .../gcloud/resourcemanager/ProjectTest.java   | 214 ++++++++++
 .../resourcemanager/ResourceIdTest.java       |  42 ++
 .../resourcemanager/SerializationTest.java    | 126 ++++++
 13 files changed, 1475 insertions(+), 28 deletions(-)
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
 create mode 100644 gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceId.java
 create mode 100644 gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java
 create mode 100644 gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java
 create mode 100644 gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
 create mode 100644 gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceIdTest.java
 create mode 100644 gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java
new file mode 100644
index 000000000000..765e38d3c2f8
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java
@@ -0,0 +1,389 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.collect.ImmutableList;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A Google Cloud IAM Policy object
+ */
+public class Policy implements Serializable {
+
+  private static final long serialVersionUID = 3493286111316914094L;
+  private final List bindings;
+  private final Integer version;
+  private final String etag;
+
+  public static enum MemberType {
+    ALL_USERS("allUsers"),
+    ALL_AUTHENTICATED_USERS("allAuthenticatedUsers"),
+    USER("user:"),
+    SERVICE_ACCOUNT("serviceAccount:"),
+    GROUP("group:"),
+    DOMAIN("domain:");
+
+    private final String prefix;
+
+    MemberType(String prefix) {
+      this.prefix = prefix;
+    }
+
+    String prefix() {
+      return prefix;
+    }
+  }
+
+  public enum RoleType {
+    OWNER,
+    EDITOR,
+    VIEWER;
+  }
+
+  /**
+   * Represents a member belonging to an IAM policy binding
+   */
+  public static final class Member implements Serializable {
+
+    private static final long serialVersionUID = 6496912037577986137L;
+    private final MemberType memberType;
+    private final String emailOrDomain;
+
+    Member(MemberType memberType, String emailOrDomain) {
+      this.memberType = memberType;
+      this.emailOrDomain = emailOrDomain;
+    }
+
+    public static Member allUsers() {
+      throw new UnsupportedOperationException(
+          "Google Cloud Resource Manager does not support the \"all users\" member type yet.");
+      // return new Member(MemberType.ALL_USERS, null);
+    }
+
+    public static Member allAuthenticatedUsers() {
+      throw new UnsupportedOperationException("Google Cloud Resource Manager does not support the "
+          + "\"all authenticated users\" member type yet.");
+      // return new Member(MemberType.ALL_AUTHENTICATED_USERS, null);
+    }
+
+    public static Member user(String email) {
+      return new Member(MemberType.USER, email);
+    }
+
+    public static Member serviceAccount(String email) {
+      return new Member(MemberType.SERVICE_ACCOUNT, email);
+    }
+
+    public static Member group(String email) {
+      return new Member(MemberType.GROUP, email);
+    }
+
+    public static Member domain(String domain) {
+      throw new UnsupportedOperationException(
+          "Google Cloud Resource Manager does not support domain members yet.");
+      // return new Member(MemberType.DOMAIN, domain);
+    }
+
+    public MemberType type() {
+      return memberType;
+    }
+
+    public String emailOrDomain() {
+      return emailOrDomain;
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(memberType, emailOrDomain);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj instanceof Member && Objects.equals(this.memberType, ((Member) obj).memberType)
+          && Objects.equals(this.emailOrDomain, ((Member) obj).emailOrDomain);
+    }
+  }
+
+  /**
+   * Represents an IAM policy binding
+   */
+  public static class Binding implements Serializable {
+
+    private static final long serialVersionUID = -8493421092718338925L;
+    private final RoleType role;
+    private final List members;
+
+    public static class Builder {
+      private RoleType role;
+      private List members;
+
+      Builder() {
+        members = new ArrayList();
+      }
+
+      public Builder role(RoleType role) {
+        this.role = role;
+        return this;
+      }
+
+      public Builder members(List members) {
+        this.members = checkNotNull(members);
+        return this;
+      }
+
+      public Builder clearMembers() {
+        this.members = new ArrayList<>();
+        return this;
+      }
+
+      public Builder addMember(Member member) {
+        this.members.add(member);
+        return this;
+      }
+
+      public Builder removeMember(Member member) {
+        this.members.remove(member);
+        return this;
+      }
+
+      public Binding build() {
+        return new Binding(role, members);
+      }
+    }
+
+    private Binding(RoleType role, List members) {
+      this.role = role;
+      ImmutableList.Builder membersListBuilder = new ImmutableList.Builder<>();
+      for (Member member : members) {
+        membersListBuilder.add(member);
+      }
+      this.members = membersListBuilder.build();
+    }
+
+    public static Binding binding(RoleType role, List members) {
+      return new Binding(role, members);
+    }
+
+    public RoleType role() {
+      return role;
+    }
+
+    public List members() {
+      return members;
+    }
+
+    public static Builder builder() {
+      return new Builder();
+    }
+
+    public Builder toBuilder() {
+      List mutableMembers = new ArrayList<>();
+      for (Member member : members) {
+        mutableMembers.add(member);
+      }
+      return new Builder().role(role).members(mutableMembers);
+    }
+
+    com.google.api.services.cloudresourcemanager.model.Binding toPb() {
+      com.google.api.services.cloudresourcemanager.model.Binding bindingPb =
+          new com.google.api.services.cloudresourcemanager.model.Binding();
+      if (role != null) {
+        bindingPb.setRole("roles/" + role.toString().toLowerCase());
+      }
+      List membersPb = new ArrayList<>(members.size());
+      for (Member member : members) {
+        if (member.emailOrDomain() != null) {
+          membersPb.add(member.type().prefix() + member.emailOrDomain());
+        } else {
+          membersPb.add(member.type().prefix());
+        }
+      }
+      bindingPb.setMembers(membersPb);
+      return bindingPb;
+    }
+
+    static Binding fromPb(com.google.api.services.cloudresourcemanager.model.Binding bindingPb) {
+      RoleType role =
+          (bindingPb.getRole() == null)
+              ? null : RoleType.valueOf(bindingPb.getRole().split("/")[1].toUpperCase());
+      List members = new ArrayList<>();
+      if (bindingPb.getMembers() != null) {
+        for (String memberPb : bindingPb.getMembers()) {
+          String[] memberInfo = memberPb.split(":", 2);
+          String memberTypeStr = memberInfo[0];
+          String emailOrDomain = (memberInfo.length > 1) ? emailOrDomain = memberInfo[1] : null;
+          switch (memberTypeStr) {
+            case "allUsers":
+              members.add(new Member(MemberType.ALL_USERS, null));
+              break;
+            case "allAuthenticatedUsers":
+              members.add(new Member(MemberType.ALL_AUTHENTICATED_USERS, null));
+              break;
+            case "user":
+              members.add(new Member(MemberType.USER, checkNotNull(emailOrDomain)));
+              break;
+            case "serviceAccount":
+              members.add(new Member(MemberType.SERVICE_ACCOUNT, checkNotNull(emailOrDomain)));
+              break;
+            case "group":
+              members.add(new Member(MemberType.GROUP, checkNotNull(emailOrDomain)));
+              break;
+            case "domain":
+              members.add(new Member(MemberType.DOMAIN, checkNotNull(emailOrDomain)));
+              break;
+            default:
+              throw new UnsupportedOperationException("Unsupported member type: " + memberTypeStr);
+          }
+        }
+      }
+      return new Binding(role, members);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(role, members);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj instanceof Binding && Objects.equals(this.role, ((Binding) obj).role)
+          && Objects.equals(this.members, ((Binding) obj).members);
+    }
+  }
+
+  public static final class Builder {
+    private List bindings;
+    private String etag;
+    private Integer version;
+
+    private Builder() {
+      bindings = new ArrayList<>();
+    }
+
+    public Builder addBinding(Binding binding) {
+      this.bindings.add(binding);
+      return this;
+    }
+
+    public Builder removeBinding(Binding binding) {
+      this.bindings.remove(binding);
+      return this;
+    }
+
+    public Builder clearBindings() {
+      this.bindings = new ArrayList<>();
+      return this;
+    }
+
+    public Builder bindings(List bindings) {
+      this.bindings = checkNotNull(bindings);
+      return this;
+    }
+
+    public Builder etag(String etag) {
+      this.etag = etag;
+      return this;
+    }
+
+    public Builder version(Integer version) {
+      this.version = version;
+      return this;
+    }
+
+    public Policy build() {
+      return new Policy(this);
+    }
+  }
+
+  Policy(Builder builder) {
+    ImmutableList.Builder bindingsListBuilder = new ImmutableList.Builder<>();
+    for (Binding binding : builder.bindings) {
+      bindingsListBuilder.add(binding);
+    }
+    bindings = bindingsListBuilder.build();
+    version = builder.version;
+    etag = builder.etag;
+  }
+
+  public List bindings() {
+    return bindings;
+  }
+
+  public Integer version() {
+    return version;
+  }
+
+  public String etag() {
+    return etag;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    List mutableBindings = new ArrayList<>();
+    for (Binding binding : bindings) {
+      mutableBindings.add(binding);
+    }
+    return new Builder().bindings(mutableBindings).etag(etag).version(version);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bindings, etag, version);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof Policy && Objects.equals(this.bindings, ((Policy) obj).bindings)
+        && Objects.equals(this.etag, ((Policy) obj).etag)
+        && Objects.equals(this.version, ((Policy) obj).version);
+  }
+
+  com.google.api.services.cloudresourcemanager.model.Policy toPb() {
+    com.google.api.services.cloudresourcemanager.model.Policy policyPb =
+        new com.google.api.services.cloudresourcemanager.model.Policy();
+    List bindingsPb = new ArrayList<>();
+    for (Binding binding : bindings) {
+      bindingsPb.add(binding.toPb());
+    }
+    policyPb.setBindings(bindingsPb);
+    policyPb.setVersion(version);
+    policyPb.setEtag(etag);
+    return policyPb;
+  }
+
+  static Policy fromPb(com.google.api.services.cloudresourcemanager.model.Policy policyPb) {
+    Builder policyBuilder = Policy.builder();
+    if (policyPb.getBindings() != null) {
+      for (com.google.api.services.cloudresourcemanager.model.Binding bindingPb :
+          policyPb.getBindings()) {
+        policyBuilder.addBinding(Binding.fromPb(bindingPb));
+      }
+    }
+    policyBuilder.version(policyPb.getVersion());
+    policyBuilder.etag(policyPb.getEtag());
+    return policyBuilder.build();
+  }
+}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
new file mode 100644
index 000000000000..1813d1083018
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.gcloud.spi.ResourceManagerRpc.Permission;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A Google Cloud Resource Manager project object.
+ *
+ * This class' member variables are immutable.  Methods that change or update the underlying Project
+ * information return a new Project instance.
+ */
+public class Project {
+
+  private final ResourceManager resourceManager;
+  private final ProjectInfo info;
+  private final Policy policy;
+
+  public Project(ResourceManager resourceManager, ProjectInfo projectInfo, Policy policy) {
+    this.resourceManager = checkNotNull(resourceManager);
+    this.info = checkNotNull(projectInfo);
+    this.policy = checkNotNull(policy);
+  }
+
+  public static Project load(ResourceManager resourceManager, String projectId) {
+    ProjectInfo projectInfo = resourceManager.get(projectId);
+    Policy policy = resourceManager.getIamPolicy(projectId);
+    return new Project(resourceManager, projectInfo, policy);
+  }
+
+  public ProjectInfo info() {
+    return info;
+  }
+
+  public Policy policy() {
+    return policy;
+  }
+
+  public ResourceManager resourceManager() {
+    return resourceManager;
+  }
+
+  public Project reload() {
+    return new Project(
+        resourceManager, resourceManager.get(info.id()), resourceManager.getIamPolicy(info.id()));
+  }
+
+  public void delete() {
+    resourceManager.delete(info.id());
+  }
+
+  public void undelete() {
+    resourceManager.undelete(info.id());
+  }
+
+  public Project replace(ProjectInfo projectInfo) {
+    return new Project(resourceManager, resourceManager.replace(checkNotNull(projectInfo)), policy);
+  }
+
+  public Project replaceIamPolicy(Policy policy) {
+    return new Project(
+        resourceManager, info, resourceManager.replaceIamPolicy(info.id(), checkNotNull(policy)));
+  }
+
+  public List hasPermissions(Permission first, Permission... others) {
+    List permissions = new ArrayList<>();
+    permissions.add(first);
+    for (Permission other : others) {
+      permissions.add(other);
+    }
+    return resourceManager.hasPermissions(info.id(), permissions);
+  }
+
+  public boolean hasAllPermissions(Permission first, Permission... others) {
+    return !(hasPermissions(first, others).contains(false));
+  }
+}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
new file mode 100644
index 000000000000..d69f94c530d5
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.collect.ImmutableMap;
+
+import org.joda.time.DateTime;
+import org.joda.time.format.ISODateTimeFormat;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * A Google Cloud Resource Manager project metadata object.
+ */
+public class ProjectInfo implements Serializable {
+
+  private static final long serialVersionUID = 9148970963697734236L;
+  private final String name;
+  private final String id;
+  private final Map labels;
+  private final Long number;
+  private final State state;
+  private final Long createTimeMillis;
+  private final ResourceId parent;
+
+  public enum State {
+    LIFECYCLE_STATE_UNSPECIFIED,
+    ACTIVE,
+    DELETE_REQUESTED,
+    DELETE_IN_PROGRESS;
+  }
+
+  public static class Builder {
+    private String name;
+    private String id;
+    private Map labels;
+    private Long number;
+    private State state;
+    private Long createTimeMillis;
+    private ResourceId parent;
+
+    Builder() {
+      labels = new HashMap();
+    }
+
+    public Builder name(String name) {
+      this.name = name;
+      return this;
+    }
+
+    public Builder id(String id) {
+      this.id = id;
+      return this;
+    }
+
+    public Builder addLabel(String key, String value) {
+      this.labels.put(key, value);
+      return this;
+    }
+
+    public Builder removeLabel(String key) {
+      this.labels.remove(key);
+      return this;
+    }
+
+    public Builder clearLabels() {
+      this.labels.clear();
+      return this;
+    }
+
+    public Builder labels(Map labels) {
+      this.labels = checkNotNull(labels);
+      return this;
+    }
+
+    Builder number(Long number) {
+      this.number = number;
+      return this;
+    }
+
+    Builder state(State state) {
+      this.state = state;
+      return this;
+    }
+
+    Builder createTimeMillis(Long createTimeMillis) {
+      this.createTimeMillis = createTimeMillis;
+      return this;
+    }
+
+    public Builder parent(ResourceId parent) {
+      this.parent = parent;
+      return this;
+    }
+
+    public ProjectInfo build() {
+      return new ProjectInfo(name, id, labels, number, state, createTimeMillis, parent);
+    }
+  }
+
+  ProjectInfo(String name, String id, Map labels, Long number, State state,
+      Long createTimeMillis, ResourceId parent) {
+    this.name = name;
+    this.id = checkNotNull(id);
+    ImmutableMap.Builder labelsMapBuilder = ImmutableMap.builder();
+    for (Map.Entry entry : labels.entrySet()) {
+      labelsMapBuilder.put(entry.getKey(), entry.getValue());
+    }
+    this.labels = (labels == null) ? null : labelsMapBuilder.build();
+    this.number = number;
+    this.state = state;
+    this.createTimeMillis = createTimeMillis;
+    this.parent = parent;
+  }
+
+  public String id() {
+    return id;
+  }
+
+  public String name() {
+    return name;
+  }
+
+  public Long number() {
+    return number;
+  }
+
+  public Map labels() {
+    return labels;
+  }
+
+  public State state() {
+    return state;
+  }
+
+  public Long createTimeMillis() {
+    return createTimeMillis;
+  }
+
+  public ResourceId parent() {
+    return parent;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == this) {
+      return true;
+    } else if (obj instanceof ProjectInfo) {
+      ProjectInfo other = (ProjectInfo) obj;
+      return Objects.equals(this.name, other.name) && Objects.equals(this.id, other.id)
+          && Objects.equals(this.labels, other.labels) && Objects.equals(this.number, other.number)
+          && Objects.equals(this.state, other.state)
+          && Objects.equals(this.createTimeMillis, other.createTimeMillis)
+          && Objects.equals(this.parent, other.parent);
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, id, labels, number, state, createTimeMillis, parent);
+  }
+
+  public static Builder builder(String id) {
+    return new Builder().id(id);
+  }
+
+  public Builder toBuilder() {
+    Map mutableLabels = new HashMap();
+    for (Map.Entry entry : labels.entrySet()) {
+      mutableLabels.put(entry.getKey(), entry.getValue());
+    }
+    return new Builder()
+        .name(name)
+        .id(id)
+        .labels(mutableLabels)
+        .number(number)
+        .state(state)
+        .createTimeMillis(createTimeMillis)
+        .parent(parent);
+  }
+
+  com.google.api.services.cloudresourcemanager.model.Project toPb() {
+    com.google.api.services.cloudresourcemanager.model.Project projectPb =
+        new com.google.api.services.cloudresourcemanager.model.Project();
+    projectPb.setName(name);
+    projectPb.setProjectId(id);
+    projectPb.setLabels(labels);
+    projectPb.setProjectNumber(number);
+    if (state != null) {
+      projectPb.setLifecycleState(state.toString());
+    }
+    if (createTimeMillis != null) {
+      projectPb.setCreateTime(ISODateTimeFormat.dateTime().print(createTimeMillis));
+    }
+    if (parent != null) {
+      projectPb.setParent(parent.toPb());
+    }
+    return projectPb;
+  }
+
+  static ProjectInfo fromPb(com.google.api.services.cloudresourcemanager.model.Project projectPb) {
+    ProjectInfo.Builder builder = 
+        ProjectInfo.builder(projectPb.getProjectId())
+            .name(projectPb.getName())
+            .number(projectPb.getProjectNumber());
+    if (projectPb.getLabels() != null) {
+      builder.labels(projectPb.getLabels());
+    }
+    if (projectPb.getLifecycleState() != null) {
+      builder.state(State.valueOf(projectPb.getLifecycleState()));
+    }
+    if (projectPb.getCreateTime() != null) {
+      builder.createTimeMillis(DateTime.parse(projectPb.getCreateTime()).getMillis());
+    }
+    if (projectPb.getParent() != null) {
+      builder.parent(ResourceId.fromPb(projectPb.getParent()));
+    }
+    return builder.build();
+  }
+}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceId.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceId.java
new file mode 100644
index 000000000000..c640709d6faa
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceId.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Represents a Google Cloud Resource Manager Resource ID
+ */
+public class ResourceId implements Serializable {
+
+  private static final long serialVersionUID = 7928469304338358885L;
+  private final String id;
+  private final Type type;
+
+  public enum Type {
+    ORGANIZATION("organization"),
+    UNKNOWN("unknown");
+
+    private final String strValue;
+
+    Type(String strValue) {
+      this.strValue = strValue;
+    }
+  }
+
+  private ResourceId(String id, Type type) {
+    this.id = checkNotNull(id);
+    this.type = checkNotNull(type);
+  }
+
+  public String id() {
+    return id;
+  }
+
+  public Type type() {
+    return type;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ResourceId && Objects.equals(this.id, ((ResourceId) obj).id)
+        && Objects.equals(this.type, ((ResourceId) obj).type);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, type);
+  }
+
+  public static ResourceId of(String id, Type type) {
+    return new ResourceId(id, type);
+  }
+
+  com.google.api.services.cloudresourcemanager.model.ResourceId toPb() {
+    com.google.api.services.cloudresourcemanager.model.ResourceId resourceIdPb =
+        new com.google.api.services.cloudresourcemanager.model.ResourceId();
+    resourceIdPb.setId(id);
+    resourceIdPb.setType(type.strValue);
+    return resourceIdPb;
+  }
+
+  static ResourceId fromPb(
+      com.google.api.services.cloudresourcemanager.model.ResourceId resourceIdPb) {
+    return new ResourceId(resourceIdPb.getId(), Type.valueOf(resourceIdPb.getType().toUpperCase()));
+  }
+}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
index 8a9966faa653..29fddd409e8a 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
@@ -16,7 +16,12 @@
 
 package com.google.gcloud.resourcemanager;
 
+import com.google.gcloud.Page;
 import com.google.gcloud.Service;
+import com.google.gcloud.spi.ResourceManagerRpc.ListOptions;
+import com.google.gcloud.spi.ResourceManagerRpc.Permission;
+
+import java.util.List;
 
 /**
  * An interface for Google Cloud Resource Manager.
@@ -27,5 +32,78 @@ public interface ResourceManager extends Service {
 
   public static final String DEFAULT_CONTENT_TYPE = "application/octet-stream";
 
-  // TODO(ajaykannan): Fix me! Add in missing methods.
+  /**
+   * Create a new project.
+   *
+   * @return ProjectInfo object representing the new project's metadata.  The returned object will
+   * include additional read-only information, namely project number, lifecycle state, and creation
+   * time.
+   * @throws ResourceManagerException upon failure
+   */
+  ProjectInfo create(ProjectInfo project);
+
+  /**
+   * Delete the requested project.
+   *
+   * @throws ResourceManagerException upon failure
+   */
+  void delete(String projectId);
+
+  /**
+   * Return the requested project or {@code null} if not found.
+   *
+   * @throws ResourceManagerException upon failure
+   */
+  ProjectInfo get(String projectId);
+
+  /**
+   * List the projects viewable by the current user.  Use {@link ListOptions} to filter this list,
+   * set page size, and set page tokens.  Note that pagination is currently not implemented by the
+   * Cloud Resource Manager API.
+   *
+   * @return {@code Page}, a paginated list of projects.
+   * @throws ResourceManagerException upon failure
+   */
+  Page list(ListOptions listOptions);
+
+  /**
+   * Replace project metadata.
+   *
+   * @return the ProjectInfo representing the new project metadata
+   * @throws ResourceManagerException upon failure
+   */
+  ProjectInfo replace(ProjectInfo newProject);
+
+  /**
+   * Undo a delete request.  This will only succeed if the project's lifecycle state is
+   * DELETE_REQUESTED.
+   *
+   * @throws ResourceManagerException
+   */
+  void undelete(String projectId);
+
+  /**
+   * Get the IAM policy for the project specified.
+   *
+   * @return IAM Policy
+   * @throws ResourceManagerException upon failure
+   */
+  Policy getIamPolicy(String projectId);
+
+  /**
+   * Replace the IAM Policy for a project with the policy given.
+   *
+   * @return the new IAM Policy
+   * @throws ResourceManagerException upon failure
+   */
+  Policy replaceIamPolicy(String projectId, Policy policy);
+
+  /**
+   * Test whether the caller of this function has the permissions provided as arguments.
+   *
+   * @return List of booleans representing whether the caller has the corresponding permission in
+   * the given permissions list.
+   * @throws ResourceManagerException upon failure
+   */
+  List hasPermissions(String projectId, List permissions);
 }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
index e136db8fd339..8287ed167557 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
@@ -16,6 +16,7 @@
 
 package com.google.gcloud.resourcemanager;
 
+import com.google.gcloud.BaseServiceException;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.RetryHelper.RetryInterruptedException;
 
@@ -25,29 +26,13 @@
  * @see Google Cloud
  *      Resource Manager error codes
  */
-public class ResourceManagerException extends RuntimeException {
+public class ResourceManagerException extends BaseServiceException {
 
   private static final long serialVersionUID = 6841689911565501705L;
   private static final int UNKNOWN_CODE = -1;
 
-  private final int code;
-  private final boolean retryable;
-
   public ResourceManagerException(int code, String message, boolean retryable) {
-    super(message);
-    this.code = code;
-    this.retryable = retryable;
-  }
-
-  /**
-   * Returns the code associated with this exception.
-   */
-  public int code() {
-    return code;
-  }
-
-  public boolean retryable() {
-    return retryable;
+    super(code, message, retryable);
   }
 
   /**
@@ -60,6 +45,6 @@ public boolean retryable() {
    */
   static ResourceManagerException translateAndThrow(RetryHelperException ex) {
     throw new ResourceManagerException(UNKNOWN_CODE, ex.getMessage(), false);
-        // TODO(ajaykannan): Fix me!
+    // TODO(ajaykannan): Fix me!
   }
 }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
index e43609be95c1..51d8e5411212 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
@@ -70,6 +70,11 @@ private ResourceManagerOptions(Builder builder) {
     super(ResourceManagerFactory.class, ResourceManagerRpcFactory.class, builder);
   }
 
+  @Override
+  protected boolean projectIdRequired() {
+    return false;
+  }
+
   @Override
   protected ResourceManagerFactory defaultServiceFactory() {
     return DefaultResourceManagerFactory.INSTANCE;
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
index 1223627bbfcb..9410891771c9 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
@@ -29,13 +29,24 @@
 public interface ResourceManagerRpc {
 
   public enum Permission {
-    CREATE,
-    DELETE,
-    GET,
-    LIST,
-    REPLACE,
-    GET_IAM_POLICY,
-    REPLACE_IAM_POLICY
+    CREATE("resourcemanager.projects.create"),
+    DELETE("resourcemanager.projects.delete"),
+    GET("resourcemanager.projects.get"),
+    LIST("resourcemanager.projects.list"),
+    REPLACE("resourcemanager.projects.replace"),
+    UNDELETE("resourcemanager.projects.undelete"),
+    GET_IAM_POLICY("resourcemanager.projects.getIamPolicy"),
+    REPLACE_IAM_POLICY("resourcemanager.projects.setIamPolicy");
+
+    String permissionPb;
+
+    Permission(String permissionPb) {
+      this.permissionPb = permissionPb;
+    }
+
+    String toPb() {
+      return permissionPb;
+    }
   }
 
   class Tuple {
@@ -110,7 +121,7 @@ public int pageSize() {
 
   Policy getIamPolicy(String projectId) throws ResourceManagerException;
 
-  boolean replaceIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
+  Policy replaceIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
 
   List hasPermissions(String projectId, List permissions)
       throws ResourceManagerException;
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java
new file mode 100644
index 000000000000..77037d2996c6
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.gcloud.resourcemanager.Policy.Binding;
+import com.google.gcloud.resourcemanager.Policy.Member;
+import com.google.gcloud.resourcemanager.Policy.RoleType;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PolicyTest {
+
+  private static final Binding OWNER_BINDING;
+  private static final Binding EDITOR_BINDING;
+  private static final Binding VIEWER_BINDING;
+  private static final Binding EMPTY_BINDING = Policy.Binding.builder().build();
+  private static final List OWNER_MEMBER_LIST = new ArrayList<>();
+  private static final List EDITOR_MEMBER_LIST = new ArrayList<>();
+  private static final List VIEWER_MEMBER_LIST = new ArrayList<>();
+  static {
+    OWNER_MEMBER_LIST.add(Member.user("first-owner@email.com"));
+    OWNER_MEMBER_LIST.add(Member.group("group-of-owners@email.com"));
+    OWNER_BINDING =
+        Policy.Binding.builder().role(RoleType.OWNER).members(OWNER_MEMBER_LIST).build();
+    EDITOR_MEMBER_LIST.add(Member.serviceAccount("editor@someemail.com"));
+    EDITOR_BINDING =
+        Policy.Binding.builder().role(RoleType.EDITOR).members(EDITOR_MEMBER_LIST).build();
+    VIEWER_MEMBER_LIST.add(Member.serviceAccount("app@someemail.com"));
+    VIEWER_MEMBER_LIST.add(Member.user("viewer@email.com"));
+    VIEWER_BINDING =
+        Policy.Binding.builder().role(RoleType.VIEWER).members(VIEWER_MEMBER_LIST).build();
+  }
+  private static final Policy EMPTY_POLICY = Policy.builder().build();
+  private static final Integer VERSION = 1;
+  private static final String ETAG = "some-etag-value";
+  private static final Policy FULL_POLICY =
+      Policy.builder()
+          .addBinding(OWNER_BINDING)
+          .addBinding(EDITOR_BINDING)
+          .addBinding(VIEWER_BINDING)
+          .version(VERSION)
+          .etag(ETAG)
+          .build();
+
+  @Test
+  public void testBindingBuilder() {
+    assertEquals(OWNER_BINDING.role(), RoleType.OWNER);
+    assertEquals(OWNER_BINDING.members(), OWNER_MEMBER_LIST);
+    assertNull(EMPTY_BINDING.role());
+    assertTrue(EMPTY_BINDING.members().isEmpty());
+  }
+
+  @Test
+  public void testBindingToBuilder() {
+    assertEquals(OWNER_BINDING, OWNER_BINDING.toBuilder().build());
+    assertEquals(EMPTY_BINDING, EMPTY_BINDING.toBuilder().build());
+  }
+
+  @Test
+  public void testBindingToAndFromPb() {
+    assertEquals(OWNER_BINDING, Binding.fromPb(OWNER_BINDING.toPb()));
+    assertEquals(EDITOR_BINDING, Binding.fromPb(EDITOR_BINDING.toPb()));
+    assertEquals(VIEWER_BINDING, Binding.fromPb(VIEWER_BINDING.toPb()));
+    assertEquals(EMPTY_BINDING, Binding.fromPb(EMPTY_BINDING.toPb()));
+  }
+
+  @Test
+  public void testPolicyBuilder() {
+    assertEquals(OWNER_BINDING, FULL_POLICY.bindings().get(0));
+    assertEquals(EDITOR_BINDING, FULL_POLICY.bindings().get(1));
+    assertEquals(VIEWER_BINDING, FULL_POLICY.bindings().get(2));
+    assertEquals(VERSION, FULL_POLICY.version());
+    assertEquals(ETAG, FULL_POLICY.etag());
+  }
+
+  @Test
+  public void testPolicyToBuilder() {
+    assertEquals(FULL_POLICY, FULL_POLICY.toBuilder().build());
+    assertEquals(EMPTY_POLICY, EMPTY_POLICY.toBuilder().build());
+  }
+
+  @Test
+  public void testPolicyToAndFromPb() {
+    assertEquals(EMPTY_POLICY, Policy.fromPb(EMPTY_POLICY.toPb()));
+    assertEquals(FULL_POLICY, Policy.fromPb(FULL_POLICY.toPb()));
+  }
+}
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java
new file mode 100644
index 000000000000..d6e27aecd103
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ProjectInfoTest {
+
+  private static final String ID = "project-id";
+  private static final String NAME = "myProj";
+  private static final Map LABELS = new HashMap();
+  static {
+    LABELS.put("k1", "v1");
+    LABELS.put("k2", "k2");
+  }
+  private static final Long NUMBER = 123L;
+  private static final Long CREATE_TIME_MILLIS = 123456789L;
+  private static final ProjectInfo.State STATE = ProjectInfo.State.DELETE_REQUESTED;
+  private static final ResourceId PARENT = ResourceId.of("owner-id", ResourceId.Type.ORGANIZATION);
+  private static final ProjectInfo FULL_PROJECT_INFO =
+      ProjectInfo.builder(ID)
+          .name(NAME)
+          .labels(LABELS)
+          .number(NUMBER)
+          .createTimeMillis(CREATE_TIME_MILLIS)
+          .state(STATE)
+          .parent(PARENT)
+          .build();
+  private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.builder(ID).build();
+
+  @Test
+  public void testBuilder() {
+    assertEquals(ID, FULL_PROJECT_INFO.id());
+    assertEquals(NAME, FULL_PROJECT_INFO.name());
+    assertEquals(LABELS, FULL_PROJECT_INFO.labels());
+    assertEquals(NUMBER, FULL_PROJECT_INFO.number());
+    assertEquals(CREATE_TIME_MILLIS, FULL_PROJECT_INFO.createTimeMillis());
+    assertEquals(STATE, FULL_PROJECT_INFO.state());
+    assertEquals(PARENT, FULL_PROJECT_INFO.parent());
+  }
+
+  @Test
+  public void testToBuilder() {
+    assertEquals(FULL_PROJECT_INFO, FULL_PROJECT_INFO.toBuilder().build());
+    assertEquals(PARTIAL_PROJECT_INFO, PARTIAL_PROJECT_INFO.toBuilder().build());
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    assertEquals(FULL_PROJECT_INFO, ProjectInfo.fromPb(FULL_PROJECT_INFO.toPb()));
+    assertEquals(PARTIAL_PROJECT_INFO, ProjectInfo.fromPb(PARTIAL_PROJECT_INFO.toPb()));
+  }
+}
+
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
new file mode 100644
index 000000000000..6d36c024d0d2
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import com.google.gcloud.resourcemanager.Policy.Binding;
+import com.google.gcloud.resourcemanager.Policy.Member;
+import com.google.gcloud.resourcemanager.Policy.RoleType;
+import com.google.gcloud.spi.ResourceManagerRpc.Permission;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ProjectTest {
+  private static final String ID = "project-id";
+  private static final String NAME = "myProj";
+  private static final Map LABELS = new HashMap();
+  static {
+    LABELS.put("k1", "v1");
+    LABELS.put("k2", "k2");
+  }
+  private static final Long NUMBER = 123L;
+  private static final Long CREATE_TIME_MILLIS = 123456789L;
+  private static final ProjectInfo.State STATE = ProjectInfo.State.DELETE_REQUESTED;
+  private static final ResourceId PARENT = ResourceId.of("owner-id", ResourceId.Type.ORGANIZATION);
+  private static final ProjectInfo PROJECT_INFO =
+      ProjectInfo.builder(ID)
+          .name(NAME)
+          .labels(LABELS)
+          .number(NUMBER)
+          .createTimeMillis(CREATE_TIME_MILLIS)
+          .state(STATE)
+          .parent(PARENT)
+          .build();
+  private static final Binding OWNER_BINDING;
+  private static final Binding EDITOR_BINDING;
+  private static final Binding VIEWER_BINDING;
+  static {
+    List ownerMemberList = new ArrayList<>();
+    List editorMemberList = new ArrayList<>();
+    List viewerMemberList = new ArrayList<>();
+
+    ownerMemberList.add(Member.user("first-owner@email.com"));
+    ownerMemberList.add(Member.group("group-of-owners@email.com"));
+    OWNER_BINDING = Policy.Binding.builder().role(RoleType.OWNER).members(ownerMemberList).build();
+    editorMemberList.add(Member.serviceAccount("editor@someemail.com"));
+    EDITOR_BINDING =
+        Policy.Binding.builder().role(RoleType.EDITOR).members(editorMemberList).build();
+    viewerMemberList.add(Member.serviceAccount("app@someemail.com"));
+    viewerMemberList.add(Member.user("viewer@email.com"));
+    VIEWER_BINDING =
+        Policy.Binding.builder().role(RoleType.VIEWER).members(viewerMemberList).build();
+  }
+  private static final Policy POLICY =
+      Policy.builder()
+          .addBinding(OWNER_BINDING)
+          .addBinding(EDITOR_BINDING)
+          .addBinding(VIEWER_BINDING)
+          .version(1)
+          .etag("some-etag-value")
+          .build();
+  private static final List PERMISSIONS_REQUESTED =
+      Arrays.asList(new Permission[] {Permission.REPLACE, Permission.GET});
+  private static final List PERMISSIONS_OWNED = Arrays.asList(new Boolean[] {false, true});
+
+  private ResourceManager resourceManager;
+  private Project project;
+
+  @Before
+  public void setUp() throws Exception {
+    resourceManager = createStrictMock(ResourceManager.class);
+    project = new Project(resourceManager, PROJECT_INFO, POLICY);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    verify(resourceManager);
+  }
+
+  @Test
+  public void testLoad() {
+    expect(resourceManager.get(PROJECT_INFO.id())).andReturn(PROJECT_INFO);
+    expect(resourceManager.getIamPolicy(PROJECT_INFO.id())).andReturn(POLICY);
+    replay(resourceManager);
+    Project loadedProject = Project.load(resourceManager, PROJECT_INFO.id());
+    assertEquals(PROJECT_INFO, loadedProject.info());
+    assertEquals(POLICY, loadedProject.policy());
+  }
+
+  @Test
+  public void testReload() {
+    ProjectInfo newInfo = PROJECT_INFO.toBuilder().addLabel("k3", "v3").build();
+    Policy newPolicy = POLICY.toBuilder().removeBinding(VIEWER_BINDING).build();
+    expect(resourceManager.get(PROJECT_INFO.id())).andReturn(newInfo);
+    expect(resourceManager.getIamPolicy(PROJECT_INFO.id())).andReturn(newPolicy);
+    replay(resourceManager);
+    Project newProject = project.reload();
+    assertSame(resourceManager, newProject.resourceManager());
+    assertEquals(newInfo, newProject.info());
+    assertEquals(newPolicy, newProject.policy());
+  }
+
+  @Test
+  public void testPolicy() {
+    assertEquals(project.policy(), POLICY);
+    replay(resourceManager);
+  }
+
+  @Test
+  public void testInfo() {
+    assertEquals(project.info(), PROJECT_INFO);
+    replay(resourceManager);
+  }
+
+  @Test
+  public void testResourceManager() {
+    assertEquals(project.resourceManager(), resourceManager);
+    replay(resourceManager);
+  }
+
+  @Test
+  public void testDelete() {
+    resourceManager.delete(PROJECT_INFO.id());
+    expectLastCall();
+    replay(resourceManager);
+    project.delete();
+  }
+
+  @Test
+  public void testUndelete() {
+    resourceManager.undelete(PROJECT_INFO.id());
+    expectLastCall();
+    replay(resourceManager);
+    project.undelete();
+  }
+
+  @Test
+  public void testReplace() {
+    ProjectInfo newInfo = PROJECT_INFO.toBuilder().addLabel("k3", "v3").build();
+    expect(resourceManager.replace(newInfo)).andReturn(newInfo);
+    replay(resourceManager);
+    Project newProject = project.replace(newInfo);
+    assertSame(newProject.resourceManager(), resourceManager);
+    assertEquals(newProject.info(), newInfo);
+    assertEquals(newProject.policy(), POLICY);
+  }
+
+  @Test
+  public void testReplaceIamPolicy() {
+    Policy newPolicy = POLICY.toBuilder().removeBinding(VIEWER_BINDING).build();
+    expect(resourceManager.replaceIamPolicy(PROJECT_INFO.id(), newPolicy)).andReturn(newPolicy);
+    replay(resourceManager);
+    Project newProject = project.replaceIamPolicy(newPolicy);
+    assertSame(newProject.resourceManager(), resourceManager);
+    assertEquals(newProject.info(), PROJECT_INFO);
+    assertEquals(newProject.policy(), newPolicy);
+  }
+
+  @Test
+  public void testHasPermissions() {
+    expect(resourceManager.hasPermissions(PROJECT_INFO.id(), PERMISSIONS_REQUESTED))
+        .andReturn(PERMISSIONS_OWNED);
+    replay(resourceManager);
+    List response =
+        project.hasPermissions(PERMISSIONS_REQUESTED.get(0), PERMISSIONS_REQUESTED.get(1));
+    assertEquals(response, PERMISSIONS_OWNED);
+  }
+
+  @Test
+  public void testHasAllPermissions() {
+    expect(resourceManager.hasPermissions(PROJECT_INFO.id(), PERMISSIONS_REQUESTED))
+        .andReturn(PERMISSIONS_OWNED);
+    List permissionsRequested2 =
+        Arrays.asList(new Permission[] {Permission.UNDELETE, Permission.DELETE});
+    List permissionsOwned2 = Arrays.asList(new Boolean[] {true, true});
+    expect(resourceManager.hasPermissions(PROJECT_INFO.id(), permissionsRequested2))
+        .andReturn(permissionsOwned2);
+    replay(resourceManager);
+    assertFalse(
+        project.hasAllPermissions(PERMISSIONS_REQUESTED.get(0), PERMISSIONS_REQUESTED.get(1)));
+    assertTrue(
+        project.hasAllPermissions(permissionsRequested2.get(0), permissionsRequested2.get(1)));
+  }
+}
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceIdTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceIdTest.java
new file mode 100644
index 000000000000..1f66017312a6
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceIdTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class ResourceIdTest {
+
+private static final ResourceId RESOURCE_ID = ResourceId.of("id", ResourceId.Type.ORGANIZATION);
+
+  @Test
+  public void testOf() {
+    assertEquals(RESOURCE_ID.id(), "id");
+    assertEquals(RESOURCE_ID.type(), ResourceId.Type.ORGANIZATION);
+  }
+
+  @Test
+  public void testEquals() {
+    assertEquals(RESOURCE_ID, ResourceId.of("id", ResourceId.Type.ORGANIZATION));
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    assertEquals(RESOURCE_ID, ResourceId.fromPb(RESOURCE_ID.toPb()));
+  }
+}
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
new file mode 100644
index 000000000000..e848c3a61680
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+import com.google.gcloud.AuthCredentials;
+import com.google.gcloud.PageImpl;
+import com.google.gcloud.RetryParams;
+import com.google.gcloud.resourcemanager.Policy.Binding;
+import com.google.gcloud.resourcemanager.Policy.Member;
+import com.google.gcloud.resourcemanager.Policy.RoleType;
+
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SerializationTest {
+
+  private static final ResourceId RESOURCE_ID =
+      ResourceId.of("some id", ResourceId.Type.ORGANIZATION);
+  private static final Binding OWNER_BINDING;
+  private static final Binding EDITOR_BINDING;
+  private static final Binding VIEWER_BINDING;
+  private static final Binding EMPTY_BINDING = Policy.Binding.builder().build();
+  static {
+    List ownerMemberList = new ArrayList<>();
+    List editorMemberList = new ArrayList<>();
+    List viewerMemberList = new ArrayList<>();
+    ownerMemberList.add(Member.user("first-owner@email.com"));
+    ownerMemberList.add(Member.group("group-of-owners@email.com"));
+    OWNER_BINDING = Policy.Binding.builder().role(RoleType.OWNER).members(ownerMemberList).build();
+    editorMemberList.add(Member.serviceAccount("editor@someemail.com"));
+    EDITOR_BINDING =
+        Policy.Binding.builder().role(RoleType.EDITOR).members(editorMemberList).build();
+    viewerMemberList.add(Member.serviceAccount("app@someemail.com"));
+    viewerMemberList.add(Member.user("viewer@email.com"));
+    VIEWER_BINDING =
+        Policy.Binding.builder().role(RoleType.VIEWER).members(viewerMemberList).build();
+  }
+  private static final Policy POLICY =
+      Policy.builder()
+          .addBinding(OWNER_BINDING)
+          .addBinding(EDITOR_BINDING)
+          .addBinding(VIEWER_BINDING)
+          .version(1)
+          .etag("some-etag-value")
+          .build();
+  private static final Policy EMPTY_POLICY = Policy.builder().build();
+  private static final ProjectInfo PROJECT_INFO1 = ProjectInfo.builder("id1").build();
+  private static final ProjectInfo PROJECT_INFO2;
+  static {
+    Map labels = new HashMap();
+    labels.put("key", "value");
+    PROJECT_INFO2 =
+        new ProjectInfo("name", "id", labels, 123L, ProjectInfo.State.ACTIVE, 1234L, RESOURCE_ID);
+  }
+  private static final PageImpl PAGE_RESULT =
+      new PageImpl<>(null, "c", Collections.singletonList(PROJECT_INFO1));
+
+  @Test
+  public void testServiceOptions() throws Exception {
+    ResourceManagerOptions options = ResourceManagerOptions.builder().build();
+    ResourceManagerOptions serializedCopy = serializeAndDeserialize(options);
+    assertEquals(options, serializedCopy);
+    options =
+        options.toBuilder()
+            .projectId("some-unnecessary-project-ID")
+            .retryParams(RetryParams.defaultInstance())
+            .authCredentials(AuthCredentials.noCredentials())
+            .build();
+    serializedCopy = serializeAndDeserialize(options);
+    assertEquals(options, serializedCopy);
+  }
+
+  @Test
+  public void testModelAndRequests() throws Exception {
+    Serializable[] objects = {RESOURCE_ID, OWNER_BINDING.members().get(0), OWNER_BINDING,
+        EDITOR_BINDING, VIEWER_BINDING, EMPTY_BINDING, POLICY, EMPTY_POLICY, PROJECT_INFO1,
+        PROJECT_INFO2, PAGE_RESULT};
+    for (Serializable obj : objects) {
+      Object copy = serializeAndDeserialize(obj);
+      assertEquals(obj, obj);
+      assertEquals(obj, copy);
+      assertNotSame(obj, copy);
+      assertEquals(copy, copy);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  private  T serializeAndDeserialize(T obj) throws IOException, ClassNotFoundException {
+    ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+    try (ObjectOutputStream output = new ObjectOutputStream(bytes)) {
+      output.writeObject(obj);
+    }
+    try (ObjectInputStream input =
+        new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
+      return (T) input.readObject();
+    }
+  }
+}

From 9d6fbff4ea8172f01a64a51dc78f58131e5120f0 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 16 Nov 2015 17:18:12 -0800
Subject: [PATCH 191/322] Fix style, simplify equals methods, fix tests, and
 add Project javadocs

---
 .../google/gcloud/resourcemanager/Policy.java | 102 +++++++-----------
 .../gcloud/resourcemanager/Project.java       |  65 +++++++++--
 .../gcloud/resourcemanager/ProjectInfo.java   |  44 +++-----
 .../gcloud/resourcemanager/ResourceId.java    |  15 +--
 .../resourcemanager/ResourceManager.java      |  21 ++--
 .../ResourceManagerOptions.java               |   7 ++
 .../gcloud/resourcemanager/PolicyTest.java    |  75 +++++++------
 .../resourcemanager/ProjectInfoTest.java      |  54 ++++++++--
 .../gcloud/resourcemanager/ProjectTest.java   |  84 ++++++---------
 .../resourcemanager/ResourceIdTest.java       |  20 +++-
 .../resourcemanager/SerializationTest.java    |  64 +++++------
 11 files changed, 295 insertions(+), 256 deletions(-)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java
index 765e38d3c2f8..efa95d9f7c73 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java
@@ -19,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -122,6 +123,32 @@ public boolean equals(Object obj) {
       return obj instanceof Member && Objects.equals(this.memberType, ((Member) obj).memberType)
           && Objects.equals(this.emailOrDomain, ((Member) obj).emailOrDomain);
     }
+
+    String toPb() {
+      return emailOrDomain != null ? memberType.prefix() + emailOrDomain : memberType.prefix();
+    }
+
+    static Member fromPb(String memberPb) {
+      String[] memberInfo = memberPb.split(":", 2);
+      String memberStr = memberInfo[0];
+      String emailOrDomain = (memberInfo.length > 1) ? memberInfo[1] : null;
+      switch (memberStr) {
+        case "allUsers":
+          return new Member(MemberType.ALL_USERS, null);
+        case "allAuthenticatedUsers":
+          return new Member(MemberType.ALL_AUTHENTICATED_USERS, null);
+        case "user":
+          return new Member(MemberType.USER, checkNotNull(emailOrDomain));
+        case "serviceAccount":
+          return new Member(MemberType.SERVICE_ACCOUNT, checkNotNull(emailOrDomain));
+        case "group":
+          return new Member(MemberType.GROUP, checkNotNull(emailOrDomain));
+        case "domain":
+          return new Member(MemberType.DOMAIN, checkNotNull(emailOrDomain));
+        default:
+          throw new UnsupportedOperationException("Unsupported member type: " + memberStr);
+      }
+    }
   }
 
   /**
@@ -147,7 +174,7 @@ public Builder role(RoleType role) {
       }
 
       public Builder members(List members) {
-        this.members = checkNotNull(members);
+        this.members = Lists.newArrayList(checkNotNull(members));
         return this;
       }
 
@@ -172,15 +199,11 @@ public Binding build() {
     }
 
     private Binding(RoleType role, List members) {
-      this.role = role;
-      ImmutableList.Builder membersListBuilder = new ImmutableList.Builder<>();
-      for (Member member : members) {
-        membersListBuilder.add(member);
-      }
-      this.members = membersListBuilder.build();
+      this.role = checkNotNull(role);
+      this.members = ImmutableList.copyOf(members);
     }
 
-    public static Binding binding(RoleType role, List members) {
+    public static Binding of(RoleType role, List members) {
       return new Binding(role, members);
     }
 
@@ -197,26 +220,16 @@ public static Builder builder() {
     }
 
     public Builder toBuilder() {
-      List mutableMembers = new ArrayList<>();
-      for (Member member : members) {
-        mutableMembers.add(member);
-      }
-      return new Builder().role(role).members(mutableMembers);
+      return new Builder().role(role).members(members);
     }
 
     com.google.api.services.cloudresourcemanager.model.Binding toPb() {
       com.google.api.services.cloudresourcemanager.model.Binding bindingPb =
           new com.google.api.services.cloudresourcemanager.model.Binding();
-      if (role != null) {
-        bindingPb.setRole("roles/" + role.toString().toLowerCase());
-      }
+      bindingPb.setRole("roles/" + role.toString().toLowerCase());
       List membersPb = new ArrayList<>(members.size());
       for (Member member : members) {
-        if (member.emailOrDomain() != null) {
-          membersPb.add(member.type().prefix() + member.emailOrDomain());
-        } else {
-          membersPb.add(member.type().prefix());
-        }
+        membersPb.add(member.toPb());
       }
       bindingPb.setMembers(membersPb);
       return bindingPb;
@@ -229,31 +242,7 @@ static Binding fromPb(com.google.api.services.cloudresourcemanager.model.Binding
       List members = new ArrayList<>();
       if (bindingPb.getMembers() != null) {
         for (String memberPb : bindingPb.getMembers()) {
-          String[] memberInfo = memberPb.split(":", 2);
-          String memberTypeStr = memberInfo[0];
-          String emailOrDomain = (memberInfo.length > 1) ? emailOrDomain = memberInfo[1] : null;
-          switch (memberTypeStr) {
-            case "allUsers":
-              members.add(new Member(MemberType.ALL_USERS, null));
-              break;
-            case "allAuthenticatedUsers":
-              members.add(new Member(MemberType.ALL_AUTHENTICATED_USERS, null));
-              break;
-            case "user":
-              members.add(new Member(MemberType.USER, checkNotNull(emailOrDomain)));
-              break;
-            case "serviceAccount":
-              members.add(new Member(MemberType.SERVICE_ACCOUNT, checkNotNull(emailOrDomain)));
-              break;
-            case "group":
-              members.add(new Member(MemberType.GROUP, checkNotNull(emailOrDomain)));
-              break;
-            case "domain":
-              members.add(new Member(MemberType.DOMAIN, checkNotNull(emailOrDomain)));
-              break;
-            default:
-              throw new UnsupportedOperationException("Unsupported member type: " + memberTypeStr);
-          }
+          members.add(Member.fromPb(memberPb));
         }
       }
       return new Binding(role, members);
@@ -266,8 +255,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-      return obj instanceof Binding && Objects.equals(this.role, ((Binding) obj).role)
-          && Objects.equals(this.members, ((Binding) obj).members);
+      return obj instanceof Binding && Objects.equals(toPb(), ((Binding) obj).toPb());
     }
   }
 
@@ -296,7 +284,7 @@ public Builder clearBindings() {
     }
 
     public Builder bindings(List bindings) {
-      this.bindings = checkNotNull(bindings);
+      this.bindings = new ArrayList<>(checkNotNull(bindings));
       return this;
     }
 
@@ -316,11 +304,7 @@ public Policy build() {
   }
 
   Policy(Builder builder) {
-    ImmutableList.Builder bindingsListBuilder = new ImmutableList.Builder<>();
-    for (Binding binding : builder.bindings) {
-      bindingsListBuilder.add(binding);
-    }
-    bindings = bindingsListBuilder.build();
+    bindings = ImmutableList.copyOf(builder.bindings);
     version = builder.version;
     etag = builder.etag;
   }
@@ -342,11 +326,7 @@ public static Builder builder() {
   }
 
   public Builder toBuilder() {
-    List mutableBindings = new ArrayList<>();
-    for (Binding binding : bindings) {
-      mutableBindings.add(binding);
-    }
-    return new Builder().bindings(mutableBindings).etag(etag).version(version);
+    return new Builder().bindings(bindings).etag(etag).version(version);
   }
 
   @Override
@@ -356,9 +336,7 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof Policy && Objects.equals(this.bindings, ((Policy) obj).bindings)
-        && Objects.equals(this.etag, ((Policy) obj).etag)
-        && Objects.equals(this.version, ((Policy) obj).version);
+    return obj instanceof Policy && Objects.equals(toPb(), ((Policy) obj).toPb());
   }
 
   com.google.api.services.cloudresourcemanager.model.Policy toPb() {
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
index 1813d1083018..74296a0be773 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -20,7 +20,6 @@
 
 import com.google.gcloud.spi.ResourceManagerRpc.Permission;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -35,12 +34,22 @@ public class Project {
   private final ProjectInfo info;
   private final Policy policy;
 
+  /**
+   * Constructs a Project object that contains the ProjectInfo and Policy given.
+   */
   public Project(ResourceManager resourceManager, ProjectInfo projectInfo, Policy policy) {
     this.resourceManager = checkNotNull(resourceManager);
     this.info = checkNotNull(projectInfo);
     this.policy = checkNotNull(policy);
   }
 
+  /**
+   * Constructs a Project object that contains project and policy information loaded from the
+   * server.
+   *
+   * @return Project object containing the project's metadata and IAM policy
+   * @throws ResourceManagerException upon failure
+   */
   public static Project load(ResourceManager resourceManager, String projectId) {
     ProjectInfo projectInfo = resourceManager.get(projectId);
     Policy policy = resourceManager.getIamPolicy(projectId);
@@ -59,38 +68,76 @@ public ResourceManager resourceManager() {
     return resourceManager;
   }
 
+  /**
+   * Returns a Project object with updated project and policy information.
+   *
+   * @return Project object containing the project's updated metadata and IAM policy
+   * @throws ResourceManagerException upon failure
+   */
   public Project reload() {
     return new Project(
         resourceManager, resourceManager.get(info.id()), resourceManager.getIamPolicy(info.id()));
   }
 
+  /**
+   * Requests that this project be deleted. For an unspecified amount of time, this action can be
+   * undone by calling {@link #undelete}.
+   *
+   * @throws ResourceManagerException upon failure
+   */
   public void delete() {
     resourceManager.delete(info.id());
   }
 
+  /**
+   * Requests that a project's lifecycle status be changed from {@code DELETE_REQUESTED} to
+   * {@code ACTIVE}.
+   *
+   * @throws ResourceManagerException upon failure
+   */
   public void undelete() {
     resourceManager.undelete(info.id());
   }
 
+  /**
+   * Replaces the project metadata (not including the IAM policy) using the given ProjectInfo.
+   *
+   * @return Project object containing the project's updated metadata
+   * @throws ResourceManagerException upon failure
+   */
   public Project replace(ProjectInfo projectInfo) {
     return new Project(resourceManager, resourceManager.replace(checkNotNull(projectInfo)), policy);
   }
 
+  /**
+   * Replaces the project's IAM policy using the given policy.
+   *
+   * @return Project object containing the project's updated IAM policy
+   * @throws ResourceManagerException upon failure
+   */
   public Project replaceIamPolicy(Policy policy) {
     return new Project(
         resourceManager, info, resourceManager.replaceIamPolicy(info.id(), checkNotNull(policy)));
   }
 
-  public List hasPermissions(Permission first, Permission... others) {
-    List permissions = new ArrayList<>();
-    permissions.add(first);
-    for (Permission other : others) {
-      permissions.add(other);
-    }
+  /**
+   * Returns whether the caller has the permissions specified in the parameters.
+   *
+   * @return List of booleans representing whether the user has the corresponding permission
+   *     provided as a parameter
+   * @throws ResourceManagerException upon failure
+   */
+  public List hasPermissions(Permission... permissions) {
     return resourceManager.hasPermissions(info.id(), permissions);
   }
 
-  public boolean hasAllPermissions(Permission first, Permission... others) {
-    return !(hasPermissions(first, others).contains(false));
+  /**
+   * Returns whether the caller has all the permissions specified in the parameters.
+   *
+   * @return true if the caller has all the permissions specified, otherwise false.
+   * @throws ResourceManagerException upon failure
+   */
+  public boolean hasAllPermissions(Permission... permissions) {
+    return !(hasPermissions(permissions).contains(false));
   }
 }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
index d69f94c530d5..4e3aed325db7 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
@@ -17,6 +17,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 
 import org.joda.time.DateTime;
 import org.joda.time.format.ISODateTimeFormat;
@@ -86,7 +87,7 @@ public Builder clearLabels() {
     }
 
     public Builder labels(Map labels) {
-      this.labels = checkNotNull(labels);
+      this.labels = Maps.newHashMap(checkNotNull(labels));
       return this;
     }
 
@@ -111,23 +112,18 @@ public Builder parent(ResourceId parent) {
     }
 
     public ProjectInfo build() {
-      return new ProjectInfo(name, id, labels, number, state, createTimeMillis, parent);
+      return new ProjectInfo(this);
     }
   }
 
-  ProjectInfo(String name, String id, Map labels, Long number, State state,
-      Long createTimeMillis, ResourceId parent) {
-    this.name = name;
-    this.id = checkNotNull(id);
-    ImmutableMap.Builder labelsMapBuilder = ImmutableMap.builder();
-    for (Map.Entry entry : labels.entrySet()) {
-      labelsMapBuilder.put(entry.getKey(), entry.getValue());
-    }
-    this.labels = (labels == null) ? null : labelsMapBuilder.build();
-    this.number = number;
-    this.state = state;
-    this.createTimeMillis = createTimeMillis;
-    this.parent = parent;
+  ProjectInfo(Builder builder) {
+    this.name = builder.name;
+    this.id = checkNotNull(builder.id);
+    this.labels = ImmutableMap.copyOf(builder.labels);
+    this.number = builder.number;
+    this.state = builder.state;
+    this.createTimeMillis = builder.createTimeMillis;
+    this.parent = builder.parent;
   }
 
   public String id() {
@@ -160,17 +156,7 @@ public ResourceId parent() {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj == this) {
-      return true;
-    } else if (obj instanceof ProjectInfo) {
-      ProjectInfo other = (ProjectInfo) obj;
-      return Objects.equals(this.name, other.name) && Objects.equals(this.id, other.id)
-          && Objects.equals(this.labels, other.labels) && Objects.equals(this.number, other.number)
-          && Objects.equals(this.state, other.state)
-          && Objects.equals(this.createTimeMillis, other.createTimeMillis)
-          && Objects.equals(this.parent, other.parent);
-    }
-    return false;
+    return obj instanceof ProjectInfo && Objects.equals(toPb(), ((ProjectInfo) obj).toPb());
   }
 
   @Override
@@ -183,14 +169,10 @@ public static Builder builder(String id) {
   }
 
   public Builder toBuilder() {
-    Map mutableLabels = new HashMap();
-    for (Map.Entry entry : labels.entrySet()) {
-      mutableLabels.put(entry.getKey(), entry.getValue());
-    }
     return new Builder()
         .name(name)
         .id(id)
-        .labels(mutableLabels)
+        .labels(labels)
         .number(number)
         .state(state)
         .createTimeMillis(createTimeMillis)
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceId.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceId.java
index c640709d6faa..6e6022460e04 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceId.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceId.java
@@ -29,14 +29,8 @@ public class ResourceId implements Serializable {
   private final Type type;
 
   public enum Type {
-    ORGANIZATION("organization"),
-    UNKNOWN("unknown");
-
-    private final String strValue;
-
-    Type(String strValue) {
-      this.strValue = strValue;
-    }
+    ORGANIZATION,
+    UNKNOWN;
   }
 
   private ResourceId(String id, Type type) {
@@ -54,8 +48,7 @@ public Type type() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ResourceId && Objects.equals(this.id, ((ResourceId) obj).id)
-        && Objects.equals(this.type, ((ResourceId) obj).type);
+    return obj instanceof ResourceId && Objects.equals(toPb(), ((ResourceId) obj).toPb());
   }
 
   @Override
@@ -71,7 +64,7 @@ com.google.api.services.cloudresourcemanager.model.ResourceId toPb() {
     com.google.api.services.cloudresourcemanager.model.ResourceId resourceIdPb =
         new com.google.api.services.cloudresourcemanager.model.ResourceId();
     resourceIdPb.setId(id);
-    resourceIdPb.setType(type.strValue);
+    resourceIdPb.setType(type.toString().toLowerCase());
     return resourceIdPb;
   }
 
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
index 29fddd409e8a..ca6a1cb24b27 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
@@ -35,15 +35,16 @@ public interface ResourceManager extends Service {
   /**
    * Create a new project.
    *
-   * @return ProjectInfo object representing the new project's metadata.  The returned object will
-   * include additional read-only information, namely project number, lifecycle state, and creation
-   * time.
+   * @return ProjectInfo object representing the new project's metadata. The returned object will
+   *     include additional read-only information, namely project number, lifecycle state, and
+   *     creation time.
    * @throws ResourceManagerException upon failure
    */
   ProjectInfo create(ProjectInfo project);
 
   /**
-   * Delete the requested project.
+   * Sends a request to delete a project. For an unspecified amount of time, this action can be
+   * undone using {@link #undelete}.
    *
    * @throws ResourceManagerException upon failure
    */
@@ -57,8 +58,8 @@ public interface ResourceManager extends Service {
   ProjectInfo get(String projectId);
 
   /**
-   * List the projects viewable by the current user.  Use {@link ListOptions} to filter this list,
-   * set page size, and set page tokens.  Note that pagination is currently not implemented by the
+   * List the projects viewable by the current user. Use {@link ListOptions} to filter this list,
+   * set page size, and set page tokens. Note that pagination is currently not implemented by the
    * Cloud Resource Manager API.
    *
    * @return {@code Page}, a paginated list of projects.
@@ -75,8 +76,8 @@ public interface ResourceManager extends Service {
   ProjectInfo replace(ProjectInfo newProject);
 
   /**
-   * Undo a delete request.  This will only succeed if the project's lifecycle state is
-   * DELETE_REQUESTED.
+   * Undo a delete request. This will only succeed if the server processes the undelete request
+   * while the project's state is {@code DELETE_REQUESTED}.
    *
    * @throws ResourceManagerException
    */
@@ -102,8 +103,8 @@ public interface ResourceManager extends Service {
    * Test whether the caller of this function has the permissions provided as arguments.
    *
    * @return List of booleans representing whether the caller has the corresponding permission in
-   * the given permissions list.
+   *     the given permissions array.
    * @throws ResourceManagerException upon failure
    */
-  List hasPermissions(String projectId, List permissions);
+  List hasPermissions(String projectId, Permission... permissions);
 }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
index 51d8e5411212..990163c459da 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
@@ -40,6 +40,13 @@ public ResourceManager create(ResourceManagerOptions options) {
     }
   }
 
+  /**
+   * Returns a default {@code ResourceManagerOptions} instance.
+   */
+  public static ResourceManagerOptions defaultInstance() {
+    return builder().build();
+  }
+
   public static class DefaultResourceManagerRpcFactory implements ResourceManagerRpcFactory {
     private static final ResourceManagerRpcFactory INSTANCE =
         new DefaultResourceManagerRpcFactory();
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java
index 77037d2996c6..6b52f20f3fae 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java
@@ -17,40 +17,31 @@
 package com.google.gcloud.resourcemanager;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotEquals;
 
+import com.google.common.collect.ImmutableList;
 import com.google.gcloud.resourcemanager.Policy.Binding;
 import com.google.gcloud.resourcemanager.Policy.Member;
 import com.google.gcloud.resourcemanager.Policy.RoleType;
 
 import org.junit.Test;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class PolicyTest {
 
-  private static final Binding OWNER_BINDING;
-  private static final Binding EDITOR_BINDING;
-  private static final Binding VIEWER_BINDING;
-  private static final Binding EMPTY_BINDING = Policy.Binding.builder().build();
-  private static final List OWNER_MEMBER_LIST = new ArrayList<>();
-  private static final List EDITOR_MEMBER_LIST = new ArrayList<>();
-  private static final List VIEWER_MEMBER_LIST = new ArrayList<>();
-  static {
-    OWNER_MEMBER_LIST.add(Member.user("first-owner@email.com"));
-    OWNER_MEMBER_LIST.add(Member.group("group-of-owners@email.com"));
-    OWNER_BINDING =
-        Policy.Binding.builder().role(RoleType.OWNER).members(OWNER_MEMBER_LIST).build();
-    EDITOR_MEMBER_LIST.add(Member.serviceAccount("editor@someemail.com"));
-    EDITOR_BINDING =
-        Policy.Binding.builder().role(RoleType.EDITOR).members(EDITOR_MEMBER_LIST).build();
-    VIEWER_MEMBER_LIST.add(Member.serviceAccount("app@someemail.com"));
-    VIEWER_MEMBER_LIST.add(Member.user("viewer@email.com"));
-    VIEWER_BINDING =
-        Policy.Binding.builder().role(RoleType.VIEWER).members(VIEWER_MEMBER_LIST).build();
-  }
+  private static final List OWNER_MEMBER_LIST = ImmutableList.of(
+      Member.user("first-owner@email.com"), Member.group("group-of-owners@email.com"));
+  private static final List EDITOR_MEMBER_LIST =
+      ImmutableList.of(Member.serviceAccount("editor@someemail.com"));
+  private static final List VIEWER_MEMBER_LIST =
+      ImmutableList.of(Member.serviceAccount("app@someemail.com"), Member.user("viewer@email.com"));
+  private static final Binding OWNER_BINDING =
+      Policy.Binding.builder().role(RoleType.OWNER).members(OWNER_MEMBER_LIST).build();
+  private static final Binding EDITOR_BINDING =
+      Policy.Binding.builder().role(RoleType.EDITOR).members(EDITOR_MEMBER_LIST).build();
+  private static final Binding VIEWER_BINDING =
+      Policy.Binding.builder().role(RoleType.VIEWER).members(VIEWER_MEMBER_LIST).build();
   private static final Policy EMPTY_POLICY = Policy.builder().build();
   private static final Integer VERSION = 1;
   private static final String ETAG = "some-etag-value";
@@ -65,16 +56,13 @@ public class PolicyTest {
 
   @Test
   public void testBindingBuilder() {
-    assertEquals(OWNER_BINDING.role(), RoleType.OWNER);
-    assertEquals(OWNER_BINDING.members(), OWNER_MEMBER_LIST);
-    assertNull(EMPTY_BINDING.role());
-    assertTrue(EMPTY_BINDING.members().isEmpty());
+    assertEquals(RoleType.OWNER, OWNER_BINDING.role());
+    assertEquals(OWNER_MEMBER_LIST, OWNER_BINDING.members());
   }
 
   @Test
   public void testBindingToBuilder() {
     assertEquals(OWNER_BINDING, OWNER_BINDING.toBuilder().build());
-    assertEquals(EMPTY_BINDING, EMPTY_BINDING.toBuilder().build());
   }
 
   @Test
@@ -82,7 +70,6 @@ public void testBindingToAndFromPb() {
     assertEquals(OWNER_BINDING, Binding.fromPb(OWNER_BINDING.toPb()));
     assertEquals(EDITOR_BINDING, Binding.fromPb(EDITOR_BINDING.toPb()));
     assertEquals(VIEWER_BINDING, Binding.fromPb(VIEWER_BINDING.toPb()));
-    assertEquals(EMPTY_BINDING, Binding.fromPb(EMPTY_BINDING.toPb()));
   }
 
   @Test
@@ -96,13 +83,35 @@ public void testPolicyBuilder() {
 
   @Test
   public void testPolicyToBuilder() {
-    assertEquals(FULL_POLICY, FULL_POLICY.toBuilder().build());
-    assertEquals(EMPTY_POLICY, EMPTY_POLICY.toBuilder().build());
+    comparePolicies(FULL_POLICY, FULL_POLICY.toBuilder().build());
+    comparePolicies(EMPTY_POLICY, EMPTY_POLICY.toBuilder().build());
   }
 
   @Test
   public void testPolicyToAndFromPb() {
-    assertEquals(EMPTY_POLICY, Policy.fromPb(EMPTY_POLICY.toPb()));
-    assertEquals(FULL_POLICY, Policy.fromPb(FULL_POLICY.toPb()));
+    comparePolicies(FULL_POLICY, Policy.fromPb(FULL_POLICY.toPb()));
+    comparePolicies(EMPTY_POLICY, Policy.fromPb(EMPTY_POLICY.toPb()));
+  }
+
+  @Test
+  public void testEquals() {
+    comparePolicies(
+        FULL_POLICY,
+        Policy.builder()
+            .addBinding(OWNER_BINDING)
+            .addBinding(EDITOR_BINDING)
+            .addBinding(VIEWER_BINDING)
+            .version(VERSION)
+            .etag(ETAG)
+            .build());
+    comparePolicies(EMPTY_POLICY, Policy.builder().build());
+    assertNotEquals(FULL_POLICY, EMPTY_POLICY);
+  }
+
+  private void comparePolicies(Policy expected, Policy value) {
+    assertEquals(expected, value);
+    assertEquals(expected.bindings(), value.bindings());
+    assertEquals(expected.version(), value.version());
+    assertEquals(expected.etag(), value.etag());
   }
 }
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java
index d6e27aecd103..c0bfb73af3fd 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java
@@ -17,21 +17,20 @@
 package com.google.gcloud.resourcemanager;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableMap;
 
 import org.junit.Test;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class ProjectInfoTest {
 
   private static final String ID = "project-id";
   private static final String NAME = "myProj";
-  private static final Map LABELS = new HashMap();
-  static {
-    LABELS.put("k1", "v1");
-    LABELS.put("k2", "k2");
-  }
+  private static final Map LABELS = ImmutableMap.of("k1", "v1", "k2", "v2");
   private static final Long NUMBER = 123L;
   private static final Long CREATE_TIME_MILLIS = 123456789L;
   private static final ProjectInfo.State STATE = ProjectInfo.State.DELETE_REQUESTED;
@@ -56,18 +55,53 @@ public void testBuilder() {
     assertEquals(CREATE_TIME_MILLIS, FULL_PROJECT_INFO.createTimeMillis());
     assertEquals(STATE, FULL_PROJECT_INFO.state());
     assertEquals(PARENT, FULL_PROJECT_INFO.parent());
+
+    assertEquals(ID, PARTIAL_PROJECT_INFO.id());
+    assertEquals(null, PARTIAL_PROJECT_INFO.name());
+    assertTrue(PARTIAL_PROJECT_INFO.labels().isEmpty());
+    assertEquals(null, PARTIAL_PROJECT_INFO.number());
+    assertEquals(null, PARTIAL_PROJECT_INFO.createTimeMillis());
+    assertEquals(null, PARTIAL_PROJECT_INFO.state());
+    assertEquals(null, PARTIAL_PROJECT_INFO.parent());
   }
 
   @Test
   public void testToBuilder() {
-    assertEquals(FULL_PROJECT_INFO, FULL_PROJECT_INFO.toBuilder().build());
-    assertEquals(PARTIAL_PROJECT_INFO, PARTIAL_PROJECT_INFO.toBuilder().build());
+    compareProjects(FULL_PROJECT_INFO, FULL_PROJECT_INFO.toBuilder().build());
+    compareProjects(PARTIAL_PROJECT_INFO, PARTIAL_PROJECT_INFO.toBuilder().build());
   }
 
   @Test
   public void testToAndFromPb() {
-    assertEquals(FULL_PROJECT_INFO, ProjectInfo.fromPb(FULL_PROJECT_INFO.toPb()));
-    assertEquals(PARTIAL_PROJECT_INFO, ProjectInfo.fromPb(PARTIAL_PROJECT_INFO.toPb()));
+    compareProjects(FULL_PROJECT_INFO, ProjectInfo.fromPb(FULL_PROJECT_INFO.toPb()));
+    compareProjects(PARTIAL_PROJECT_INFO, ProjectInfo.fromPb(PARTIAL_PROJECT_INFO.toPb()));
+  }
+
+  @Test
+  public void testEquals() {
+    compareProjects(
+        FULL_PROJECT_INFO,
+        ProjectInfo.builder(ID)
+            .name(NAME)
+            .labels(LABELS)
+            .number(NUMBER)
+            .createTimeMillis(CREATE_TIME_MILLIS)
+            .state(STATE)
+            .parent(PARENT)
+            .build());
+    compareProjects(PARTIAL_PROJECT_INFO, ProjectInfo.builder(ID).build());
+    assertNotEquals(FULL_PROJECT_INFO, PARTIAL_PROJECT_INFO);
+  }
+
+  private void compareProjects(ProjectInfo expected, ProjectInfo value) {
+    assertEquals(expected, value);
+    assertEquals(expected.id(), value.id());
+    assertEquals(expected.name(), value.name());
+    assertEquals(expected.labels(), value.labels());
+    assertEquals(expected.number(), value.number());
+    assertEquals(expected.createTimeMillis(), value.createTimeMillis());
+    assertEquals(expected.state(), value.state());
+    assertEquals(expected.parent(), value.parent());
   }
 }
 
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
index 6d36c024d0d2..a4388d8a725e 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
@@ -26,6 +26,8 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.resourcemanager.Policy.Binding;
 import com.google.gcloud.resourcemanager.Policy.Member;
 import com.google.gcloud.resourcemanager.Policy.RoleType;
@@ -35,20 +37,13 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class ProjectTest {
   private static final String ID = "project-id";
   private static final String NAME = "myProj";
-  private static final Map LABELS = new HashMap();
-  static {
-    LABELS.put("k1", "v1");
-    LABELS.put("k2", "k2");
-  }
+  private static final Map LABELS = ImmutableMap.of("k1", "v1", "k2", "v2");
   private static final Long NUMBER = 123L;
   private static final Long CREATE_TIME_MILLIS = 123456789L;
   private static final ProjectInfo.State STATE = ProjectInfo.State.DELETE_REQUESTED;
@@ -62,25 +57,18 @@ public class ProjectTest {
           .state(STATE)
           .parent(PARENT)
           .build();
-  private static final Binding OWNER_BINDING;
-  private static final Binding EDITOR_BINDING;
-  private static final Binding VIEWER_BINDING;
-  static {
-    List ownerMemberList = new ArrayList<>();
-    List editorMemberList = new ArrayList<>();
-    List viewerMemberList = new ArrayList<>();
-
-    ownerMemberList.add(Member.user("first-owner@email.com"));
-    ownerMemberList.add(Member.group("group-of-owners@email.com"));
-    OWNER_BINDING = Policy.Binding.builder().role(RoleType.OWNER).members(ownerMemberList).build();
-    editorMemberList.add(Member.serviceAccount("editor@someemail.com"));
-    EDITOR_BINDING =
-        Policy.Binding.builder().role(RoleType.EDITOR).members(editorMemberList).build();
-    viewerMemberList.add(Member.serviceAccount("app@someemail.com"));
-    viewerMemberList.add(Member.user("viewer@email.com"));
-    VIEWER_BINDING =
-        Policy.Binding.builder().role(RoleType.VIEWER).members(viewerMemberList).build();
-  }
+  private static final List OWNER_MEMBER_LIST = ImmutableList.of(
+      Member.user("first-owner@email.com"), Member.group("group-of-owners@email.com"));
+  private static final List EDITOR_MEMBER_LIST =
+      ImmutableList.of(Member.serviceAccount("editor@someemail.com"));
+  private static final List VIEWER_MEMBER_LIST =
+      ImmutableList.of(Member.serviceAccount("app@someemail.com"), Member.user("viewer@email.com"));
+  private static final Binding OWNER_BINDING =
+      Policy.Binding.builder().role(RoleType.OWNER).members(OWNER_MEMBER_LIST).build();
+  private static final Binding EDITOR_BINDING =
+      Policy.Binding.builder().role(RoleType.EDITOR).members(EDITOR_MEMBER_LIST).build();
+  private static final Binding VIEWER_BINDING =
+      Policy.Binding.builder().role(RoleType.VIEWER).members(VIEWER_MEMBER_LIST).build();
   private static final Policy POLICY =
       Policy.builder()
           .addBinding(OWNER_BINDING)
@@ -89,9 +77,8 @@ public class ProjectTest {
           .version(1)
           .etag("some-etag-value")
           .build();
-  private static final List PERMISSIONS_REQUESTED =
-      Arrays.asList(new Permission[] {Permission.REPLACE, Permission.GET});
-  private static final List PERMISSIONS_OWNED = Arrays.asList(new Boolean[] {false, true});
+  private static final Permission[] PERMISSIONS_REQUESTED = {Permission.REPLACE, Permission.GET};
+  private static final List PERMISSIONS_OWNED = ImmutableList.of(false, true);
 
   private ResourceManager resourceManager;
   private Project project;
@@ -132,20 +119,20 @@ public void testReload() {
 
   @Test
   public void testPolicy() {
-    assertEquals(project.policy(), POLICY);
     replay(resourceManager);
+    assertEquals(POLICY, project.policy());
   }
 
   @Test
   public void testInfo() {
-    assertEquals(project.info(), PROJECT_INFO);
     replay(resourceManager);
+    assertEquals(PROJECT_INFO, project.info());
   }
 
   @Test
   public void testResourceManager() {
-    assertEquals(project.resourceManager(), resourceManager);
     replay(resourceManager);
+    assertEquals(resourceManager, project.resourceManager());
   }
 
   @Test
@@ -170,9 +157,9 @@ public void testReplace() {
     expect(resourceManager.replace(newInfo)).andReturn(newInfo);
     replay(resourceManager);
     Project newProject = project.replace(newInfo);
-    assertSame(newProject.resourceManager(), resourceManager);
-    assertEquals(newProject.info(), newInfo);
-    assertEquals(newProject.policy(), POLICY);
+    assertSame(resourceManager, newProject.resourceManager());
+    assertEquals(newInfo, newProject.info());
+    assertEquals(POLICY, newProject.policy());
   }
 
   @Test
@@ -181,9 +168,9 @@ public void testReplaceIamPolicy() {
     expect(resourceManager.replaceIamPolicy(PROJECT_INFO.id(), newPolicy)).andReturn(newPolicy);
     replay(resourceManager);
     Project newProject = project.replaceIamPolicy(newPolicy);
-    assertSame(newProject.resourceManager(), resourceManager);
-    assertEquals(newProject.info(), PROJECT_INFO);
-    assertEquals(newProject.policy(), newPolicy);
+    assertSame(resourceManager, newProject.resourceManager());
+    assertEquals(PROJECT_INFO, newProject.info());
+    assertEquals(newPolicy, newProject.policy());
   }
 
   @Test
@@ -192,23 +179,20 @@ public void testHasPermissions() {
         .andReturn(PERMISSIONS_OWNED);
     replay(resourceManager);
     List response =
-        project.hasPermissions(PERMISSIONS_REQUESTED.get(0), PERMISSIONS_REQUESTED.get(1));
-    assertEquals(response, PERMISSIONS_OWNED);
+        project.hasPermissions(PERMISSIONS_REQUESTED[0], PERMISSIONS_REQUESTED[1]);
+    assertEquals(PERMISSIONS_OWNED, response);
   }
 
   @Test
   public void testHasAllPermissions() {
     expect(resourceManager.hasPermissions(PROJECT_INFO.id(), PERMISSIONS_REQUESTED))
         .andReturn(PERMISSIONS_OWNED);
-    List permissionsRequested2 =
-        Arrays.asList(new Permission[] {Permission.UNDELETE, Permission.DELETE});
-    List permissionsOwned2 = Arrays.asList(new Boolean[] {true, true});
-    expect(resourceManager.hasPermissions(PROJECT_INFO.id(), permissionsRequested2))
-        .andReturn(permissionsOwned2);
+    Permission[] permissionsRequestAllOwned = {Permission.UNDELETE, Permission.DELETE};
+    List permissionsResponseAllOwned = ImmutableList.of(true, true);
+    expect(resourceManager.hasPermissions(PROJECT_INFO.id(), permissionsRequestAllOwned))
+        .andReturn(permissionsResponseAllOwned);
     replay(resourceManager);
-    assertFalse(
-        project.hasAllPermissions(PERMISSIONS_REQUESTED.get(0), PERMISSIONS_REQUESTED.get(1)));
-    assertTrue(
-        project.hasAllPermissions(permissionsRequested2.get(0), permissionsRequested2.get(1)));
+    assertFalse(project.hasAllPermissions(PERMISSIONS_REQUESTED));
+    assertTrue(project.hasAllPermissions(permissionsRequestAllOwned));
   }
 }
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceIdTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceIdTest.java
index 1f66017312a6..3879a38457fc 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceIdTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceIdTest.java
@@ -17,26 +17,36 @@
 package com.google.gcloud.resourcemanager;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 import org.junit.Test;
 
 public class ResourceIdTest {
 
-private static final ResourceId RESOURCE_ID = ResourceId.of("id", ResourceId.Type.ORGANIZATION);
+  private static final String ID = "id";
+  private static final ResourceId.Type TYPE = ResourceId.Type.ORGANIZATION;
+  private static final ResourceId RESOURCE_ID = ResourceId.of(ID, TYPE);
 
   @Test
   public void testOf() {
-    assertEquals(RESOURCE_ID.id(), "id");
-    assertEquals(RESOURCE_ID.type(), ResourceId.Type.ORGANIZATION);
+    assertEquals(ID, RESOURCE_ID.id());
+    assertEquals(TYPE, RESOURCE_ID.type());
   }
 
   @Test
   public void testEquals() {
-    assertEquals(RESOURCE_ID, ResourceId.of("id", ResourceId.Type.ORGANIZATION));
+    assertEquals(RESOURCE_ID, ResourceId.of(ID, TYPE));
+    assertEquals(ID, RESOURCE_ID.id());
+    assertEquals(TYPE, RESOURCE_ID.type());
+    assertNotEquals(ResourceId.of("another-ID", TYPE), RESOURCE_ID);
+    assertNotEquals(ResourceId.of(ID, ResourceId.Type.UNKNOWN), RESOURCE_ID);
   }
 
   @Test
   public void testToAndFromPb() {
-    assertEquals(RESOURCE_ID, ResourceId.fromPb(RESOURCE_ID.toPb()));
+    ResourceId copy = ResourceId.fromPb(RESOURCE_ID.toPb());
+    assertEquals(RESOURCE_ID, copy);
+    assertEquals(ID, copy.id());
+    assertEquals(TYPE, copy.type());
   }
 }
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
index e848c3a61680..72c8de7e9527 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
@@ -19,6 +19,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.PageImpl;
 import com.google.gcloud.RetryParams;
@@ -34,36 +36,27 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public class SerializationTest {
 
   private static final ResourceId RESOURCE_ID =
       ResourceId.of("some id", ResourceId.Type.ORGANIZATION);
-  private static final Binding OWNER_BINDING;
-  private static final Binding EDITOR_BINDING;
-  private static final Binding VIEWER_BINDING;
-  private static final Binding EMPTY_BINDING = Policy.Binding.builder().build();
-  static {
-    List ownerMemberList = new ArrayList<>();
-    List editorMemberList = new ArrayList<>();
-    List viewerMemberList = new ArrayList<>();
-    ownerMemberList.add(Member.user("first-owner@email.com"));
-    ownerMemberList.add(Member.group("group-of-owners@email.com"));
-    OWNER_BINDING = Policy.Binding.builder().role(RoleType.OWNER).members(ownerMemberList).build();
-    editorMemberList.add(Member.serviceAccount("editor@someemail.com"));
-    EDITOR_BINDING =
-        Policy.Binding.builder().role(RoleType.EDITOR).members(editorMemberList).build();
-    viewerMemberList.add(Member.serviceAccount("app@someemail.com"));
-    viewerMemberList.add(Member.user("viewer@email.com"));
-    VIEWER_BINDING =
-        Policy.Binding.builder().role(RoleType.VIEWER).members(viewerMemberList).build();
-  }
-  private static final Policy POLICY =
+  private static final List OWNER_MEMBER_LIST = ImmutableList.of(
+      Member.user("first-owner@email.com"), Member.group("group-of-owners@email.com"));
+  private static final List EDITOR_MEMBER_LIST =
+      ImmutableList.of(Member.serviceAccount("editor@someemail.com"));
+  private static final List VIEWER_MEMBER_LIST =
+      ImmutableList.of(Member.serviceAccount("app@someemail.com"), Member.user("viewer@email.com"));
+  private static final Binding OWNER_BINDING =
+      Policy.Binding.builder().role(RoleType.OWNER).members(OWNER_MEMBER_LIST).build();
+  private static final Binding EDITOR_BINDING =
+      Policy.Binding.builder().role(RoleType.EDITOR).members(EDITOR_MEMBER_LIST).build();
+  private static final Binding VIEWER_BINDING =
+      Policy.Binding.builder().role(RoleType.VIEWER).members(VIEWER_MEMBER_LIST).build();
+  private static final Policy EMPTY_POLICY = Policy.builder().build();
+  private static final Policy FULL_POLICY =
       Policy.builder()
           .addBinding(OWNER_BINDING)
           .addBinding(EDITOR_BINDING)
@@ -71,17 +64,18 @@ public class SerializationTest {
           .version(1)
           .etag("some-etag-value")
           .build();
-  private static final Policy EMPTY_POLICY = Policy.builder().build();
-  private static final ProjectInfo PROJECT_INFO1 = ProjectInfo.builder("id1").build();
-  private static final ProjectInfo PROJECT_INFO2;
-  static {
-    Map labels = new HashMap();
-    labels.put("key", "value");
-    PROJECT_INFO2 =
-        new ProjectInfo("name", "id", labels, 123L, ProjectInfo.State.ACTIVE, 1234L, RESOURCE_ID);
-  }
+  private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.builder("id1").build();
+  private static final ProjectInfo FULL_PROJECT_INFO =
+      ProjectInfo.builder("id")
+          .name("name")
+          .labels(ImmutableMap.of("key", "value"))
+          .number(123L)
+          .state(ProjectInfo.State.ACTIVE)
+          .createTimeMillis(1234L)
+          .parent(RESOURCE_ID)
+          .build();
   private static final PageImpl PAGE_RESULT =
-      new PageImpl<>(null, "c", Collections.singletonList(PROJECT_INFO1));
+      new PageImpl<>(null, "c", Collections.singletonList(PARTIAL_PROJECT_INFO));
 
   @Test
   public void testServiceOptions() throws Exception {
@@ -101,8 +95,8 @@ public void testServiceOptions() throws Exception {
   @Test
   public void testModelAndRequests() throws Exception {
     Serializable[] objects = {RESOURCE_ID, OWNER_BINDING.members().get(0), OWNER_BINDING,
-        EDITOR_BINDING, VIEWER_BINDING, EMPTY_BINDING, POLICY, EMPTY_POLICY, PROJECT_INFO1,
-        PROJECT_INFO2, PAGE_RESULT};
+        EDITOR_BINDING, VIEWER_BINDING, EMPTY_POLICY, FULL_POLICY, PARTIAL_PROJECT_INFO,
+        FULL_PROJECT_INFO, PAGE_RESULT};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);

From e625c20f67ee7b096f944ed744d95ffba6ad3f6d Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 20 Nov 2015 10:41:07 -0800
Subject: [PATCH 192/322] Add documentation and make resource ID type string

---
 .../gcloud/resourcemanager/ProjectInfo.java   | 94 ++++++++++++++++++-
 .../gcloud/resourcemanager/ResourceId.java    | 15 +--
 .../resourcemanager/ProjectInfoTest.java      |  2 +-
 .../gcloud/resourcemanager/ProjectTest.java   |  2 +-
 .../resourcemanager/ResourceIdTest.java       |  3 +-
 .../resourcemanager/SerializationTest.java    |  3 +-
 6 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
index 4e3aed325db7..b5913b763ea0 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
@@ -41,11 +41,24 @@ public class ProjectInfo implements Serializable {
   private final Long createTimeMillis;
   private final ResourceId parent;
 
+  /**
+   * The project lifecycle state.
+   *
+   * 
 | info dataset  | info table  
 |
+ *  info job  | create dataset  |
+ *  create table  
 (:)+ |
+ *  create view  
 |
+ *  create external-table  
 
 (:)+  |
+ *  delete dataset  | delete table  
 
 | cancel  |
+ *  copy     |
+ *  load  
 + |
+ *  extract  
 
 + | query "}
+ * 
+ * 
+ *
+ * 
The first parameter is an optional {@code project_id} (logged-in project will be used if not
+ * supplied). Second parameter is a BigQuery operation and can be used to demonstrate its usage. For
+ * operations that apply to more than one entity (`list`, `create`, `info` and `delete`) the third
+ * parameter specifies the entity. {@code } indicates that only primitive types are
+ * supported by the {@code create table} and {@code create external-table} operations
+ * ({@code string}, {@code float}, {@code integer}, {@code timestamp}, {@code boolean}).
+ * {@code }, {@code } and {@code } parameters are URIs to
+ * Google Cloud Storage blobs, in the form {@code gs://bucket/path}. See each action's run method
+ * for the specific BigQuery interaction.
+ */
+public class BigQueryExample {
+
+  private static final Map CREATE_ACTIONS = new HashMap<>();
+  private static final Map INFO_ACTIONS = new HashMap<>();
+  private static final Map LIST_ACTIONS = new HashMap<>();
+  private static final Map DELETE_ACTIONS = new HashMap<>();
+  private static final Map ACTIONS = new HashMap<>();
+
+  private abstract static class BigQueryAction {
+
+    abstract void run(BigQuery bigquery, T request) throws Exception;
+
+    abstract T parse(String... args) throws Exception;
+
+    protected String params() {
+      return "";
+    }
+  }
+
+  private static class ParentAction extends BigQueryAction> {
+
+    private final Map subActions;
+
+    public ParentAction(Map subActions) {
+      this.subActions = ImmutableMap.copyOf(subActions);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    void run(BigQuery bigquery, Tuple subaction) throws Exception {
+      subaction.x().run(bigquery, subaction.y());
+    }
+
+    @Override
+    Tuple parse(String... args) throws Exception {
+      if (args.length >= 1) {
+        BigQueryAction action = subActions.get(args[0]);
+        if (action != null) {
+          Object actionArguments = action.parse(Arrays.copyOfRange(args, 1, args.length));
+          return Tuple.of(action, actionArguments);
+        }
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    public String params() {
+      StringBuilder builder = new StringBuilder();
+      for (Map.Entry entry : subActions.entrySet()) {
+        builder.append("\n").append(entry.getKey());
+        String param = entry.getValue().params();
+        if (param != null && !param.isEmpty()) {
+          builder.append(' ').append(param);
+        }
+      }
+      return builder.toString();
+    }
+  }
+
+  private abstract static class VoidAction extends BigQueryAction {
+    @Override
+    Void parse(String... args) throws Exception {
+      if (args.length == 0) {
+        return null;
+      }
+      throw new IllegalArgumentException();
+    }
+  }
+
+  /**
+   * This class demonstrates how to list BigQuery Datasets.
+   *
+   * @see Datasets: list
+   *     
+   */
+  private static class ListDatasetsAction extends VoidAction {
+    @Override
+    public void run(BigQuery bigquery, Void arg) {
+      Iterator datasetInfoIterator = bigquery.listDatasets().iterateAll();
+      while (datasetInfoIterator.hasNext()) {
+        System.out.println(datasetInfoIterator.next());
+      }
+    }
+  }
+
+  private abstract static class DatasetAction extends BigQueryAction {
+    @Override
+    DatasetId parse(String... args) throws Exception {
+      if (args.length == 1) {
+        return DatasetId.of(args[0]);
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    public String params() {
+      return "";
+    }
+  }
+
+  /**
+   * This class demonstrates how to list BigQuery Tables in a Dataset.
+   *
+   * @see Tables: list
+   */
+  private static class ListTablesAction extends DatasetAction {
+    @Override
+    public void run(BigQuery bigquery, DatasetId datasetId) {
+      Iterator tableInfoIterator = bigquery.listTables(datasetId).iterateAll();
+      while (tableInfoIterator.hasNext()) {
+        System.out.println(tableInfoIterator.next());
+      }
+    }
+  }
+
+  /**
+   * This class demonstrates how to retrieve information on a BigQuery Dataset.
+   *
+   * @see Datasets: get
+   *     
+   */
+  private static class DatasetInfoAction extends DatasetAction {
+    @Override
+    public void run(BigQuery bigquery, DatasetId datasetId) {
+      System.out.println("Dataset info: " + bigquery.getDataset(datasetId));
+    }
+  }
+
+  /**
+   * This class demonstrates how to create a BigQuery Dataset.
+   *
+   * @see Datasets:
+   *     insert
+   */
+  private static class CreateDatasetAction extends DatasetAction {
+    @Override
+    public void run(BigQuery bigquery, DatasetId datasetId) {
+      bigquery.create(DatasetInfo.builder(datasetId).build());
+      System.out.println("Created dataset " + datasetId);
+    }
+  }
+
+  /**
+   * This class demonstrates how to delete a BigQuery Dataset.
+   *
+   * @see Datasets:
+   *     delete
+   */
+  private static class DeleteDatasetAction extends DatasetAction {
+    @Override
+    public void run(BigQuery bigquery, DatasetId datasetId) {
+      bigquery.delete(datasetId);
+      System.out.println("Dataset " + datasetId + " was deleted");
+    }
+  }
+
+  private abstract static class TableAction extends BigQueryAction {
+    @Override
+    TableId parse(String... args) throws Exception {
+      if (args.length == 2) {
+        return TableId.of(args[0], args[1]);
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    public String params() {
+      return " 
 
";
+    }
+  }
+
+  /**
+   * This class demonstrates how to retrieve information on a BigQuery Table.
+   *
+   * @see Tables: get
+   */
+  private static class TableInfoAction extends TableAction {
+    @Override
+    public void run(BigQuery bigquery, TableId tableId) {
+      System.out.println("Table info: " + bigquery.getTable(tableId));
+    }
+  }
+
+  /**
+   * This class demonstrates how to delete a BigQuery Table.
+   *
+   * @see Tables: delete
+   *     
+   */
+  private static class DeleteTableAction extends TableAction {
+    @Override
+    public void run(BigQuery bigquery, TableId tableId) {
+      bigquery.delete(tableId);
+      System.out.println("Table " + tableId + " was deleted");
+    }
+  }
+
+  /**
+   * This class demonstrates how to list the rows in a BigQuery Table.
+   *
+   * @see Tabledata:
+   *     list
+   */
+  private static class ListTableDataAction extends TableAction {
+    @Override
+    public void run(BigQuery bigquery, TableId tableId) {
+      Iterator> iterator = bigquery.listTableData(tableId).iterateAll();
+      while (iterator.hasNext()) {
+        System.out.println(iterator.next());
+      }
+    }
+  }
+
+  private abstract static class JobAction extends BigQueryAction {
+    @Override
+    JobId parse(String... args) throws Exception {
+      if (args.length == 1) {
+        return JobId.of(args[0]);
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    public String params() {
+      return "";
+    }
+  }
+
+  /**
+   * This class demonstrates how to list BigQuery Jobs.
+   *
+   * @see Jobs: list
+   */
+  private static class ListJobsAction extends VoidAction {
+    @Override
+    public void run(BigQuery bigquery, Void arg) {
+      Iterator datasetInfoIterator = bigquery.listJobs().iterateAll();
+      while (datasetInfoIterator.hasNext()) {
+        System.out.println(datasetInfoIterator.next());
+      }
+    }
+  }
+
+  /**
+   * This class demonstrates how to retrieve information on a BigQuery Job.
+   *
+   * @see Jobs: get
+   */
+  private static class JobInfoAction extends JobAction {
+    @Override
+    public void run(BigQuery bigquery, JobId jobId) {
+      System.out.println("Job info: " + bigquery.getJob(jobId));
+    }
+  }
+
+  /**
+   * This class demonstrates how to cancel a BigQuery Job.
+   *
+   * @see Jobs: cancel
+   */
+  private static class CancelJobAction extends JobAction {
+    @Override
+    public void run(BigQuery bigquery, JobId jobId) {
+      bigquery.cancel(jobId);
+      System.out.println("Requested cancel for job " + jobId);
+    }
+  }
+
+  private abstract static class CreateTableAction extends BigQueryAction {
+    @Override
+    void run(BigQuery bigquery, BaseTableInfo table) throws Exception {
+      BaseTableInfo createTable = bigquery.create(table);
+      System.out.println("Created table " + createTable.tableId());
+      System.out.println(createTable.toString());
+    }
+
+    static Schema parseSchema(String[] args, int start, int end) {
+      Schema.Builder builder = Schema.builder();
+      for (int i = start; i < end; i++) {
+        String[] fieldsArray = args[i].split(":");
+        if (fieldsArray.length != 2) {
+          throw new IllegalArgumentException();
+        }
+        String fieldName = fieldsArray[0];
+        String typeString = fieldsArray[1];
+        Field.Type fieldType;
+        switch (typeString) {
+          case "string":
+            fieldType = Field.Type.string();
+            break;
+          case "integer":
+            fieldType = Field.Type.integer();
+            break;
+          case "timestamp":
+            fieldType = Field.Type.timestamp();
+            break;
+          case "float":
+            fieldType = Field.Type.floatingPoint();
+            break;
+          case "boolean":
+            fieldType = Field.Type.bool();
+            break;
+          default:
+            throw new IllegalArgumentException();
+        }
+        builder.addField(Field.of(fieldName, fieldType));
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * This class demonstrates how to create a simple BigQuery Table (i.e. a table of type
+   * {@link BaseTableInfo.Type#TABLE}).
+   *
+   * @see Tables: insert
+   *     
+   */
+  private static class CreateSimpleTableAction extends CreateTableAction {
+    @Override
+    BaseTableInfo parse(String... args) throws Exception {
+      if (args.length >= 3) {
+        String dataset = args[0];
+        String table = args[1];
+        TableId tableId = TableId.of(dataset, table);
+        return TableInfo.of(tableId, parseSchema(args, 2, args.length));
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    protected String params() {
+      return " 
 (:)+";
+    }
+  }
+
+  /**
+   * This class demonstrates how to create a BigQuery External Table (i.e. a table of type
+   * {@link BaseTableInfo.Type#EXTERNAL}).
+   *
+   * @see Tables: insert
+   *     
+   */
+  private static class CreateExternalTableAction extends CreateTableAction {
+    @Override
+    BaseTableInfo parse(String... args) throws Exception {
+      if (args.length >= 5) {
+        String dataset = args[0];
+        String table = args[1];
+        TableId tableId = TableId.of(dataset, table);
+        ExternalDataConfiguration configuration =
+            ExternalDataConfiguration.of(args[args.length - 1],
+                parseSchema(args, 3, args.length - 1), FormatOptions.of(args[2]));
+        return ExternalTableInfo.of(tableId, configuration);
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    protected String params() {
+      return " 
 (:)+ ";
+    }
+  }
+
+  /**
+   * This class demonstrates how to create a BigQuery View Table (i.e. a table of type
+   * {@link BaseTableInfo.Type#VIEW}).
+   *
+   * @see Tables: insert
+   *     
+   */
+  private static class CreateViewAction extends CreateTableAction {
+    @Override
+    BaseTableInfo parse(String... args) throws Exception {
+      if (args.length == 3) {
+        String dataset = args[0];
+        String table = args[1];
+        String query = args[2];
+        TableId tableId = TableId.of(dataset, table);
+        return ViewInfo.of(tableId, query);
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    protected String params() {
+      return " 
 
";
+    }
+  }
+
+  private abstract static class JobRunAction extends BigQueryAction {
+    @Override
+    void run(BigQuery bigquery, JobInfo job) throws Exception {
+      System.out.println("Creating job");
+      JobInfo startedJob = bigquery.create(job);
+      while (startedJob.status().state() != JobStatus.State.DONE) {
+        System.out.println("Waiting for job " + startedJob.jobId().job() + " to complete");
+        Thread.sleep(1000L);
+        startedJob = bigquery.getJob(startedJob.jobId());
+      }
+      if (startedJob.status().error() == null) {
+        System.out.println("Job " + startedJob.jobId().job() + " suceeded");
+      } else {
+        System.out.println("Job " + startedJob.jobId().job() + " failed");
+        System.out.println("Error: " + startedJob.status().error());
+      }
+    }
+  }
+
+  /**
+   * This class demonstrates how to create a BigQuery Load Job and wait for it to complete.
+   *
+   * @see Jobs: insert
+   */
+  private static class LoadAction extends JobRunAction {
+    @Override
+    LoadJobInfo parse(String... args) throws Exception {
+      if (args.length >= 4) {
+        String dataset = args[0];
+        String table = args[1];
+        String format = args[2];
+        TableId tableId = TableId.of(dataset, table);
+        return LoadJobInfo.builder(tableId, Arrays.asList(args).subList(3, args.length))
+            .formatOptions(FormatOptions.of(format))
+            .build();
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    protected String params() {
+      return " 
 
 +";
+    }
+  }
+
+  /**
+   * This class demonstrates how to create a BigQuery Extract Job and wait for it to complete.
+   *
+   * @see Jobs: insert
+   */
+  private static class ExtractAction extends JobRunAction {
+    @Override
+    ExtractJobInfo parse(String... args) throws Exception {
+      if (args.length >= 4) {
+        String dataset = args[0];
+        String table = args[1];
+        String format = args[2];
+        TableId tableId = TableId.of(dataset, table);
+        return ExtractJobInfo.builder(tableId, Arrays.asList(args).subList(3, args.length))
+            .format(format)
+            .build();
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    protected String params() {
+      return " 
 
 +";
+    }
+  }
+
+  /**
+   * This class demonstrates how to create a BigQuery Copy Job and wait for it to complete.
+   *
+   * @see Jobs: insert
+   */
+  private static class CopyAction extends JobRunAction {
+    @Override
+    CopyJobInfo parse(String... args) throws Exception {
+      if (args.length == 4) {
+        TableId sourceTableId = TableId.of(args[0], args[1]);
+        TableId destinationTableId = TableId.of(args[2], args[3]);
+        return CopyJobInfo.of(destinationTableId, sourceTableId);
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    protected String params() {
+      return "   ";
+    }
+  }
+
+  /**
+   * This class demonstrates how to run a BigQuery SQL Query and wait for associated job to
+   * complete. Results or errors are shown.
+   *
+   * @see Jobs: query
+   */
+  private static class QueryAction extends BigQueryAction {
+    @Override
+    void run(BigQuery bigquery, QueryRequest queryRequest) throws Exception {
+      System.out.println("Running query");
+      QueryResponse queryResponse = bigquery.query(queryRequest);
+      while (!queryResponse.jobComplete()) {
+        System.out.println("Waiting for query job " + queryResponse.jobId() + " to complete");
+        Thread.sleep(1000L);
+        queryResponse = bigquery.getQueryResults(queryResponse.jobId());
+      }
+      if (!queryResponse.hasErrors()) {
+        System.out.println("Query succeeded. Results:");
+        Iterator> iterator = queryResponse.result().iterateAll();
+        while (iterator.hasNext()) {
+          System.out.println(iterator.next());
+        }
+      } else {
+        System.out.println("Query completed with errors. Errors:");
+        for (BigQueryError err : queryResponse.executionErrors()) {
+          System.out.println(err);
+        }
+      }
+    }
+
+    @Override
+    QueryRequest parse(String... args) throws Exception {
+      if (args.length == 1) {
+        return QueryRequest.of(args[0]);
+      }
+      throw new IllegalArgumentException();
+    }
+
+    @Override
+    protected String params() {
+      return "";
+    }
+  }
+
+  static {
+    CREATE_ACTIONS.put("dataset", new CreateDatasetAction());
+    CREATE_ACTIONS.put("table", new CreateSimpleTableAction());
+    CREATE_ACTIONS.put("view", new CreateViewAction());
+    CREATE_ACTIONS.put("external-table", new CreateExternalTableAction());
+    INFO_ACTIONS.put("dataset", new DatasetInfoAction());
+    INFO_ACTIONS.put("table", new TableInfoAction());
+    INFO_ACTIONS.put("job", new JobInfoAction());
+    LIST_ACTIONS.put("datasets", new ListDatasetsAction());
+    LIST_ACTIONS.put("tables", new ListTablesAction());
+    LIST_ACTIONS.put("jobs", new ListJobsAction());
+    LIST_ACTIONS.put("data", new ListTableDataAction());
+    DELETE_ACTIONS.put("dataset", new DeleteDatasetAction());
+    DELETE_ACTIONS.put("table", new DeleteTableAction());
+    ACTIONS.put("create", new ParentAction(CREATE_ACTIONS));
+    ACTIONS.put("info", new ParentAction(INFO_ACTIONS));
+    ACTIONS.put("list", new ParentAction(LIST_ACTIONS));
+    ACTIONS.put("delete", new ParentAction(DELETE_ACTIONS));
+    ACTIONS.put("cancel", new CancelJobAction());
+    ACTIONS.put("load", new LoadAction());
+    ACTIONS.put("extract", new ExtractAction());
+    ACTIONS.put("copy", new CopyAction());
+    ACTIONS.put("query", new QueryAction());
+  }
+
+  private static void printUsage() {
+    StringBuilder actionAndParams = new StringBuilder();
+    for (Map.Entry entry : ACTIONS.entrySet()) {
+      actionAndParams.append("\n\t").append(entry.getKey());
+
+      String param = entry.getValue().params();
+      if (param != null && !param.isEmpty()) {
+        actionAndParams.append(' ').append(param.replace("\n", "\n\t\t"));
+      }
+    }
+    System.out.printf("Usage: %s [] operation [entity] *%s%n",
+        BigQueryExample.class.getSimpleName(), actionAndParams);
+  }
+
+  @SuppressWarnings("unchecked")
+  public static void main(String... args) throws Exception {
+    BigQueryOptions.Builder optionsBuilder = BigQueryOptions.builder();
+    BigQueryAction action;
+    String actionName;
+    if (args.length >= 2 && !ACTIONS.containsKey(args[0])) {
+      actionName = args[1];
+      optionsBuilder.projectId(args[0]);
+      action = ACTIONS.get(args[1]);
+      args = Arrays.copyOfRange(args, 2, args.length);
+    } else {
+      actionName = args[0];
+      action = ACTIONS.get(args[0]);
+      args = Arrays.copyOfRange(args, 1, args.length);
+    }
+    if (action == null) {
+      System.out.println("Unrecognized action.");
+      printUsage();
+      return;
+    }
+    BigQuery bigquery = optionsBuilder.build().service();
+    Object request;
+    try {
+      request = action.parse(args);
+    } catch (IllegalArgumentException ex) {
+      System.out.println("Invalid input for action '" + actionName + "'");
+      System.out.println("Expected: " + action.params());
+      return;
+    } catch (Exception ex) {
+      System.out.println("Failed to parse request.");
+      ex.printStackTrace();
+      return;
+    }
+    action.run(bigquery, request);
+  }
+}

From d1c41f79b3336f0f1191b3c55cf198c129b66325 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 28 Dec 2015 13:55:32 +0100
Subject: [PATCH 233/322] Update version to 0.1.1

---
 gcloud-java-bigquery/pom.xml        | 2 +-
 gcloud-java-core/pom.xml            | 2 +-
 gcloud-java-datastore/pom.xml       | 2 +-
 gcloud-java-examples/pom.xml        | 2 +-
 gcloud-java-resourcemanager/pom.xml | 2 +-
 gcloud-java-storage/pom.xml         | 2 +-
 gcloud-java/pom.xml                 | 2 +-
 pom.xml                             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gcloud-java-bigquery/pom.xml b/gcloud-java-bigquery/pom.xml
index 2f22fad6fea8..0d425b7dd973 100644
--- a/gcloud-java-bigquery/pom.xml
+++ b/gcloud-java-bigquery/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1-SNAPSHOT
+    0.1.1
   
   
     gcloud-java-bigquery
diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index 83c8dbb00e71..d86ccc7648cf 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1-SNAPSHOT
+    0.1.1
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index 163fd8accf7a..8dc60889c1ac 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1-SNAPSHOT
+    0.1.1
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index 4f113dd78ec0..b6156d5e4358 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1-SNAPSHOT
+    0.1.1
   
   
     gcloud-java-examples
diff --git a/gcloud-java-resourcemanager/pom.xml b/gcloud-java-resourcemanager/pom.xml
index ced6f4edfccf..6894b99a7361 100644
--- a/gcloud-java-resourcemanager/pom.xml
+++ b/gcloud-java-resourcemanager/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1-SNAPSHOT
+    0.1.1
   
   
     gcloud-java-resourcemanager
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 907ec66d7214..60644084f693 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1-SNAPSHOT
+    0.1.1
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 74904ae040a6..3b94aa407be8 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1-SNAPSHOT
+    0.1.1
   
   
     
diff --git a/pom.xml b/pom.xml
index d6c043cb23b4..72d34c488ce3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.1.1-SNAPSHOT
+  0.1.1
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From 7a7f6985fe465e9dd6a075af55493f42b4933be0 Mon Sep 17 00:00:00 2001
From: travis-ci 
Date: Mon, 28 Dec 2015 13:34:33 +0000
Subject: [PATCH 234/322] Updating version in README files. [ci skip]

---
 README.md                             | 6 +++---
 gcloud-java-core/README.md            | 6 +++---
 gcloud-java-datastore/README.md       | 6 +++---
 gcloud-java-examples/README.md        | 6 +++---
 gcloud-java-resourcemanager/README.md | 6 +++---
 gcloud-java-storage/README.md         | 6 +++---
 gcloud-java/README.md                 | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index e67b58cb8d67..cce721b86a89 100644
--- a/README.md
+++ b/README.md
@@ -27,16 +27,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.1.0
+  0.1.1
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:0.1.0'
+compile 'com.google.gcloud:gcloud-java:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.0"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.1"
 ```
 
 Example Applications
diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index 3aea0f16efc5..edad8ea2c27e 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-core
-  0.1.0
+  0.1.1
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-core:jar:0.1.0'
+compile 'com.google.gcloud:gcloud-java-core:jar:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.1.0"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.1.1"
 ```
 
 Troubleshooting
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index 9777668f8d0e..a1442bfaa183 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-datastore
-  0.1.0
+  0.1.1
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-datastore:jar:0.1.0'
+compile 'com.google.gcloud:gcloud-java-datastore:jar:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.1.0"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.1.1"
 ```
 
 Example Application
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index 404310c646f8..ff4e7bc258af 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-examples
-  0.1.0
+  0.1.1
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-examples:jar:0.1.0'
+compile 'com.google.gcloud:gcloud-java-examples:jar:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.1.0"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.1.1"
 ```
 
 To run examples from your command line:
diff --git a/gcloud-java-resourcemanager/README.md b/gcloud-java-resourcemanager/README.md
index fc8b6e0893c1..74079b13ab5b 100644
--- a/gcloud-java-resourcemanager/README.md
+++ b/gcloud-java-resourcemanager/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-resourcemanager
-  0.1.0
+  0.1.1
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-resourcemanager:jar:0.1.0'
+compile 'com.google.gcloud:gcloud-java-resourcemanager:jar:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-resourcemanager" % "0.1.0"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-resourcemanager" % "0.1.1"
 ```
 
 Example Application
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 01d34f318a42..208ff4d32480 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-storage
-  0.1.0
+  0.1.1
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-storage:jar:0.1.0'
+compile 'com.google.gcloud:gcloud-java-storage:jar:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.1.0"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.1.1"
 ```
 
 Example Application
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index 98cd7a8f6e85..68f84d492025 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.1.0
+  0.1.1
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:jar:0.1.0'
+compile 'com.google.gcloud:gcloud-java:jar:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.0"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.1"
 ```
 
 Troubleshooting

From 15fb8df7ba4d154caf96ecf16d0641ddc89dc724 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 28 Dec 2015 16:37:48 +0100
Subject: [PATCH 235/322] Update version to 0.1.2-SNAPSHOT

---
 gcloud-java-bigquery/pom.xml        | 2 +-
 gcloud-java-core/pom.xml            | 2 +-
 gcloud-java-datastore/pom.xml       | 2 +-
 gcloud-java-examples/pom.xml        | 2 +-
 gcloud-java-resourcemanager/pom.xml | 2 +-
 gcloud-java-storage/pom.xml         | 2 +-
 gcloud-java/pom.xml                 | 2 +-
 pom.xml                             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gcloud-java-bigquery/pom.xml b/gcloud-java-bigquery/pom.xml
index 0d425b7dd973..be459da08547 100644
--- a/gcloud-java-bigquery/pom.xml
+++ b/gcloud-java-bigquery/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1
+    0.1.2-SNAPSHOT
   
   
     gcloud-java-bigquery
diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index d86ccc7648cf..ee39bcca1f72 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1
+    0.1.2-SNAPSHOT
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index 8dc60889c1ac..74cb36847486 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1
+    0.1.2-SNAPSHOT
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index b6156d5e4358..8d7c8d870b97 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1
+    0.1.2-SNAPSHOT
   
   
     gcloud-java-examples
diff --git a/gcloud-java-resourcemanager/pom.xml b/gcloud-java-resourcemanager/pom.xml
index 6894b99a7361..244edb0b77cf 100644
--- a/gcloud-java-resourcemanager/pom.xml
+++ b/gcloud-java-resourcemanager/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1
+    0.1.2-SNAPSHOT
   
   
     gcloud-java-resourcemanager
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 60644084f693..d901a328ac8a 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1
+    0.1.2-SNAPSHOT
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 3b94aa407be8..ee8662cf5a0e 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.1
+    0.1.2-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 72d34c488ce3..20aa2c057a99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.1.1
+  0.1.2-SNAPSHOT
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From b762fd798b72f7277ac234f6d1023b7bcddc9a26 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 28 Dec 2015 17:12:59 +0100
Subject: [PATCH 236/322] Add shield, dependency code and link to
 BigQueryExample to bigquery README

---
 gcloud-java-bigquery/README.md | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/gcloud-java-bigquery/README.md b/gcloud-java-bigquery/README.md
index 077e4fbc332a..7fe65b5600c2 100644
--- a/gcloud-java-bigquery/README.md
+++ b/gcloud-java-bigquery/README.md
@@ -5,7 +5,7 @@ Java idiomatic client for [Google Cloud BigQuery] (https://cloud.google.com/bigq
 
 [![Build Status](https://travis-ci.org/GoogleCloudPlatform/gcloud-java.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/gcloud-java)
 [![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/gcloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/gcloud-java?branch=master)
-
+[![Maven](https://img.shields.io/maven-central/v/com.google.gcloud/gcloud-java-bigquery.svg)]( https://img.shields.io/maven-central/v/com.google.gcloud/gcloud-java-bigquery.svg)
 
 -  [Homepage] (https://googlecloudplatform.github.io/gcloud-java/)
 -  [API Documentation] (http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/bigquery/package-summary.html)
@@ -16,18 +16,26 @@ Java idiomatic client for [Google Cloud BigQuery] (https://cloud.google.com/bigq
 Quickstart
 ----------
 If you are using Maven, add this to your pom.xml file
-
-
+```xml
+
+  com.google.gcloud
+  gcloud-java-bigquery
+  0.1.1
+
+```
 If you are using Gradle, add this to your dependencies
-
-
+```Groovy
+compile 'com.google.gcloud:gcloud-java-bigquery:0.1.1'
+```
 If you are using SBT, add this to your dependencies
-
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-bigquery" % "0.1.1"
+```
 
 Example Application
 -------------------
-
-
+- [`BigQueryExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java) - A simple command line interface providing some of Cloud BigQuery's functionality.
+Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/BigQueryExample.html).
 
 Authentication
 --------------

From ab5ab13d13a70f00c5e9515fe21eed21b1e9a65c Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 28 Dec 2015 17:15:24 +0100
Subject: [PATCH 237/322] Fix gradle dependency code in all gcloud-java modules

---
 gcloud-java-core/README.md            | 2 +-
 gcloud-java-datastore/README.md       | 2 +-
 gcloud-java-examples/README.md        | 2 +-
 gcloud-java-resourcemanager/README.md | 2 +-
 gcloud-java-storage/README.md         | 2 +-
 gcloud-java/README.md                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index edad8ea2c27e..89834e1c2361 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -22,7 +22,7 @@ If you are using Maven, add this to your pom.xml file
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-core:jar:0.1.1'
+compile 'com.google.gcloud:gcloud-java-core:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index a1442bfaa183..fa9eb22bf6fa 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -25,7 +25,7 @@ If you are using Maven, add this to your pom.xml file
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-datastore:jar:0.1.1'
+compile 'com.google.gcloud:gcloud-java-datastore:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index ff4e7bc258af..f0131e6ade84 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -22,7 +22,7 @@ If you are using Maven, add this to your pom.xml file
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-examples:jar:0.1.1'
+compile 'com.google.gcloud:gcloud-java-examples:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
diff --git a/gcloud-java-resourcemanager/README.md b/gcloud-java-resourcemanager/README.md
index 74079b13ab5b..f047df17515f 100644
--- a/gcloud-java-resourcemanager/README.md
+++ b/gcloud-java-resourcemanager/README.md
@@ -25,7 +25,7 @@ If you are using Maven, add this to your pom.xml file
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-resourcemanager:jar:0.1.1'
+compile 'com.google.gcloud:gcloud-java-resourcemanager:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 208ff4d32480..724dfd137e79 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -25,7 +25,7 @@ If you are using Maven, add this to your pom.xml file
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-storage:jar:0.1.1'
+compile 'com.google.gcloud:gcloud-java-storage:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index 68f84d492025..4cb03390a91a 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -30,7 +30,7 @@ If you are using Maven, add this to your pom.xml file
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:jar:0.1.1'
+compile 'com.google.gcloud:gcloud-java:0.1.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala

From 2530b3c70d95508b35a6fbaf760b9638e5326d20 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 28 Dec 2015 09:08:16 -0800
Subject: [PATCH 238/322] Speed up resource manager tests

---
 .../resourcemanager/testing/LocalResourceManagerHelper.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
index 51c0d5ee28e5..8238fd0f1959 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
@@ -185,6 +185,7 @@ private static void writeResponse(HttpExchange exchange, Response response) {
     exchange.getResponseHeaders().set("Content-type", "application/json; charset=UTF-8");
     OutputStream outputStream = exchange.getResponseBody();
     try {
+      exchange.getResponseHeaders().add("Connection", "close");
       exchange.sendResponseHeaders(response.code(), response.body().length());
       outputStream.write(response.body().getBytes(StandardCharsets.UTF_8));
       outputStream.close();

From 329bd70010b0bf49a2a096e1b35524102f364ff0 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 29 Dec 2015 11:27:30 +0100
Subject: [PATCH 239/322] Minor fixes to READMEs and pom.xml - Add load to
 bigquery usage example - Sort modules alphabetically in both READMEs and
 pom.xml - Use BigQuery API instead of Google Cloud BigQuery API in example's
 README

---
 README.md                      | 156 ++++++++++++++++-----------------
 gcloud-java-examples/README.md |  33 +++----
 pom.xml                        |   6 +-
 3 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/README.md b/README.md
index cce721b86a89..e3c810b200f2 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,10 @@ Java idiomatic client for [Google Cloud Platform][cloud-platform] services.
 
 This client supports the following Google Cloud Platform services:
 
+-  [Google Cloud BigQuery] (#google-cloud-bigquery)
 -  [Google Cloud Datastore] (#google-cloud-datastore)
--  [Google Cloud Storage] (#google-cloud-storage)
 -  [Google Cloud Resource Manager] (#google-cloud-resource-manager)
--  [Google Cloud BigQuery] (#google-cloud-bigquery)
+-  [Google Cloud Storage] (#google-cloud-storage)
 
 > Note: This client is a work-in-progress, and may occasionally
 > make backwards-incompatible changes.
@@ -42,14 +42,14 @@ libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.1"
 Example Applications
 --------------------
 
+- [`BigQueryExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java) - A simple command line interface providing some of Cloud BigQuery's functionality
+  - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/BigQueryExample.html).
 - [`DatastoreExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java) - A simple command line interface for the Cloud Datastore
   - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/DatastoreExample.html).
-- [`StorageExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java) - A simple command line interface providing some of Cloud Storage's functionality
-  - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/StorageExample.html).
 - [`ResourceManagerExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java) - A simple command line interface providing some of Cloud Resource Manager's functionality
   - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/ResourceManagerExample.html).
-- [`BigQueryExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java) - A simple command line interface providing some of Cloud BigQuery's functionality
-  - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/BigQueryExample.html).
+- [`StorageExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java) - A simple command line interface providing some of Cloud Storage's functionality
+  - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/StorageExample.html).
 
 Specifying a Project ID
 -----------------------
@@ -109,6 +109,51 @@ Next, choose a method for authenticating API requests from within your project:
 4. Google Cloud SDK credentials
 5. Compute Engine credentials
 
+Google Cloud BigQuery
+----------------------
+
+- [API Documentation][bigquery-api]
+- [Official Documentation][cloud-bigquery-docs]
+
+#### Preview
+
+Here is a code snippet showing a simple usage example from within Compute/App Engine. Note that you
+must [supply credentials](#authentication) and a project ID if running this snippet elsewhere.
+
+```java
+import com.google.gcloud.bigquery.BaseTableInfo;
+import com.google.gcloud.bigquery.BigQuery;
+import com.google.gcloud.bigquery.BigQueryOptions;
+import com.google.gcloud.bigquery.Field;
+import com.google.gcloud.bigquery.JobStatus;
+import com.google.gcloud.bigquery.LoadJobInfo;
+import com.google.gcloud.bigquery.Schema;
+import com.google.gcloud.bigquery.TableId;
+import com.google.gcloud.bigquery.TableInfo;
+
+BigQuery bigquery = BigQueryOptions.defaultInstance().service();
+TableId tableId = TableId.of("dataset", "table");
+BaseTableInfo info = bigquery.getTable(tableId);
+if (info == null) {
+  System.out.println("Creating table " + tableId);
+  Field integerField = Field.of("fieldName", Field.Type.integer());
+  bigquery.create(TableInfo.of(tableId, Schema.of(integerField)));
+} else {
+  System.out.println("Loading data into table " + tableId);
+  LoadJobInfo loadJob = LoadJobInfo.of(tableId, "gs://bucket/path");
+  loadJob = bigquery.create(loadJob);
+  while (loadJob.status().state() != JobStatus.State.DONE) {
+    Thread.sleep(1000L);
+    loadJob = bigquery.getJob(loadJob.jobId());
+  }
+  if (loadJob.status().error() != null) {
+    System.out.println("Job completed with errors");
+  } else {
+    System.out.println("Job succeeded");
+  }
+}
+```
+
 Google Cloud Datastore
 ----------------------
 
@@ -149,45 +194,6 @@ if (entity == null) {
 }
 ```
 
-Google Cloud Storage
-----------------------
-
-- [API Documentation][storage-api]
-- [Official Documentation][cloud-storage-docs]
-
-*Follow the [activation instructions][cloud-storage-activation] to use the Google Cloud Storage API with your project.*
-
-#### Preview
-
-Here is a code snippet showing a simple usage example from within Compute/App Engine.  Note that you must [supply credentials](#authentication) and a project ID if running this snippet elsewhere.
-
-```java
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import com.google.gcloud.storage.Blob;
-import com.google.gcloud.storage.BlobId;
-import com.google.gcloud.storage.Storage;
-import com.google.gcloud.storage.StorageOptions;
-
-import java.nio.ByteBuffer;
-import java.nio.channels.WritableByteChannel;
-
-Storage storage = StorageOptions.defaultInstance().service();
-BlobId blobId = BlobId.of("bucket", "blob_name");
-Blob blob = Blob.load(storage, blobId);
-if (blob == null) {
-  BlobInfo blobInfo = BlobInfo.builder(blobId).contentType("text/plain").build();
-  storage.create(blobInfo, "Hello, Cloud Storage!".getBytes(UTF_8));
-} else {
-  System.out.println("Updating content for " + blobId.name());
-  byte[] prevContent = blob.content();
-  System.out.println(new String(prevContent, UTF_8));
-  WritableByteChannel channel = blob.writer();
-  channel.write(ByteBuffer.wrap("Updated content".getBytes(UTF_8)));
-  channel.close();
-}
-```
-
 Google Cloud Resource Manager
 ----------------------
 
@@ -219,48 +225,42 @@ while (projectIterator.hasNext()) {
 }
 ```
 
-Google Cloud BigQuery
+Google Cloud Storage
 ----------------------
 
-- [API Documentation][bigquery-api]
-- [Official Documentation][cloud-bigquery-docs]
+- [API Documentation][storage-api]
+- [Official Documentation][cloud-storage-docs]
+
+*Follow the [activation instructions][cloud-storage-activation] to use the Google Cloud Storage API with your project.*
 
 #### Preview
 
-Here is a code snippet showing a simple usage example from within Compute/App Engine. Note that you
-must [supply credentials](#authentication) and a project ID if running this snippet elsewhere.
+Here is a code snippet showing a simple usage example from within Compute/App Engine.  Note that you must [supply credentials](#authentication) and a project ID if running this snippet elsewhere.
 
 ```java
-import com.google.gcloud.bigquery.BaseTableInfo;
-import com.google.gcloud.bigquery.BigQuery;
-import com.google.gcloud.bigquery.BigQueryOptions;
-import com.google.gcloud.bigquery.Field;
-import com.google.gcloud.bigquery.JobStatus;
-import com.google.gcloud.bigquery.LoadJobInfo;
-import com.google.gcloud.bigquery.Schema;
-import com.google.gcloud.bigquery.TableId;
-import com.google.gcloud.bigquery.TableInfo;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
-BigQuery bigquery = BigQueryOptions.defaultInstance().service();
-TableId tableId = TableId.of("dataset", "table");
-BaseTableInfo info = bigquery.getTable(tableId);
-if (info == null) {
-  System.out.println("Creating table " + tableId);
-  Field integerField = Field.of("fieldName", Field.Type.integer());
-  bigquery.create(TableInfo.of(tableId, Schema.of(integerField)));
+import com.google.gcloud.storage.Blob;
+import com.google.gcloud.storage.BlobId;
+import com.google.gcloud.storage.Storage;
+import com.google.gcloud.storage.StorageOptions;
+
+import java.nio.ByteBuffer;
+import java.nio.channels.WritableByteChannel;
+
+Storage storage = StorageOptions.defaultInstance().service();
+BlobId blobId = BlobId.of("bucket", "blob_name");
+Blob blob = Blob.load(storage, blobId);
+if (blob == null) {
+  BlobInfo blobInfo = BlobInfo.builder(blobId).contentType("text/plain").build();
+  storage.create(blobInfo, "Hello, Cloud Storage!".getBytes(UTF_8));
 } else {
-  System.out.println("Loading data into table " + tableId);
-  LoadJobInfo loadJob = LoadJobInfo.of(tableId, "gs://bucket/path");
-  loadJob = bigquery.create(loadJob);
-  while (loadJob.status().state() != JobStatus.State.DONE) {
-    Thread.sleep(1000L);
-    loadJob = bigquery.getJob(loadJob.jobId());
-  }
-  if (loadJob.status().error() != null) {
-    System.out.println("Job completed with errors");
-  } else {
-    System.out.println("Job succeeded");
-  }
+  System.out.println("Updating content for " + blobId.name());
+  byte[] prevContent = blob.content();
+  System.out.println(new String(prevContent, UTF_8));
+  WritableByteChannel channel = blob.writer();
+  channel.write(ByteBuffer.wrap("Updated content".getBytes(UTF_8)));
+  channel.close();
 }
 ```
 
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index f0131e6ade84..0f66fe523e26 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -39,6 +39,17 @@ To run examples from your command line:
 
 4. Run an example using Maven from command line.
 
+  Here's an example run of `BigQueryExample`.
+
+  Before running the example, go to the [Google Developers Console][developers-console] to ensure that BigQuery API is enabled.
+  ```
+  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="create dataset new_dataset_id"
+  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="create table new_dataset_id new_table_id field_name:string"
+  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="list tables new_dataset_id"
+  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="load new_dataset_id new_table_id CSV gs://my_bucket/my_csv_file"
+  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="query 'select * from new_dataset_id.new_table_id'"
+  ```
+
   Here's an example run of `DatastoreExample`.
   
   Note that you have to enable the Google Cloud Datastore API on the [Google Developers Console][developers-console] before running the following commands.
@@ -48,16 +59,6 @@ To run examples from your command line:
   $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.DatastoreExample" -Dexec.args="my_name delete"
   ```
 
-  Here's an example run of `StorageExample`.
-
-  Before running the example, go to the [Google Developers Console][developers-console] to ensure that Google Cloud Storage API is enabled and that you have a bucket.  Also ensure that you have a test file (`test.txt` is chosen here) to upload to Cloud Storage stored locally on your machine.
-  ```
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="upload /path/to/test.txt "
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="list "
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="download  test.txt"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="delete  test.txt"
-  ```
-
   Here's an example run of `ResourceManagerExample`.
 
   Be sure to change the placeholder project ID "my-project-id" with your own globally unique project ID.
@@ -67,14 +68,14 @@ To run examples from your command line:
   $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" -Dexec.args="get my-project-id"
   ```
 
-  Here's an example run of `BigQueryExample`.
+  Here's an example run of `StorageExample`.
 
-  Before running the example, go to the [Google Developers Console][developers-console] to ensure that Google Cloud BigQuery API is enabled.
+  Before running the example, go to the [Google Developers Console][developers-console] to ensure that Google Cloud Storage API is enabled and that you have a bucket.  Also ensure that you have a test file (`test.txt` is chosen here) to upload to Cloud Storage stored locally on your machine.
   ```
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="create dataset new_dataset_id"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="create table new_dataset_id new_table_id field_name:string"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="list tables new_dataset_id"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="query 'select * from new_dataset_id.new_table_id'"
+  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="upload /path/to/test.txt "
+  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="list "
+  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="download  test.txt"
+  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="delete  test.txt"
   ```
 
 Troubleshooting
diff --git a/pom.xml b/pom.xml
index 20aa2c057a99..b27c9cc123a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,13 +66,13 @@
     gcloud-java
   
   
+    gcloud-java
+    gcloud-java-bigquery
     gcloud-java-core
     gcloud-java-datastore
+    gcloud-java-examples
     gcloud-java-resourcemanager
     gcloud-java-storage
-    gcloud-java
-    gcloud-java-examples
-    gcloud-java-bigquery
   
   
     

From 7e052dae27b857ed3301e6aed83e41bd01d40e48 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 29 Dec 2015 11:29:29 +0100
Subject: [PATCH 240/322] Minor changes to gcloud-java-examples - Remove
 unnecessary 'the' in examples javadoc - Split long usage examples into
 multiple lines for BigQueryExample and StorageExample - Add messages to
 IllegalArgumentException in BigQueryExample and display better error - Handle
 no arguments case in BigQueryExample - Handle boolean result of delete and
 cancel actions in BigQueryExample

---
 .../gcloud/examples/BigQueryExample.java      | 122 +++++++++++++-----
 .../gcloud/examples/DatastoreExample.java     |   2 +-
 .../examples/ResourceManagerExample.java      |   2 +-
 .../gcloud/examples/StorageExample.java       |  18 ++-
 4 files changed, 101 insertions(+), 43 deletions(-)

diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
index eb46bc69adf4..a1190c705faf 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
@@ -49,7 +49,7 @@
 import java.util.Map;
 
 /**
- * An example of using the Google BigQuery.
+ * An example of using Google BigQuery.
  *
  * 
This example demonstrates a simple/typical BigQuery usage.
  *
@@ -58,17 +58,25 @@
  * 
  • login using gcloud SDK - {@code gcloud auth login}.
    • 
  * 
  • compile using maven - {@code mvn compile}
    • 
  * 
  • run using maven -
- * {@code mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample"
- * -Dexec.args="[] list datasets | list tables  | list jobs |
- *  list data  
    •  
     | info dataset  | info table  
     |
- *  info job  | create dataset  |
+ * 
    {@code mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="[]
+ *  list datasets |
+ *  list tables  |
+ *  list jobs |
+ *  list data  
     |
+ *  info dataset  |
+ *  info table  
     |
+ *  info job  |
+ *  create dataset  |
  *  create table  
     (:)+ |
  *  create view  
     |
  *  create external-table  
     
     (:)+  |
- *  delete dataset  | delete table  
     
     | cancel  |
+ *  delete dataset  |
+ *  delete table  
     |
+ *  cancel  |
  *  copy     |
  *  load  
     + |
- *  extract  
     
     + | query "}
+ *  extract  
     
     + |
+ *  query "}
  * 
  * 
  *
@@ -122,16 +130,18 @@ Tuple parse(String... args) throws Exception {
         if (action != null) {
           Object actionArguments = action.parse(Arrays.copyOfRange(args, 1, args.length));
           return Tuple.of(action, actionArguments);
+        } else {
+          throw new IllegalArgumentException("Unrecognized entity '" + args[0] + "'.");
         }
       }
-      throw new IllegalArgumentException();
+      throw new IllegalArgumentException("Missing required entity.");
     }
 
     @Override
     public String params() {
       StringBuilder builder = new StringBuilder();
       for (Map.Entry entry : subActions.entrySet()) {
-        builder.append("\n").append(entry.getKey());
+        builder.append('\n').append(entry.getKey());
         String param = entry.getValue().params();
         if (param != null && !param.isEmpty()) {
           builder.append(' ').append(param);
@@ -141,13 +151,13 @@ public String params() {
     }
   }
 
-  private abstract static class VoidAction extends BigQueryAction {
+  private abstract static class NoArgsAction extends BigQueryAction {
     @Override
     Void parse(String... args) throws Exception {
       if (args.length == 0) {
         return null;
       }
-      throw new IllegalArgumentException();
+      throw new IllegalArgumentException("This action takes no arguments.");
     }
   }
 
@@ -157,7 +167,7 @@ Void parse(String... args) throws Exception {
    * @see Datasets: list
    *     
    */
-  private static class ListDatasetsAction extends VoidAction {
+  private static class ListDatasetsAction extends NoArgsAction {
     @Override
     public void run(BigQuery bigquery, Void arg) {
       Iterator datasetInfoIterator = bigquery.listDatasets().iterateAll();
@@ -170,10 +180,15 @@ public void run(BigQuery bigquery, Void arg) {
   private abstract static class DatasetAction extends BigQueryAction {
     @Override
     DatasetId parse(String... args) throws Exception {
+      String message;
       if (args.length == 1) {
         return DatasetId.of(args[0]);
+      } else if (args.length > 1) {
+        message = "Too many arguments.";
+      } else {
+        message = "Missing required dataset id.";
       }
-      throw new IllegalArgumentException();
+      throw new IllegalArgumentException(message);
     }
 
     @Override
@@ -233,18 +248,26 @@ public void run(BigQuery bigquery, DatasetId datasetId) {
   private static class DeleteDatasetAction extends DatasetAction {
     @Override
     public void run(BigQuery bigquery, DatasetId datasetId) {
-      bigquery.delete(datasetId);
-      System.out.println("Dataset " + datasetId + " was deleted");
+      if (bigquery.delete(datasetId)) {
+        System.out.println("Dataset " + datasetId + " was deleted");
+      } else {
+        System.out.println("Dataset " + datasetId + " not found");
+      }
     }
   }
 
   private abstract static class TableAction extends BigQueryAction {
     @Override
     TableId parse(String... args) throws Exception {
+      String message;
       if (args.length == 2) {
         return TableId.of(args[0], args[1]);
+      } else if (args.length < 2) {
+        message = "Missing required dataset and table id.";
+      } else {
+        message = "Too many arguments.";
       }
-      throw new IllegalArgumentException();
+      throw new IllegalArgumentException(message);
     }
 
     @Override
@@ -274,8 +297,11 @@ public void run(BigQuery bigquery, TableId tableId) {
   private static class DeleteTableAction extends TableAction {
     @Override
     public void run(BigQuery bigquery, TableId tableId) {
-      bigquery.delete(tableId);
-      System.out.println("Table " + tableId + " was deleted");
+      if (bigquery.delete(tableId)) {
+        System.out.println("Table " + tableId + " was deleted");
+      } else {
+        System.out.println("Table " + tableId + " not found");
+      }
     }
   }
 
@@ -298,10 +324,15 @@ public void run(BigQuery bigquery, TableId tableId) {
   private abstract static class JobAction extends BigQueryAction {
     @Override
     JobId parse(String... args) throws Exception {
+      String message;
       if (args.length == 1) {
         return JobId.of(args[0]);
+      } else if (args.length > 1) {
+        message = "Too many arguments.";
+      } else {
+        message = "Missing required query.";
       }
-      throw new IllegalArgumentException();
+      throw new IllegalArgumentException(message);
     }
 
     @Override
@@ -315,7 +346,7 @@ public String params() {
    *
    * @see Jobs: list
    */
-  private static class ListJobsAction extends VoidAction {
+  private static class ListJobsAction extends NoArgsAction {
     @Override
     public void run(BigQuery bigquery, Void arg) {
       Iterator datasetInfoIterator = bigquery.listJobs().iterateAll();
@@ -345,8 +376,11 @@ public void run(BigQuery bigquery, JobId jobId) {
   private static class CancelJobAction extends JobAction {
     @Override
     public void run(BigQuery bigquery, JobId jobId) {
-      bigquery.cancel(jobId);
-      System.out.println("Requested cancel for job " + jobId);
+      if (bigquery.cancel(jobId)) {
+        System.out.println("Requested cancel for job " + jobId);
+      } else {
+        System.out.println("Job " + jobId + " not found");
+      }
     }
   }
 
@@ -354,7 +388,7 @@ private abstract static class CreateTableAction extends BigQueryAction 1) {
+        message = "Too many arguments.";
+      } else {
+        message = "Missing required query.";
       }
-      throw new IllegalArgumentException();
+      throw new IllegalArgumentException(message);
     }
 
     @Override
@@ -650,6 +699,11 @@ private static void printUsage() {
 
   @SuppressWarnings("unchecked")
   public static void main(String... args) throws Exception {
+    if (args.length < 1) {
+      System.out.println("Missing required project id and action");
+      printUsage();
+      return;
+    }
     BigQueryOptions.Builder optionsBuilder = BigQueryOptions.builder();
     BigQueryAction action;
     String actionName;
@@ -673,7 +727,7 @@ public static void main(String... args) throws Exception {
     try {
       request = action.parse(args);
     } catch (IllegalArgumentException ex) {
-      System.out.println("Invalid input for action '" + actionName + "'");
+      System.out.println("Invalid input for action '" + actionName + "'. " + ex.getMessage());
       System.out.println("Expected: " + action.params());
       return;
     } catch (Exception ex) {
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
index 0951e3e93978..e408bab1338e 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
@@ -36,7 +36,7 @@
 import java.util.TreeMap;
 
 /**
- * An example of using the Google Cloud Datastore.
+ * An example of using Google Cloud Datastore.
  *
  * 
    This example adds, display or clear comments for a given user.
  *
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java
index 049ed35368db..c1ba4e06cf7d 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java
@@ -27,7 +27,7 @@
 import java.util.Scanner;
 
 /**
- * An example of using the Google Cloud Resource Manager.
+ * An example of using Google Cloud Resource Manager.
  *
  * 
    This example creates, deletes, gets, and lists projects.
  *
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index e042e8eb54bc..deaedfa7f027 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -58,7 +58,7 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * An example of using the Google Cloud Storage.
+ * An example of using Google Cloud Storage.
  *
  * 
    This example demonstrates a simple/typical storage usage.
  *
@@ -67,12 +67,16 @@
  * 
  • login using gcloud SDK - {@code gcloud auth login}.
    • 
  * 
  • compile using maven - {@code mvn compile}
    • 
  * 
  • run using maven -
- * {@code mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample"
- * -Dexec.args="[] list [] | info [ []] |
- *  download   [local_file] | upload   [] |
- *  delete  + | cp     |
- *  compose  +  | update_metadata   [key=value]* |
- *  sign_url    "}
+ * 
    {@code mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="[]
+ *  list [] |
+ *  info [ []] |
+ *  download   [local_file] |
+ *  upload   [] |
+ *  delete  + |
+ *  cp     |
+ *  compose  +  |
+ *  update_metadata   [key=value]* |
+ *  sign_url    "}
    
  * 
    • 
  * 
  *

From f78da9d7f3a4f069d05208384d9a53dbd59689df Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 29 Dec 2015 11:32:59 +0100
Subject: [PATCH 241/322] Add checkNotNull to FormatOptions.of method

---
 .../main/java/com/google/gcloud/bigquery/FormatOptions.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
index ebf9f651a8d2..f46e7b40f4c1 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
@@ -16,6 +16,8 @@
 
 package com.google.gcloud.bigquery;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.common.base.MoreObjects;
 
 import java.io.Serializable;
@@ -85,7 +87,7 @@ public static FormatOptions datastoreBackup() {
    * Default options for the provided format.
    */
   public static FormatOptions of(String format) {
-    if (format.equals(CSV)) {
+    if (checkNotNull(format).equals(CSV)) {
       return csv();
     }
     return new FormatOptions(format);

From afe953de798df407060753a591ea0b19e972bf34 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 29 Dec 2015 15:15:27 +0100
Subject: [PATCH 242/322] Add example to BigQuery package-info

---
 .../google/gcloud/bigquery/package-info.java  | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
index 4acaa40ca851..8553de221fdc 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
@@ -18,9 +18,28 @@
  * A client to Google Cloud BigQuery.
  *
  * 
    A simple usage example:
- * 
    {@code
- * //TODO(mziccard): add code example
- * }
    
+ * 
     {@code
+ * BigQuery bigquery = BigQueryOptions.defaultInstance().service();
+ * TableId tableId = TableId.of("dataset", "table");
+ * BaseTableInfo info = bigquery.getTable(tableId);
+ * if (info == null) {
+ *   System.out.println("Creating table " + tableId);
+ *   Field integerField = Field.of("fieldName", Field.Type.integer());
+ *   bigquery.create(TableInfo.of(tableId, Schema.of(integerField)));
+ * } else {
+ *   System.out.println("Loading data into table " + tableId);
+ *   LoadJobInfo loadJob = LoadJobInfo.of(tableId, "gs://bucket/path");
+ *   loadJob = bigquery.create(loadJob);
+ *   while (loadJob.status().state() != JobStatus.State.DONE) {
+ *     Thread.sleep(1000L);
+ *     loadJob = bigquery.getJob(loadJob.jobId());
+ *   }
+ *   if (loadJob.status().error() != null) {
+ *     System.out.println("Job completed with errors");
+ *   } else {
+ *     System.out.println("Job succeeded");
+ *   }
+ * }}
    
  *
  * @see Google Cloud BigQuery
  */

From 5e193c5d2f0b3c5c52a286050edd5e866e1c05b2 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 29 Dec 2015 15:17:24 +0100
Subject: [PATCH 243/322] Fix indentation in Storage and ResourceManager
 package-info

---
 .../java/com/google/gcloud/resourcemanager/package-info.java    | 2 +-
 .../src/main/java/com/google/gcloud/storage/package-info.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java
index 0c9b0e5a4059..b8687fbf1314 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java
@@ -18,7 +18,7 @@
  * A client to Google Cloud Resource Manager.
  *
  * 
    Here's a simple usage example for using gcloud-java-resourcemanager:
- * 
    {@code
+ * 
     {@code
  * ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().service();
  * String myProjectId = "my-globally-unique-project-id"; // Change to a unique project ID.
  * ProjectInfo myProject = resourceManager.create(ProjectInfo.builder(myProjectId).build());
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
index a55b23c3666c..7938a0094419 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
@@ -18,7 +18,7 @@
  * A client to Google Cloud Storage.
  *
  * 
    Here's a simple usage example for using gcloud-java from App/Compute Engine:
- * 
    {@code
+ * 
     {@code
  * Storage storage = StorageOptions.defaultInstance().service();
  * BlobId blobId = BlobId.of("bucket", "blob_name");
  * Blob blob = Blob.load(storage, blobId);

From acbd5c0bfb57e3688a376a695e6a5893396c852e Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 29 Dec 2015 17:16:58 +0100
Subject: [PATCH 244/322] Add support for templateSuffix to BigQuery
 InsertAllRequest

---
 .../google/gcloud/bigquery/BigQueryImpl.java  |  1 +
 .../gcloud/bigquery/InsertAllRequest.java     | 36 ++++++++++++-
 .../gcloud/bigquery/BigQueryImplTest.java     |  3 +-
 .../gcloud/bigquery/ITBigQueryTest.java       | 35 ++++++++++++
 .../gcloud/bigquery/InsertAllRequestTest.java | 53 ++++++++++++++-----
 5 files changed, 111 insertions(+), 17 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
index 62685d8ecc46..a65490998c17 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -412,6 +412,7 @@ public InsertAllResponse insertAll(InsertAllRequest request) throws BigQueryExce
     final TableDataInsertAllRequest requestPb = new TableDataInsertAllRequest();
     requestPb.setIgnoreUnknownValues(request.ignoreUnknownValues());
     requestPb.setSkipInvalidRows(request.skipInvalidRows());
+    requestPb.setTemplateSuffix(request.templateSuffix());
     List rowsPb = Lists.transform(request.rows(), new Function() {
       @Override
       public Rows apply(RowToInsert rowToInsert) {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
index 56be098b197b..8b6f573b1e3c 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
@@ -45,6 +45,7 @@ public class InsertAllRequest implements Serializable {
   private final List rows;
   private final Boolean skipInvalidRows;
   private final Boolean ignoreUnknownValues;
+  private final String templateSuffix;
 
   /**
    * A Google Big Query row to be inserted into a table. Each {@code RowToInsert} has an associated
@@ -140,6 +141,7 @@ public static final class Builder {
     private List rows;
     private Boolean skipInvalidRows;
     private Boolean ignoreUnknownValues;
+    private String templateSuffix;
 
     private Builder() {}
 
@@ -231,6 +233,20 @@ public Builder ignoreUnknownValues(boolean ignoreUnknownValues) {
       return this;
     }
 
+    /**
+     * If specified, the destination table is treated as a base template. Rows are inserted into an
+     * instance table named "{destination}{templateSuffix}". BigQuery will manage the creation of
+     * the instance table, using the schema of the base template table.
+     *
+     * @see 
+     *     Template Tables
+     */
+    public Builder templateSuffix(String templateSuffix) {
+      this.templateSuffix = templateSuffix;
+      return this;
+    }
+
     public InsertAllRequest build() {
       return new InsertAllRequest(this);
     }
@@ -241,6 +257,7 @@ private InsertAllRequest(Builder builder) {
     this.rows = ImmutableList.copyOf(checkNotNull(builder.rows));
     this.ignoreUnknownValues = builder.ignoreUnknownValues;
     this.skipInvalidRows = builder.skipInvalidRows;
+    this.templateSuffix = builder.templateSuffix;
   }
 
   /**
@@ -273,6 +290,19 @@ public Boolean skipInvalidRows() {
     return skipInvalidRows;
   }
 
+  /**
+   * If specified, the destination table is treated as a base template. Rows are inserted into an
+   * instance table named "{destination}{templateSuffix}". BigQuery will manage the creation of the
+   * instance table, using the schema of the base template table.
+   *
+   * @see 
+   *     Template Tables
+   */
+  public String templateSuffix() {
+    return templateSuffix;
+  }
+
   /**
    * Returns a builder for an {@code InsertAllRequest} object given the destination table.
    */
@@ -384,12 +414,13 @@ public String toString() {
         .add("rows", rows)
         .add("ignoreUnknownValues", ignoreUnknownValues)
         .add("skipInvalidRows", skipInvalidRows)
+        .add("templateSuffix", templateSuffix)
         .toString();
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(table, rows, ignoreUnknownValues, skipInvalidRows);
+    return Objects.hash(table, rows, ignoreUnknownValues, skipInvalidRows, templateSuffix);
   }
 
   @Override
@@ -401,6 +432,7 @@ public boolean equals(Object obj) {
     return Objects.equals(table, other.table)
         && Objects.equals(rows, other.rows)
         && Objects.equals(ignoreUnknownValues, other.ignoreUnknownValues)
-        && Objects.equals(skipInvalidRows, other.skipInvalidRows);
+        && Objects.equals(skipInvalidRows, other.skipInvalidRows)
+        && Objects.equals(templateSuffix, other.templateSuffix);
   }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index bcc946f65006..6a6a1c7cd6af 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -614,6 +614,7 @@ public void testInsertAll() {
         .rows(rows)
         .skipInvalidRows(false)
         .ignoreUnknownValues(true)
+        .templateSuffix("suffix")
         .build();
     TableDataInsertAllRequest requestPb = new TableDataInsertAllRequest().setRows(
         Lists.transform(rows, new Function() {
@@ -623,7 +624,7 @@ public TableDataInsertAllRequest.Rows apply(RowToInsert rowToInsert) {
                 .setJson(rowToInsert.content());
           }
         })
-    ).setSkipInvalidRows(false).setIgnoreUnknownValues(true);
+    ).setSkipInvalidRows(false).setIgnoreUnknownValues(true).setTemplateSuffix("suffix");
     TableDataInsertAllResponse responsePb = new TableDataInsertAllResponse().setInsertErrors(
         ImmutableList.of(new TableDataInsertAllResponse.InsertErrors().setIndex(0L).setErrors(
             ImmutableList.of(new ErrorProto().setMessage("ErrorMessage")))));
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index 4a4f01de4124..34f4f6893187 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -475,6 +475,41 @@ public void testInsertAll() {
     assertTrue(bigquery.delete(TableId.of(DATASET, tableName)));
   }
 
+  @Test
+  public void testInsertAllWithSuffix() {
+    String tableName = "test_insert_all_with_suffix_table";
+    BaseTableInfo tableInfo = TableInfo.of(TableId.of(DATASET, tableName), TABLE_SCHEMA);
+    assertNotNull(bigquery.create(tableInfo));
+    InsertAllRequest request = InsertAllRequest.builder(tableInfo.tableId())
+        .addRow(ImmutableMap.of(
+            "TimestampField", "2014-08-19 07:41:35.220 -05:00",
+            "StringField", "stringValue",
+            "IntegerField", ImmutableList.of(0, 1),
+            "BooleanField", false,
+            "RecordField", ImmutableMap.of(
+                "TimestampField", "1969-07-20 20:18:04 UTC",
+                "IntegerField", ImmutableList.of(1, 0),
+                "BooleanField", true)))
+        .addRow(ImmutableMap.of(
+            "TimestampField", "2014-08-19 07:41:35.220 -05:00",
+            "StringField", "stringValue",
+            "IntegerField", ImmutableList.of(0, 1),
+            "BooleanField", false,
+            "RecordField", ImmutableMap.of(
+                "TimestampField", "1969-07-20 20:18:04 UTC",
+                "IntegerField", ImmutableList.of(1, 0),
+                "BooleanField", true)))
+        .templateSuffix("_suffix")
+        .build();
+    InsertAllResponse response = bigquery.insertAll(request);
+    assertFalse(response.hasErrors());
+    assertEquals(0, response.insertErrors().size());
+    String newTableName = tableName + "_suffix";
+    assertNotNull(bigquery.getTable(DATASET, newTableName, TableOption.fields()));
+    assertTrue(bigquery.delete(TableId.of(DATASET, tableName)));
+    assertTrue(bigquery.delete(TableId.of(DATASET, newTableName)));
+  }
+
   @Test
   public void testInsertAllWithErrors() {
     String tableName = "test_insert_all_with_errors_table";
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java
index fb744bd78920..d2e1de14a571 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/InsertAllRequestTest.java
@@ -18,6 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
@@ -45,6 +46,7 @@ public class InsertAllRequestTest {
   private static final BaseTableInfo TABLE_INFO = TableInfo.of(TABLE_ID, TABLE_SCHEMA);
   private static final boolean SKIP_INVALID_ROWS = true;
   private static final boolean IGNORE_UNKNOWN_VALUES = false;
+  private static final String TEMPLATE_SUFFIX = "templateSuffix";
   private static final InsertAllRequest INSERT_ALL_REQUEST1 = InsertAllRequest.builder(TABLE_ID)
       .addRow(CONTENT1)
       .addRow(CONTENT2)
@@ -90,20 +92,25 @@ public class InsertAllRequestTest {
           .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
           .skipInvalidRows(SKIP_INVALID_ROWS)
           .build();
-  private static final InsertAllRequest INSERT_ALL_REQUEST9 =
-      InsertAllRequest.builder(TABLE_INFO)
-          .addRow("id1", CONTENT1)
-          .addRow("id2", CONTENT2)
-          .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
-          .skipInvalidRows(SKIP_INVALID_ROWS)
-          .build();
-  private static final InsertAllRequest INSERT_ALL_REQUEST10 =
-      InsertAllRequest.builder(TABLE_INFO)
-          .addRow("id1", CONTENT1)
-          .addRow("id2", CONTENT2)
-          .ignoreUnknownValues(true)
-          .skipInvalidRows(false)
-          .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST9 = InsertAllRequest.builder(TABLE_INFO)
+      .addRow("id1", CONTENT1)
+      .addRow("id2", CONTENT2)
+      .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+      .skipInvalidRows(SKIP_INVALID_ROWS)
+      .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST10 = InsertAllRequest.builder(TABLE_INFO)
+      .addRow("id1", CONTENT1)
+      .addRow("id2", CONTENT2)
+      .ignoreUnknownValues(true)
+      .skipInvalidRows(false)
+      .build();
+  private static final InsertAllRequest INSERT_ALL_REQUEST11 = InsertAllRequest.builder(TABLE_INFO)
+      .addRow("id1", CONTENT1)
+      .addRow("id2", CONTENT2)
+      .ignoreUnknownValues(true)
+      .skipInvalidRows(false)
+      .templateSuffix(TEMPLATE_SUFFIX)
+      .build();
 
   @Test
   public void testBuilder() {
@@ -117,6 +124,7 @@ public void testBuilder() {
     assertEquals(TABLE_ID, INSERT_ALL_REQUEST8.table());
     assertEquals(TABLE_ID, INSERT_ALL_REQUEST9.table());
     assertEquals(TABLE_ID, INSERT_ALL_REQUEST10.table());
+    assertEquals(TABLE_ID, INSERT_ALL_REQUEST11.table());
     assertEquals(ROWS, INSERT_ALL_REQUEST1.rows());
     assertEquals(ROWS, INSERT_ALL_REQUEST2.rows());
     assertEquals(ROWS, INSERT_ALL_REQUEST4.rows());
@@ -127,6 +135,7 @@ public void testBuilder() {
     assertEquals(ROWS_WITH_ID, INSERT_ALL_REQUEST8.rows());
     assertEquals(ROWS_WITH_ID, INSERT_ALL_REQUEST9.rows());
     assertEquals(ROWS_WITH_ID, INSERT_ALL_REQUEST10.rows());
+    assertEquals(ROWS_WITH_ID, INSERT_ALL_REQUEST11.rows());
     assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST1.skipInvalidRows());
     assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST2.skipInvalidRows());
     assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST3.skipInvalidRows());
@@ -137,6 +146,7 @@ public void testBuilder() {
     assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST8.skipInvalidRows());
     assertEquals(SKIP_INVALID_ROWS, INSERT_ALL_REQUEST9.skipInvalidRows());
     assertFalse(INSERT_ALL_REQUEST10.skipInvalidRows());
+    assertFalse(INSERT_ALL_REQUEST11.skipInvalidRows());
     assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST1.ignoreUnknownValues());
     assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST2.ignoreUnknownValues());
     assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST3.ignoreUnknownValues());
@@ -147,6 +157,18 @@ public void testBuilder() {
     assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST8.ignoreUnknownValues());
     assertEquals(IGNORE_UNKNOWN_VALUES, INSERT_ALL_REQUEST9.ignoreUnknownValues());
     assertTrue(INSERT_ALL_REQUEST10.ignoreUnknownValues());
+    assertTrue(INSERT_ALL_REQUEST11.ignoreUnknownValues());
+    assertNull(INSERT_ALL_REQUEST1.templateSuffix());
+    assertNull(INSERT_ALL_REQUEST2.templateSuffix());
+    assertNull(INSERT_ALL_REQUEST3.templateSuffix());
+    assertNull(INSERT_ALL_REQUEST4.templateSuffix());
+    assertNull(INSERT_ALL_REQUEST5.templateSuffix());
+    assertNull(INSERT_ALL_REQUEST6.templateSuffix());
+    assertNull(INSERT_ALL_REQUEST7.templateSuffix());
+    assertNull(INSERT_ALL_REQUEST8.templateSuffix());
+    assertNull(INSERT_ALL_REQUEST9.templateSuffix());
+    assertNull(INSERT_ALL_REQUEST10.templateSuffix());
+    assertEquals(TEMPLATE_SUFFIX, INSERT_ALL_REQUEST11.templateSuffix());
   }
 
   @Test
@@ -183,6 +205,8 @@ public void testEquals() {
     compareInsertAllRequest(INSERT_ALL_REQUEST5, INSERT_ALL_REQUEST7);
     compareInsertAllRequest(INSERT_ALL_REQUEST7, INSERT_ALL_REQUEST8);
     compareInsertAllRequest(INSERT_ALL_REQUEST8, INSERT_ALL_REQUEST9);
+    compareInsertAllRequest(INSERT_ALL_REQUEST10, INSERT_ALL_REQUEST10);
+    compareInsertAllRequest(INSERT_ALL_REQUEST11, INSERT_ALL_REQUEST11);
   }
 
   private void compareInsertAllRequest(InsertAllRequest expected, InsertAllRequest value) {
@@ -193,5 +217,6 @@ private void compareInsertAllRequest(InsertAllRequest expected, InsertAllRequest
     assertEquals(expected.rows(), value.rows());
     assertEquals(expected.ignoreUnknownValues(), value.ignoreUnknownValues());
     assertEquals(expected.skipInvalidRows(), value.skipInvalidRows());
+    assertEquals(expected.templateSuffix(), value.templateSuffix());
   }
 }

From 6af6db4cdfbc1adf69f5eb8e668fdf5f8b089766 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 30 Dec 2015 12:52:31 +0100
Subject: [PATCH 245/322] Add more info on BigQuery load's source file

---
 gcloud-java-examples/README.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index 0f66fe523e26..031d18fc0c19 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -41,7 +41,17 @@ To run examples from your command line:
 
   Here's an example run of `BigQueryExample`.
 
-  Before running the example, go to the [Google Developers Console][developers-console] to ensure that BigQuery API is enabled.
+  Before running the example, go to the [Google Developers Console][developers-console] to ensure
+  that BigQuery API is enabled. You can upload a CSV file `my_csv_file` to the `my_bucket` bucket
+  (replace `my_csv_file` and `my_bucket` with actual file and bucket names) using the GCS
+  [web browser](https://console.developers.google.com/storage/browser). The CSV file will be used to
+  load data into a BigQuery table and should look something like:
+  ```csv
+  value1
+  value2
+  value3
+  ```
+  Then you are ready to run the following example:
   ```
   $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="create dataset new_dataset_id"
   $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="create table new_dataset_id new_table_id field_name:string"

From 5e734eeed030f6919f5a7ac04784f9ff0ad3bddc Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 30 Dec 2015 19:31:32 +0100
Subject: [PATCH 246/322] Add functional classes for BigQuery datasets jobs and
 tables

---
 .../com/google/gcloud/bigquery/Dataset.java   | 285 ++++++++++++++++++
 .../java/com/google/gcloud/bigquery/Job.java  | 117 +++++++
 .../com/google/gcloud/bigquery/Table.java     | 276 +++++++++++++++++
 .../google/gcloud/bigquery/DatasetTest.java   | 197 ++++++++++++
 .../com/google/gcloud/bigquery/JobTest.java   | 141 +++++++++
 .../com/google/gcloud/bigquery/TableTest.java | 243 +++++++++++++++
 6 files changed, 1259 insertions(+)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
new file mode 100644
index 000000000000..7c3358fedb99
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
+import com.google.gcloud.Page;
+import com.google.gcloud.PageImpl;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A Google BigQuery Dataset.
+ *
+ * 
    Objects of this class are immutable. Operations that modify the dataset like {@link #update}
+ * return a new object. To get a {@code Dataset} object with the most recent information use
+ * {@link #reload}.
+ * 
    
+ */
+public final class Dataset {
+
+  private final BigQuery bigquery;
+  private final DatasetInfo info;
+
+  private static class TablePageFetcher implements PageImpl.NextPageFetcher
     
     {
+
+    private static final long serialVersionUID = 6906197848579250598L;
+
+    private final BigQueryOptions options;
+    private final Page infoPage;
+
+    TablePageFetcher(BigQueryOptions options, Page infoPage) {
+      this.options = options;
+      this.infoPage = infoPage;
+    }
+
+    @Override
+    public Page
     nextPage() {
+      Page nextInfoPage = infoPage.nextPage();
+      return new PageImpl<>(new TablePageFetcher(options, nextInfoPage),
+          nextInfoPage.nextPageCursor(), new LazyTableIterable(options, nextInfoPage.values()));
+    }
+  }
+
+  private static class LazyTableIterable implements Iterable
    , Serializable {
+
+    private static final long serialVersionUID = 3312744215731674032L;
+
+    private final BigQueryOptions options;
+    private Iterable infoIterable;
+    private transient BigQuery bigquery;
+
+    public LazyTableIterable(BigQueryOptions options, Iterable infoIterable) {
+      this.options = options;
+      this.infoIterable = infoIterable;
+      this.bigquery = options.service();
+    }
+
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+      in.defaultReadObject();
+      this.bigquery = options.service();
+    }
+
+    @Override
+    public Iterator
     iterator() {
+      return Iterators.transform(infoIterable.iterator(), new Function() {
+        @Override
+        public Table apply(BaseTableInfo tableInfo) {
+          return new Table(bigquery, tableInfo);
+        }
+      });
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(options, infoIterable);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (!(obj instanceof LazyTableIterable)) {
+        return false;
+      }
+      LazyTableIterable other = (LazyTableIterable) obj;
+      return Objects.equals(options, other.options)
+          && Objects.equals(infoIterable, other.infoIterable);
+    }
+  }
+
+  /**
+   * Constructs a {@code Dataset} object for the provided {@code DatasetInfo}. The BigQuery service
+   * is used to issue requests.
+   *
+   * @param bigquery the BigQuery service used for issuing requests
+   * @param info dataset's info
+   */
+  public Dataset(BigQuery bigquery, DatasetInfo info) {
+    this.bigquery = checkNotNull(bigquery);
+    this.info = checkNotNull(info);
+  }
+
+  /**
+   * Creates a {@code Dataset} object for the provided dataset's user-defined id. Performs an RPC
+   * call to get the latest dataset information.
+   *
+   * @param bigquery the BigQuery service used for issuing requests
+   * @param dataset dataset's user-defined id
+   * @return the {@code Dataset} object or {@code null} if not found.
+   * @throws BigQueryException upon failure
+   */
+  public static Dataset load(BigQuery bigquery, String dataset) {
+    DatasetInfo info = bigquery.getDataset(dataset);
+    return info != null ? new Dataset(bigquery, info) : null;
+  }
+
+  /**
+   * Returns the dataset's information.
+   */
+  public DatasetInfo info() {
+    return info;
+  }
+
+  /**
+   * Checks if this dataset exists.
+   *
+   * @return {@code true} if this dataset exists, {@code false} otherwise.
+   * @throws BigQueryException upon failure
+   */
+  public boolean exists() {
+    return bigquery.getDataset(info.datasetId(), BigQuery.DatasetOption.fields()) != null;
+  }
+
+  /**
+   * Fetches current dataset's latest information.
+   *
+   * @param options dataset options
+   * @return a {@code Dataset} object with latest information.
+   * @throws BigQueryException upon failure
+   */
+  public Dataset reload(BigQuery.DatasetOption... options) {
+    return new Dataset(bigquery, bigquery.getDataset(info.datasetId(), options));
+  }
+
+  /**
+   * Updates the dataset's information. Dataset's user-defined id cannot be changed. A new
+   * {@code Dataset} object is returned.
+   *
+   * @param datasetInfo new dataset's information. User-defined id must match the one of the current
+   *     dataset
+   * @param options dataset options
+   * @return a {@code Dataset} object with updated information.
+   * @throws BigQueryException upon failure
+   */
+  public Dataset update(DatasetInfo datasetInfo, BigQuery.DatasetOption... options) {
+    checkArgument(Objects.equals(datasetInfo.datasetId().dataset(),
+        info.datasetId().dataset()), "Dataset's user-defined ids must match");
+    return new Dataset(bigquery, bigquery.update(datasetInfo, options));
+  }
+
+  /**
+   * Deletes this dataset.
+   *
+   * @return {@code true} if dataset was deleted, {@code false} if it was not found.
+   * @throws BigQueryException upon failure
+   */
+  public boolean delete() {
+    return bigquery.delete(info.datasetId());
+  }
+
+  /**
+   * Returns the paginated list of tables in this dataset.
+   *
+   * @param options options for listing tables
+   * @throws BigQueryException upon failure
+   */
+  public Page
     list(BigQuery.TableListOption... options) {
+    Page infoPage = bigquery.listTables(info.datasetId(), options);
+    BigQueryOptions bigqueryOptions = bigquery.options();
+    return new PageImpl<>(new TablePageFetcher(bigqueryOptions, infoPage),
+        infoPage.nextPageCursor(), new LazyTableIterable(bigqueryOptions, infoPage.values()));
+  }
+
+  /**
+   * Returns the requested table in this dataset or {@code null} if not found.
+   *
+   * @param table user-defined id of the requested table
+   * @param options table options
+   * @throws BigQueryException upon failure
+   */
+  public Table get(String table, BigQuery.TableOption... options) {
+    BaseTableInfo tableInfo =
+        bigquery.getTable(TableId.of(info.datasetId().dataset(), table), options);
+    return tableInfo != null ? new Table(bigquery, tableInfo) : null;
+  }
+
+  /**
+   * Creates a new simple table in this dataset.
+   *
+   * @param table the table's user-defined id
+   * @param schema the table's schema
+   * @param options options for table creation
+   * @return a {@code Table} object for the created table.
+   * @throws BigQueryException upon failure
+   */
+  public Table create(String table, Schema schema, BigQuery.TableOption... options) {
+    BaseTableInfo tableInfo = TableInfo.of(TableId.of(info.datasetId().dataset(), table), schema);
+    return new Table(bigquery, bigquery.create(tableInfo, options));
+  }
+
+  /**
+   * Creates a new view table in this dataset.
+   *
+   * @param table the table's user-defined id
+   * @param query the query used to generate the table
+   * @param functions user-defined functions that can be used by the query
+   * @param options options for table creation
+   * @return a {@code Table} object for the created table.
+   * @throws BigQueryException upon failure
+   */
+  public Table create(String table, String query, List functions,
+      BigQuery.TableOption... options) {
+    BaseTableInfo tableInfo =
+        ViewInfo.of(TableId.of(info.datasetId().dataset(), table), query, functions);
+    return new Table(bigquery, bigquery.create(tableInfo, options));
+  }
+
+  /**
+   * Creates a new view table in this dataset.
+   *
+   * @param table the table's user-defined id
+   * @param query the query used to generate the table
+   * @param options options for table creation
+   * @return a {@code Table} object for the created table.
+   * @throws BigQueryException upon failure
+   */
+  public Table create(String table, String query, BigQuery.TableOption... options) {
+    BaseTableInfo tableInfo =  ViewInfo.of(TableId.of(info.datasetId().dataset(), table), query);
+    return new Table(bigquery, bigquery.create(tableInfo, options));
+  }
+
+  /**
+   * Creates a new external table in this dataset.
+   *
+   * @param table the table's user-defined id
+   * @param configuration data format, location and other properties of an external table
+   * @param options options for table creation
+   * @return a {@code Table} object for the created table.
+   * @throws BigQueryException upon failure
+   */
+  public Table create(String table, ExternalDataConfiguration configuration,
+      BigQuery.TableOption... options) {
+    BaseTableInfo tableInfo =
+        ExternalTableInfo.of(TableId.of(info.datasetId().dataset(), table), configuration);
+    return new Table(bigquery, bigquery.create(tableInfo, options));
+  }
+
+  /**
+   * Returns the dataset's {@code BigQuery} object used to issue requests.
+   */
+  public BigQuery bigquery() {
+    return bigquery;
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
new file mode 100644
index 000000000000..06e9b1ced569
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * A Google BigQuery Job.
+ *
+ * 
    Objects of this class are immutable. To get a {@code Job} object with the most recent
+ * information use {@link #reload}.
+ * 
    
+ */
+public final class Job {
+
+  private final BigQuery bigquery;
+  private final JobInfo info;
+
+  /**
+   * Constructs a {@code Job} object for the provided {@code JobInfo}. The BigQuery service
+   * is used to issue requests.
+   *
+   * @param bigquery the BigQuery service used for issuing requests
+   * @param info jobs's info
+   */
+  public Job(BigQuery bigquery, JobInfo info) {
+    this.bigquery = checkNotNull(bigquery);
+    this.info = checkNotNull(info);
+  }
+
+  /**
+   * Creates a {@code Job} object for the provided job's user-defined id. Performs an RPC call
+   * to get the latest job information.
+   *
+   * @param bigquery the BigQuery service used for issuing requests
+   * @param job job's id, either user-defined or picked by the BigQuery service
+   * @return the {@code Job} object or {@code null} if not found.
+   * @throws BigQueryException upon failure
+   */
+  public static Job load(BigQuery bigquery, String job) {
+    JobInfo info = bigquery.getJob(job);
+    return info != null ? new Job(bigquery, info) : null;
+  }
+
+  /**
+   * Returns the job's information.
+   */
+  public JobInfo info() {
+    return info;
+  }
+
+  /**
+   * Checks if this job exists.
+   *
+   * @return {@code true} if this job exists, {@code false} otherwise.
+   * @throws BigQueryException upon failure
+   */
+  public boolean exists() {
+    return bigquery.getJob(info.jobId(), BigQuery.JobOption.fields()) != null;
+  }
+
+  /**
+   * Checks if this job has completed its execution, either failing or succeeding.
+   *
+   * @return {@code true} if this job is in {@link JobStatus.State#DONE} state, {@code false} if the
+   *     state is not {@link JobStatus.State#DONE} or the job does not exist.
+   * @throws BigQueryException upon failure
+   */
+  public boolean isDone() {
+    JobInfo job = bigquery.getJob(info.jobId(),
+        BigQuery.JobOption.fields(BigQuery.JobField.STATUS));
+    return job != null && job.status().state() == JobStatus.State.DONE;
+  }
+
+  /**
+   * Fetches current job's latest information.
+   *
+   * @param options job options
+   * @return a {@code Job} object with latest information.
+   * @throws BigQueryException upon failure
+   */
+  public Job reload(BigQuery.JobOption... options) {
+    return new Job(bigquery, bigquery.getJob(info.jobId(), options));
+  }
+
+  /**
+   * Sends a job cancel request.
+   *
+   * @return {@code true} if cancel request was sent successfully, {@code false} if job was not
+   *     found.
+   * @throws BigQueryException upon failure
+   */
+  public boolean cancel() {
+    return bigquery.cancel(info.jobId());
+  }
+
+  /**
+   * Returns the job's {@code BigQuery} object used to issue requests.
+   */
+  public BigQuery bigquery() {
+    return bigquery;
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
new file mode 100644
index 000000000000..33cbe602033a
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.Page;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A Google BigQuery Table.
+ *
+ * 
    Objects of this class are immutable. Operations that modify the table like {@link #update}
+ * return a new object. To get a {@code Table} object with the most recent information use
+ * {@link #reload}.
+ * 
    
+ */
+public final class Table {
+
+  private final BigQuery bigquery;
+  private final BaseTableInfo info;
+
+  /**
+   * Constructs a {@code Table} object for the provided {@code TableInfo}. The BigQuery service
+   * is used to issue requests.
+   *
+   * @param bigquery the BigQuery service used for issuing requests
+   * @param info table's info
+   */
+  public Table(BigQuery bigquery, BaseTableInfo info) {
+    this.bigquery = checkNotNull(bigquery);
+    this.info = checkNotNull(info);
+  }
+
+  /**
+   * Creates a {@code Table} object for the provided dataset and table's user-defined ids. Performs
+   * an RPC call to get the latest table information.
+   *
+   * @param bigquery the BigQuery service used for issuing requests
+   * @param dataset the dataset's user-defined id
+   * @param table the table's user-defined id
+   * @return the {@code Table} object or {@code null} if not found.
+   * @throws BigQueryException upon failure
+   */
+  public static Table load(BigQuery bigquery, String dataset, String table) {
+    return load(bigquery, TableId.of(dataset, table));
+  }
+
+  /**
+   * Creates a {@code Table} object for the provided table identity. Performs an RPC call to get the
+   * latest table information.
+   *
+   * @param bigquery the BigQuery service used for issuing requests
+   * @param table the table's identity
+   * @return the {@code Table} object or {@code null} if not found.
+   * @throws BigQueryException upon failure
+   */
+  public static Table load(BigQuery bigquery, TableId table) {
+    BaseTableInfo info = bigquery.getTable(table);
+    return info != null ? new Table(bigquery, info) : null;
+  }
+
+  /**
+   * Returns the table's information.
+   */
+  public BaseTableInfo info() {
+    return info;
+  }
+
+  /**
+   * Checks if this table exists.
+   *
+   * @return {@code true} if this table exists, {@code false} otherwise.
+   * @throws BigQueryException upon failure
+   */
+  public boolean exists() {
+    return bigquery.getTable(info.tableId(), BigQuery.TableOption.fields()) != null;
+  }
+
+  /**
+   * Fetches current table's latest information.
+   *
+   * @param options table options
+   * @return a {@code Table} object with latest information.
+   * @throws BigQueryException upon failure
+   */
+  public Table reload(BigQuery.TableOption... options) {
+    return new Table(bigquery, bigquery.getTable(info.tableId(), options));
+  }
+
+  /**
+   * Updates the table's information. Dataset's and table's user-defined ids cannot be changed. A
+   * new {@code Table} object is returned.
+   *
+   * @param tableInfo new table's information. Dataset's and table's user-defined ids must match the
+   *     ones of the current table
+   * @param options dataset options
+   * @return a {@code Table} object with updated information.
+   * @throws BigQueryException upon failure
+   */
+  public Table update(BaseTableInfo tableInfo, BigQuery.TableOption... options) {
+    checkArgument(Objects.equals(tableInfo.tableId().dataset(),
+        info.tableId().dataset()), "Dataset's user-defined ids must match");
+    checkArgument(Objects.equals(tableInfo.tableId().table(),
+        info.tableId().table()), "Table's user-defined ids must match");
+    return new Table(bigquery, bigquery.update(tableInfo, options));
+  }
+
+  /**
+   * Deletes this table.
+   *
+   * @return {@code true} if table was deleted, {@code false} if it was not found.
+   * @throws BigQueryException upon failure
+   */
+  public boolean delete() {
+    return bigquery.delete(info.tableId());
+  }
+
+  /**
+   * Insert rows into the table.
+   *
+   * @param rows rows to be inserted
+   * @throws BigQueryException upon failure
+   */
+  InsertAllResponse insert(Iterable rows) throws BigQueryException {
+    return bigquery.insertAll(InsertAllRequest.of(info.tableId(), rows));
+  }
+
+  /**
+   * Insert rows into the table.
+   *
+   * @param rows rows to be inserted
+   * @param skipInvalidRows whether to insert all valid rows, even if invalid rows exist. If not set
+   *     the entire insert operation will fail if rows to be inserted contain an invalid row
+   * @param ignoreUnknownValues whether to accept rows that contain values that do not match the
+   *     schema. The unknown values are ignored. If not set, rows with unknown values are considered
+   *     to be invalid
+   * @throws BigQueryException upon failure
+   */
+  InsertAllResponse insert(Iterable rows, boolean skipInvalidRows,
+      boolean ignoreUnknownValues) throws BigQueryException {
+    InsertAllRequest request = InsertAllRequest.builder(info.tableId(), rows)
+        .skipInvalidRows(skipInvalidRows)
+        .ignoreUnknownValues(ignoreUnknownValues)
+        .build();
+    return bigquery.insertAll(request);
+  }
+
+  /**
+   * Returns the paginated list rows in this table.
+   *
+   * @param options table data list options
+   * @throws BigQueryException upon failure
+   */
+  Page> list(BigQuery.TableDataListOption... options) throws BigQueryException {
+    return bigquery.listTableData(info.tableId(), options);
+  }
+
+  /**
+   * Starts a BigQuery Job to copy the current table to the provided destination table. Returns the
+   * started {@link Job} object.
+   *
+   * @param destinationDataset the user-defined id of the destination dataset
+   * @param destinationTable the user-defined id of the destination table
+   * @param options job options
+   * @throws BigQueryException upon failure
+   */
+  Job copy(String destinationDataset, String destinationTable, BigQuery.JobOption... options)
+      throws BigQueryException {
+    return copy(TableId.of(destinationDataset, destinationTable), options);
+  }
+
+  /**
+   * Starts a BigQuery Job to copy the current table to the provided destination table. Returns the
+   * started {@link Job} object.
+   *
+   * @param destinationTable the destination table of the copy job
+   * @param options job options
+   * @throws BigQueryException upon failure
+   */
+  Job copy(TableId destinationTable, BigQuery.JobOption... options) throws BigQueryException {
+    JobInfo job = bigquery.create(CopyJobInfo.of(destinationTable, info.tableId()), options);
+    return new Job(bigquery, job);
+  }
+
+  /**
+   * Starts a BigQuery Job to extract the current table to the provided destination URI. Returns the
+   * started {@link Job} object.
+   *
+   * @param format the format of the extracted data
+   * @param destinationUri the fully-qualified Google Cloud Storage URI (e.g. gs://bucket/path)
+   *     where the extracted table should be written
+   * @param options job options
+   * @throws BigQueryException upon failure
+   */
+  Job extract(String format, String destinationUri, BigQuery.JobOption... options)
+      throws BigQueryException {
+    return extract(format, ImmutableList.of(destinationUri), options);
+  }
+
+  /**
+   * Starts a BigQuery Job to extract the current table to the provided destination URIs. Returns
+   * the started {@link Job} object.
+   *
+   * @param format the format of the exported data
+   * @param destinationUris the fully-qualified Google Cloud Storage URIs (e.g. gs://bucket/path)
+   *     where the extracted table should be written
+   * @param options job options
+   * @throws BigQueryException upon failure
+   */
+  Job extract(String format, List destinationUris, BigQuery.JobOption... options)
+      throws BigQueryException {
+    ExtractJobInfo job = ExtractJobInfo.builder(info.tableId(), destinationUris)
+        .format(format)
+        .build();
+    return new Job(bigquery, bigquery.create(job, options));
+  }
+
+  /**
+   * Starts a BigQuery Job to load data into the current table from the provided source URI. Returns
+   * the started {@link Job} object.
+   *
+   * @param format the format of the data to load
+   * @param sourceUri the fully-qualified Google Cloud Storage URI (e.g. gs://bucket/path) from
+   *     which to load the data
+   * @param options job options
+   * @throws BigQueryException upon failure
+   */
+  Job load(FormatOptions format, String sourceUri, BigQuery.JobOption... options)
+      throws BigQueryException {
+    return load(format, ImmutableList.of(sourceUri), options);
+  }
+
+  /**
+   * Starts a BigQuery Job to load data into the current table from the provided source URIs.
+   * Returns the started {@link Job} object.
+   *
+   * @param format the format of the exported data
+   * @param sourceUris the fully-qualified Google Cloud Storage URIs (e.g. gs://bucket/path) from
+   *     which to load the data
+   * @param options job options
+   * @throws BigQueryException upon failure
+   */
+  Job load(FormatOptions format, List sourceUris, BigQuery.JobOption... options)
+      throws BigQueryException {
+    LoadJobInfo job = LoadJobInfo.builder(info.tableId(), sourceUris)
+        .formatOptions(format)
+        .build();
+    return new Job(bigquery, bigquery.create(job, options));
+  }
+
+  /**
+   * Returns the table's {@code BigQuery} object used to issue requests.
+   */
+  public BigQuery bigquery() {
+    return bigquery;
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
new file mode 100644
index 000000000000..6920b6812df3
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.Page;
+import com.google.gcloud.PageImpl;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
+
+public class DatasetTest {
+
+  private static final DatasetId DATASET_ID = DatasetId.of("dataset");
+  private static final DatasetInfo DATASET_INFO = DatasetInfo.builder(DATASET_ID).build();
+  private static final Field FIELD = Field.of("FieldName", Field.Type.integer());
+  private static final Iterable TABLE_INFO_RESULTS = ImmutableList.of(
+      TableInfo.builder(TableId.of("dataset", "table1"), Schema.of(FIELD)).build(),
+      ViewInfo.builder(TableId.of("dataset", "table2"), "QUERY").build(),
+      ExternalTableInfo.builder(TableId.of("dataset", "table2"),
+          ExternalDataConfiguration.of(ImmutableList.of("URI"), Schema.of(), FormatOptions.csv()))
+          .build());
+
+  private BigQuery bigquery;
+  private Dataset dataset;
+
+  @Before
+  public void setUp() throws Exception {
+    bigquery = createStrictMock(BigQuery.class);
+    dataset = new Dataset(bigquery, DATASET_INFO);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    verify(bigquery);
+  }
+
+  @Test
+  public void testInfo() throws Exception {
+    assertEquals(DATASET_INFO, dataset.info());
+    replay(bigquery);
+  }
+
+  @Test
+  public void testExists_True() throws Exception {
+    BigQuery.DatasetOption[] expectedOptions = {BigQuery.DatasetOption.fields()};
+    expect(bigquery.getDataset(DATASET_ID, expectedOptions)).andReturn(DATASET_INFO);
+    replay(bigquery);
+    assertTrue(dataset.exists());
+  }
+
+  @Test
+  public void testExists_False() throws Exception {
+    BigQuery.DatasetOption[] expectedOptions = {BigQuery.DatasetOption.fields()};
+    expect(bigquery.getDataset(DATASET_ID, expectedOptions)).andReturn(null);
+    replay(bigquery);
+    assertFalse(dataset.exists());
+  }
+
+  @Test
+  public void testReload() throws Exception {
+    DatasetInfo updatedInfo = DATASET_INFO.toBuilder().description("Description").build();
+    expect(bigquery.getDataset(DATASET_ID)).andReturn(updatedInfo);
+    replay(bigquery);
+    Dataset updatedDataset = dataset.reload();
+    assertSame(bigquery, updatedDataset.bigquery());
+    assertEquals(updatedInfo, updatedDataset.info());
+  }
+
+  @Test
+  public void testUpdate() throws Exception {
+    DatasetInfo updatedInfo = DATASET_INFO.toBuilder().description("Description").build();
+    expect(bigquery.update(updatedInfo)).andReturn(updatedInfo);
+    replay(bigquery);
+    Dataset updatedDataset = dataset.update(updatedInfo);
+    assertSame(bigquery, dataset.bigquery());
+    assertEquals(updatedInfo, updatedDataset.info());
+  }
+
+  @Test
+  public void testDelete() throws Exception {
+    expect(bigquery.delete(DATASET_INFO.datasetId())).andReturn(true);
+    replay(bigquery);
+    assertTrue(dataset.delete());
+  }
+
+  @Test
+  public void testList() throws Exception {
+    BigQueryOptions bigqueryOptions = createStrictMock(BigQueryOptions.class);
+    PageImpl tableInfoPage = new PageImpl<>(null, "c", TABLE_INFO_RESULTS);
+    expect(bigquery.listTables(DATASET_INFO.datasetId())).andReturn(tableInfoPage);
+    expect(bigquery.options()).andReturn(bigqueryOptions);
+    expect(bigqueryOptions.service()).andReturn(bigquery);
+    replay(bigquery, bigqueryOptions);
+    Page
     tablePage = dataset.list();
+    Iterator tableInfoIterator = tableInfoPage.values().iterator();
+    Iterator
     tableIterator = tablePage.values().iterator();
+    while (tableInfoIterator.hasNext() && tableIterator.hasNext()) {
+      assertEquals(tableInfoIterator.next(), tableIterator.next().info());
+    }
+    assertFalse(tableInfoIterator.hasNext());
+    assertFalse(tableIterator.hasNext());
+    assertEquals(tableInfoPage.nextPageCursor(), tablePage.nextPageCursor());
+    verify(bigqueryOptions);
+  }
+
+  @Test
+  public void testGet() throws Exception {
+    BaseTableInfo info = TableInfo.builder(TableId.of("dataset", "table1"), Schema.of()).build();
+    expect(bigquery.getTable(TableId.of("dataset", "table1"))).andReturn(info);
+    replay(bigquery);
+    Table table = dataset.get("table1");
+    assertNotNull(table);
+    assertEquals(info, table.info());
+  }
+
+  @Test
+  public void testGetNull() throws Exception {
+    expect(bigquery.getTable(TableId.of("dataset", "table1"))).andReturn(null);
+    replay(bigquery);
+    assertNull(dataset.get("table1"));
+  }
+
+  @Test
+  public void testCreateTable() throws Exception {
+    TableInfo info = TableInfo.builder(TableId.of("dataset", "table1"), Schema.of(FIELD)).build();
+    expect(bigquery.create(info)).andReturn(info);
+    replay(bigquery);
+    Table table = dataset.create("table1", Schema.of(FIELD));
+    assertEquals(info, table.info());
+  }
+
+  @Test
+  public void testCreateView() throws Exception {
+    ViewInfo info = ViewInfo.builder(TableId.of("dataset", "table2"), "QUERY").build();
+    expect(bigquery.create(info)).andReturn(info);
+    replay(bigquery);
+    Table table = dataset.create("table2", "QUERY");
+    assertEquals(info, table.info());
+  }
+
+  @Test
+  public void testCreateExternalTable() throws Exception {
+    ExternalTableInfo info = ExternalTableInfo.builder(TableId.of("dataset", "table3"),
+        ExternalDataConfiguration.of(ImmutableList.of("URI"), Schema.of(), FormatOptions.csv()))
+        .build();
+    expect(bigquery.create(info)).andReturn(info);
+    replay(bigquery);
+    Table table = dataset.create("table3", ExternalDataConfiguration.of(
+        ImmutableList.of("URI"), Schema.of(), FormatOptions.csv()));
+    assertEquals(info, table.info());
+  }
+
+  @Test
+  public void testLoad() throws Exception {
+    expect(bigquery.getDataset(DATASET_INFO.datasetId().dataset())).andReturn(DATASET_INFO);
+    replay(bigquery);
+    Dataset loadedDataset = Dataset.load(bigquery, DATASET_INFO.datasetId().dataset());
+    assertNotNull(loadedDataset);
+    assertEquals(DATASET_INFO, loadedDataset.info());
+  }
+
+  @Test
+  public void testLoadNull() throws Exception {
+    expect(bigquery.getDataset(DATASET_INFO.datasetId().dataset())).andReturn(null);
+    replay(bigquery);
+    assertNull(Dataset.load(bigquery, DATASET_INFO.datasetId().dataset()));
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
new file mode 100644
index 000000000000..2073adb3dd80
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class JobTest {
+
+  private static final JobId JOB_ID = JobId.of("dataset", "job");
+  private static final TableId TABLE_ID1 = TableId.of("dataset", "table1");
+  private static final TableId TABLE_ID2 = TableId.of("dataset", "table2");
+  private static final JobInfo JOB_INFO = CopyJobInfo.of(JOB_ID, TABLE_ID1, TABLE_ID2);
+
+  private BigQuery bigquery;
+  private Job job;
+
+  @Before
+  public void setUp() throws Exception {
+    bigquery = createStrictMock(BigQuery.class);
+    job = new Job(bigquery, JOB_INFO);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    verify(bigquery);
+  }
+
+  @Test
+  public void testInfo() throws Exception {
+    assertEquals(JOB_INFO, job.info());
+    replay(bigquery);
+  }
+
+  @Test
+  public void testExists_True() throws Exception {
+    BigQuery.JobOption[] expectedOptions = {BigQuery.JobOption.fields()};
+    expect(bigquery.getJob(JOB_INFO.jobId(), expectedOptions)).andReturn(JOB_INFO);
+    replay(bigquery);
+    assertTrue(job.exists());
+  }
+
+  @Test
+  public void testExists_False() throws Exception {
+    BigQuery.JobOption[] expectedOptions = {BigQuery.JobOption.fields()};
+    expect(bigquery.getJob(JOB_INFO.jobId(), expectedOptions)).andReturn(null);
+    replay(bigquery);
+    assertFalse(job.exists());
+  }
+
+  @Test
+  public void testIsDone_True() throws Exception {
+    JobStatus status = createStrictMock(JobStatus.class);
+    expect(status.state()).andReturn(JobStatus.State.DONE);
+    BigQuery.JobOption[] expectedOptions = {BigQuery.JobOption.fields(BigQuery.JobField.STATUS)};
+    expect(bigquery.getJob(JOB_INFO.jobId(), expectedOptions))
+        .andReturn(JOB_INFO.toBuilder().status(status).build());
+    replay(status, bigquery);
+    assertTrue(job.isDone());
+    verify(status);
+  }
+
+  @Test
+  public void testIsDone_False() throws Exception {
+    JobStatus status = createStrictMock(JobStatus.class);
+    expect(status.state()).andReturn(JobStatus.State.RUNNING);
+    BigQuery.JobOption[] expectedOptions = {BigQuery.JobOption.fields(BigQuery.JobField.STATUS)};
+    expect(bigquery.getJob(JOB_INFO.jobId(), expectedOptions))
+        .andReturn(JOB_INFO.toBuilder().status(status).build());
+    replay(status, bigquery);
+    assertFalse(job.isDone());
+    verify(status);
+  }
+
+  @Test
+  public void testIsDone_NotExists() throws Exception {
+    BigQuery.JobOption[] expectedOptions = {BigQuery.JobOption.fields(BigQuery.JobField.STATUS)};
+    expect(bigquery.getJob(JOB_INFO.jobId(), expectedOptions)).andReturn(null);
+    replay(bigquery);
+    assertFalse(job.isDone());
+  }
+
+  @Test
+  public void testReload() throws Exception {
+    JobInfo updatedInfo = JOB_INFO.toBuilder().etag("etag").build();
+    expect(bigquery.getJob(JOB_INFO.jobId())).andReturn(updatedInfo);
+    replay(bigquery);
+    Job updatedJob = job.reload();
+    assertSame(bigquery, updatedJob.bigquery());
+    assertEquals(updatedInfo, updatedJob.info());
+  }
+
+  @Test
+  public void testCancel() throws Exception {
+    expect(bigquery.cancel(JOB_INFO.jobId())).andReturn(true);
+    replay(bigquery);
+    assertTrue(job.cancel());
+  }
+
+  @Test
+  public void testLoad() throws Exception {
+    expect(bigquery.getJob(JOB_INFO.jobId().job())).andReturn(JOB_INFO);
+    replay(bigquery);
+    Job loadedJob = Job.load(bigquery, JOB_INFO.jobId().job());
+    assertNotNull(loadedJob);
+    assertEquals(JOB_INFO, loadedJob.info());
+  }
+
+  @Test
+  public void testLoadNull() throws Exception {
+    expect(bigquery.getJob(JOB_INFO.jobId().job())).andReturn(null);
+    replay(bigquery);
+    assertNull(Job.load(bigquery, JOB_INFO.jobId().job()));
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
new file mode 100644
index 000000000000..1520dbfcd580
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterators;
+import com.google.gcloud.Page;
+import com.google.gcloud.PageImpl;
+import com.google.gcloud.bigquery.InsertAllRequest.RowToInsert;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.List;
+
+public class TableTest {
+
+  private static final TableId TABLE_ID1 = TableId.of("dataset", "table1");
+  private static final TableId TABLE_ID2 = TableId.of("dataset", "table2");
+  private static final JobInfo COPY_JOB_INFO = CopyJobInfo.of(TABLE_ID2, TABLE_ID1);
+  private static final JobInfo LOAD_JOB_INFO =
+      LoadJobInfo.builder(TABLE_ID1, ImmutableList.of("URI"))
+          .formatOptions(FormatOptions.json())
+          .build();
+  private static final JobInfo EXTRACT_JOB_INFO =
+      ExtractJobInfo.builder(TABLE_ID1, ImmutableList.of("URI"))
+          .format("CSV")
+          .build();
+  private static final Field FIELD = Field.of("FieldName", Field.Type.integer());
+  private static final TableInfo TABLE_INFO = TableInfo.of(TABLE_ID1, Schema.of(FIELD));
+  private static final List ROWS_TO_INSERT = ImmutableList.of(
+      RowToInsert.of("id1", ImmutableMap.of("key", "val1")),
+      RowToInsert.of("id2", ImmutableMap.of("key", "val2")));
+  private static final InsertAllRequest INSERT_ALL_REQUEST =
+      InsertAllRequest.of(TABLE_ID1, ROWS_TO_INSERT);
+  private static final InsertAllRequest INSERT_ALL_REQUEST_COMPLETE =
+      InsertAllRequest.builder(TABLE_ID1, ROWS_TO_INSERT)
+          .skipInvalidRows(true)
+          .ignoreUnknownValues(true)
+          .build();
+  private static final InsertAllResponse EMPTY_INSERT_ALL_RESPONSE =
+      new InsertAllResponse(ImmutableMap.>of());
+  private static final FieldValue FIELD_VALUE1 =
+      new FieldValue(FieldValue.Attribute.PRIMITIVE, "val1");
+  private static final FieldValue FIELD_VALUE2 =
+      new FieldValue(FieldValue.Attribute.PRIMITIVE, "val1");
+  private static final Iterable> ROWS = ImmutableList.of(
+      (List) ImmutableList.of(FIELD_VALUE1), ImmutableList.of(FIELD_VALUE2));
+
+  private BigQuery bigquery;
+  private Table table;
+
+  @Before
+  public void setUp() throws Exception {
+    bigquery = createStrictMock(BigQuery.class);
+    table = new Table(bigquery, TABLE_INFO);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    verify(bigquery);
+  }
+
+  @Test
+  public void testInfo() throws Exception {
+    assertEquals(TABLE_INFO, table.info());
+    replay(bigquery);
+  }
+
+  @Test
+  public void testExists_True() throws Exception {
+    BigQuery.TableOption[] expectedOptions = {BigQuery.TableOption.fields()};
+    expect(bigquery.getTable(TABLE_INFO.tableId(), expectedOptions)).andReturn(TABLE_INFO);
+    replay(bigquery);
+    assertTrue(table.exists());
+  }
+
+  @Test
+  public void testExists_False() throws Exception {
+    BigQuery.TableOption[] expectedOptions = {BigQuery.TableOption.fields()};
+    expect(bigquery.getTable(TABLE_INFO.tableId(), expectedOptions)).andReturn(null);
+    replay(bigquery);
+    assertFalse(table.exists());
+  }
+
+  @Test
+  public void testReload() throws Exception {
+    TableInfo updatedInfo = TABLE_INFO.toBuilder().description("Description").build();
+    expect(bigquery.getTable(TABLE_INFO.tableId())).andReturn(updatedInfo);
+    replay(bigquery);
+    Table updatedTable = table.reload();
+    assertSame(bigquery, updatedTable.bigquery());
+    assertEquals(updatedInfo, updatedTable.info());
+  }
+
+  @Test
+  public void testDelete() throws Exception {
+    expect(bigquery.delete(TABLE_INFO.tableId())).andReturn(true);
+    replay(bigquery);
+    assertTrue(table.delete());
+  }
+
+  @Test
+  public void testInsert() throws Exception {
+    expect(bigquery.insertAll(INSERT_ALL_REQUEST)).andReturn(EMPTY_INSERT_ALL_RESPONSE);
+    replay(bigquery);
+    InsertAllResponse response = table.insert(ROWS_TO_INSERT);
+    assertSame(EMPTY_INSERT_ALL_RESPONSE, response);
+  }
+
+  @Test
+  public void testInsertComplete() throws Exception {
+    expect(bigquery.insertAll(INSERT_ALL_REQUEST_COMPLETE)).andReturn(EMPTY_INSERT_ALL_RESPONSE);
+    replay(bigquery);
+    InsertAllResponse response = table.insert(ROWS_TO_INSERT, true, true);
+    assertSame(EMPTY_INSERT_ALL_RESPONSE, response);
+  }
+
+  @Test
+  public void testList() throws Exception {
+    PageImpl> tableDataPage = new PageImpl<>(null, "c", ROWS);
+    expect(bigquery.listTableData(TABLE_ID1)).andReturn(tableDataPage);
+    replay(bigquery);
+    Page> dataPage = table.list();
+    Iterator> tableDataIterator = tableDataPage.values().iterator();
+    Iterator> dataIterator = dataPage.values().iterator();
+    assertTrue(Iterators.elementsEqual(tableDataIterator, dataIterator));
+  }
+
+  @Test
+  public void testCopyFromString() throws Exception {
+    expect(bigquery.create(COPY_JOB_INFO)).andReturn(COPY_JOB_INFO);
+    replay(bigquery);
+    Job job = table.copy(TABLE_ID2.dataset(), TABLE_ID2.table());
+    assertSame(bigquery, job.bigquery());
+    assertEquals(COPY_JOB_INFO, job.info());
+  }
+
+  @Test
+  public void testCopyFromId() throws Exception {
+    expect(bigquery.create(COPY_JOB_INFO)).andReturn(COPY_JOB_INFO);
+    replay(bigquery);
+    Job job = table.copy(TABLE_ID2);
+    assertSame(bigquery, job.bigquery());
+    assertEquals(COPY_JOB_INFO, job.info());
+  }
+
+  @Test
+  public void testLoadDataUri() throws Exception {
+    expect(bigquery.create(LOAD_JOB_INFO)).andReturn(LOAD_JOB_INFO);
+    replay(bigquery);
+    Job job = table.load(FormatOptions.json(), "URI");
+    assertSame(bigquery, job.bigquery());
+    assertEquals(LOAD_JOB_INFO, job.info());
+  }
+
+  @Test
+  public void testLoadDataUris() throws Exception {
+    expect(bigquery.create(LOAD_JOB_INFO)).andReturn(LOAD_JOB_INFO);
+    replay(bigquery);
+    Job job = table.load(FormatOptions.json(), ImmutableList.of("URI"));
+    assertSame(bigquery, job.bigquery());
+    assertEquals(LOAD_JOB_INFO, job.info());
+  }
+
+  @Test
+  public void testExtractDataUri() throws Exception {
+    expect(bigquery.create(EXTRACT_JOB_INFO)).andReturn(EXTRACT_JOB_INFO);
+    replay(bigquery);
+    Job job = table.extract("CSV", "URI");
+    assertSame(bigquery, job.bigquery());
+    assertEquals(EXTRACT_JOB_INFO, job.info());
+  }
+
+  @Test
+  public void testExtractDataUris() throws Exception {
+    expect(bigquery.create(EXTRACT_JOB_INFO)).andReturn(EXTRACT_JOB_INFO);
+    replay(bigquery);
+    Job job = table.extract("CSV", ImmutableList.of("URI"));
+    assertSame(bigquery, job.bigquery());
+    assertEquals(EXTRACT_JOB_INFO, job.info());
+  }
+
+  @Test
+  public void testLoadFromId() throws Exception {
+    expect(bigquery.getTable(TABLE_INFO.tableId())).andReturn(TABLE_INFO);
+    replay(bigquery);
+    Table loadedTable = Table.load(bigquery, TABLE_INFO.tableId());
+    assertNotNull(loadedTable);
+    assertEquals(TABLE_INFO, loadedTable.info());
+  }
+
+  @Test
+  public void testLoadFromStrings() throws Exception {
+    expect(bigquery.getTable(TABLE_INFO.tableId())).andReturn(TABLE_INFO);
+    replay(bigquery);
+    Table loadedTable = Table.load(bigquery, TABLE_ID1.dataset(), TABLE_ID1.table());
+    assertNotNull(loadedTable);
+    assertEquals(TABLE_INFO, loadedTable.info());
+  }
+
+  @Test
+  public void testLoadFromIdNull() throws Exception {
+    expect(bigquery.getTable(TABLE_INFO.tableId())).andReturn(null);
+    replay(bigquery);
+    assertNull(Table.load(bigquery, TABLE_INFO.tableId()));
+  }
+
+  @Test
+  public void testLoadFromStringsNull() throws Exception {
+    expect(bigquery.getTable(TABLE_INFO.tableId())).andReturn(null);
+    replay(bigquery);
+    assertNull(Table.load(bigquery, TABLE_ID1.dataset(), TABLE_ID1.table()));
+  }
+}

From edfb4707e6ae51b8bc15f4afb9dc1d44708dd08b Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 30 Dec 2015 08:59:29 -0800
Subject: [PATCH 247/322] Document generic types

---
 .../com/google/gcloud/bigquery/BaseTableInfo.java |  6 ++++++
 .../java/com/google/gcloud/bigquery/JobInfo.java  |  9 +++++++++
 .../main/java/com/google/gcloud/BaseService.java  |  5 +++++
 .../src/main/java/com/google/gcloud/Page.java     |  2 ++
 .../src/main/java/com/google/gcloud/PageImpl.java |  7 +++++++
 .../main/java/com/google/gcloud/Restorable.java   |  2 ++
 .../java/com/google/gcloud/RestorableState.java   |  2 ++
 .../src/main/java/com/google/gcloud/Service.java  |  5 +++++
 .../java/com/google/gcloud/ServiceFactory.java    |  5 ++++-
 .../java/com/google/gcloud/ServiceOptions.java    | 15 +++++++++++++++
 .../java/com/google/gcloud/datastore/BaseKey.java |  9 +++++++--
 .../google/gcloud/datastore/StructuredQuery.java  |  8 +++++++-
 .../com/google/gcloud/datastore/ValueBuilder.java |  4 ++++
 13 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
index 16d2af6f4580..bbe7c99ea0fa 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
@@ -94,6 +94,12 @@ public enum Type {
   private final Long expirationTime;
   private final Long lastModifiedTime;
 
+  /**
+   * Base builder for tables.
+   *
+   * @param  the table type.
+   * @param  the table builder.
+   */
   public abstract static class Builder> {
 
     private String etag;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
index 6d7efc147d25..e05bbf488733 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -32,6 +32,8 @@
  * a table. Use {@link QueryJobInfo} for a job that runs a query.
  *
  * @see Jobs
+ *
+ * @param  the statistics type.
  */
 public abstract class JobInfo implements Serializable {
 
@@ -87,6 +89,13 @@ public enum WriteDisposition {
   private final S statistics;
   private final String userEmail;
 
+  /**
+   * Base builder for jobs.
+   *
+   * @param  the job type.
+   * @param  the job statistics type.
+   * @param  the job builder.
+   */
   public abstract static class Builder> {
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java
index 7600d25411fd..a7edc86c0d7d 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java
@@ -16,6 +16,11 @@
 
 package com.google.gcloud;
 
+/**
+ * Base class for service objects.
+ *
+ * @param  the {@code ServiceOptions} subclass corresponding to the service.
+ */
 public abstract class BaseService>
     implements Service {
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Page.java b/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
index 2819b56a17a0..bb4d1f8b951e 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
@@ -40,6 +40,8 @@
  *   }
  *   page = page.nextPage();
  * }}
+ *
+ * @param  the value type that the page holds.
  */
 public interface Page {
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
index 1c7a61ec471f..9524aaa4c69b 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -25,6 +25,8 @@
 
 /**
  * Base implementation for Google Cloud paginated results.
+ *
+ * @param  the value type that the page holds.
  */
 public class PageImpl implements Page, Serializable {
 
@@ -34,6 +36,11 @@ public class PageImpl implements Page, Serializable {
   private final Iterable results;
   private final NextPageFetcher pageFetcher;
 
+  /**
+   * Interface for fetching the next page of results from the service.
+   *
+   * @param  the value type that the page holds.
+   */
   public interface NextPageFetcher extends Serializable {
     Page nextPage();
   }
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
index 51391e33bd7d..fdac020331ed 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
@@ -33,6 +33,8 @@
  * X restorableObj = state.restore();
  * ...
  * }
+ *
+ * @param  the restorable object's type.
  */
 public interface Restorable> {
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java b/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java
index 0c60411cb285..18e9d8bc502e 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java
@@ -22,6 +22,8 @@
  *
  * Implementations of this class must implement {@link java.io.Serializable} to ensure that the
  * state of a the object can be correctly serialized.
+ *
+ * @param  the restored object's type.
  */
 public interface RestorableState> {
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Service.java b/gcloud-java-core/src/main/java/com/google/gcloud/Service.java
index 2748c55058b4..b54705b9f0af 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Service.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Service.java
@@ -16,6 +16,11 @@
 
 package com.google.gcloud;
 
+/**
+ * Interface for service objects.
+ *
+ * @param  the {@code ServiceOptions} subclass corresponding to the service.
+ */
 public interface Service> {
   OptionsT options();
 }
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java
index 3828bf30260b..6226fdb504c3 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java
@@ -19,8 +19,11 @@
 /**
  * A base interface for all service factories.
  *
- * Implementation must provide a public no-arg constructor.
+ * 
    Implementation must provide a public no-arg constructor.
  * Loading of a factory implementation is done via {@link java.util.ServiceLoader}.
+ *
+ * @param  the service subclass.
+ * @param  the {@code ServiceOptions} subclass corresponding to the service.
  */
 @SuppressWarnings("rawtypes")
 public interface ServiceFactory {
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 862d3f7b533d..588c041eb602 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -53,6 +53,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+/**
+ * Abstract class representing service options.
+ *
+ * @param  the service subclass.
+ * @param  the spi-layer class corresponding to the service.
+ * @param  the {@code ServiceOptions} subclass corresponding to the service.
+ */
 public abstract class ServiceOptions, ServiceRpcT,
     OptionsT extends ServiceOptions> implements Serializable {
 
@@ -150,6 +157,14 @@ private Object readResolve() throws ObjectStreamException {
     }
   }
 
+  /**
+   * Builder for {@code ServiceOptions}.
+   *
+   * @param  the service subclass.
+   * @param  the spi-layer class corresponding to the service.
+   * @param  the {@code ServiceOptions} subclass corresponding to the service.
+   * @param  the {@code ServiceOptions} builder.
+   */
   protected abstract static class Builder, ServiceRpcT,
       OptionsT extends ServiceOptions,
       B extends Builder> {
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java
index 3add6bae67c4..a8ad7d4e7734 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java
@@ -31,7 +31,7 @@
 /**
  * Base class for keys.
  */
-abstract class BaseKey extends Serializable {
+public abstract class BaseKey extends Serializable {
 
   private static final long serialVersionUID = -4671243265877410635L;
 
@@ -39,7 +39,12 @@ abstract class BaseKey extends Serializable {
   private final transient String namespace;
   private final transient ImmutableList path;
 
-  abstract static class Builder> {
+  /**
+   * Base class for key builders.
+   *
+   * @param  the key builder.
+   */
+  protected abstract static class Builder> {
 
     String projectId;
     String namespace;
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
index 7b2312c85fc8..293c17cf3c57 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -609,7 +609,13 @@ public static Projection first(String property) {
     }
   }
 
-  static class BaseBuilder> {
+  /**
+   * Base class for StructuredQuery builders.
+   *
+   * @param  the type of result the query returns.
+   * @param  the query builder.
+   */
+  protected static class BaseBuilder> {
 
     private final ResultType resultType;
     private String namespace;
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ValueBuilder.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ValueBuilder.java
index f5b5d4c1319b..a867ef25b321 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ValueBuilder.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ValueBuilder.java
@@ -18,6 +18,10 @@
 
 /**
  * A common interface for Value builders.
+ *
+ * @param  the data type that the {@code Value} object holds.
+ * @param 
     the value type.
+ * @param  the value type's associated builder.
  */
 public interface ValueBuilder, B extends ValueBuilder> {
 

From 2da16c7fbb99450b012e9924ee033d781833cc0f Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 30 Dec 2015 15:32:16 -0800
Subject: [PATCH 248/322] Add build/test documentation

---
 CONTRIBUTING.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 167bf18e5082..d2684e6e111b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,6 +15,20 @@ Using maven for build/test
 After you cloned the repository use Maven for building and running the tests.
 Maven 3.0+ is required.
 
+When downloading the source, we recommend you obtain service account credentials. 
+These credentials will allow you to run integration tests using `mvn verify` in command line. 
+Follow step 2 of the [authentication instructions](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) to generate and use JSON service account credentials.
+
+It's also important to test that changes don't break compatibility with App/Compute Engine and when running elsewhere. 
+To run tests on different platforms, try deploying the apps available on the [gcloud-java-examples](https://github.com/GoogleCloudPlatform/gcloud-java-examples) repository. 
+End-to-end tests should ensure that gcloud-java works when running on the
+
+* App Engine production environment (see the docs for [uploading your app to production App Engine](https://cloud.google.com/appengine/docs/java/tools/maven#uploading_your_app_to_production_app_engine))
+* App Engine development server (see the docs for [testing your app with the development server](https://cloud.google.com/appengine/docs/java/tools/maven#testing_your_app_with_the_development_server))
+* Compute Engine (see the [Getting Started Guide](https://cloud.google.com/compute/docs/quickstart), and be sure to [enable the appropriate APIs](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication#on-google-compute-engine))
+* Your desktop (using `mvn exec:java`, for example)
+
+When changes are made to authentication and project ID-related code, authentication and project ID inference should be tested using all relevant methods detailed in the [authentication docs](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) and [project ID docs](https://github.com/GoogleCloudPlatform/gcloud-java#specifying-a-project-id).
 
 Adding Features
 ---------------

From 16b451d0d4733549105c9ec9ad7c90009719ce73 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 4 Jan 2016 09:18:30 -0800
Subject: [PATCH 249/322] Check for null in Project.load

---
 .../com/google/gcloud/resourcemanager/Project.java  |  6 +++---
 .../google/gcloud/resourcemanager/ProjectTest.java  | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
index 1b79eb973da3..b0e3582e8606 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -42,12 +42,12 @@ public Project(ResourceManager resourceManager, ProjectInfo projectInfo) {
   /**
    * Constructs a Project object that contains project information loaded from the server.
    *
-   * @return Project object containing the project's metadata
+   * @return Project object containing the project's metadata or {@code null} if not found
    * @throws ResourceManagerException upon failure
    */
   public static Project load(ResourceManager resourceManager, String projectId) {
     ProjectInfo projectInfo = resourceManager.get(projectId);
-    return new Project(resourceManager, projectInfo);
+    return projectInfo != null ? new Project(resourceManager, projectInfo) : null;
   }
 
   /**
@@ -67,7 +67,7 @@ public ResourceManager resourceManager() {
   /**
    * Returns a Project object with updated project information.
    *
-   * @return Project object containing the project's updated metadata
+   * @return Project object containing the project's updated metadata or {@code null} if not found
    * @throws ResourceManagerException upon failure
    */
   public Project reload() {
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
index 65bb37dbccf9..f137c0370d04 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
@@ -21,6 +21,8 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 import com.google.common.collect.ImmutableMap;
@@ -78,6 +80,17 @@ public void testReload() {
     assertEquals(newInfo, newProject.info());
   }
 
+  @Test
+  public void testReloadDeletedProject() {
+    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(PROJECT_INFO);
+    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
+    replay(resourceManager);
+    Project loadedProject = Project.load(resourceManager, PROJECT_INFO.projectId());
+    assertNotNull(loadedProject);
+    Project reloadedProject = loadedProject.reload();
+    assertNull(reloadedProject);
+  }
+
   @Test
   public void testInfo() {
     replay(resourceManager);

From d75f1f458eb983ddf756a74f2db1d59b8575f951 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 4 Jan 2016 19:28:02 +0100
Subject: [PATCH 250/322] Minor fixes to bigquery functional classes - Remove
 periods from javadoc return paragraphs - Add options to load methods -
 Implement reload using load - Document that reload can return null - Add code
 snippet to Job.isDone - Better unit tests

---
 .../com/google/gcloud/bigquery/Dataset.java   | 26 +++++++------
 .../java/com/google/gcloud/bigquery/Job.java  | 33 ++++++++++------
 .../com/google/gcloud/bigquery/Table.java     | 27 +++++++------
 .../google/gcloud/bigquery/DatasetTest.java   | 31 ++++++++++++++-
 .../com/google/gcloud/bigquery/JobTest.java   | 30 +++++++++++++-
 .../com/google/gcloud/bigquery/TableTest.java | 39 +++++++++++++++++++
 6 files changed, 148 insertions(+), 38 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
index 7c3358fedb99..dee41fb4b0ea 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
@@ -127,11 +127,12 @@ public Dataset(BigQuery bigquery, DatasetInfo info) {
    *
    * @param bigquery the BigQuery service used for issuing requests
    * @param dataset dataset's user-defined id
-   * @return the {@code Dataset} object or {@code null} if not found.
+   * @param options dataset options
+   * @return the {@code Dataset} object or {@code null} if not found
    * @throws BigQueryException upon failure
    */
-  public static Dataset load(BigQuery bigquery, String dataset) {
-    DatasetInfo info = bigquery.getDataset(dataset);
+  public static Dataset load(BigQuery bigquery, String dataset, BigQuery.DatasetOption... options) {
+    DatasetInfo info = bigquery.getDataset(dataset, options);
     return info != null ? new Dataset(bigquery, info) : null;
   }
 
@@ -145,7 +146,7 @@ public DatasetInfo info() {
   /**
    * Checks if this dataset exists.
    *
-   * @return {@code true} if this dataset exists, {@code false} otherwise.
+   * @return {@code true} if this dataset exists, {@code false} otherwise
    * @throws BigQueryException upon failure
    */
   public boolean exists() {
@@ -153,14 +154,15 @@ public boolean exists() {
   }
 
   /**
-   * Fetches current dataset's latest information.
+   * Fetches current dataset's latest information. Returns {@code null} if the dataset does not
+   * exist.
    *
    * @param options dataset options
-   * @return a {@code Dataset} object with latest information.
+   * @return a {@code Dataset} object with latest information or {@code null} if not found
    * @throws BigQueryException upon failure
    */
   public Dataset reload(BigQuery.DatasetOption... options) {
-    return new Dataset(bigquery, bigquery.getDataset(info.datasetId(), options));
+    return Dataset.load(bigquery, info.datasetId().dataset(), options);
   }
 
   /**
@@ -170,7 +172,7 @@ public Dataset reload(BigQuery.DatasetOption... options) {
    * @param datasetInfo new dataset's information. User-defined id must match the one of the current
    *     dataset
    * @param options dataset options
-   * @return a {@code Dataset} object with updated information.
+   * @return a {@code Dataset} object with updated information
    * @throws BigQueryException upon failure
    */
   public Dataset update(DatasetInfo datasetInfo, BigQuery.DatasetOption... options) {
@@ -221,7 +223,7 @@ public Table get(String table, BigQuery.TableOption... options) {
    * @param table the table's user-defined id
    * @param schema the table's schema
    * @param options options for table creation
-   * @return a {@code Table} object for the created table.
+   * @return a {@code Table} object for the created table
    * @throws BigQueryException upon failure
    */
   public Table create(String table, Schema schema, BigQuery.TableOption... options) {
@@ -236,7 +238,7 @@ public Table create(String table, Schema schema, BigQuery.TableOption... options
    * @param query the query used to generate the table
    * @param functions user-defined functions that can be used by the query
    * @param options options for table creation
-   * @return a {@code Table} object for the created table.
+   * @return a {@code Table} object for the created table
    * @throws BigQueryException upon failure
    */
   public Table create(String table, String query, List functions,
@@ -252,7 +254,7 @@ public Table create(String table, String query, List functi
    * @param table the table's user-defined id
    * @param query the query used to generate the table
    * @param options options for table creation
-   * @return a {@code Table} object for the created table.
+   * @return a {@code Table} object for the created table
    * @throws BigQueryException upon failure
    */
   public Table create(String table, String query, BigQuery.TableOption... options) {
@@ -266,7 +268,7 @@ public Table create(String table, String query, BigQuery.TableOption... options)
    * @param table the table's user-defined id
    * @param configuration data format, location and other properties of an external table
    * @param options options for table creation
-   * @return a {@code Table} object for the created table.
+   * @return a {@code Table} object for the created table
    * @throws BigQueryException upon failure
    */
   public Table create(String table, ExternalDataConfiguration configuration,
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
index 06e9b1ced569..e6de2a9d7a4a 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
@@ -43,16 +43,17 @@ public Job(BigQuery bigquery, JobInfo info) {
   }
 
   /**
-   * Creates a {@code Job} object for the provided job's user-defined id. Performs an RPC call
-   * to get the latest job information.
+   * Creates a {@code Job} object for the provided job's user-defined id. Performs an RPC call to
+   * get the latest job information.
    *
    * @param bigquery the BigQuery service used for issuing requests
    * @param job job's id, either user-defined or picked by the BigQuery service
-   * @return the {@code Job} object or {@code null} if not found.
+   * @param options job options
+   * @return the {@code Job} object or {@code null} if not found
    * @throws BigQueryException upon failure
    */
-  public static Job load(BigQuery bigquery, String job) {
-    JobInfo info = bigquery.getJob(job);
+  public static Job load(BigQuery bigquery, String job, BigQuery.JobOption... options) {
+    JobInfo info = bigquery.getJob(job, options);
     return info != null ? new Job(bigquery, info) : null;
   }
 
@@ -66,7 +67,7 @@ public JobInfo info() {
   /**
    * Checks if this job exists.
    *
-   * @return {@code true} if this job exists, {@code false} otherwise.
+   * @return {@code true} if this job exists, {@code false} otherwise
    * @throws BigQueryException upon failure
    */
   public boolean exists() {
@@ -74,10 +75,18 @@ public boolean exists() {
   }
 
   /**
-   * Checks if this job has completed its execution, either failing or succeeding.
+   * Checks if this job has completed its execution, either failing or succeeding. If the job does
+   * not exist this method returns {@code false}. To correctly wait for job's completion check that
+   * the job exists first, using {@link #exists()}:
+   * 
     {@code
+   * if (job.exists()) {
+   *   while(!job.isDone()) {
+   *     Thread.sleep(1000L);
+   *   }
+   * }}
    
    *
    * @return {@code true} if this job is in {@link JobStatus.State#DONE} state, {@code false} if the
-   *     state is not {@link JobStatus.State#DONE} or the job does not exist.
+   *     state is not {@link JobStatus.State#DONE} or the job does not exist
    * @throws BigQueryException upon failure
    */
   public boolean isDone() {
@@ -87,21 +96,21 @@ public boolean isDone() {
   }
 
   /**
-   * Fetches current job's latest information.
+   * Fetches current job's latest information. Returns {@code null} if the job does not exist.
    *
    * @param options job options
-   * @return a {@code Job} object with latest information.
+   * @return a {@code Job} object with latest information or {@code null} if not found
    * @throws BigQueryException upon failure
    */
   public Job reload(BigQuery.JobOption... options) {
-    return new Job(bigquery, bigquery.getJob(info.jobId(), options));
+    return Job.load(bigquery, info.jobId().job(), options);
   }
 
   /**
    * Sends a job cancel request.
    *
    * @return {@code true} if cancel request was sent successfully, {@code false} if job was not
-   *     found.
+   *     found
    * @throws BigQueryException upon failure
    */
   public boolean cancel() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
index 33cbe602033a..fec3e0c03a90 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
@@ -57,11 +57,13 @@ public Table(BigQuery bigquery, BaseTableInfo info) {
    * @param bigquery the BigQuery service used for issuing requests
    * @param dataset the dataset's user-defined id
    * @param table the table's user-defined id
-   * @return the {@code Table} object or {@code null} if not found.
+   * @param options table options
+   * @return the {@code Table} object or {@code null} if not found
    * @throws BigQueryException upon failure
    */
-  public static Table load(BigQuery bigquery, String dataset, String table) {
-    return load(bigquery, TableId.of(dataset, table));
+  public static Table load(BigQuery bigquery, String dataset, String table,
+      BigQuery.TableOption... options) {
+    return load(bigquery, TableId.of(dataset, table), options);
   }
 
   /**
@@ -70,11 +72,12 @@ public static Table load(BigQuery bigquery, String dataset, String table) {
    *
    * @param bigquery the BigQuery service used for issuing requests
    * @param table the table's identity
-   * @return the {@code Table} object or {@code null} if not found.
+   * @param options table options
+   * @return the {@code Table} object or {@code null} if not found
    * @throws BigQueryException upon failure
    */
-  public static Table load(BigQuery bigquery, TableId table) {
-    BaseTableInfo info = bigquery.getTable(table);
+  public static Table load(BigQuery bigquery, TableId table, BigQuery.TableOption... options) {
+    BaseTableInfo info = bigquery.getTable(table, options);
     return info != null ? new Table(bigquery, info) : null;
   }
 
@@ -88,7 +91,7 @@ public BaseTableInfo info() {
   /**
    * Checks if this table exists.
    *
-   * @return {@code true} if this table exists, {@code false} otherwise.
+   * @return {@code true} if this table exists, {@code false} otherwise
    * @throws BigQueryException upon failure
    */
   public boolean exists() {
@@ -96,14 +99,14 @@ public boolean exists() {
   }
 
   /**
-   * Fetches current table's latest information.
+   * Fetches current table's latest information. Returns {@code null} if the table does not exist.
    *
    * @param options table options
-   * @return a {@code Table} object with latest information.
+   * @return a {@code Table} object with latest information or {@code null} if not found
    * @throws BigQueryException upon failure
    */
   public Table reload(BigQuery.TableOption... options) {
-    return new Table(bigquery, bigquery.getTable(info.tableId(), options));
+    return Table.load(bigquery, info.tableId(), options);
   }
 
   /**
@@ -113,7 +116,7 @@ public Table reload(BigQuery.TableOption... options) {
    * @param tableInfo new table's information. Dataset's and table's user-defined ids must match the
    *     ones of the current table
    * @param options dataset options
-   * @return a {@code Table} object with updated information.
+   * @return a {@code Table} object with updated information
    * @throws BigQueryException upon failure
    */
   public Table update(BaseTableInfo tableInfo, BigQuery.TableOption... options) {
@@ -127,7 +130,7 @@ public Table update(BaseTableInfo tableInfo, BigQuery.TableOption... options) {
   /**
    * Deletes this table.
    *
-   * @return {@code true} if table was deleted, {@code false} if it was not found.
+   * @return {@code true} if table was deleted, {@code false} if it was not found
    * @throws BigQueryException upon failure
    */
   public boolean delete() {
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
index 6920b6812df3..7395d4d18d69 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
@@ -88,13 +88,31 @@ public void testExists_False() throws Exception {
   @Test
   public void testReload() throws Exception {
     DatasetInfo updatedInfo = DATASET_INFO.toBuilder().description("Description").build();
-    expect(bigquery.getDataset(DATASET_ID)).andReturn(updatedInfo);
+    expect(bigquery.getDataset(DATASET_ID.dataset())).andReturn(updatedInfo);
     replay(bigquery);
     Dataset updatedDataset = dataset.reload();
     assertSame(bigquery, updatedDataset.bigquery());
     assertEquals(updatedInfo, updatedDataset.info());
   }
 
+  @Test
+  public void testReloadNull() throws Exception {
+    expect(bigquery.getDataset(DATASET_ID.dataset())).andReturn(null);
+    replay(bigquery);
+    assertNull(dataset.reload());
+  }
+
+  @Test
+  public void testReloadWithOptions() throws Exception {
+    DatasetInfo updatedInfo = DATASET_INFO.toBuilder().description("Description").build();
+    expect(bigquery.getDataset(DATASET_ID.dataset(), BigQuery.DatasetOption.fields()))
+        .andReturn(updatedInfo);
+    replay(bigquery);
+    Dataset updatedDataset = dataset.reload(BigQuery.DatasetOption.fields());
+    assertSame(bigquery, updatedDataset.bigquery());
+    assertEquals(updatedInfo, updatedDataset.info());
+  }
+
   @Test
   public void testUpdate() throws Exception {
     DatasetInfo updatedInfo = DATASET_INFO.toBuilder().description("Description").build();
@@ -194,4 +212,15 @@ public void testLoadNull() throws Exception {
     replay(bigquery);
     assertNull(Dataset.load(bigquery, DATASET_INFO.datasetId().dataset()));
   }
+
+  @Test
+  public void testLoadWithOptions() throws Exception {
+    expect(bigquery.getDataset(DATASET_INFO.datasetId().dataset(), BigQuery.DatasetOption.fields()))
+        .andReturn(DATASET_INFO);
+    replay(bigquery);
+    Dataset loadedDataset = Dataset.load(bigquery, DATASET_INFO.datasetId().dataset(),
+        BigQuery.DatasetOption.fields());
+    assertNotNull(loadedDataset);
+    assertEquals(DATASET_INFO, loadedDataset.info());
+  }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
index 2073adb3dd80..99b3e80a0206 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
@@ -109,13 +109,31 @@ public void testIsDone_NotExists() throws Exception {
   @Test
   public void testReload() throws Exception {
     JobInfo updatedInfo = JOB_INFO.toBuilder().etag("etag").build();
-    expect(bigquery.getJob(JOB_INFO.jobId())).andReturn(updatedInfo);
+    expect(bigquery.getJob(JOB_INFO.jobId().job())).andReturn(updatedInfo);
     replay(bigquery);
     Job updatedJob = job.reload();
     assertSame(bigquery, updatedJob.bigquery());
     assertEquals(updatedInfo, updatedJob.info());
   }
 
+  @Test
+  public void testReloadNull() throws Exception {
+    expect(bigquery.getJob(JOB_INFO.jobId().job())).andReturn(null);
+    replay(bigquery);
+    assertNull(job.reload());
+  }
+
+  @Test
+  public void testReloadWithOptions() throws Exception {
+    JobInfo updatedInfo = JOB_INFO.toBuilder().etag("etag").build();
+    expect(bigquery.getJob(JOB_INFO.jobId().job(), BigQuery.JobOption.fields()))
+        .andReturn(updatedInfo);
+    replay(bigquery);
+    Job updatedJob = job.reload(BigQuery.JobOption.fields());
+    assertSame(bigquery, updatedJob.bigquery());
+    assertEquals(updatedInfo, updatedJob.info());
+  }
+
   @Test
   public void testCancel() throws Exception {
     expect(bigquery.cancel(JOB_INFO.jobId())).andReturn(true);
@@ -138,4 +156,14 @@ public void testLoadNull() throws Exception {
     replay(bigquery);
     assertNull(Job.load(bigquery, JOB_INFO.jobId().job()));
   }
+
+  @Test
+  public void testLoadWithOptions() throws Exception {
+    expect(bigquery.getJob(JOB_INFO.jobId().job(), BigQuery.JobOption.fields()))
+        .andReturn(JOB_INFO);
+    replay(bigquery);
+    Job loadedJob = Job.load(bigquery, JOB_INFO.jobId().job(), BigQuery.JobOption.fields());
+    assertNotNull(loadedJob);
+    assertEquals(JOB_INFO, loadedJob.info());
+  }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
index 1520dbfcd580..fb022cb13b40 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
@@ -121,6 +121,24 @@ public void testReload() throws Exception {
     assertEquals(updatedInfo, updatedTable.info());
   }
 
+  @Test
+  public void testReloadNull() throws Exception {
+    expect(bigquery.getTable(TABLE_INFO.tableId())).andReturn(null);
+    replay(bigquery);
+    assertNull(table.reload());
+  }
+
+  @Test
+  public void testReloadWithOptions() throws Exception {
+    TableInfo updatedInfo = TABLE_INFO.toBuilder().description("Description").build();
+    expect(bigquery.getTable(TABLE_INFO.tableId(), BigQuery.TableOption.fields()))
+        .andReturn(updatedInfo);
+    replay(bigquery);
+    Table updatedTable = table.reload(BigQuery.TableOption.fields());
+    assertSame(bigquery, updatedTable.bigquery());
+    assertEquals(updatedInfo, updatedTable.info());
+  }
+
   @Test
   public void testDelete() throws Exception {
     expect(bigquery.delete(TABLE_INFO.tableId())).andReturn(true);
@@ -240,4 +258,25 @@ public void testLoadFromStringsNull() throws Exception {
     replay(bigquery);
     assertNull(Table.load(bigquery, TABLE_ID1.dataset(), TABLE_ID1.table()));
   }
+
+  @Test
+  public void testLoadFromIdWithOptions() throws Exception {
+    expect(bigquery.getTable(TABLE_INFO.tableId(), BigQuery.TableOption.fields()))
+        .andReturn(TABLE_INFO);
+    replay(bigquery);
+    Table loadedTable = Table.load(bigquery, TABLE_INFO.tableId(), BigQuery.TableOption.fields());
+    assertNotNull(loadedTable);
+    assertEquals(TABLE_INFO, loadedTable.info());
+  }
+
+  @Test
+  public void testLoadFromStringsWithOptions() throws Exception {
+    expect(bigquery.getTable(TABLE_INFO.tableId(), BigQuery.TableOption.fields()))
+        .andReturn(TABLE_INFO);
+    replay(bigquery);
+    Table loadedTable =
+        Table.load(bigquery, TABLE_ID1.dataset(), TABLE_ID1.table(), BigQuery.TableOption.fields());
+    assertNotNull(loadedTable);
+    assertEquals(TABLE_INFO, loadedTable.info());
+  }
 }

From 2d1a368fd2bb455b7bec909f0cdd4f44a86ad1dc Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 4 Jan 2016 19:48:08 +0100
Subject: [PATCH 251/322] Wait for table to be created in
 testInsertAllWithSuffix

---
 .../java/com/google/gcloud/bigquery/ITBigQueryTest.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index 34f4f6893187..c07aa9f05f4c 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -476,7 +476,7 @@ public void testInsertAll() {
   }
 
   @Test
-  public void testInsertAllWithSuffix() {
+  public void testInsertAllWithSuffix() throws InterruptedException {
     String tableName = "test_insert_all_with_suffix_table";
     BaseTableInfo tableInfo = TableInfo.of(TableId.of(DATASET, tableName), TABLE_SCHEMA);
     assertNotNull(bigquery.create(tableInfo));
@@ -505,7 +505,12 @@ public void testInsertAllWithSuffix() {
     assertFalse(response.hasErrors());
     assertEquals(0, response.insertErrors().size());
     String newTableName = tableName + "_suffix";
-    assertNotNull(bigquery.getTable(DATASET, newTableName, TableOption.fields()));
+    BaseTableInfo suffixTable = bigquery.getTable(DATASET, newTableName, TableOption.fields());
+    while (suffixTable == null) {
+      Thread.sleep(1000L);
+      suffixTable = bigquery.getTable(DATASET, newTableName, TableOption.fields());
+    }
+    assertNotNull(suffixTable);
     assertTrue(bigquery.delete(TableId.of(DATASET, tableName)));
     assertTrue(bigquery.delete(TableId.of(DATASET, newTableName)));
   }

From 2e152a341a9ca34fc3ef61b54d8c56f92d99ea7e Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 4 Jan 2016 10:48:42 -0800
Subject: [PATCH 252/322] add load null test

---
 .../com/google/gcloud/resourcemanager/ProjectTest.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
index f137c0370d04..5d765d20c313 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
@@ -80,6 +80,13 @@ public void testReload() {
     assertEquals(newInfo, newProject.info());
   }
 
+  @Test
+  public void testLoadNull() {
+    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
+    replay(resourceManager);
+    assertNull(Project.load(resourceManager, PROJECT_INFO.projectId()));
+  }
+
   @Test
   public void testReloadDeletedProject() {
     expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(PROJECT_INFO);

From 46f7958e2f39848469f7aa8537da42d707ed3585 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 5 Jan 2016 09:18:34 +0100
Subject: [PATCH 253/322] Document delay in table creation when insertAll is
 used with templateSuffix

---
 .../gcloud/bigquery/InsertAllRequest.java     | 22 +++++++++++++++++--
 .../gcloud/bigquery/ITBigQueryTest.java       |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
index 8b6f573b1e3c..bd86f208480f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
@@ -236,7 +236,16 @@ public Builder ignoreUnknownValues(boolean ignoreUnknownValues) {
     /**
      * If specified, the destination table is treated as a base template. Rows are inserted into an
      * instance table named "{destination}{templateSuffix}". BigQuery will manage the creation of
-     * the instance table, using the schema of the base template table.
+     * the instance table, using the schema of the base template table. Table creation might take
+     * some time. To obtain table's information after {@link BigQuery#insertAll(InsertAllRequest)}
+     * is called use:
+     * 
     {@code
+     * String suffixTableId = ...;
+     * BaseTableInfo suffixTable = bigquery.getTable(DATASET, suffixTableId);
+     * while (suffixTable == null) {
+     *   Thread.sleep(1000L);
+     *   suffixTable = bigquery.getTable(DATASET, suffixTableId);
+     * }}
    
      *
      * @see 
@@ -293,7 +302,16 @@ public Boolean skipInvalidRows() {
   /**
    * If specified, the destination table is treated as a base template. Rows are inserted into an
    * instance table named "{destination}{templateSuffix}". BigQuery will manage the creation of the
-   * instance table, using the schema of the base template table.
+   * instance table, using the schema of the base template table. Table creation might take some
+   * time. To obtain table's information after {@link BigQuery#insertAll(InsertAllRequest)} is
+   * called use:
+   * 
     {@code
+   * String suffixTableId = ...;
+   * BaseTableInfo suffixTable = bigquery.getTable(DATASET, suffixTableId);
+   * while (suffixTable == null) {
+   *   Thread.sleep(1000L);
+   *   suffixTable = bigquery.getTable(DATASET, suffixTableId);
+   * }}
    
    *
    * @see     
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index c07aa9f05f4c..798973149d20 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -506,11 +506,11 @@ public void testInsertAllWithSuffix() throws InterruptedException {
     assertEquals(0, response.insertErrors().size());
     String newTableName = tableName + "_suffix";
     BaseTableInfo suffixTable = bigquery.getTable(DATASET, newTableName, TableOption.fields());
+    // wait until the new table is created. If the table is never created the test will time-out
     while (suffixTable == null) {
       Thread.sleep(1000L);
       suffixTable = bigquery.getTable(DATASET, newTableName, TableOption.fields());
     }
-    assertNotNull(suffixTable);
     assertTrue(bigquery.delete(TableId.of(DATASET, tableName)));
     assertTrue(bigquery.delete(TableId.of(DATASET, newTableName)));
   }

From dce12315ed472414cf63dc2fa2418550610c2fd1 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 4 Jan 2016 19:29:58 +0100
Subject: [PATCH 254/322] Minor fixes to storage functional classes - Remove
 periods from javadoc return paragraphs - Add options to load methods -
 Implement reload using load - Document that reload can return null - Better
 unit tests

---
 .../java/com/google/gcloud/storage/Blob.java  | 31 +++++-----
 .../com/google/gcloud/storage/Bucket.java     | 19 +++---
 .../com/google/gcloud/storage/BlobTest.java   | 59 ++++++++++++++++++-
 .../com/google/gcloud/storage/BucketTest.java | 39 +++++++++++-
 4 files changed, 121 insertions(+), 27 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index c39a0aa73871..b85cbba7d869 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -156,29 +156,32 @@ public Blob(Storage storage, BlobInfo info) {
 
   /**
    * Creates a {@code Blob} object for the provided bucket and blob names. Performs an RPC call to
-   * get the latest blob information.
+   * get the latest blob information. Returns {@code null} if the blob does not exist.
    *
    * @param storage the storage service used for issuing requests
    * @param bucket bucket's name
+   * @param options blob get options
    * @param blob blob's name
-   * @return the {@code Blob} object or {@code null} if not found.
+   * @return the {@code Blob} object or {@code null} if not found
    * @throws StorageException upon failure
    */
-  public static Blob load(Storage storage, String bucket, String blob) {
-    return load(storage, BlobId.of(bucket, blob));
+  public static Blob load(Storage storage, String bucket, String blob,
+      Storage.BlobGetOption... options) {
+    return load(storage, BlobId.of(bucket, blob), options);
   }
 
   /**
    * Creates a {@code Blob} object for the provided {@code blobId}. Performs an RPC call to get the
-   * latest blob information.
+   * latest blob information. Returns {@code null} if the blob does not exist.
    *
    * @param storage the storage service used for issuing requests
    * @param blobId blob's identifier
-   * @return the {@code Blob} object or {@code null} if not found.
+   * @param options blob get options
+   * @return the {@code Blob} object or {@code null} if not found
    * @throws StorageException upon failure
    */
-  public static Blob load(Storage storage, BlobId blobId) {
-    BlobInfo info = storage.get(blobId);
+  public static Blob load(Storage storage, BlobId blobId, Storage.BlobGetOption... options) {
+    BlobInfo info = storage.get(blobId, options);
     return info != null ? new Blob(storage, info) : null;
   }
 
@@ -221,14 +224,14 @@ public byte[] content(Storage.BlobSourceOption... options) {
   }
 
   /**
-   * Fetches current blob's latest information.
+   * Fetches current blob's latest information. Returns {@code null} if the blob does not exist.
    *
    * @param options blob read options
-   * @return a {@code Blob} object with latest information
+   * @return a {@code Blob} object with latest information or {@code null} if not found
    * @throws StorageException upon failure
    */
   public Blob reload(BlobSourceOption... options) {
-    return new Blob(storage, storage.get(info.blobId(), toGetOptions(info, options)));
+    return Blob.load(storage, info.blobId(), toGetOptions(info, options));
   }
 
   /**
@@ -368,7 +371,7 @@ public Storage storage() {
    * @param storage the storage service used to issue the request
    * @param blobs the blobs to get
    * @return an immutable list of {@code Blob} objects. If a blob does not exist or access to it has
-   *     been denied the corresponding item in the list is {@code null}.
+   *     been denied the corresponding item in the list is {@code null}
    * @throws StorageException upon failure
    */
   public static List get(final Storage storage, BlobId... blobs) {
@@ -397,7 +400,7 @@ public Blob apply(BlobInfo blobInfo) {
    * @param storage the storage service used to issue the request
    * @param infos the blobs to update
    * @return an immutable list of {@code Blob} objects. If a blob does not exist or access to it has
-   *     been denied the corresponding item in the list is {@code null}.
+   *     been denied the corresponding item in the list is {@code null}
    * @throws StorageException upon failure
    */
   public static List update(final Storage storage, BlobInfo... infos) {
@@ -422,7 +425,7 @@ public Blob apply(BlobInfo blobInfo) {
    * @param blobs the blobs to delete
    * @return an immutable list of booleans. If a blob has been deleted the corresponding item in the
    *     list is {@code true}. If a blob was not found, deletion failed or access to the resource
-   *     was denied the corresponding item is {@code false}.
+   *     was denied the corresponding item is {@code false}
    * @throws StorageException upon failure
    */
   public static List delete(Storage storage, BlobId... blobs) {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 8a90de143100..ca24d1442103 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -210,11 +210,12 @@ public Bucket(Storage storage, BucketInfo info) {
    * 
    * @param storage the storage service used for issuing requests
    * @param bucket bucket's name
-   * @return the {@code Bucket} object or {@code null} if not found.
+   * @param options blob get options
+   * @return the {@code Bucket} object or {@code null} if not found
    * @throws StorageException upon failure
    */
-  public static Bucket load(Storage storage, String bucket) {
-    BucketInfo info = storage.get(bucket);
+  public static Bucket load(Storage storage, String bucket, Storage.BucketGetOption... options) {
+    BucketInfo info = storage.get(bucket, options);
     return info != null ? new Bucket(storage, info) : null;
   }
 
@@ -239,14 +240,14 @@ public boolean exists(BucketSourceOption... options) {
   }
 
   /**
-   * Fetches current bucket's latest information.
+   * Fetches current bucket's latest information. Returns {@code null} if the bucket does not exist.
    *
    * @param options bucket read options
-   * @return a {@code Bucket} object with latest information
+   * @return a {@code Bucket} object with latest information or {@code null} if not found
    * @throws StorageException upon failure
    */
   public Bucket reload(BucketSourceOption... options) {
-    return new Bucket(storage, storage.get(info.name(), toGetOptions(info, options)));
+    return Bucket.load(storage, info.name(), toGetOptions(info, options));
   }
 
   /**
@@ -307,7 +308,7 @@ public Blob get(String blob, BlobGetOption... options) {
    * @param blobName1 first blob to get
    * @param blobName2 second blob to get
    * @param blobNames other blobs to get
-   * @return an immutable list of {@code Blob} objects.
+   * @return an immutable list of {@code Blob} objects
    * @throws StorageException upon failure
    */
   public List get(String blobName1, String blobName2, String... blobNames) {
@@ -337,7 +338,7 @@ public List get(String blobName1, String blobName2, String... blobNames) {
    * @param contentType the blob content type. If {@code null} then
    *     {@value com.google.gcloud.storage.Storage#DEFAULT_CONTENT_TYPE} is used.
    * @param options options for blob creation
-   * @return a complete blob information.
+   * @return a complete blob information
    * @throws StorageException upon failure
    */
   public Blob create(String blob, byte[] content, String contentType, BlobTargetOption... options) {
@@ -356,7 +357,7 @@ public Blob create(String blob, byte[] content, String contentType, BlobTargetOp
    * @param contentType the blob content type. If {@code null} then
    *     {@value com.google.gcloud.storage.Storage#DEFAULT_CONTENT_TYPE} is used.
    * @param options options for blob creation
-   * @return a complete blob information.
+   * @return a complete blob information
    * @throws StorageException upon failure
    */
   public Blob create(String blob, InputStream content, String contentType,
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
index 4f5eb4022744..45cf79e01278 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
@@ -45,7 +45,7 @@
 
 public class BlobTest {
 
-  private static final BlobInfo BLOB_INFO = BlobInfo.builder("b", "n").build();
+  private static final BlobInfo BLOB_INFO = BlobInfo.builder("b", "n").metageneration(42L).build();
   private static final BlobId[] BLOB_ID_ARRAY = {BlobId.of("b1", "n1"),
       BlobId.of("b2", "n2"), BlobId.of("b3", "n3")};
   private static final BlobInfo[] BLOB_INFO_ARRAY = {BlobInfo.builder("b1", "n1").build(),
@@ -105,6 +105,24 @@ public void testReload() throws Exception {
     assertEquals(updatedInfo, updatedBlob.info());
   }
 
+  @Test
+  public void testReloadNull() throws Exception {
+    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobGetOption[0])).andReturn(null);
+    replay(storage);
+    assertNull(blob.reload());
+  }
+
+  @Test
+  public void testReloadWithOptions() throws Exception {
+    BlobInfo updatedInfo = BLOB_INFO.toBuilder().cacheControl("c").build();
+    Storage.BlobGetOption[] options = {Storage.BlobGetOption.metagenerationMatch(42L)};
+    expect(storage.get(BLOB_INFO.blobId(), options)).andReturn(updatedInfo);
+    replay(storage);
+    Blob updatedBlob = blob.reload(Blob.BlobSourceOption.metagenerationMatch());
+    assertSame(storage, updatedBlob.storage());
+    assertEquals(updatedInfo, updatedBlob.info());
+  }
+
   @Test
   public void testUpdate() throws Exception {
     BlobInfo updatedInfo = BLOB_INFO.toBuilder().cacheControl("c").build();
@@ -285,7 +303,7 @@ public void testDeleteSome() throws Exception {
 
   @Test
   public void testLoadFromString() throws Exception {
-    expect(storage.get(BLOB_INFO.blobId())).andReturn(BLOB_INFO);
+    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobGetOption[0])).andReturn(BLOB_INFO);
     replay(storage);
     Blob loadedBlob = Blob.load(storage, BLOB_INFO.bucket(), BLOB_INFO.name());
     assertEquals(BLOB_INFO, loadedBlob.info());
@@ -293,10 +311,45 @@ public void testLoadFromString() throws Exception {
 
   @Test
   public void testLoadFromId() throws Exception {
-    expect(storage.get(BLOB_INFO.blobId())).andReturn(BLOB_INFO);
+    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobGetOption[0])).andReturn(BLOB_INFO);
     replay(storage);
     Blob loadedBlob = Blob.load(storage, BLOB_INFO.blobId());
     assertNotNull(loadedBlob);
     assertEquals(BLOB_INFO, loadedBlob.info());
   }
+
+  @Test
+  public void testLoadFromStringNull() throws Exception {
+    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobGetOption[0])).andReturn(null);
+    replay(storage);
+    assertNull(Blob.load(storage, BLOB_INFO.bucket(), BLOB_INFO.name()));
+  }
+
+  @Test
+  public void testLoadFromIdNull() throws Exception {
+    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobGetOption[0])).andReturn(null);
+    replay(storage);
+    assertNull(Blob.load(storage, BLOB_INFO.blobId()));
+  }
+
+  @Test
+  public void testLoadFromStringWithOptions() throws Exception {
+    expect(storage.get(BLOB_INFO.blobId(), Storage.BlobGetOption.generationMatch(42L)))
+        .andReturn(BLOB_INFO);
+    replay(storage);
+    Blob loadedBlob = Blob.load(storage, BLOB_INFO.bucket(), BLOB_INFO.name(),
+        Storage.BlobGetOption.generationMatch(42L));
+    assertEquals(BLOB_INFO, loadedBlob.info());
+  }
+
+  @Test
+  public void testLoadFromIdWithOptions() throws Exception {
+    expect(storage.get(BLOB_INFO.blobId(), Storage.BlobGetOption.generationMatch(42L)))
+        .andReturn(BLOB_INFO);
+    replay(storage);
+    Blob loadedBlob =
+        Blob.load(storage, BLOB_INFO.blobId(), Storage.BlobGetOption.generationMatch(42L));
+    assertNotNull(loadedBlob);
+    assertEquals(BLOB_INFO, loadedBlob.info());
+  }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
index 81e7a68b2465..f1644bd8ea37 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -24,6 +24,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
@@ -47,7 +48,7 @@
 
 public class BucketTest {
 
-  private static final BucketInfo BUCKET_INFO = BucketInfo.of("b");
+  private static final BucketInfo BUCKET_INFO = BucketInfo.builder("b").metageneration(42L).build();
   private static final Iterable BLOB_INFO_RESULTS = ImmutableList.of(
       BlobInfo.builder("b", "n1").build(),
       BlobInfo.builder("b", "n2").build(),
@@ -100,6 +101,24 @@ public void testReload() throws Exception {
     assertEquals(updatedInfo, updatedBucket.info());
   }
 
+  @Test
+  public void testReloadNull() throws Exception {
+    expect(storage.get(BUCKET_INFO.name())).andReturn(null);
+    replay(storage);
+    assertNull(bucket.reload());
+  }
+
+  @Test
+  public void testReloadWithOptions() throws Exception {
+    BucketInfo updatedInfo = BUCKET_INFO.toBuilder().notFoundPage("p").build();
+    expect(storage.get(updatedInfo.name(), Storage.BucketGetOption.metagenerationMatch(42L)))
+        .andReturn(updatedInfo);
+    replay(storage);
+    Bucket updatedBucket = bucket.reload(Bucket.BucketSourceOption.metagenerationMatch());
+    assertSame(storage, updatedBucket.storage());
+    assertEquals(updatedInfo, updatedBucket.info());
+  }
+
   @Test
   public void testUpdate() throws Exception {
     BucketInfo updatedInfo = BUCKET_INFO.toBuilder().notFoundPage("p").build();
@@ -223,4 +242,22 @@ public void testLoad() throws Exception {
     assertNotNull(loadedBucket);
     assertEquals(BUCKET_INFO, loadedBucket.info());
   }
+
+  @Test
+  public void testLoadNull() throws Exception {
+    expect(storage.get(BUCKET_INFO.name())).andReturn(null);
+    replay(storage);
+    assertNull(Bucket.load(storage, BUCKET_INFO.name()));
+  }
+
+  @Test
+  public void testLoadWithOptions() throws Exception {
+    expect(storage.get(BUCKET_INFO.name(), Storage.BucketGetOption.fields()))
+        .andReturn(BUCKET_INFO);
+    replay(storage);
+    Bucket loadedBucket =
+        Bucket.load(storage, BUCKET_INFO.name(), Storage.BucketGetOption.fields());
+    assertNotNull(loadedBucket);
+    assertEquals(BUCKET_INFO, loadedBucket.info());
+  }
 }

From d58930eb7bbff659bed22f3019b16b848130ccfc Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 5 Jan 2016 10:57:08 +0100
Subject: [PATCH 255/322] Add better tests for bigquery functional classes

---
 .../google/gcloud/bigquery/DatasetTest.java   | 108 +++++++++++++++++-
 .../com/google/gcloud/bigquery/JobTest.java   |   6 +
 .../com/google/gcloud/bigquery/TableTest.java |  64 +++++++++++
 3 files changed, 177 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
index 7395d4d18d69..05be4df39773 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
@@ -33,9 +33,12 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import java.util.Iterator;
+import java.util.List;
 
 public class DatasetTest {
 
@@ -48,7 +51,12 @@ public class DatasetTest {
       ExternalTableInfo.builder(TableId.of("dataset", "table2"),
           ExternalDataConfiguration.of(ImmutableList.of("URI"), Schema.of(), FormatOptions.csv()))
           .build());
+  private static final UserDefinedFunction FUNCTION1 = UserDefinedFunction.inline("inline");
+  private static final UserDefinedFunction FUNCTION2 = UserDefinedFunction.inline("gs://b/f");
+  private static final List FUNCTIONS = ImmutableList.of(FUNCTION1, FUNCTION2);
 
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
   private BigQuery bigquery;
   private Dataset dataset;
 
@@ -69,6 +77,12 @@ public void testInfo() throws Exception {
     replay(bigquery);
   }
 
+  @Test
+  public void testBigQuery() throws Exception {
+    assertSame(bigquery, dataset.bigquery());
+    replay(bigquery);
+  }
+
   @Test
   public void testExists_True() throws Exception {
     BigQuery.DatasetOption[] expectedOptions = {BigQuery.DatasetOption.fields()};
@@ -119,7 +133,28 @@ public void testUpdate() throws Exception {
     expect(bigquery.update(updatedInfo)).andReturn(updatedInfo);
     replay(bigquery);
     Dataset updatedDataset = dataset.update(updatedInfo);
-    assertSame(bigquery, dataset.bigquery());
+    assertSame(bigquery, updatedDataset.bigquery());
+    assertEquals(updatedInfo, updatedDataset.info());
+  }
+
+  @Test
+  public void testUpdateWithDifferentId() throws Exception {
+    DatasetInfo updatedInfo = DATASET_INFO.toBuilder()
+        .datasetId(DatasetId.of("dataset2"))
+        .description("Description")
+        .build();
+    replay(bigquery);
+    thrown.expect(IllegalArgumentException.class);
+    dataset.update(updatedInfo);
+  }
+
+  @Test
+  public void testUpdateWithOptions() throws Exception {
+    DatasetInfo updatedInfo = DATASET_INFO.toBuilder().description("Description").build();
+    expect(bigquery.update(updatedInfo, BigQuery.DatasetOption.fields())).andReturn(updatedInfo);
+    replay(bigquery);
+    Dataset updatedDataset = dataset.update(updatedInfo, BigQuery.DatasetOption.fields());
+    assertSame(bigquery, updatedDataset.bigquery());
     assertEquals(updatedInfo, updatedDataset.info());
   }
 
@@ -150,6 +185,27 @@ public void testList() throws Exception {
     verify(bigqueryOptions);
   }
 
+  @Test
+  public void testListWithOptions() throws Exception {
+    BigQueryOptions bigqueryOptions = createStrictMock(BigQueryOptions.class);
+    PageImpl tableInfoPage = new PageImpl<>(null, "c", TABLE_INFO_RESULTS);
+    expect(bigquery.listTables(DATASET_INFO.datasetId(), BigQuery.TableListOption.maxResults(10L)))
+        .andReturn(tableInfoPage);
+    expect(bigquery.options()).andReturn(bigqueryOptions);
+    expect(bigqueryOptions.service()).andReturn(bigquery);
+    replay(bigquery, bigqueryOptions);
+    Page
     tablePage = dataset.list(BigQuery.TableListOption.maxResults(10L));
+    Iterator tableInfoIterator = tableInfoPage.values().iterator();
+    Iterator
     tableIterator = tablePage.values().iterator();
+    while (tableInfoIterator.hasNext() && tableIterator.hasNext()) {
+      assertEquals(tableInfoIterator.next(), tableIterator.next().info());
+    }
+    assertFalse(tableInfoIterator.hasNext());
+    assertFalse(tableIterator.hasNext());
+    assertEquals(tableInfoPage.nextPageCursor(), tablePage.nextPageCursor());
+    verify(bigqueryOptions);
+  }
+
   @Test
   public void testGet() throws Exception {
     BaseTableInfo info = TableInfo.builder(TableId.of("dataset", "table1"), Schema.of()).build();
@@ -167,6 +223,17 @@ public void testGetNull() throws Exception {
     assertNull(dataset.get("table1"));
   }
 
+  @Test
+  public void testGetWithOptions() throws Exception {
+    BaseTableInfo info = TableInfo.builder(TableId.of("dataset", "table1"), Schema.of()).build();
+    expect(bigquery.getTable(TableId.of("dataset", "table1"), BigQuery.TableOption.fields()))
+        .andReturn(info);
+    replay(bigquery);
+    Table table = dataset.get("table1", BigQuery.TableOption.fields());
+    assertNotNull(table);
+    assertEquals(info, table.info());
+  }
+
   @Test
   public void testCreateTable() throws Exception {
     TableInfo info = TableInfo.builder(TableId.of("dataset", "table1"), Schema.of(FIELD)).build();
@@ -176,6 +243,15 @@ public void testCreateTable() throws Exception {
     assertEquals(info, table.info());
   }
 
+  @Test
+  public void testCreateTableWithOptions() throws Exception {
+    TableInfo info = TableInfo.builder(TableId.of("dataset", "table1"), Schema.of(FIELD)).build();
+    expect(bigquery.create(info, BigQuery.TableOption.fields())).andReturn(info);
+    replay(bigquery);
+    Table table = dataset.create("table1", Schema.of(FIELD), BigQuery.TableOption.fields());
+    assertEquals(info, table.info());
+  }
+
   @Test
   public void testCreateView() throws Exception {
     ViewInfo info = ViewInfo.builder(TableId.of("dataset", "table2"), "QUERY").build();
@@ -185,6 +261,24 @@ public void testCreateView() throws Exception {
     assertEquals(info, table.info());
   }
 
+  @Test
+  public void testCreateViewWithUserDefinedFunctions() throws Exception {
+    ViewInfo info = ViewInfo.builder(TableId.of("dataset", "table2"), "QUERY", FUNCTIONS).build();
+    expect(bigquery.create(info)).andReturn(info);
+    replay(bigquery);
+    Table table = dataset.create("table2", "QUERY", FUNCTIONS);
+    assertEquals(info, table.info());
+  }
+
+  @Test
+  public void testCreateViewWithOptions() throws Exception {
+    ViewInfo info = ViewInfo.builder(TableId.of("dataset", "table2"), "QUERY").build();
+    expect(bigquery.create(info, BigQuery.TableOption.fields())).andReturn(info);
+    replay(bigquery);
+    Table table = dataset.create("table2", "QUERY", BigQuery.TableOption.fields());
+    assertEquals(info, table.info());
+  }
+
   @Test
   public void testCreateExternalTable() throws Exception {
     ExternalTableInfo info = ExternalTableInfo.builder(TableId.of("dataset", "table3"),
@@ -197,6 +291,18 @@ public void testCreateExternalTable() throws Exception {
     assertEquals(info, table.info());
   }
 
+  @Test
+  public void testCreateExternalTableWithOptions() throws Exception {
+    ExternalTableInfo info = ExternalTableInfo.builder(TableId.of("dataset", "table3"),
+        ExternalDataConfiguration.of(ImmutableList.of("URI"), Schema.of(), FormatOptions.csv()))
+        .build();
+    expect(bigquery.create(info, BigQuery.TableOption.fields())).andReturn(info);
+    replay(bigquery);
+    Table table = dataset.create("table3", ExternalDataConfiguration.of(
+        ImmutableList.of("URI"), Schema.of(), FormatOptions.csv()), BigQuery.TableOption.fields());
+    assertEquals(info, table.info());
+  }
+
   @Test
   public void testLoad() throws Exception {
     expect(bigquery.getDataset(DATASET_INFO.datasetId().dataset())).andReturn(DATASET_INFO);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
index 99b3e80a0206..d99176b6904c 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
@@ -58,6 +58,12 @@ public void testInfo() throws Exception {
     replay(bigquery);
   }
 
+  @Test
+  public void testBigQuery() throws Exception {
+    assertSame(bigquery, job.bigquery());
+    replay(bigquery);
+  }
+
   @Test
   public void testExists_True() throws Exception {
     BigQuery.JobOption[] expectedOptions = {BigQuery.JobOption.fields()};
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
index fb022cb13b40..e5b152a91a5f 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
@@ -36,7 +36,9 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import java.util.Iterator;
 import java.util.List;
@@ -75,6 +77,8 @@ public class TableTest {
   private static final Iterable> ROWS = ImmutableList.of(
       (List) ImmutableList.of(FIELD_VALUE1), ImmutableList.of(FIELD_VALUE2));
 
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
   private BigQuery bigquery;
   private Table table;
 
@@ -95,6 +99,12 @@ public void testInfo() throws Exception {
     replay(bigquery);
   }
 
+  @Test
+  public void testBigQuery() throws Exception {
+    assertSame(bigquery, table.bigquery());
+    replay(bigquery);
+  }
+
   @Test
   public void testExists_True() throws Exception {
     BigQuery.TableOption[] expectedOptions = {BigQuery.TableOption.fields()};
@@ -139,6 +149,48 @@ public void testReloadWithOptions() throws Exception {
     assertEquals(updatedInfo, updatedTable.info());
   }
 
+  @Test
+  public void testUpdate() throws Exception {
+    BaseTableInfo updatedInfo = TABLE_INFO.toBuilder().description("Description").build();
+    expect(bigquery.update(updatedInfo)).andReturn(updatedInfo);
+    replay(bigquery);
+    Table updatedTable = table.update(updatedInfo);
+    assertSame(bigquery, updatedTable.bigquery());
+    assertEquals(updatedInfo, updatedTable.info());
+  }
+
+  @Test
+  public void testUpdateWithDifferentId() throws Exception {
+    TableInfo updatedInfo = TABLE_INFO.toBuilder()
+        .tableId(TableId.of("dataset", "table3"))
+        .description("Description")
+        .build();
+    replay(bigquery);
+    thrown.expect(IllegalArgumentException.class);
+    table.update(updatedInfo);
+  }
+
+  @Test
+  public void testUpdateWithDifferentDatasetId() throws Exception {
+    TableInfo updatedInfo = TABLE_INFO.toBuilder()
+        .tableId(TableId.of("dataset1", "table1"))
+        .description("Description")
+        .build();
+    replay(bigquery);
+    thrown.expect(IllegalArgumentException.class);
+    table.update(updatedInfo);
+  }
+
+  @Test
+  public void testUpdateWithOptions() throws Exception {
+    BaseTableInfo updatedInfo = TABLE_INFO.toBuilder().description("Description").build();
+    expect(bigquery.update(updatedInfo, BigQuery.TableOption.fields())).andReturn(updatedInfo);
+    replay(bigquery);
+    Table updatedTable = table.update(updatedInfo, BigQuery.TableOption.fields());
+    assertSame(bigquery, updatedTable.bigquery());
+    assertEquals(updatedInfo, updatedTable.info());
+  }
+
   @Test
   public void testDelete() throws Exception {
     expect(bigquery.delete(TABLE_INFO.tableId())).andReturn(true);
@@ -173,6 +225,18 @@ public void testList() throws Exception {
     assertTrue(Iterators.elementsEqual(tableDataIterator, dataIterator));
   }
 
+  @Test
+  public void testListWithOptions() throws Exception {
+    PageImpl> tableDataPage = new PageImpl<>(null, "c", ROWS);
+    expect(bigquery.listTableData(TABLE_ID1, BigQuery.TableDataListOption.maxResults(10L)))
+        .andReturn(tableDataPage);
+    replay(bigquery);
+    Page> dataPage = table.list(BigQuery.TableDataListOption.maxResults(10L));
+    Iterator> tableDataIterator = tableDataPage.values().iterator();
+    Iterator> dataIterator = dataPage.values().iterator();
+    assertTrue(Iterators.elementsEqual(tableDataIterator, dataIterator));
+  }
+
   @Test
   public void testCopyFromString() throws Exception {
     expect(bigquery.create(COPY_JOB_INFO)).andReturn(COPY_JOB_INFO);

From 4aa8a97ef59b6e46d56e0ff0667e0d584672b87f Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 5 Jan 2016 15:28:20 +0100
Subject: [PATCH 256/322] Add support for queryPlan to QueryStatistics

---
 .../google/gcloud/bigquery/JobStatistics.java |  33 +-
 .../google/gcloud/bigquery/QueryStage.java    | 431 ++++++++++++++++++
 .../gcloud/bigquery/ITBigQueryTest.java       |   2 +
 .../gcloud/bigquery/JobStatisticsTest.java    |  26 ++
 .../gcloud/bigquery/QueryStageTest.java       | 126 +++++
 5 files changed, 616 insertions(+), 2 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryStageTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
index 8322a887a4a0..cd6f3c8e71df 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
@@ -5,6 +5,7 @@
 import com.google.api.services.bigquery.model.JobStatistics4;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.collect.Lists;
 
 import java.io.Serializable;
 import java.util.List;
@@ -242,6 +243,7 @@ public static class QueryStatistics extends JobStatistics {
     private final Boolean cacheHit;
     private final Long totalBytesBilled;
     private final Long totalBytesProcessed;
+    private final List queryPlan;
 
     static final class Builder extends JobStatistics.Builder {
 
@@ -249,6 +251,7 @@ static final class Builder extends JobStatistics.Builder queryPlan;
 
       private Builder() {}
 
@@ -258,6 +261,10 @@ private Builder(com.google.api.services.bigquery.model.JobStatistics statisticsP
         this.cacheHit = statisticsPb.getQuery().getCacheHit();
         this.totalBytesBilled = statisticsPb.getQuery().getTotalBytesBilled();
         this.totalBytesProcessed = statisticsPb.getQuery().getTotalBytesProcessed();
+        if (statisticsPb.getQuery().getQueryPlan() != null) {
+          this.queryPlan =
+              Lists.transform(statisticsPb.getQuery().getQueryPlan(), QueryStage.FROM_PB_FUNCTION);
+        }
       }
 
       Builder billingTier(Integer billingTier) {
@@ -280,6 +287,11 @@ Builder totalBytesProcessed(Long totalBytesProcessed) {
         return self();
       }
 
+      Builder queryPlan(List queryPlan) {
+        this.queryPlan = queryPlan;
+        return self();
+      }
+
       @Override
       QueryStatistics build() {
         return new QueryStatistics(this);
@@ -292,6 +304,7 @@ private QueryStatistics(Builder builder) {
       this.cacheHit = builder.cacheHit;
       this.totalBytesBilled = builder.totalBytesBilled;
       this.totalBytesProcessed = builder.totalBytesProcessed;
+      this.queryPlan = builder.queryPlan;
     }
 
     /**
@@ -325,13 +338,26 @@ public Long totalBytesProcessed() {
       return totalBytesProcessed;
     }
 
+    /**
+     * Returns the query plan as a list of stages. Each stage involves a number of steps that read
+     * from data sources, perform a series of transformations on the input, and emit an output to a
+     * future stage (or the final result). The query plan is available for a completed query job and
+     * is retained for 7 days.
+     *
+     * @see Query Plan
+     */
+    public List queryPlan() {
+      return queryPlan;
+    }
+
     @Override
     ToStringHelper toStringHelper() {
       return super.toStringHelper()
           .add("billingTier", billingTier)
           .add("cacheHit", cacheHit)
           .add("totalBytesBilled", totalBytesBilled)
-          .add("totalBytesProcessed", totalBytesProcessed);
+          .add("totalBytesProcessed", totalBytesProcessed)
+          .add("queryPlan", queryPlan);
     }
 
     @Override
@@ -343,7 +369,7 @@ public boolean equals(Object obj) {
     @Override
     public int hashCode() {
       return Objects.hash(super.hashCode(), billingTier, cacheHit, totalBytesBilled,
-          totalBytesProcessed);
+          totalBytesProcessed, queryPlan);
     }
 
     @Override
@@ -353,6 +379,9 @@ com.google.api.services.bigquery.model.JobStatistics toPb() {
       queryStatisticsPb.setCacheHit(cacheHit);
       queryStatisticsPb.setTotalBytesBilled(totalBytesBilled);
       queryStatisticsPb.setTotalBytesProcessed(totalBytesProcessed);
+      if (queryPlan != null) {
+        queryStatisticsPb.setQueryPlan(Lists.transform(queryPlan, QueryStage.TO_PB_FUNCTION));
+      }
       return super.toPb().setQuery(queryStatisticsPb);
     }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java
new file mode 100644
index 000000000000..85de9be96818
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.api.services.bigquery.model.ExplainQueryStage;
+import com.google.api.services.bigquery.model.ExplainQueryStep;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * BigQuery provides diagnostic information about a completed query's execution plan (or query plan
+ * for short). The query plan describes a query as a series of stages, with each stage comprising a
+ * number of steps that read from data sources, perform a series of transformations on the input,
+ * and emit an output to a future stage (or the final result). This class contains information on a
+ * query stage.
+ *
+ * @see Query Plan
+ */
+public class QueryStage implements Serializable {
+
+  static final Function FROM_PB_FUNCTION =
+      new Function() {
+        @Override
+        public QueryStage apply(ExplainQueryStage pb) {
+          return QueryStage.fromPb(pb);
+        }
+      };
+  static final Function TO_PB_FUNCTION =
+      new Function() {
+        @Override
+        public ExplainQueryStage apply(QueryStage stage) {
+          return stage.toPb();
+        }
+      };
+  private static final long serialVersionUID = -472281297327952320L;
+
+  /**
+   * Each query stage is made of a number of steps. This class contains information on a query step.
+   *
+   * @see Steps
+   *     Metadata
+   */
+  public static class QueryStep implements Serializable {
+
+    static final Function FROM_PB_FUNCTION =
+        new Function() {
+          @Override
+          public QueryStep apply(ExplainQueryStep pb) {
+            return QueryStep.fromPb(pb);
+          }
+        };
+    static final Function TO_PB_FUNCTION =
+        new Function() {
+          @Override
+          public ExplainQueryStep apply(QueryStep stage) {
+            return stage.toPb();
+          }
+        };
+    private static final long serialVersionUID = 8663444604771794411L;
+
+    private final String kind;
+    private final List substeps;
+
+    QueryStep(String kind, List substeps) {
+      this.kind = kind;
+      this.substeps = substeps;
+    }
+
+    public String kind() {
+      return kind;
+    }
+
+    public List substeps() {
+      return substeps;
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("kind", kind)
+          .add("substeps", substeps)
+          .toString();
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(kind, substeps);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (!(obj instanceof QueryStep)) {
+        return false;
+      }
+      QueryStep other = (QueryStep) obj;
+      return Objects.equals(kind, other.kind)
+          && Objects.equals(substeps, other.substeps);
+    }
+
+    ExplainQueryStep toPb() {
+      return new ExplainQueryStep().setKind(kind).setSubsteps(substeps);
+    }
+
+    static QueryStep fromPb(com.google.api.services.bigquery.model.ExplainQueryStep stepPb) {
+      List substeps = null;
+      if (stepPb.getSubsteps() != null) {
+        substeps = ImmutableList.copyOf(stepPb.getSubsteps());
+      }
+      return new QueryStep(stepPb.getKind(), substeps);
+    }
+  }
+
+  private final double computeRatioAvg;
+  private final double computeRatioMax;
+  private final long id;
+  private final String name;
+  private final double readRatioAvg;
+  private final double readRatioMax;
+  private final long recordsRead;
+  private final long recordsWritten;
+  private final List steps;
+  private final double waitRatioAvg;
+  private final double waitRatioMax;
+  private final double writeRatioAvg;
+  private final double writeRatioMax;
+
+  static final class Builder {
+
+    private double computeRatioAvg;
+    private double computeRatioMax;
+    private long id;
+    private String name;
+    private double readRatioAvg;
+    private double readRatioMax;
+    private long recordsRead;
+    private long recordsWritten;
+    private List steps;
+    private double waitRatioAvg;
+    private double waitRatioMax;
+    private double writeRatioAvg;
+    private double writeRatioMax;
+
+    private Builder() {}
+
+    Builder computeRatioAvg(double computeRatioAvg) {
+      this.computeRatioAvg = computeRatioAvg;
+      return this;
+    }
+
+    Builder computeRatioMax(double computeRatioMax) {
+      this.computeRatioMax = computeRatioMax;
+      return this;
+    }
+
+    Builder id(long id) {
+      this.id = id;
+      return this;
+    }
+
+    Builder name(String name) {
+      this.name = name;
+      return this;
+    }
+
+    Builder readRatioAvg(double readRatioAvg) {
+      this.readRatioAvg = readRatioAvg;
+      return this;
+    }
+
+    Builder readRatioMax(double readRatioMax) {
+      this.readRatioMax = readRatioMax;
+      return this;
+    }
+
+    Builder recordsRead(long recordsRead) {
+      this.recordsRead = recordsRead;
+      return this;
+    }
+
+    Builder recordsWritten(long recordsWritten) {
+      this.recordsWritten = recordsWritten;
+      return this;
+    }
+
+    Builder steps(List steps) {
+      this.steps = steps;
+      return this;
+    }
+
+    Builder waitRatioAvg(double waitRatioAvg) {
+      this.waitRatioAvg = waitRatioAvg;
+      return this;
+    }
+
+    Builder waitRatioMax(double waitRatioMax) {
+      this.waitRatioMax = waitRatioMax;
+      return this;
+    }
+
+    Builder writeRatioAvg(double writeRatioAvg) {
+      this.writeRatioAvg = writeRatioAvg;
+      return this;
+    }
+
+    Builder writeRatioMax(double writeRatioMax) {
+      this.writeRatioMax = writeRatioMax;
+      return this;
+    }
+
+    QueryStage build() {
+      return new QueryStage(this);
+    }
+  }
+
+  QueryStage(Builder builder) {
+    computeRatioAvg = builder.computeRatioAvg;
+    computeRatioMax = builder.computeRatioMax;
+    id = builder.id;
+    name = builder.name;
+    readRatioAvg = builder.readRatioAvg;
+    readRatioMax = builder.readRatioMax;
+    recordsRead = builder.recordsRead;
+    recordsWritten = builder.recordsWritten;
+    steps = builder.steps;
+    waitRatioAvg = builder.waitRatioAvg;
+    waitRatioMax = builder.waitRatioMax;
+    writeRatioAvg = builder.writeRatioAvg;
+    writeRatioMax = builder.writeRatioMax;
+  }
+
+  /**
+   * Returns the relative amount of time the average shard spent on CPU-bound tasks.
+   */
+  public double computeRatioAvg() {
+    return computeRatioAvg;
+  }
+
+  /**
+   * Returns the relative amount of time the slowest shard spent on CPU-bound tasks.
+   */
+  public double computeRatioMax() {
+    return computeRatioMax;
+  }
+
+  /**
+   * Returns a unique ID for the stage within its plan.
+   */
+  public long id() {
+    return id;
+  }
+
+  /**
+   * Returns a human-readable name for the stage.
+   */
+  public String name() {
+    return name;
+  }
+
+  /**
+   * Returns the relative amount of time the average shard spent reading input.
+   */
+  public double readRatioAvg() {
+    return readRatioAvg;
+  }
+
+  /**
+   * Returns the relative amount of time the slowest shard spent reading input.
+   */
+  public double readRatioMax() {
+    return readRatioMax;
+  }
+
+  /**
+   * Returns the number of records read into the stage.
+   */
+  public long recordsRead() {
+    return recordsRead;
+  }
+
+  /**
+   * Returns the number of records written by the stage.
+   */
+  public long recordsWritten() {
+    return recordsWritten;
+  }
+
+  /**
+   * Returns the list of steps within the stage in dependency order (approximately chronological).
+   */
+  public List steps() {
+    return steps;
+  }
+
+  /**
+   * Returns the relative amount of time the average shard spent waiting to be scheduled.
+   */
+  public double waitRatioAvg() {
+    return waitRatioAvg;
+  }
+
+  /**
+   * Returns the relative amount of time the slowest shard spent waiting to be scheduled.
+   */
+  public double waitRatioMax() {
+    return waitRatioMax;
+  }
+
+  /**
+   * Returns the relative amount of time the average shard spent on writing output.
+   */
+  public double writeRatioAvg() {
+    return writeRatioAvg;
+  }
+
+  /**
+   * Returns the relative amount of time the slowest shard spent on writing output.
+   */
+  public double writeRatioMax() {
+    return writeRatioMax;
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("computeRatioAvg", computeRatioAvg)
+        .add("computeRatioMax", computeRatioMax)
+        .add("id", id)
+        .add("name", name)
+        .add("readRatioAvg", readRatioAvg)
+        .add("readRatioMax", readRatioMax)
+        .add("recordsRead", recordsRead)
+        .add("recordsWritten", recordsWritten)
+        .add("steps", steps)
+        .add("waitRatioAvg", waitRatioAvg)
+        .add("waitRatioMax", waitRatioMax)
+        .add("writeRatioAvg", writeRatioAvg)
+        .add("writeRatioMax", writeRatioMax)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(computeRatioAvg, computeRatioMax, id, name, readRatioAvg, readRatioMax,
+        recordsRead, recordsWritten, steps, waitRatioAvg, waitRatioMax, writeRatioAvg);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (!(obj instanceof QueryStage)) {
+      return false;
+    }
+    QueryStage other = (QueryStage) obj;
+    return id == other.id
+        && computeRatioAvg == other.computeRatioAvg
+        && computeRatioMax == other.computeRatioMax
+        && readRatioAvg == other.readRatioAvg
+        && readRatioMax == other.readRatioMax
+        && recordsRead == other.recordsRead
+        && recordsWritten == other.recordsWritten
+        && waitRatioAvg == other.waitRatioAvg
+        && waitRatioMax == other.waitRatioMax
+        && writeRatioAvg == other.writeRatioAvg
+        && writeRatioMax == other.writeRatioMax
+        && Objects.equals(steps, other.steps)
+        && Objects.equals(name, other.name);
+  }
+
+  static Builder builder() {
+    return new Builder();
+  }
+
+  ExplainQueryStage toPb() {
+    ExplainQueryStage stagePb = new ExplainQueryStage()
+        .setComputeRatioAvg(computeRatioAvg)
+        .setComputeRatioMax(computeRatioMax)
+        .setId(id)
+        .setName(name)
+        .setReadRatioAvg(readRatioAvg)
+        .setReadRatioMax(readRatioMax)
+        .setRecordsRead(recordsRead)
+        .setRecordsWritten(recordsWritten)
+        .setWaitRatioAvg(waitRatioAvg)
+        .setWaitRatioMax(waitRatioMax)
+        .setWriteRatioAvg(writeRatioAvg)
+        .setWriteRatioMax(writeRatioMax);
+    if (steps != null) {
+      stagePb.setSteps(Lists.transform(steps, QueryStep.TO_PB_FUNCTION));
+    }
+    return stagePb;
+  }
+
+  static QueryStage fromPb(com.google.api.services.bigquery.model.ExplainQueryStage stagePb) {
+    Builder builder = new QueryStage.Builder();
+    builder.computeRatioAvg(stagePb.getComputeRatioAvg());
+    builder.computeRatioMax(stagePb.getComputeRatioMax());
+    builder.id(stagePb.getId());
+    builder.name(stagePb.getName());
+    builder.readRatioAvg(stagePb.getReadRatioAvg());
+    builder.readRatioMax(stagePb.getReadRatioMax());
+    builder.recordsRead(stagePb.getRecordsRead());
+    builder.recordsWritten(stagePb.getRecordsWritten());
+    if (stagePb.getSteps() != null) {
+      builder.steps(Lists.transform(stagePb.getSteps(), QueryStep.FROM_PB_FUNCTION));
+    }
+    builder.waitRatioAvg(stagePb.getWaitRatioAvg());
+    builder.waitRatioMax(stagePb.getWaitRatioMax());
+    builder.writeRatioAvg(stagePb.getWriteRatioAvg());
+    builder.writeRatioMax(stagePb.getWriteRatioMax());
+    return builder.build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index 34f4f6893187..e11dea1a9936 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -610,6 +610,8 @@ public void testQuery() throws InterruptedException {
       rowCount++;
     }
     assertEquals(2, rowCount);
+    QueryJobInfo queryJob = bigquery.getJob(response.jobId());
+    assertNotNull(queryJob.statistics().queryPlan());
   }
 
   @Test
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java
index 5b2123faa67d..1ec67d034754 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java
@@ -22,6 +22,7 @@
 import com.google.gcloud.bigquery.JobStatistics.ExtractStatistics;
 import com.google.gcloud.bigquery.JobStatistics.LoadStatistics;
 import com.google.gcloud.bigquery.JobStatistics.QueryStatistics;
+import com.google.gcloud.bigquery.QueryStage.QueryStep;
 
 import org.junit.Test;
 
@@ -63,6 +64,26 @@ public class JobStatisticsTest {
       .inputBytes(INPUT_BYTES)
       .inputFiles(INPUT_FILES)
       .build();
+  private static final List SUBSTEPS1 = ImmutableList.of("substep1", "substep2");
+  private static final List SUBSTEPS2 = ImmutableList.of("substep3", "substep4");
+  private static final QueryStep QUERY_STEP1 = new QueryStep("KIND", SUBSTEPS1);
+  private static final QueryStep QUERY_STEP2 = new QueryStep("KIND", SUBSTEPS2);
+  private static final QueryStage QUERY_STAGE = QueryStage.builder()
+      .computeRatioAvg(1.1)
+      .computeRatioMax(2.2)
+      .id(42L)
+      .name("stage")
+      .readRatioAvg(3.3)
+      .readRatioMax(4.4)
+      .recordsRead(5L)
+      .recordsWritten(6L)
+      .steps(ImmutableList.of(QUERY_STEP1, QUERY_STEP2))
+      .waitRatioAvg(7.7)
+      .waitRatioMax(8.8)
+      .writeRatioAvg(9.9)
+      .writeRatioMax(10.10)
+      .build();
+  private static final List QUERY_PLAN = ImmutableList.of(QUERY_STAGE);
   private static final QueryStatistics QUERY_STATISTICS = QueryStatistics.builder()
       .creationTime(CREATION_TIME)
       .endTime(END_TIME)
@@ -71,6 +92,7 @@ public class JobStatisticsTest {
       .cacheHit(CACHE_HIT)
       .totalBytesBilled(TOTAL_BYTES_BILLED)
       .totalBytesProcessed(TOTAL_BYTES_PROCESSED)
+      .queryPlan(QUERY_PLAN)
       .build();
   private static final QueryStatistics QUERY_STATISTICS_INCOMPLETE = QueryStatistics.builder()
       .creationTime(CREATION_TIME)
@@ -111,6 +133,8 @@ public void testBuilder() {
     assertEquals(CACHE_HIT, QUERY_STATISTICS.cacheHit());
     assertEquals(TOTAL_BYTES_BILLED, QUERY_STATISTICS.totalBytesBilled());
     assertEquals(TOTAL_BYTES_PROCESSED, QUERY_STATISTICS.totalBytesProcessed());
+    assertEquals(TOTAL_BYTES_PROCESSED, QUERY_STATISTICS.totalBytesProcessed());
+    assertEquals(QUERY_PLAN, QUERY_STATISTICS.queryPlan());
 
     assertEquals(CREATION_TIME, LOAD_STATISTICS_INCOMPLETE.creationTime());
     assertEquals(START_TIME, LOAD_STATISTICS_INCOMPLETE.startTime());
@@ -127,6 +151,7 @@ public void testBuilder() {
     assertEquals(CACHE_HIT, QUERY_STATISTICS_INCOMPLETE.cacheHit());
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.totalBytesBilled());
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.totalBytesProcessed());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.queryPlan());
   }
 
   @Test
@@ -165,6 +190,7 @@ private void compareQueryStatistics(QueryStatistics expected, QueryStatistics va
     assertEquals(expected.cacheHit(), value.cacheHit());
     assertEquals(expected.totalBytesBilled(), value.totalBytesBilled());
     assertEquals(expected.totalBytesProcessed(), value.totalBytesProcessed());
+    assertEquals(expected.queryPlan(), value.queryPlan());
   }
 
   private void compareStatistics(JobStatistics expected, JobStatistics value) {
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryStageTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryStageTest.java
new file mode 100644
index 000000000000..6ffc05ab50f2
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryStageTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.QueryStage.QueryStep;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class QueryStageTest {
+
+  private static final List SUBSTEPS1 = ImmutableList.of("substep1", "substep2");
+  private static final List SUBSTEPS2 = ImmutableList.of("substep3", "substep4");
+  private static final QueryStep QUERY_STEP1 = new QueryStep("KIND", SUBSTEPS1);
+  private static final QueryStep QUERY_STEP2 = new QueryStep("KIND", SUBSTEPS2);
+  private static final double COMPUTE_RATIO_AVG = 1.1;
+  private static final double COMPUTE_RATIO_MAX = 2.2;
+  private static final long ID = 42L;
+  private static final String NAME = "StageName";
+  private static final double READ_RATIO_AVG = 3.3;
+  private static final double READ_RATIO_MAX = 4.4;
+  private static final long RECORDS_READ = 5L;
+  private static final long RECORDS_WRITTEN = 6L;
+  private static final List STEPS = ImmutableList.of(QUERY_STEP1, QUERY_STEP2);
+  private static final double WAIT_RATIO_AVG = 7.7;
+  private static final double WAIT_RATIO_MAX = 8.8;
+  private static final double WRITE_RATIO_AVG = 9.9;
+  private static final double WRITE_RATIO_MAX = 10.10;
+  private static final QueryStage QUERY_STAGE = QueryStage.builder()
+      .computeRatioAvg(COMPUTE_RATIO_AVG)
+      .computeRatioMax(COMPUTE_RATIO_MAX)
+      .id(ID)
+      .name(NAME)
+      .readRatioAvg(READ_RATIO_AVG)
+      .readRatioMax(READ_RATIO_MAX)
+      .recordsRead(RECORDS_READ)
+      .recordsWritten(RECORDS_WRITTEN)
+      .steps(STEPS)
+      .waitRatioAvg(WAIT_RATIO_AVG)
+      .waitRatioMax(WAIT_RATIO_MAX)
+      .writeRatioAvg(WRITE_RATIO_AVG)
+      .writeRatioMax(WRITE_RATIO_MAX)
+      .build();
+
+  @Test
+  public void testQueryStepConstructor() {
+    assertEquals("KIND", QUERY_STEP1.kind());
+    assertEquals("KIND", QUERY_STEP2.kind());
+    assertEquals(SUBSTEPS1, QUERY_STEP1.substeps());
+    assertEquals(SUBSTEPS2, QUERY_STEP2.substeps());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(COMPUTE_RATIO_AVG, QUERY_STAGE.computeRatioAvg(), 0);
+    assertEquals(COMPUTE_RATIO_MAX, QUERY_STAGE.computeRatioMax(), 0);
+    assertEquals(ID, QUERY_STAGE.id());
+    assertEquals(NAME, QUERY_STAGE.name());
+    assertEquals(READ_RATIO_AVG, QUERY_STAGE.readRatioAvg(), 0);
+    assertEquals(READ_RATIO_MAX, QUERY_STAGE.readRatioMax(), 0);
+    assertEquals(RECORDS_READ, QUERY_STAGE.recordsRead());
+    assertEquals(RECORDS_WRITTEN, QUERY_STAGE.recordsWritten());
+    assertEquals(STEPS, QUERY_STAGE.steps());
+    assertEquals(WAIT_RATIO_AVG, QUERY_STAGE.waitRatioAvg(), 0);
+    assertEquals(WAIT_RATIO_MAX, QUERY_STAGE.waitRatioMax(), 0);
+    assertEquals(WRITE_RATIO_AVG, QUERY_STAGE.writeRatioAvg(), 0);
+    assertEquals(WRITE_RATIO_MAX, QUERY_STAGE.writeRatioMax(), 0);
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    compareQueryStep(QUERY_STEP1, QueryStep.fromPb(QUERY_STEP1.toPb()));
+    compareQueryStep(QUERY_STEP2, QueryStep.fromPb(QUERY_STEP2.toPb()));
+    compareQueryStage(QUERY_STAGE, QueryStage.fromPb(QUERY_STAGE.toPb()));
+  }
+
+  @Test
+  public void testEquals() {
+    compareQueryStep(QUERY_STEP1, QUERY_STEP1);
+    compareQueryStep(QUERY_STEP2, QUERY_STEP2);
+    compareQueryStage(QUERY_STAGE, QUERY_STAGE);
+  }
+
+  private void compareQueryStage(QueryStage expected, QueryStage value) {
+    assertEquals(expected, value);
+    assertEquals(expected.computeRatioAvg(), value.computeRatioAvg(), 0);
+    assertEquals(expected.computeRatioMax(), value.computeRatioMax(), 0);
+    assertEquals(expected.id(), value.id());
+    assertEquals(expected.name(), value.name());
+    assertEquals(expected.readRatioAvg(), value.readRatioAvg(), 0);
+    assertEquals(expected.readRatioMax(), value.readRatioMax(), 0);
+    assertEquals(expected.recordsRead(), value.recordsRead());
+    assertEquals(expected.recordsWritten(), value.recordsWritten());
+    assertEquals(expected.steps(), value.steps());
+    assertEquals(expected.waitRatioAvg(), value.waitRatioAvg(), 0);
+    assertEquals(expected.waitRatioMax(), value.waitRatioMax(), 0);
+    assertEquals(expected.writeRatioAvg(), value.writeRatioAvg(), 0);
+    assertEquals(expected.writeRatioMax(), value.writeRatioMax(), 0);
+    assertEquals(expected.hashCode(), value.hashCode());
+  }
+
+  private void compareQueryStep(QueryStep expected, QueryStep value) {
+    assertEquals(expected, value);
+    assertEquals(expected.kind(), value.kind());
+    assertEquals(expected.substeps(), value.substeps());
+    assertEquals(expected.hashCode(), value.hashCode());
+  }
+}

From 65340bd56c5538007f139e7e9c4775100ba0eca8 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 5 Jan 2016 20:08:17 -0800
Subject: [PATCH 257/322] Make ResourceManagerImpl package protected

---
 .../com/google/gcloud/resourcemanager/ResourceManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
index 1ee247861d59..9ae8c976631b 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
@@ -37,7 +37,7 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-public class ResourceManagerImpl
+final class ResourceManagerImpl
     extends BaseService implements ResourceManager {
 
   private static final Interceptor EXCEPTION_HANDLER_INTERCEPTOR = new Interceptor() {

From 0a5962034bace33b6f1705a0ee32048d0762ed6e Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 6 Jan 2016 15:18:58 +0100
Subject: [PATCH 258/322] Add more factory methods to Load and ExtractJobInfo

---
 .../gcloud/bigquery/ExtractJobInfo.java       | 35 +++++++++++++++++++
 .../google/gcloud/bigquery/LoadJobInfo.java   | 35 +++++++++++++++++++
 .../com/google/gcloud/bigquery/Table.java     | 12 +++----
 .../gcloud/bigquery/ExtractJobInfoTest.java   | 19 ++++++++++
 .../gcloud/bigquery/LoadJobInfoTest.java      | 22 ++++++++++++
 5 files changed, 115 insertions(+), 8 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
index 268672b04d68..effdab84f265 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
@@ -263,6 +263,23 @@ public static ExtractJobInfo of(TableId sourceTable, List destinationUri
     return builder(sourceTable, destinationUris).build();
   }
 
+  /**
+   * Returns a BigQuery Extract Job for the given source table, format and destination URI. Job's id
+   * is chosen by the service.
+   */
+  public static ExtractJobInfo of(TableId sourceTable, String format, String destinationUri) {
+    return builder(sourceTable, destinationUri).format(format).build();
+  }
+
+  /**
+   * Returns a BigQuery Extract Job for the given source table, format and destination URIs. Job's
+   * id is chosen by the service.
+   */
+  public static ExtractJobInfo of(TableId sourceTable, String format,
+      List destinationUris) {
+    return builder(sourceTable, destinationUris).format(format).build();
+  }
+
   /**
    * Returns a BigQuery Extract Job for the given source table and destination URI. Job's id is set
    * to the provided value.
@@ -279,6 +296,24 @@ public static ExtractJobInfo of(JobId jobId, TableId sourceTable, List d
     return builder(sourceTable, destinationUris).jobId(jobId).build();
   }
 
+  /**
+   * Returns a BigQuery Extract Job for the given source table, format and destination URI. Job's id
+   * is set to the provided value.
+   */
+  public static ExtractJobInfo of(JobId jobId, TableId sourceTable, String format,
+      String destinationUri) {
+    return builder(sourceTable, destinationUri).format(format).jobId(jobId).build();
+  }
+
+  /**
+   * Returns a BigQuery Extract Job for the given source table, format and destination URIs. Job's
+   * id is set to the provided value.
+   */
+  public static ExtractJobInfo of(JobId jobId, TableId sourceTable, String format,
+      List destinationUris) {
+    return builder(sourceTable, destinationUris).format(format).jobId(jobId).build();
+  }
+
   @SuppressWarnings("unchecked")
   static ExtractJobInfo fromPb(Job jobPb) {
     return new Builder(jobPb).build();
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
index df78b7ecec2f..1120bbbacf3f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
@@ -407,6 +407,23 @@ public static LoadJobInfo of(TableId destinationTable, List sourceUris)
     return builder(destinationTable, sourceUris).build();
   }
 
+  /**
+   * Returns a BigQuery Load Job for the given destination table, format and source URI. Job's id is
+   * chosen by the service.
+   */
+  public static LoadJobInfo of(TableId destinationTable, FormatOptions format, String sourceUri) {
+    return builder(destinationTable, sourceUri).formatOptions(format).build();
+  }
+
+  /**
+   * Returns a BigQuery Load Job for the given destination table, format and source URIs. Job's id
+   * is chosen by the service.
+   */
+  public static LoadJobInfo of(TableId destinationTable, FormatOptions format,
+      List sourceUris) {
+    return builder(destinationTable, sourceUris).formatOptions(format).build();
+  }
+
   /**
    * Returns a BigQuery Load Job for the given destination table and source URI. Job's id is set to
    * the provided value.
@@ -423,6 +440,24 @@ public static LoadJobInfo of(JobId jobId, TableId destinationTable, List
     return builder(destinationTable, sourceUris).jobId(jobId).build();
   }
 
+  /**
+   * Returns a BigQuery Load Job for the given destination table, format, and source URI. Job's id
+   * is set to the provided value.
+   */
+  public static LoadJobInfo of(JobId jobId, TableId destinationTable, FormatOptions format,
+      String sourceUri) {
+    return builder(destinationTable, sourceUri).formatOptions(format).jobId(jobId).build();
+  }
+
+  /**
+   * Returns a BigQuery Load Job for the given destination table, format and source URIs. Job's id
+   * is set to the provided value.
+   */
+  public static LoadJobInfo of(JobId jobId, TableId destinationTable, FormatOptions format,
+      List sourceUris) {
+    return builder(destinationTable, sourceUris).formatOptions(format).jobId(jobId).build();
+  }
+
   @SuppressWarnings("unchecked")
   static LoadJobInfo fromPb(Job jobPb) {
     return new Builder(jobPb).build();
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
index fec3e0c03a90..fd9a96e132b6 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
@@ -231,10 +231,8 @@ Job extract(String format, String destinationUri, BigQuery.JobOption... options)
    */
   Job extract(String format, List destinationUris, BigQuery.JobOption... options)
       throws BigQueryException {
-    ExtractJobInfo job = ExtractJobInfo.builder(info.tableId(), destinationUris)
-        .format(format)
-        .build();
-    return new Job(bigquery, bigquery.create(job, options));
+    return new Job(bigquery,
+        bigquery.create(ExtractJobInfo.of(info.tableId(), format, destinationUris), options));
   }
 
   /**
@@ -264,10 +262,8 @@ Job load(FormatOptions format, String sourceUri, BigQuery.JobOption... options)
    */
   Job load(FormatOptions format, List sourceUris, BigQuery.JobOption... options)
       throws BigQueryException {
-    LoadJobInfo job = LoadJobInfo.builder(info.tableId(), sourceUris)
-        .formatOptions(format)
-        .build();
-    return new Job(bigquery, bigquery.create(job, options));
+    return new Job(bigquery, bigquery.create(LoadJobInfo.of(info.tableId(), format, sourceUris),
+        options));
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java
index e73975c6c3ab..bb47112b6410 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java
@@ -38,6 +38,7 @@ public class ExtractJobInfoTest {
   private static final TableId TABLE_ID = TableId.of("dataset", "table");
   private static final String FIELD_DELIMITER = ",";
   private static final String FORMAT = "CSV";
+  private static final String JSON_FORMAT = "NEWLINE_DELIMITED_JSON";
   private static final Boolean PRINT_HEADER = true;
   private static final String COMPRESSION = "GZIP";
   private static final JobId JOB_ID = JobId.of("job");
@@ -95,6 +96,14 @@ public void testOf() {
     job = ExtractJobInfo.of(TABLE_ID, DESTINATION_URI);
     assertEquals(TABLE_ID, job.sourceTable());
     assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
+    job = ExtractJobInfo.of(TABLE_ID, JSON_FORMAT, DESTINATION_URIS);
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(DESTINATION_URIS, job.destinationUris());
+    assertEquals(JSON_FORMAT, job.format());
+    job = ExtractJobInfo.of(TABLE_ID, JSON_FORMAT, DESTINATION_URI);
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
+    assertEquals(JSON_FORMAT, job.format());
     job = ExtractJobInfo.of(JOB_ID, TABLE_ID, DESTINATION_URIS);
     assertEquals(JOB_ID, job.jobId());
     assertEquals(TABLE_ID, job.sourceTable());
@@ -103,6 +112,16 @@ public void testOf() {
     assertEquals(JOB_ID, job.jobId());
     assertEquals(TABLE_ID, job.sourceTable());
     assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
+    job = ExtractJobInfo.of(JOB_ID, TABLE_ID, JSON_FORMAT, DESTINATION_URIS);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(DESTINATION_URIS, job.destinationUris());
+    assertEquals(JSON_FORMAT, job.format());
+    job = ExtractJobInfo.of(JOB_ID, TABLE_ID, JSON_FORMAT, DESTINATION_URI);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
+    assertEquals(JSON_FORMAT, job.format());
   }
 
   @Test
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
index bb2a263fc3e0..06ce0b42ad4b 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
@@ -102,6 +102,16 @@ public void testOf() {
     job = LoadJobInfo.of(TABLE_ID, SOURCE_URI);
     assertEquals(TABLE_ID, job.destinationTable());
     assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
+    job = LoadJobInfo.of(TABLE_ID, CSV_OPTIONS, SOURCE_URIS);
+    assertEquals(TABLE_ID, job.destinationTable());
+    assertEquals(SOURCE_URIS, job.sourceUris());
+    assertEquals(FORMAT, job.format());
+    assertEquals(CSV_OPTIONS, job.csvOptions());
+    job = LoadJobInfo.of(TABLE_ID, CSV_OPTIONS, SOURCE_URI);
+    assertEquals(TABLE_ID, job.destinationTable());
+    assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
+    assertEquals(FORMAT, job.format());
+    assertEquals(CSV_OPTIONS, job.csvOptions());
     job = LoadJobInfo.of(JOB_ID, TABLE_ID, SOURCE_URIS);
     assertEquals(JOB_ID, job.jobId());
     assertEquals(TABLE_ID, job.destinationTable());
@@ -110,6 +120,18 @@ public void testOf() {
     assertEquals(JOB_ID, job.jobId());
     assertEquals(TABLE_ID, job.destinationTable());
     assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
+    job = LoadJobInfo.of(JOB_ID, TABLE_ID, CSV_OPTIONS, SOURCE_URIS);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(TABLE_ID, job.destinationTable());
+    assertEquals(SOURCE_URIS, job.sourceUris());
+    assertEquals(FORMAT, job.format());
+    assertEquals(CSV_OPTIONS, job.csvOptions());
+    job = LoadJobInfo.of(JOB_ID, TABLE_ID, CSV_OPTIONS, SOURCE_URI);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(TABLE_ID, job.destinationTable());
+    assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
+    assertEquals(FORMAT, job.format());
+    assertEquals(CSV_OPTIONS, job.csvOptions());
   }
 
   @Test

From c3e808db13527ecc37005cdb5b032b41d00053e9 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 6 Jan 2016 15:25:57 +0100
Subject: [PATCH 259/322] Fix self reference in QueryJobInfo.Priority javadoc

---
 .../main/java/com/google/gcloud/bigquery/QueryJobInfo.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
index dd09d7010a50..5a8b822e87ef 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
@@ -53,8 +53,8 @@ public enum Priority {
 
     /**
      * Query is queued and started as soon as idle resources are available, usually within a few
-     * minutes. If a {@link Priority#BATCH} query hasn't started within 3 hours, its priority is
-     * changed to {@link Priority#INTERACTIVE}.
+     * minutes. If the query hasn't started within 3 hours, its priority is changed to
+     * {@link Priority#INTERACTIVE}.
      */
     BATCH
   }

From 7c0a746d9851dd5d993b542cd5fcc693e0a54169 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 6 Jan 2016 16:08:59 +0100
Subject: [PATCH 260/322] Make infoIterable final in LazyBlobIterable and
 LazyTableIterable

---
 .../src/main/java/com/google/gcloud/bigquery/Dataset.java       | 2 +-
 .../src/main/java/com/google/gcloud/storage/Bucket.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
index dee41fb4b0ea..a867868700fb 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
@@ -69,7 +69,7 @@ private static class LazyTableIterable implements Iterable
    , Serializable
     private static final long serialVersionUID = 3312744215731674032L;
 
     private final BigQueryOptions options;
-    private Iterable infoIterable;
+    private final Iterable infoIterable;
     private transient BigQuery bigquery;
 
     public LazyTableIterable(BigQueryOptions options, Iterable infoIterable) {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index ca24d1442103..61ff1ec9d0a3 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -81,7 +81,7 @@ private static class LazyBlobIterable implements Iterable, Serializable {
     private static final long serialVersionUID = -3092290247725378832L;
 
     private final StorageOptions options;
-    private Iterable infoIterable;
+    private final Iterable infoIterable;
     private transient Storage storage;
 
     public LazyBlobIterable(StorageOptions options, Iterable infoIterable) {

From 13b1b0e5ab44cb19c0802fcac992baa0bac9c8f7 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 6 Jan 2016 10:31:56 +0100
Subject: [PATCH 261/322] Minor fixes to QueryStage - Add javadoc to QueryStep
 - Rename QueryStep.kind to name - Make QueryStep.substeps an empty list if
 not set - Document that QueryStatistics.queryPlan can return null - Add check
 for query plan in ITBigQueryTest.testQueryJob - Add unit tests for QueryStep
 - Better javadoc for QueryPlan getters

---
 .../google/gcloud/bigquery/JobStatistics.java |  8 +--
 .../google/gcloud/bigquery/QueryStage.java    | 63 +++++++++++--------
 .../gcloud/bigquery/ITBigQueryTest.java       |  2 +
 .../gcloud/bigquery/QueryStageTest.java       | 11 +++-
 4 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
index cd6f3c8e71df..b2d50882aabb 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
@@ -339,10 +339,10 @@ public Long totalBytesProcessed() {
     }
 
     /**
-     * Returns the query plan as a list of stages. Each stage involves a number of steps that read
-     * from data sources, perform a series of transformations on the input, and emit an output to a
-     * future stage (or the final result). The query plan is available for a completed query job and
-     * is retained for 7 days.
+     * Returns the query plan as a list of stages or {@code null} if a query plan is not available.
+     * Each stage involves a number of steps that read from data sources, perform a series of
+     * transformations on the input, and emit an output to a future stage (or the final result). The
+     * query plan is available for a completed query job and is retained for 7 days.
      *
      * @see Query Plan
      */
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java
index 85de9be96818..8c9f91fd39f3 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java
@@ -78,18 +78,27 @@ public ExplainQueryStep apply(QueryStep stage) {
         };
     private static final long serialVersionUID = 8663444604771794411L;
 
-    private final String kind;
+    private final String name;
     private final List substeps;
 
-    QueryStep(String kind, List substeps) {
-      this.kind = kind;
+    QueryStep(String name, List substeps) {
+      this.name = name;
       this.substeps = substeps;
     }
 
-    public String kind() {
-      return kind;
+    /**
+     * Returns a machine-readable name for the operation.
+     *
+     * @see Steps
+     *     Metadata
+     */
+    public String name() {
+      return name;
     }
 
+    /**
+     * Returns a list of human-readable stage descriptions.
+     */
     public List substeps() {
       return substeps;
     }
@@ -97,14 +106,14 @@ public List substeps() {
     @Override
     public String toString() {
       return MoreObjects.toStringHelper(this)
-          .add("kind", kind)
+          .add("name", name)
           .add("substeps", substeps)
           .toString();
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(kind, substeps);
+      return Objects.hash(name, substeps);
     }
 
     @Override
@@ -113,20 +122,16 @@ public boolean equals(Object obj) {
         return false;
       }
       QueryStep other = (QueryStep) obj;
-      return Objects.equals(kind, other.kind)
-          && Objects.equals(substeps, other.substeps);
+      return Objects.equals(name, other.name) && Objects.equals(substeps, other.substeps);
     }
 
     ExplainQueryStep toPb() {
-      return new ExplainQueryStep().setKind(kind).setSubsteps(substeps);
+      return new ExplainQueryStep().setKind(name).setSubsteps(substeps);
     }
 
     static QueryStep fromPb(com.google.api.services.bigquery.model.ExplainQueryStep stepPb) {
-      List substeps = null;
-      if (stepPb.getSubsteps() != null) {
-        substeps = ImmutableList.copyOf(stepPb.getSubsteps());
-      }
-      return new QueryStep(stepPb.getKind(), substeps);
+      return new QueryStep(stepPb.getKind(), ImmutableList.copyOf(stepPb.getSubsteps() != null
+          ? stepPb.getSubsteps() : ImmutableList.of()));
     }
   }
 
@@ -249,14 +254,16 @@ QueryStage build() {
   }
 
   /**
-   * Returns the relative amount of time the average shard spent on CPU-bound tasks.
+   * Returns the time the average worker spent CPU-bound, divided by the longest time spent by any
+   * worker in any segment.
    */
   public double computeRatioAvg() {
     return computeRatioAvg;
   }
 
   /**
-   * Returns the relative amount of time the slowest shard spent on CPU-bound tasks.
+   * Returns the time the slowest worker spent CPU-bound, divided by the longest time spent by any
+   * worker in any segment.
    */
   public double computeRatioMax() {
     return computeRatioMax;
@@ -277,28 +284,30 @@ public String name() {
   }
 
   /**
-   * Returns the relative amount of time the average shard spent reading input.
+   * Returns the time the average worker spent reading input data, divided by the longest time spent
+   * by any worker in any segment.
    */
   public double readRatioAvg() {
     return readRatioAvg;
   }
 
   /**
-   * Returns the relative amount of time the slowest shard spent reading input.
+   * Returns the time the slowest worker spent reading input data, divided by the longest time spent
+   * by any worker in any segment.
    */
   public double readRatioMax() {
     return readRatioMax;
   }
 
   /**
-   * Returns the number of records read into the stage.
+   * Returns the number of rows (top-level records) read by the stage.
    */
   public long recordsRead() {
     return recordsRead;
   }
 
   /**
-   * Returns the number of records written by the stage.
+   * Returns the number of rows (top-level records) written by the stage.
    */
   public long recordsWritten() {
     return recordsWritten;
@@ -312,28 +321,32 @@ public List steps() {
   }
 
   /**
-   * Returns the relative amount of time the average shard spent waiting to be scheduled.
+   * Returns the time the average worker spent waiting to be scheduled, divided by the longest time
+   * spent by any worker in any segment.
    */
   public double waitRatioAvg() {
     return waitRatioAvg;
   }
 
   /**
-   * Returns the relative amount of time the slowest shard spent waiting to be scheduled.
+   * Returns the time the slowest worker spent waiting to be scheduled, divided by the longest time
+   * spent by any worker in any segment.
    */
   public double waitRatioMax() {
     return waitRatioMax;
   }
 
   /**
-   * Returns the relative amount of time the average shard spent on writing output.
+   * Returns the time the average worker spent writing output data, divided by the longest time
+   * spent by any worker in any segment.
    */
   public double writeRatioAvg() {
     return writeRatioAvg;
   }
 
   /**
-   * Returns the relative amount of time the slowest shard spent on writing output.
+   * Returns the time the slowest worker spent writing output data, divided by the longest time
+   * spent by any worker in any segment.
    */
   public double writeRatioMax() {
     return writeRatioMax;
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index e11dea1a9936..0a13e9ed3399 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -771,6 +771,8 @@ public void testQueryJob() throws InterruptedException {
     }
     assertEquals(2, rowCount);
     assertTrue(bigquery.delete(DATASET, tableName));
+    QueryJobInfo queryJob = bigquery.getJob(remoteJob.jobId());
+    assertNotNull(queryJob.statistics().queryPlan());
   }
 
   @Test
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryStageTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryStageTest.java
index 6ffc05ab50f2..99a7c8096454 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryStageTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryStageTest.java
@@ -18,6 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.api.services.bigquery.model.ExplainQueryStep;
 import com.google.common.collect.ImmutableList;
 import com.google.gcloud.bigquery.QueryStage.QueryStep;
 
@@ -62,8 +63,8 @@ public class QueryStageTest {
 
   @Test
   public void testQueryStepConstructor() {
-    assertEquals("KIND", QUERY_STEP1.kind());
-    assertEquals("KIND", QUERY_STEP2.kind());
+    assertEquals("KIND", QUERY_STEP1.name());
+    assertEquals("KIND", QUERY_STEP2.name());
     assertEquals(SUBSTEPS1, QUERY_STEP1.substeps());
     assertEquals(SUBSTEPS2, QUERY_STEP2.substeps());
   }
@@ -90,6 +91,10 @@ public void testToAndFromPb() {
     compareQueryStep(QUERY_STEP1, QueryStep.fromPb(QUERY_STEP1.toPb()));
     compareQueryStep(QUERY_STEP2, QueryStep.fromPb(QUERY_STEP2.toPb()));
     compareQueryStage(QUERY_STAGE, QueryStage.fromPb(QUERY_STAGE.toPb()));
+    ExplainQueryStep stepPb = new ExplainQueryStep();
+    stepPb.setKind("KIND");
+    stepPb.setSubsteps(null);
+    compareQueryStep(new QueryStep("KIND", ImmutableList.of()), QueryStep.fromPb(stepPb));
   }
 
   @Test
@@ -119,7 +124,7 @@ private void compareQueryStage(QueryStage expected, QueryStage value) {
 
   private void compareQueryStep(QueryStep expected, QueryStep value) {
     assertEquals(expected, value);
-    assertEquals(expected.kind(), value.kind());
+    assertEquals(expected.name(), value.name());
     assertEquals(expected.substeps(), value.substeps());
     assertEquals(expected.hashCode(), value.hashCode());
   }

From ea21d237dc8cc052802c0a5cf907abcdc2801e66 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 6 Jan 2016 12:11:55 -0800
Subject: [PATCH 262/322] Docs and code cleanup

---
 .../google/gcloud/bigquery/BaseTableInfo.java |  4 +-
 .../com/google/gcloud/bigquery/BigQuery.java  |  8 ++--
 .../com/google/gcloud/bigquery/Dataset.java   |  2 +-
 .../com/google/gcloud/bigquery/JobInfo.java   |  8 ++--
 .../testing/RemoteBigQueryHelper.java         |  4 +-
 .../gcloud/bigquery/ITBigQueryTest.java       |  6 +--
 .../com/google/gcloud/AuthCredentials.java    | 10 ++---
 .../java/com/google/gcloud/BaseService.java   |  2 +-
 .../com/google/gcloud/ExceptionHandler.java   |  4 +-
 .../src/main/java/com/google/gcloud/Page.java |  2 +-
 .../main/java/com/google/gcloud/PageImpl.java |  4 +-
 .../java/com/google/gcloud/Restorable.java    |  2 +-
 .../com/google/gcloud/RestorableState.java    |  2 +-
 .../main/java/com/google/gcloud/Service.java  |  2 +-
 .../com/google/gcloud/ServiceFactory.java     |  4 +-
 .../com/google/gcloud/ServiceOptions.java     | 32 +++++++-------
 gcloud-java-datastore/README.md               | 25 ++++++-----
 .../google/gcloud/datastore/BaseEntity.java   | 40 +++++++++---------
 .../com/google/gcloud/datastore/Blob.java     |  2 +-
 .../gcloud/datastore/DatastoreReader.java     |  6 +--
 .../google/gcloud/datastore/KeyFactory.java   |  2 +-
 .../gcloud/examples/BigQueryExample.java      |  3 +-
 .../gcloud/examples/StorageExample.java       |  3 +-
 .../gcloud/resourcemanager/Project.java       |  5 ++-
 .../resourcemanager/ResourceManager.java      |  2 +-
 .../testing/LocalResourceManagerHelper.java   |  4 +-
 .../com/google/gcloud/storage/Storage.java    | 42 +++++++++----------
 .../google/gcloud/storage/StorageOptions.java |  2 +-
 .../storage/testing/RemoteGcsHelper.java      |  4 +-
 src/site/resources/index.html                 |  7 ++--
 30 files changed, 124 insertions(+), 119 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
index bbe7c99ea0fa..1b49a026ac14 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
@@ -97,8 +97,8 @@ public enum Type {
   /**
    * Base builder for tables.
    *
-   * @param  the table type.
-   * @param  the table builder.
+   * @param  the table type
+   * @param  the table builder
    */
   public abstract static class Builder> {
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
index 70c225942829..af5ced9d4230 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
@@ -500,7 +500,7 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
   /**
    * Deletes the requested dataset.
    *
-   * @return {@code true} if dataset was deleted, {@code false} if it was not found.
+   * @return {@code true} if dataset was deleted, {@code false} if it was not found
    * @throws BigQueryException upon failure
    */
   boolean delete(String datasetId, DatasetDeleteOption... options) throws BigQueryException;
@@ -508,7 +508,7 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
   /**
    * Deletes the requested dataset.
    *
-   * @return {@code true} if dataset was deleted, {@code false} if it was not found.
+   * @return {@code true} if dataset was deleted, {@code false} if it was not found
    * @throws BigQueryException upon failure
    */
   boolean delete(DatasetId datasetId, DatasetDeleteOption... options) throws BigQueryException;
@@ -516,7 +516,7 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
   /**
    * Deletes the requested table.
    *
-   * @return {@code true} if table was deleted, {@code false} if it was not found.
+   * @return {@code true} if table was deleted, {@code false} if it was not found
    * @throws BigQueryException upon failure
    */
   boolean delete(String datasetId, String tableId) throws BigQueryException;
@@ -524,7 +524,7 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
   /**
    * Deletes the requested table.
    *
-   * @return {@code true} if table was deleted, {@code false} if it was not found.
+   * @return {@code true} if table was deleted, {@code false} if it was not found
    * @throws BigQueryException upon failure
    */
   boolean delete(TableId tableId) throws BigQueryException;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
index a867868700fb..d3db421619c4 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
@@ -184,7 +184,7 @@ public Dataset update(DatasetInfo datasetInfo, BigQuery.DatasetOption... options
   /**
    * Deletes this dataset.
    *
-   * @return {@code true} if dataset was deleted, {@code false} if it was not found.
+   * @return {@code true} if dataset was deleted, {@code false} if it was not found
    * @throws BigQueryException upon failure
    */
   public boolean delete() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
index e05bbf488733..de33c483393d 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -33,7 +33,7 @@
  *
  * @see Jobs
  *
- * @param  the statistics type.
+ * @param  the statistics type
  */
 public abstract class JobInfo implements Serializable {
 
@@ -92,9 +92,9 @@ public enum WriteDisposition {
   /**
    * Base builder for jobs.
    *
-   * @param  the job type.
-   * @param  the job statistics type.
-   * @param  the job builder.
+   * @param  the job type
+   * @param  the job statistics type
+   * @param  the job builder
    */
   public abstract static class Builder> {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java
index 22fa62a7b86e..491e822d683c 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/testing/RemoteBigQueryHelper.java
@@ -60,7 +60,7 @@ public BigQueryOptions options() {
    *
    * @param bigquery the BigQuery service to be used to issue the delete request
    * @param dataset the dataset to be deleted
-   * @return {@code true} if deletion succeeded, {@code false} if the dataset was not found.
+   * @return {@code true} if deletion succeeded, {@code false} if the dataset was not found
    * @throws BigQueryException upon failure
    */
   public static boolean forceDelete(BigQuery bigquery, String dataset) {
@@ -80,7 +80,7 @@ public static String generateDatasetName() {
    *
    * @param projectId id of the project to be used for running the tests
    * @param keyStream input stream for a JSON key
-   * @return A {@code RemoteBigQueryHelper} object for the provided options.
+   * @return A {@code RemoteBigQueryHelper} object for the provided options
    * @throws BigQueryHelperException if {@code keyStream} is not a valid JSON key stream
    */
   public static RemoteBigQueryHelper create(String projectId, InputStream keyStream)
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index 798973149d20..3a4bdccd82e7 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -16,9 +16,9 @@
 
 package com.google.gcloud.bigquery;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -302,8 +302,8 @@ public void testCreateExternalTable() throws InterruptedException {
     assertEquals(createdTableInfo.tableId(), remoteTableInfo.tableId());
     assertEquals(TABLE_SCHEMA, remoteTableInfo.schema());
     QueryRequest request = QueryRequest.builder(
-        "SELECT TimestampField, StringField, IntegerField, BooleanField FROM " + DATASET + "." +
-            tableName)
+        "SELECT TimestampField, StringField, IntegerField, BooleanField FROM " + DATASET + "."
+            + tableName)
         .defaultDataset(DatasetId.of(DATASET))
         .maxWaitTime(60000L)
         .maxResults(1000L)
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
index dab6b928374a..fc5d74d0896c 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java
@@ -258,8 +258,8 @@ public static AuthCredentials createForAppEngine() {
    * variable GOOGLE_APPLICATION_CREDENTIALS.
    * 
    
    *
-   * @return the credentials instance.
-   * @throws IOException if the credentials cannot be created in the current environment.
+   * @return the credentials instance
+   * @throws IOException if the credentials cannot be created in the current environment
    */
   public static AuthCredentials createApplicationDefaults() throws IOException {
     return new ApplicationDefaultAuthCredentials();
@@ -275,7 +275,7 @@ public static AuthCredentials createApplicationDefaults() throws IOException {
    *
    * @param account id of the Service Account
    * @param privateKey private key associated to the account
-   * @return the credentials instance.
+   * @return the credentials instance
    */
   public static ServiceAccountAuthCredentials createFor(String account, PrivateKey privateKey) {
     return new ServiceAccountAuthCredentials(account, privateKey);
@@ -290,8 +290,8 @@ public static ServiceAccountAuthCredentials createFor(String account, PrivateKey
    * 
    
    *
    * @param jsonCredentialStream stream for Service Account Credentials in JSON format
-   * @return the credentials instance.
-   * @throws IOException if the credentials cannot be created from the stream.
+   * @return the credentials instance
+   * @throws IOException if the credentials cannot be created from the stream
    */
   public static ServiceAccountAuthCredentials createForJson(InputStream jsonCredentialStream)
       throws IOException {
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java
index a7edc86c0d7d..c028eaede331 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java
@@ -19,7 +19,7 @@
 /**
  * Base class for service objects.
  *
- * @param  the {@code ServiceOptions} subclass corresponding to the service.
+ * @param  the {@code ServiceOptions} subclass corresponding to the service
  */
 public abstract class BaseService>
     implements Service {
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ExceptionHandler.java b/gcloud-java-core/src/main/java/com/google/gcloud/ExceptionHandler.java
index c1f068594443..39d4c4e75a1a 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ExceptionHandler.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ExceptionHandler.java
@@ -64,7 +64,7 @@ enum RetryResult {
      * This method is called after the evaluation and could alter its result.
      *
      * @param exception the exception that is being evaluated
-     * @param retryResult the result of the evaluation so far.
+     * @param retryResult the result of the evaluation so far
      * @return {@link RetryResult} to indicate if the exception should be ignored (
      *         {@link RetryResult#RETRY}), propagated ({@link RetryResult#NO_RETRY}), or evaluation
      *         should proceed ({@link RetryResult#CONTINUE_EVALUATION}).
@@ -250,7 +250,7 @@ boolean shouldRetry(Exception ex) {
     Interceptor.RetryResult retryResult =
         retryInfo == null ? Interceptor.RetryResult.NO_RETRY : retryInfo.retry;
     for (Interceptor interceptor : interceptors) {
-      Interceptor.RetryResult interceptorRetry = 
+      Interceptor.RetryResult interceptorRetry =
           checkNotNull(interceptor.afterEval(ex, retryResult));
       if (interceptorRetry != Interceptor.RetryResult.CONTINUE_EVALUATION) {
         retryResult = interceptorRetry;
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Page.java b/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
index bb4d1f8b951e..53f3a3842a18 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
@@ -41,7 +41,7 @@
  *   page = page.nextPage();
  * }}
  *
- * @param  the value type that the page holds.
+ * @param  the value type that the page holds
  */
 public interface Page {
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
index 9524aaa4c69b..9ebf7f0f24e8 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -26,7 +26,7 @@
 /**
  * Base implementation for Google Cloud paginated results.
  *
- * @param  the value type that the page holds.
+ * @param  the value type that the page holds
  */
 public class PageImpl implements Page, Serializable {
 
@@ -39,7 +39,7 @@ public class PageImpl implements Page, Serializable {
   /**
    * Interface for fetching the next page of results from the service.
    *
-   * @param  the value type that the page holds.
+   * @param  the value type that the page holds
    */
   public interface NextPageFetcher extends Serializable {
     Page nextPage();
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
index fdac020331ed..90633c70046f 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
@@ -34,7 +34,7 @@
  * ...
  * }
  *
- * @param  the restorable object's type.
+ * @param  the restorable object's type
  */
 public interface Restorable> {
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java b/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java
index 18e9d8bc502e..d6ce736ae856 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java
@@ -23,7 +23,7 @@
  * Implementations of this class must implement {@link java.io.Serializable} to ensure that the
  * state of a the object can be correctly serialized.
  *
- * @param  the restored object's type.
+ * @param  the restored object's type
  */
 public interface RestorableState> {
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Service.java b/gcloud-java-core/src/main/java/com/google/gcloud/Service.java
index b54705b9f0af..60bc26670f2e 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Service.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Service.java
@@ -19,7 +19,7 @@
 /**
  * Interface for service objects.
  *
- * @param  the {@code ServiceOptions} subclass corresponding to the service.
+ * @param  the {@code ServiceOptions} subclass corresponding to the service
  */
 public interface Service> {
   OptionsT options();
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java
index 6226fdb504c3..1727e9c3976f 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java
@@ -22,8 +22,8 @@
  * 
    Implementation must provide a public no-arg constructor.
  * Loading of a factory implementation is done via {@link java.util.ServiceLoader}.
  *
- * @param  the service subclass.
- * @param  the {@code ServiceOptions} subclass corresponding to the service.
+ * @param  the service subclass
+ * @param  the {@code ServiceOptions} subclass corresponding to the service
  */
 @SuppressWarnings("rawtypes")
 public interface ServiceFactory {
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 588c041eb602..6ed1d50ba364 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -56,9 +56,9 @@
 /**
  * Abstract class representing service options.
  *
- * @param  the service subclass.
- * @param  the spi-layer class corresponding to the service.
- * @param  the {@code ServiceOptions} subclass corresponding to the service.
+ * @param  the service subclass
+ * @param  the spi-layer class corresponding to the service
+ * @param  the {@code ServiceOptions} subclass corresponding to the service
  */
 public abstract class ServiceOptions, ServiceRpcT,
     OptionsT extends ServiceOptions> implements Serializable {
@@ -160,10 +160,10 @@ private Object readResolve() throws ObjectStreamException {
   /**
    * Builder for {@code ServiceOptions}.
    *
-   * @param  the service subclass.
-   * @param  the spi-layer class corresponding to the service.
-   * @param  the {@code ServiceOptions} subclass corresponding to the service.
-   * @param  the {@code ServiceOptions} builder.
+   * @param  the service subclass
+   * @param  the spi-layer class corresponding to the service
+   * @param  the {@code ServiceOptions} subclass corresponding to the service
+   * @param  the {@code ServiceOptions} builder
    */
   protected abstract static class Builder, ServiceRpcT,
       OptionsT extends ServiceOptions,
@@ -215,7 +215,7 @@ public B serviceFactory(ServiceFactory serviceFactory) {
      * replaced by Java8's {@code java.time.Clock}.
      *
      * @param clock the clock to set
-     * @return the builder.
+     * @return the builder
      */
     public B clock(Clock clock) {
       this.clock = clock;
@@ -225,7 +225,7 @@ public B clock(Clock clock) {
     /**
      * Sets project id.
      *
-     * @return the builder.
+     * @return the builder
      */
     public B projectId(String projectId) {
       this.projectId = projectId;
@@ -235,7 +235,7 @@ public B projectId(String projectId) {
     /**
      * Sets service host.
      *
-     * @return the builder.
+     * @return the builder
      */
     public B host(String host) {
       this.host = host;
@@ -245,7 +245,7 @@ public B host(String host) {
     /**
      * Sets the transport factory.
      *
-     * @return the builder.
+     * @return the builder
      */
     public B httpTransportFactory(HttpTransportFactory httpTransportFactory) {
       this.httpTransportFactory = httpTransportFactory;
@@ -255,7 +255,7 @@ public B httpTransportFactory(HttpTransportFactory httpTransportFactory) {
     /**
      * Sets the service authentication credentials.
      *
-     * @return the builder.
+     * @return the builder
      */
     public B authCredentials(AuthCredentials authCredentials) {
       this.authCredentials = authCredentials;
@@ -266,7 +266,7 @@ public B authCredentials(AuthCredentials authCredentials) {
      * Sets configuration parameters for request retries. If no configuration is set
      * {@link RetryParams#noRetries()} is used.
      *
-     * @return the builder.
+     * @return the builder
      */
     public B retryParams(RetryParams retryParams) {
       this.retryParams = retryParams;
@@ -288,7 +288,7 @@ public B serviceRpcFactory(ServiceRpcFactory serviceRpcFa
      *
      * @param connectTimeout connection timeout in milliseconds. 0 for an infinite timeout, a
      *        negative number for the default value (20000).
-     * @return the builder.
+     * @return the builder
      */
     public B connectTimeout(int connectTimeout) {
       this.connectTimeout = connectTimeout;
@@ -300,7 +300,7 @@ public B connectTimeout(int connectTimeout) {
      *
      * @param readTimeout read timeout in milliseconds. 0 for an infinite timeout, a negative number
      *        for the default value (20000).
-     * @return the builder.
+     * @return the builder
      */
     public B readTimeout(int readTimeout) {
       this.readTimeout = readTimeout;
@@ -341,7 +341,7 @@ protected ServiceOptions(Class> ser
    * Returns whether a service requires a project ID. This method may be overridden in
    * service-specific Options objects.
    *
-   * @return true if a project ID is required to use the service, false if not.
+   * @return true if a project ID is required to use the service, false if not
    */
   protected boolean projectIdRequired() {
     return true;
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index fa9eb22bf6fa..50b6451a71a0 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -44,7 +44,7 @@ See the [Authentication](https://github.com/GoogleCloudPlatform/gcloud-java#auth
 About Google Cloud Datastore
 ----------------------------
 
-Google [Cloud Datastore][cloud-datastore] is a fully managed, schemaless database for
+Google [Cloud Datastore][cloud-datastore-docs] is a fully managed, schemaless database for
 storing non-relational data. Cloud Datastore automatically scales with
 your users and supports ACID transactions, high availability of reads and
 writes, strong consistency for reads and ancestor queries, and eventual
@@ -77,7 +77,7 @@ Datastore datastore = DatastoreOptions.defaultInstance().service();
 For other authentication options, see the [Authentication](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) page.
 
 #### Storing data
-Objects in Datastore are known as entities. Entities are grouped by "kind" and have keys for easy access. In this code snippet, we will create a new entity representing a person and store that data by the person's name.  First, add the following imports at the top of your file:
+Objects in Datastore are known as entities. Entities are grouped by "kind" and have keys for easy access. In this code snippet, we will create a new entity representing a person and store that data by the person's email.  First, add the following imports at the top of your file:
 
 ```java
 import com.google.gcloud.datastore.Entity;
@@ -89,8 +89,9 @@ Then add the following code to put an entity in Datastore.
 
 ```java
 KeyFactory keyFactory = datastore.newKeyFactory().kind("Person");
-Key key = keyFactory.newKey("John Doe");
+Key key = keyFactory.newKey("john.doe@gmail.com");
 Entity entity = Entity.builder(key)
+    .set("name", "John Doe")
     .set("age", 51)
     .set("favorite_food", "pizza")
     .build();
@@ -125,6 +126,7 @@ Query query = Query.entityQueryBuilder()
 QueryResults results = datastore.run(query);
 while (results.hasNext()) {
   Entity currentEntity = results.next();
+  System.out.println(currentEntity.getString("name") + ", you're invited to a pizza party!");
 }
 ```
 
@@ -132,7 +134,7 @@ Cloud Datastore relies on indexing to run queries. Indexing is turned on by defa
 
 #### Complete source code
 
-Here we put together all the code shown above into one program.  This program assumes that you are running on Compute Engine or from your own desktop. To run this example on App Engine, simply move the code from the main method to your application's servlet class.
+Here we put together all the code shown above into one program.  This program assumes that you are running on Compute Engine or from your own desktop. To run this example on App Engine, move this code to your application's servlet class and print the query output to the webpage instead of `System.out`.
 
 ```java
 import com.google.gcloud.datastore.Datastore;
@@ -145,7 +147,7 @@ import com.google.gcloud.datastore.QueryResults;
 import com.google.gcloud.datastore.StructuredQuery;
 import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
 
-public class GcloudJavaDatastoreExample {
+public class GcloudDatastoreExample {
 
   public static void main(String[] args) {
     // Create datastore service object.
@@ -154,8 +156,9 @@ public class GcloudJavaDatastoreExample {
 
     // Add an entity to Datastore
     KeyFactory keyFactory = datastore.newKeyFactory().kind("Person");
-    Key key = keyFactory.newKey("John Doe");
+    Key key = keyFactory.newKey("john.doe@gmail.com");
     Entity entity = Entity.builder(key)
+        .set("name", "John Doe")
         .set("age", 51)
         .set("favorite_food", "pizza")
         .build();
@@ -165,13 +168,15 @@ public class GcloudJavaDatastoreExample {
     Entity johnEntity = datastore.get(key);
 
     // Add a couple more entities to make the query results more interesting
-    Key janeKey = keyFactory.newKey("Jane Doe");
+    Key janeKey = keyFactory.newKey("jane.doe@gmail.com");
     Entity janeEntity = Entity.builder(janeKey)
+        .set("name", "Jane Doe")
         .set("age", 44)
         .set("favorite_food", "pizza")
         .build();
-    Key joeKey = keyFactory.newKey("Joe Shmoe");
+    Key joeKey = keyFactory.newKey("joe.shmoe@gmail.com");
     Entity joeEntity = Entity.builder(joeKey)
+        .set("name", "Joe Shmoe")
         .set("age", 27)
         .set("favorite_food", "sushi")
         .build();
@@ -185,7 +190,7 @@ public class GcloudJavaDatastoreExample {
     QueryResults results = datastore.run(query);
     while (results.hasNext()) {
       Entity currentEntity = results.next();
-      // Do something using the entity.  (e.g. send an invite a pizza party)
+      System.out.println(currentEntity.getString("name") + ", you're invited to a pizza party!");
     }
   }
 }
@@ -237,8 +242,6 @@ Apache 2.0 - See [LICENSE] for more information.
 [LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
 [TESTING]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/TESTING.md#testing-code-that-uses-datastore
 [cloud-platform]: https://cloud.google.com/
-[cloud-datastore]: https://cloud.google.com/datastore/docs
 [cloud-datastore-docs]: https://cloud.google.com/datastore/docs
 [cloud-datastore-activation]: https://cloud.google.com/datastore/docs/activate
 [datastore-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/datastore/package-summary.html
-
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java
index ea8c6f5af6ff..d674a5e242ad 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java
@@ -243,7 +243,7 @@ public boolean contains(String name) {
   /**
    * Returns the {@link Value} for the given property {@code name}.
    *
-   * @throws DatastoreException if not such property.
+   * @throws DatastoreException if not such property
    */
   public > V getValue(String name) {
     @SuppressWarnings("unchecked")
@@ -257,7 +257,7 @@ public > V getValue(String name) {
   /**
    * Returns true if property is an instance of NullValue.
    *
-   * @throws DatastoreException if not such property.
+   * @throws DatastoreException if not such property
    */
   public boolean isNull(String name) {
     return getValue(name) instanceof NullValue;
@@ -267,8 +267,8 @@ public boolean isNull(String name) {
   /**
    * Returns the property value as a string.
    *
-   * @throws DatastoreException if not such property.
-   * @throws ClassCastException if value is not a string.
+   * @throws DatastoreException if not such property
+   * @throws ClassCastException if value is not a string
    */
   @SuppressWarnings("unchecked")
   public String getString(String name) {
@@ -278,8 +278,8 @@ public String getString(String name) {
   /**
    * Returns the property value as long.
    *
-   * @throws DatastoreException if not such property.
-   * @throws ClassCastException if value is not a long.
+   * @throws DatastoreException if not such property
+   * @throws ClassCastException if value is not a long
    */
   @SuppressWarnings("unchecked")
   public long getLong(String name) {
@@ -289,8 +289,8 @@ public long getLong(String name) {
   /**
    * Returns the property value as a double.
    *
-   * @throws DatastoreException if not such property.
-   * @throws ClassCastException if value is not a double.
+   * @throws DatastoreException if not such property
+   * @throws ClassCastException if value is not a double
    */
   @SuppressWarnings("unchecked")
   public double getDouble(String name) {
@@ -300,8 +300,8 @@ public double getDouble(String name) {
   /**
    * Returns the property value as a boolean.
    *
-   * @throws DatastoreException if not such property.
-   * @throws ClassCastException if value is not a boolean.
+   * @throws DatastoreException if not such property
+   * @throws ClassCastException if value is not a boolean
    */
   @SuppressWarnings("unchecked")
   public boolean getBoolean(String name) {
@@ -311,8 +311,8 @@ public boolean getBoolean(String name) {
   /**
    * Returns the property value as a DateTime.
    *
-   * @throws DatastoreException if not such property.
-   * @throws ClassCastException if value is not a DateTime.
+   * @throws DatastoreException if not such property
+   * @throws ClassCastException if value is not a DateTime
    */
   @SuppressWarnings("unchecked")
   public DateTime getDateTime(String name) {
@@ -322,8 +322,8 @@ public DateTime getDateTime(String name) {
   /**
    * Returns the property value as a Key.
    *
-   * @throws DatastoreException if not such property.
-   * @throws ClassCastException if value is not a Key.
+   * @throws DatastoreException if not such property
+   * @throws ClassCastException if value is not a Key
    */
   @SuppressWarnings("unchecked")
   public Key getKey(String name) {
@@ -333,8 +333,8 @@ public Key getKey(String name) {
   /**
    * Returns the property value as an entity.
    *
-   * @throws DatastoreException if not such property.
-   * @throws ClassCastException if value is not an entity.
+   * @throws DatastoreException if not such property
+   * @throws ClassCastException if value is not an entity
    */
   @SuppressWarnings("unchecked")
   public  FullEntity getEntity(String name) {
@@ -344,8 +344,8 @@ public  FullEntity getEntity(String name) {
   /**
    * Returns the property value as a list of values.
    *
-   * @throws DatastoreException if not such property.
-   * @throws ClassCastException if value is not a list of values.
+   * @throws DatastoreException if not such property
+   * @throws ClassCastException if value is not a list of values
    */
   @SuppressWarnings("unchecked")
   public List> getList(String name) {
@@ -355,8 +355,8 @@ public List> getList(String name) {
   /**
    * Returns the property value as a blob.
    *
-   * @throws DatastoreException if not such property.
-   * @throws ClassCastException if value is not a blob.
+   * @throws DatastoreException if not such property
+   * @throws ClassCastException if value is not a blob
    */
   @SuppressWarnings("unchecked")
   public Blob getBlob(String name) {
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java
index 299deab3e964..42a98e60b5e6 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java
@@ -109,7 +109,7 @@ public InputStream asInputStream() {
    *
    * @throws java.nio.ReadOnlyBufferException if the target is read-only
    * @throws java.nio.BufferOverflowException if the target's remaining() space is not large
-   *        enough to hold the data.
+   *        enough to hold the data
    */
   public void copyTo(ByteBuffer target) {
     byteString.copyTo(target);
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreReader.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreReader.java
index 056895f850e3..4852dd53e16c 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreReader.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreReader.java
@@ -27,7 +27,7 @@ public interface DatastoreReader {
   /**
    * Returns an {@link Entity} for the given {@link Key} or {@code null} if does not exists.
    *
-   * @throws DatastoreException upon failure.
+   * @throws DatastoreException upon failure
    */
   Entity get(Key key);
 
@@ -38,7 +38,7 @@ public interface DatastoreReader {
    * from the returned {@code Iterator}'s {@link Iterator#hasNext hasNext} or
    * {@link Iterator#next next} methods.
    *
-   * @throws DatastoreException upon failure.
+   * @throws DatastoreException upon failure
    * @see #get(Key)
    */
   Iterator get(Key... key);
@@ -53,7 +53,7 @@ public interface DatastoreReader {
   /**
    * Submit a {@link Query} and returns its result.
    *
-   * @throws DatastoreException upon failure.
+   * @throws DatastoreException upon failure
    */
    QueryResults run(Query query);
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java
index 28f852ed5355..a440992870df 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyFactory.java
@@ -58,7 +58,7 @@ public Key newKey(long id) {
 
   /**
    * Resets the KeyFactory to its initial state.
-   * @return {@code this} for chaining.
+   * @return {@code this} for chaining
    */
   public KeyFactory reset() {
     projectId(pi);
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
index a1190c705faf..1754be4df7dc 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
@@ -58,7 +58,8 @@
  * 
  • login using gcloud SDK - {@code gcloud auth login}.
    • 
  * 
  • compile using maven - {@code mvn compile}
    • 
  * 
  • run using maven -
- * 
    {@code mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="[]
+ * 
    {@code mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample"
+ *  -Dexec.args="[]
  *  list datasets |
  *  list tables  |
  *  list jobs |
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index deaedfa7f027..3ef8f8b4cc32 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -67,7 +67,8 @@
  * 
  • login using gcloud SDK - {@code gcloud auth login}.
    • 
  * 
  • compile using maven - {@code mvn compile}
    • 
  * 
  • run using maven -
- * 
    {@code mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="[]
+ * 
    {@code mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample"
+ *  -Dexec.args="[]
  *  list [] |
  *  info [ []] |
  *  download   [local_file] |
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
index b0e3582e8606..a3ff354b4a53 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -65,9 +65,10 @@ public ResourceManager resourceManager() {
   }
 
   /**
-   * Returns a Project object with updated project information.
+   * Fetches the current project's latest information. Returns {@code null} if the job does not
+   * exist.
    *
-   * @return Project object containing the project's updated metadata or {@code null} if not found
+   * @return Project containing the project's updated metadata or {@code null} if not found
    * @throws ResourceManagerException upon failure
    */
   public Project reload() {
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
index 5d9840362037..3d658d18d28a 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
@@ -234,7 +234,7 @@ public static ProjectListOption fields(ProjectField... fields) {
    * @see Cloud
    * Resource Manager list
-   * @return {@code Page}, a page of projects.
+   * @return {@code Page}, a page of projects
    * @throws ResourceManagerException upon failure
    */
   Page list(ProjectListOption... options);
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
index 8238fd0f1959..25c763276b3b 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
@@ -539,7 +539,7 @@ public void stop() {
   /**
    * Utility method to change the lifecycle state of the specified project.
    *
-   * @return true if the lifecycle state was successfully updated, false otherwise.
+   * @return true if the lifecycle state was successfully updated, false otherwise
    */
   public synchronized boolean changeLifecycleState(String projectId, String lifecycleState) {
     checkArgument(
@@ -560,7 +560,7 @@ public synchronized boolean changeLifecycleState(String projectId, String lifecy
    * 
    This method can be used to fully remove a project (to mimic when the server completely
    * deletes a project).
    *
-   * @return true if the project was successfully deleted, false if the project didn't exist.
+   * @return true if the project was successfully deleted, false if the project didn't exist
    */
   public synchronized boolean removeProject(String projectId) {
     // Because this method is synchronized, any code that relies on non-atomic read/write operations
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index a6c04e45e6c6..85e79a8e9abf 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -960,7 +960,7 @@ public static class Builder {
       /**
        * Sets the blob to copy given bucket and blob name.
        *
-       * @return the builder.
+       * @return the builder
        */
       public Builder source(String bucket, String blob) {
         this.source = BlobId.of(bucket, blob);
@@ -970,7 +970,7 @@ public Builder source(String bucket, String blob) {
       /**
        * Sets the blob to copy given a {@link BlobId}.
        *
-       * @return the builder.
+       * @return the builder
        */
       public Builder source(BlobId source) {
         this.source = source;
@@ -980,7 +980,7 @@ public Builder source(BlobId source) {
       /**
        * Sets blob's source options.
        *
-       * @return the builder.
+       * @return the builder
        */
       public Builder sourceOptions(BlobSourceOption... options) {
         Collections.addAll(sourceOptions, options);
@@ -990,7 +990,7 @@ public Builder sourceOptions(BlobSourceOption... options) {
       /**
        * Sets blob's source options.
        *
-       * @return the builder.
+       * @return the builder
        */
       public Builder sourceOptions(Iterable options) {
         Iterables.addAll(sourceOptions, options);
@@ -1000,7 +1000,7 @@ public Builder sourceOptions(Iterable options) {
       /**
        * Sets the copy target. Target blob information is copied from source.
        *
-       * @return the builder.
+       * @return the builder
        */
       public Builder target(BlobId target) {
         this.target = BlobInfo.builder(target).build();
@@ -1012,7 +1012,7 @@ public Builder target(BlobId target) {
        * source blob information (e.g. {@code contentType}, {@code contentLanguage}). {@code
        * target.contentType} is a required field.
        *
-       * @return the builder.
+       * @return the builder
        * @throws IllegalArgumentException if {@code target.contentType} is {@code null}
        */
       public Builder target(BlobInfo target, BlobTargetOption... options)
@@ -1028,7 +1028,7 @@ public Builder target(BlobInfo target, BlobTargetOption... options)
        * source blob information (e.g. {@code contentType}, {@code contentLanguage}). {@code
        * target.contentType} is a required field.
        *
-       * @return the builder.
+       * @return the builder
        * @throws IllegalArgumentException if {@code target.contentType} is {@code null}
        */
       public Builder target(BlobInfo target, Iterable options)
@@ -1044,7 +1044,7 @@ public Builder target(BlobInfo target, Iterable options)
        * if source and target blob share the same location and storage class as copy is made with
        * one single RPC.
        *
-       * @return the builder.
+       * @return the builder
        */
       public Builder megabytesCopiedPerChunk(Long megabytesCopiedPerChunk) {
         this.megabytesCopiedPerChunk = megabytesCopiedPerChunk;
@@ -1114,7 +1114,7 @@ public Long megabytesCopiedPerChunk() {
      * @param sourceBucket name of the bucket containing the source blob
      * @param sourceBlob name of the source blob
      * @param target a {@code BlobInfo} object for the target blob
-     * @return a copy request.
+     * @return a copy request
      * @throws IllegalArgumentException if {@code target.contentType} is {@code null}
      */
     public static CopyRequest of(String sourceBucket, String sourceBlob, BlobInfo target)
@@ -1130,7 +1130,7 @@ public static CopyRequest of(String sourceBucket, String sourceBlob, BlobInfo ta
      *
      * @param sourceBlobId a {@code BlobId} object for the source blob
      * @param target a {@code BlobInfo} object for the target blob
-     * @return a copy request.
+     * @return a copy request
      * @throws IllegalArgumentException if {@code target.contentType} is {@code null}
      */
     public static CopyRequest of(BlobId sourceBlobId, BlobInfo target)
@@ -1145,7 +1145,7 @@ public static CopyRequest of(BlobId sourceBlobId, BlobInfo target)
      * @param sourceBucket name of the bucket containing both the source and the target blob
      * @param sourceBlob name of the source blob
      * @param targetBlob name of the target blob
-     * @return a copy request.
+     * @return a copy request
      */
     public static CopyRequest of(String sourceBucket, String sourceBlob, String targetBlob) {
       return CopyRequest.builder()
@@ -1160,7 +1160,7 @@ public static CopyRequest of(String sourceBucket, String sourceBlob, String targ
      * @param sourceBucket name of the bucket containing the source blob
      * @param sourceBlob name of the source blob
      * @param target a {@code BlobId} object for the target blob
-     * @return a copy request.
+     * @return a copy request
      */
     public static CopyRequest of(String sourceBucket, String sourceBlob, BlobId target) {
       return builder().source(sourceBucket, sourceBlob).target(target).build();
@@ -1171,7 +1171,7 @@ public static CopyRequest of(String sourceBucket, String sourceBlob, BlobId targ
      *
      * @param sourceBlobId a {@code BlobId} object for the source blob
      * @param targetBlob name of the target blob, in the same bucket of the source blob
-     * @return a copy request.
+     * @return a copy request
      */
     public static CopyRequest of(BlobId sourceBlobId, String targetBlob) {
       return CopyRequest.builder()
@@ -1185,7 +1185,7 @@ public static CopyRequest of(BlobId sourceBlobId, String targetBlob) {
      *
      * @param sourceBlobId a {@code BlobId} object for the source blob
      * @param targetBlobId a {@code BlobId} object for the target blob
-     * @return a copy request.
+     * @return a copy request
      */
     public static CopyRequest of(BlobId sourceBlobId, BlobId targetBlobId) {
       return CopyRequest.builder()
@@ -1206,7 +1206,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Create a new bucket.
    *
-   * @return a complete bucket information.
+   * @return a complete bucket information
    * @throws StorageException upon failure
    */
   BucketInfo create(BucketInfo bucketInfo, BucketTargetOption... options);
@@ -1214,7 +1214,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Create a new blob with no content.
    *
-   * @return a complete blob information.
+   * @return a complete blob information
    * @throws StorageException upon failure
    */
   BlobInfo create(BlobInfo blobInfo, BlobTargetOption... options);
@@ -1224,7 +1224,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    * {@link #writer} is recommended as it uses resumable upload. MD5 and CRC32C hashes of
    * {@code content} are computed and used for validating transferred data.
    *
-   * @return a complete blob information.
+   * @return a complete blob information
    * @throws StorageException upon failure
    * @see Hashes and ETags
    */
@@ -1236,7 +1236,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    * values in the given {@code blobInfo} are ignored unless requested via the
    * {@code BlobWriteOption.md5Match} and {@code BlobWriteOption.crc32cMatch} options.
    *
-   * @return a complete blob information.
+   * @return a complete blob information
    * @throws StorageException upon failure
    */
   BlobInfo create(BlobInfo blobInfo, InputStream content, BlobWriteOption... options);
@@ -1356,7 +1356,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Send a compose request.
    *
-   * @return the composed blob.
+   * @return the composed blob
    * @throws StorageException upon failure
    */
   BlobInfo compose(ComposeRequest composeRequest);
@@ -1391,7 +1391,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Reads all the bytes from a blob.
    *
-   * @return the blob's content.
+   * @return the blob's content
    * @throws StorageException upon failure
    */
   byte[] readAllBytes(String bucket, String blob, BlobSourceOption... options);
@@ -1399,7 +1399,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
   /**
    * Reads all the bytes from a blob.
    *
-   * @return the blob's content.
+   * @return the blob's content
    * @throws StorageException upon failure
    */
   byte[] readAllBytes(BlobId blob, BlobSourceOption... options);
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
index 9ec743c079e7..bd30cb173366 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
@@ -71,7 +71,7 @@ private Builder(StorageOptions options) {
      * Sets the path delimiter for the storage service.
      *
      * @param pathDelimiter the path delimiter to set
-     * @return the builder.
+     * @return the builder
      */
     public Builder pathDelimiter(String pathDelimiter) {
       this.pathDelimiter = pathDelimiter;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
index 77cb5661a614..73bd66520182 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
@@ -71,7 +71,7 @@ public StorageOptions options() {
    * @param bucket the bucket to be deleted
    * @param timeout the maximum time to wait
    * @param unit the time unit of the timeout argument
-   * @return true if deletion succeeded, false if timeout expired.
+   * @return true if deletion succeeded, false if timeout expired
    * @throws InterruptedException if the thread deleting the bucket is interrupted while waiting
    * @throws ExecutionException if an exception was thrown while deleting bucket or bucket objects
    */
@@ -100,7 +100,7 @@ public static String generateBucketName() {
    *
    * @param projectId id of the project to be used for running the tests
    * @param keyStream input stream for a JSON key
-   * @return A {@code RemoteGcsHelper} object for the provided options.
+   * @return A {@code RemoteGcsHelper} object for the provided options
    * @throws com.google.gcloud.storage.testing.RemoteGcsHelper.GcsHelperException if
    *     {@code keyStream} is not a valid JSON key stream
    */
diff --git a/src/site/resources/index.html b/src/site/resources/index.html
index 3ed496b5bbb3..9e9c877c18df 100644
--- a/src/site/resources/index.html
+++ b/src/site/resources/index.html
@@ -122,8 +122,8 @@ 
    What is it?
    
 		  
    gcloud is configured to access Google Cloud Platform
 		    services and authorize (OAuth 2.0) automatically on your behalf.
 		    Add the gcloud dependency to your project and get a private key to be
-		    up and ready to go. Better yet, if you are running on a Google
-		    Compute Engine instance, the private key is automatically detected.
+		    up and ready to go. Better yet, if you are running on Google
+		    App Engine or Compute Engine, the private key is automatically detected.
                 
 
                 
    
@@ -143,8 +143,7 @@ 
    Example: Retrieve Datastore Entries
    
 
 // Authentication is automatic inside Google Compute Engine
 // and Google App Engine.
-DatastoreOptions options = DatastoreOptions.defaultInstance();
-Datastore datastore = options.service();
+Datastore datastore = DatastoreOptions.defaultInstance().service();
 KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
 Key key = keyFactory.newKey(keyName);
 Entity entity = datastore.get(key);

From 0ae2be8512888ba6c9b29af786fe5c20fcbdd9c3 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 6 Jan 2016 13:25:18 +0100
Subject: [PATCH 263/322] Add BigQueryError field to BigQueryException and
 tests

---
 .../google/gcloud/bigquery/BigQueryError.java | 14 +++++---
 .../gcloud/bigquery/BigQueryException.java    | 15 ++++++++
 .../google/gcloud/spi/DefaultBigQueryRpc.java | 10 +++++-
 .../gcloud/bigquery/ITBigQueryTest.java       | 36 +++++++++++++++++--
 4 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java
index 2d89bccf62ea..e58f0d0b7213 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java
@@ -8,8 +8,14 @@
 import java.util.Objects;
 
 /**
- * Google Cloud BigQuery Job Error. Objects of this class represent errors occurred during the
- * execution of a BigQuery Job.
+ * Google Cloud BigQuery Error. Objects of this class represent errors encountered by the BigQuery
+ * service while executing a request. A BigQuery Job that terminated with an error has a non-null
+ * {@link JobStatus#error()}. A job can also encounter errors during its execution that do not cause
+ * the whole job to fail (see {@link JobStatus#executionErrors()}). Similarly, queries and insert
+ * all requests can cause BigQuery errors that do not mean the whole operation failed (see
+ * {@link QueryResponse#executionErrors()} and {@link InsertAllResponse#insertErrors()}). When a
+ * {@link BigQueryException} is thrown the BigQuery Error that caused it, if any, can be accessed
+ * with {@link BigQueryException#error()}.
  */
 public class BigQueryError implements Serializable {
 
@@ -34,14 +40,14 @@ public ErrorProto apply(BigQueryError error) {
   private final String debugInfo;
   private final String message;
 
-  BigQueryError(String reason, String location, String message, String debugInfo) {
+  public BigQueryError(String reason, String location, String message, String debugInfo) {
     this.reason = reason;
     this.location = location;
     this.debugInfo = debugInfo;
     this.message = message;
   }
 
-  BigQueryError(String reason, String location, String message) {
+  public BigQueryError(String reason, String location, String message) {
     this.reason = reason;
     this.location = location;
     this.message = message;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
index 020917762fa3..e92ffacd8f09 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
@@ -31,8 +31,23 @@ public class BigQueryException extends BaseServiceException {
   private static final long serialVersionUID = -5504832700512784654L;
   public static final int UNKNOWN_CODE = -1;
 
+  private final BigQueryError error;
+
   public BigQueryException(int code, String message, boolean retryable) {
+    this(code, message, retryable, null);
+  }
+
+  public BigQueryException(int code, String message, boolean retryable, BigQueryError error) {
     super(code, message, retryable);
+    this.error = error;
+  }
+
+  /**
+   * Returns the {@link BigQueryError} that caused this exception. Returns {@code null} if none
+   * exists.
+   */
+  public BigQueryError error() {
+    return error;
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
index 74d1c038a6bc..04e481b345c2 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -49,6 +49,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 
+import com.google.gcloud.bigquery.BigQueryError;
 import com.google.gcloud.bigquery.BigQueryException;
 import com.google.gcloud.bigquery.BigQueryOptions;
 
@@ -91,7 +92,14 @@ private static BigQueryException translate(IOException exception) {
 
   private static BigQueryException translate(GoogleJsonError exception) {
     boolean retryable = RETRYABLE_CODES.contains(exception.getCode());
-    return new BigQueryException(exception.getCode(), exception.getMessage(), retryable);
+    BigQueryError bigqueryError = null;
+    if (exception.getErrors() != null  && !exception.getErrors().isEmpty()) {
+      GoogleJsonError.ErrorInfo error = exception.getErrors().get(0);
+      bigqueryError = new BigQueryError(error.getReason(), error.getLocation(), error.getMessage(),
+          (String) error.get("debugInfo"));
+    }
+    return new BigQueryException(exception.getCode(), exception.getMessage(), retryable,
+        bigqueryError);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index 798973149d20..8742fd88025e 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -242,6 +243,11 @@ public void testUpdateDatasetWithSelectedFields() {
     assertTrue(bigquery.delete(OTHER_DATASET));
   }
 
+  @Test
+  public void testGetNonExistingTable() {
+    assertNull(bigquery.getTable(DATASET, "test_get_non_existing_table"));
+  }
+
   @Test
   public void testCreateAndGetTable() {
     String tableName = "test_create_and_get_table";
@@ -411,7 +417,7 @@ public void testListTables() {
   }
 
   @Test
-  public void testUdpateTable() {
+  public void testUpdateTable() {
     String tableName = "test_update_table";
     BaseTableInfo tableInfo = TableInfo.of(TableId.of(DATASET, tableName), TABLE_SCHEMA);
     BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
@@ -426,7 +432,7 @@ public void testUdpateTable() {
   }
 
   @Test
-  public void testUdpateTableWithSelectedFields() {
+  public void testUpdateTableWithSelectedFields() {
     String tableName = "test_update_with_selected_fields_table";
     BaseTableInfo tableInfo = TableInfo.of(TableId.of(DATASET, tableName), TABLE_SCHEMA);
     BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
@@ -444,6 +450,27 @@ public void testUdpateTableWithSelectedFields() {
     assertTrue(bigquery.delete(DATASET, tableName));
   }
 
+  @Test
+  public void testUpdateNonExistingTable() {
+    TableInfo tableInfo =
+        TableInfo.of(TableId.of(DATASET, "test_update_non_existing_table"), SIMPLE_SCHEMA);
+    try {
+      bigquery.update(tableInfo);
+      fail("BigQueryException was expected");
+    } catch (BigQueryException e) {
+      BigQueryError error = e.error();
+      assertNotNull(error);
+      assertEquals("notFound", error.reason());
+      assertNotNull(error.message());
+      assertNotNull(error.debugInfo());
+    }
+  }
+
+  @Test
+  public void testDeleteNonExistingTable() {
+    assertFalse(bigquery.delete(DATASET, "test_delete_non_existing_table"));
+  }
+
   @Test
   public void testInsertAll() {
     String tableName = "test_insert_all_table";
@@ -822,4 +849,9 @@ public void testCancelJob() throws InterruptedException {
     }
     assertNull(remoteJob.status().error());
   }
+
+  @Test
+  public void testCancelNonExistingJob() throws InterruptedException {
+    assertFalse(bigquery.cancel("test_cancel_non_existing_job"));
+  }
 }

From ce9b5c1d3676bca7a4687b91c8d348d30c7eccda Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 7 Jan 2016 13:11:00 -0800
Subject: [PATCH 264/322] Refactor page fetchers

---
 .../google/gcloud/bigquery/BigQueryImpl.java  | 76 +++++++++----------
 .../main/java/com/google/gcloud/PageImpl.java | 28 ++++++-
 .../resourcemanager/ResourceManagerImpl.java  | 36 ++-------
 .../google/gcloud/storage/StorageImpl.java    | 45 ++++-------
 4 files changed, 88 insertions(+), 97 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
index a65490998c17..9bc89206889b 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -38,6 +38,7 @@
 import com.google.gcloud.ExceptionHandler.Interceptor;
 import com.google.gcloud.Page;
 import com.google.gcloud.PageImpl;
+import com.google.gcloud.PageImpl.NextPageFetcher;
 import com.google.gcloud.RetryHelper;
 import com.google.gcloud.bigquery.InsertAllRequest.RowToInsert;
 import com.google.gcloud.spi.BigQueryRpc;
@@ -69,36 +70,17 @@ public RetryResult beforeEval(Exception exception) {
   static final ExceptionHandler EXCEPTION_HANDLER = ExceptionHandler.builder()
       .abortOn(RuntimeException.class).interceptor(EXCEPTION_HANDLER_INTERCEPTOR).build();
 
-  private abstract static class BasePageFetcher implements PageImpl.NextPageFetcher {
+  private static class DatasetPageFetcher implements NextPageFetcher {
 
-    private static final long serialVersionUID = -338124488600215401L;
-
-    protected final Map requestOptions;
-    protected final BigQueryOptions serviceOptions;
-
-    BasePageFetcher(BigQueryOptions serviceOptions, String cursor,
-        Map optionMap) {
-      this.serviceOptions = serviceOptions;
-      ImmutableMap.Builder builder = ImmutableMap.builder();
-      if (cursor != null) {
-        builder.put(BigQueryRpc.Option.PAGE_TOKEN, cursor);
-      }
-      for (Map.Entry option : optionMap.entrySet()) {
-        if (option.getKey() != BigQueryRpc.Option.PAGE_TOKEN) {
-          builder.put(option.getKey(), option.getValue());
-        }
-      }
-      this.requestOptions = builder.build();
-    }
-  }
-
-  private static class DatasetPageFetcher extends BasePageFetcher {
-
-    private static final long serialVersionUID = 3030824397616608646L;
+    private static final long serialVersionUID = -3057564042439021278L;
+    private final Map requestOptions;
+    private final BigQueryOptions serviceOptions;
 
     DatasetPageFetcher(BigQueryOptions serviceOptions, String cursor,
         Map optionMap) {
-      super(serviceOptions, cursor, optionMap);
+      this.requestOptions =
+          PageImpl.nextRequestOptions(BigQueryRpc.Option.PAGE_TOKEN, cursor, optionMap);
+      this.serviceOptions = serviceOptions;
     }
 
     @Override
@@ -107,14 +89,18 @@ public Page nextPage() {
     }
   }
 
-  private static class TablePageFetcher extends BasePageFetcher {
+  private static class TablePageFetcher implements NextPageFetcher {
 
-    private static final long serialVersionUID = 5908129355985236115L;
+    private static final long serialVersionUID = 8611248840504201187L;
+    private final Map requestOptions;
+    private final BigQueryOptions serviceOptions;
     private final String dataset;
 
     TablePageFetcher(String dataset, BigQueryOptions serviceOptions, String cursor,
         Map optionMap) {
-      super(serviceOptions, cursor, optionMap);
+      this.requestOptions =
+          PageImpl.nextRequestOptions(BigQueryRpc.Option.PAGE_TOKEN, cursor, optionMap);
+      this.serviceOptions = serviceOptions;
       this.dataset = dataset;
     }
 
@@ -124,13 +110,17 @@ public Page nextPage() {
     }
   }
 
-  private static class JobPageFetcher extends BasePageFetcher {
+  private static class JobPageFetcher implements NextPageFetcher {
 
-    private static final long serialVersionUID = -4984845360519279880L;
+    private static final long serialVersionUID = 8536533282558245472L;
+    private final Map requestOptions;
+    private final BigQueryOptions serviceOptions;
 
     JobPageFetcher(BigQueryOptions serviceOptions, String cursor,
         Map optionMap) {
-      super(serviceOptions, cursor, optionMap);
+      this.requestOptions =
+          PageImpl.nextRequestOptions(BigQueryRpc.Option.PAGE_TOKEN, cursor, optionMap);
+      this.serviceOptions = serviceOptions;
     }
 
     @Override
@@ -139,14 +129,18 @@ public Page nextPage() {
     }
   }
 
-  private static class TableDataPageFetcher extends BasePageFetcher> {
+  private static class TableDataPageFetcher implements NextPageFetcher> {
 
-    private static final long serialVersionUID = 1281938239570262432L;
+    private static final long serialVersionUID = -8501991114794410114L;
+    private final Map requestOptions;
+    private final BigQueryOptions serviceOptions;
     private final TableId table;
 
     TableDataPageFetcher(TableId table, BigQueryOptions serviceOptions, String cursor,
         Map optionMap) {
-      super(serviceOptions, cursor, optionMap);
+      this.requestOptions =
+          PageImpl.nextRequestOptions(BigQueryRpc.Option.PAGE_TOKEN, cursor, optionMap);
+      this.serviceOptions = serviceOptions;
       this.table = table;
     }
 
@@ -156,15 +150,19 @@ public Page> nextPage() {
     }
   }
 
-  private static class QueryResultsPageFetcherImpl extends BasePageFetcher>
-      implements QueryResult.QueryResultsPageFetcher {
+  private static class QueryResultsPageFetcherImpl
+      implements NextPageFetcher>, QueryResult.QueryResultsPageFetcher {
 
-    private static final long serialVersionUID = 6713948754731557486L;
+    private static final long serialVersionUID = -9198905840550459803L;
+    private final Map requestOptions;
+    private final BigQueryOptions serviceOptions;
     private final JobId job;
 
     QueryResultsPageFetcherImpl(JobId job, BigQueryOptions serviceOptions, String cursor,
         Map optionMap) {
-      super(serviceOptions, cursor, optionMap);
+      this.requestOptions =
+          PageImpl.nextRequestOptions(BigQueryRpc.Option.PAGE_TOKEN, cursor, optionMap);
+      this.serviceOptions = serviceOptions;
       this.job = job;
     }
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
index 9524aaa4c69b..e2623fca7cd5 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -17,10 +17,12 @@
 package com.google.gcloud;
 
 import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.ImmutableMap;
 
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -85,7 +87,7 @@ public Iterable values() {
 
   @Override
   public Iterator iterateAll() {
-    return new PageIterator(this);
+    return new PageIterator<>(this);
   }
 
   @Override
@@ -115,4 +117,28 @@ public boolean equals(Object obj) {
     return Objects.equals(cursor, other.cursor)
         && Objects.equals(results, other.results);
   }
+
+  /**
+   * Utility method to construct the options map for the next page request.
+   *
+   * @param  the value type that the page holds. Instances of {@code T} should be
+   *     {@code Serializable}
+   * @param pageTokenOption the key for the next page cursor option in the options map
+   * @param cursor the cursor for the next page
+   * @param optionMap the previous options map
+   * @return the options map for the next page request
+   */
+  public static  Map nextRequestOptions(
+      T pageTokenOption, String cursor, Map optionMap) {
+    ImmutableMap.Builder builder = ImmutableMap.builder();
+    if (cursor != null) {
+      builder.put(pageTokenOption, cursor);
+    }
+    for (Map.Entry option : optionMap.entrySet()) {
+      if (!Objects.equals(option.getKey(), pageTokenOption)) {
+        builder.put(option.getKey(), option.getValue());
+      }
+    }
+    return builder.build();
+  }
 }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
index 9ae8c976631b..2a0e09d9fb31 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
@@ -29,11 +29,11 @@
 import com.google.gcloud.ExceptionHandler.Interceptor;
 import com.google.gcloud.Page;
 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 java.io.Serializable;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
@@ -117,37 +117,17 @@ public com.google.api.services.cloudresourcemanager.model.Project call() {
     }
   }
 
-  private abstract static class BasePageFetcher
-      implements PageImpl.NextPageFetcher {
+  private static class ProjectPageFetcher implements NextPageFetcher {
 
-    private static final long serialVersionUID = -5560906434575940205L;
-
-    protected final Map requestOptions;
-    protected final ResourceManagerOptions serviceOptions;
-
-    BasePageFetcher(ResourceManagerOptions serviceOptions, String cursor,
-        Map optionMap) {
-      this.serviceOptions = serviceOptions;
-      ImmutableMap.Builder builder = ImmutableMap.builder();
-      if (cursor != null) {
-        builder.put(ResourceManagerRpc.Option.PAGE_TOKEN, cursor);
-      }
-      for (Map.Entry option : optionMap.entrySet()) {
-        if (option.getKey() != ResourceManagerRpc.Option.PAGE_TOKEN) {
-          builder.put(option.getKey(), option.getValue());
-        }
-      }
-      this.requestOptions = builder.build();
-    }
-  }
-
-  private static class ProjectPageFetcher extends BasePageFetcher {
-
-    private static final long serialVersionUID = -533306655445189098L;
+    private static final long serialVersionUID = 2158209410430566961L;
+    private final Map requestOptions;
+    private final ResourceManagerOptions serviceOptions;
 
     ProjectPageFetcher(ResourceManagerOptions serviceOptions, String cursor,
         Map optionMap) {
-      super(serviceOptions, cursor, optionMap);
+      this.requestOptions =
+          PageImpl.nextRequestOptions(ResourceManagerRpc.Option.PAGE_TOKEN, cursor, optionMap);
+      this.serviceOptions = serviceOptions;
     }
 
     @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 85e0b02025af..93fc202febef 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -48,6 +48,7 @@
 import com.google.gcloud.ExceptionHandler.Interceptor;
 import com.google.gcloud.Page;
 import com.google.gcloud.PageImpl;
+import com.google.gcloud.PageImpl.NextPageFetcher;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.RewriteResponse;
@@ -209,36 +210,18 @@ public BlobInfo get(BlobId blob) {
     return get(blob, new BlobGetOption[0]);
   }
 
-  private abstract static class BasePageFetcher
-      implements PageImpl.NextPageFetcher {
+  private static class BucketPageFetcher implements NextPageFetcher {
 
-    private static final long serialVersionUID = 8236329004030295223L;
-    protected final Map requestOptions;
-    protected final StorageOptions serviceOptions;
+    private static final long serialVersionUID = 5850406828803613729L;
+    private final Map requestOptions;
+    private final StorageOptions serviceOptions;
 
-    BasePageFetcher(StorageOptions serviceOptions, String cursor,
+    BucketPageFetcher(
+        StorageOptions serviceOptions, String cursor,
         Map optionMap) {
+      this.requestOptions =
+          PageImpl.nextRequestOptions(StorageRpc.Option.PAGE_TOKEN, cursor, optionMap);
       this.serviceOptions = serviceOptions;
-      ImmutableMap.Builder builder = ImmutableMap.builder();
-      if (cursor != null) {
-        builder.put(StorageRpc.Option.PAGE_TOKEN, cursor);
-      }
-      for (Map.Entry option : optionMap.entrySet()) {
-        if (option.getKey() != StorageRpc.Option.PAGE_TOKEN) {
-          builder.put(option.getKey(), option.getValue());
-        }
-      }
-      this.requestOptions = builder.build();
-    }
-  }
-
-  private static class BucketPageFetcher extends BasePageFetcher {
-
-    private static final long serialVersionUID = -5490616010200159174L;
-
-    BucketPageFetcher(StorageOptions serviceOptions, String cursor,
-        Map optionMap) {
-      super(serviceOptions, cursor, optionMap);
     }
 
     @Override
@@ -247,14 +230,18 @@ public Page nextPage() {
     }
   }
 
-  private static class BlobPageFetcher extends BasePageFetcher {
+  private static class BlobPageFetcher implements NextPageFetcher {
 
-    private static final long serialVersionUID = -5490616010200159174L;
+    private static final long serialVersionUID = 81807334445874098L;
+    private final Map requestOptions;
+    private final StorageOptions serviceOptions;
     private final String bucket;
 
     BlobPageFetcher(String bucket, StorageOptions serviceOptions, String cursor,
         Map optionMap) {
-      super(serviceOptions, cursor, optionMap);
+      this.requestOptions =
+          PageImpl.nextRequestOptions(StorageRpc.Option.PAGE_TOKEN, cursor, optionMap);
+      this.serviceOptions = serviceOptions;
       this.bucket = bucket;
     }
 

From 96783713e323ba9470210bb96f54eb33f21f019c Mon Sep 17 00:00:00 2001
From: Arie Ozarov 
Date: Thu, 7 Jan 2016 20:11:55 -0800
Subject: [PATCH 265/322] mark bigquery and resource manager as alpha

---
 README.md                             | 10 +++++-----
 gcloud-java-bigquery/README.md        |  4 ++--
 gcloud-java-resourcemanager/README.md |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index e3c810b200f2..e566256ecfe7 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,9 @@ Java idiomatic client for [Google Cloud Platform][cloud-platform] services.
 
 This client supports the following Google Cloud Platform services:
 
--  [Google Cloud BigQuery] (#google-cloud-bigquery)
+-  [Google Cloud BigQuery] (#google-cloud-bigquery-alpha) (Alpha)
 -  [Google Cloud Datastore] (#google-cloud-datastore)
--  [Google Cloud Resource Manager] (#google-cloud-resource-manager)
+-  [Google Cloud Resource Manager] (#google-cloud-resource-manager-alpha) (Alpha)
 -  [Google Cloud Storage] (#google-cloud-storage)
 
 > Note: This client is a work-in-progress, and may occasionally
@@ -109,7 +109,7 @@ Next, choose a method for authenticating API requests from within your project:
 4. Google Cloud SDK credentials
 5. Compute Engine credentials
 
-Google Cloud BigQuery
+Google Cloud BigQuery (Alpha)
 ----------------------
 
 - [API Documentation][bigquery-api]
@@ -194,7 +194,7 @@ if (entity == null) {
 }
 ```
 
-Google Cloud Resource Manager
+Google Cloud Resource Manager (Alpha)
 ----------------------
 
 - [API Documentation][resourcemanager-api]
@@ -329,4 +329,4 @@ Apache 2.0 - See [LICENSE] for more information.
 
 [cloud-bigquery]: https://cloud.google.com/bigquery/
 [cloud-bigquery-docs]: https://cloud.google.com/bigquery/docs/overview
-[bigquery-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/bigquery/package-summary.html
\ No newline at end of file
+[bigquery-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/bigquery/package-summary.html
diff --git a/gcloud-java-bigquery/README.md b/gcloud-java-bigquery/README.md
index 7fe65b5600c2..5456a01a5d71 100644
--- a/gcloud-java-bigquery/README.md
+++ b/gcloud-java-bigquery/README.md
@@ -1,4 +1,4 @@
-Google Cloud Java Client for BigQuery
+Google Cloud Java Client for BigQuery (Alpha)
 ====================================
 
 Java idiomatic client for [Google Cloud BigQuery] (https://cloud.google.com/bigquery).
@@ -327,4 +327,4 @@ Apache 2.0 - See [LICENSE] for more information.
 
 [cloud-bigquery]: https://cloud.google.com/bigquery/
 [cloud-storage]: https://cloud.google.com/storage/
-[bigquery-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/bigquery/package-summary.html
\ No newline at end of file
+[bigquery-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/bigquery/package-summary.html
diff --git a/gcloud-java-resourcemanager/README.md b/gcloud-java-resourcemanager/README.md
index f047df17515f..2eb4b3bdf44e 100644
--- a/gcloud-java-resourcemanager/README.md
+++ b/gcloud-java-resourcemanager/README.md
@@ -1,4 +1,4 @@
-Google Cloud Java Client for Resource Manager
+Google Cloud Java Client for Resource Manager (Alpha)
 =============================================
 
 Java idiomatic client for [Google Cloud Resource Manager] (https://cloud.google.com/resource-manager/).

From 1ab0ac5106b384f90868b726be933230fefab4cd Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 8 Jan 2016 12:23:35 +0100
Subject: [PATCH 266/322] Rename load to get in functional classes

---
 README.md                                     |  2 +-
 .../com/google/gcloud/bigquery/Dataset.java   |  4 +-
 .../java/com/google/gcloud/bigquery/Job.java  |  4 +-
 .../com/google/gcloud/bigquery/Table.java     |  8 ++--
 .../google/gcloud/bigquery/DatasetTest.java   | 12 +++---
 .../com/google/gcloud/bigquery/JobTest.java   | 12 +++---
 .../com/google/gcloud/bigquery/TableTest.java | 24 +++++------
 .../gcloud/examples/StorageExample.java       | 12 +++---
 .../gcloud/resourcemanager/Project.java       |  6 +--
 .../gcloud/resourcemanager/ProjectTest.java   |  6 +--
 .../java/com/google/gcloud/storage/Blob.java  | 43 ++++++++++++++-----
 .../com/google/gcloud/storage/Bucket.java     |  4 +-
 .../google/gcloud/storage/package-info.java   |  2 +-
 .../com/google/gcloud/storage/BlobTest.java   | 40 +++++++++--------
 .../com/google/gcloud/storage/BucketTest.java | 12 +++---
 15 files changed, 110 insertions(+), 81 deletions(-)

diff --git a/README.md b/README.md
index e3c810b200f2..7aab454137b4 100644
--- a/README.md
+++ b/README.md
@@ -250,7 +250,7 @@ import java.nio.channels.WritableByteChannel;
 
 Storage storage = StorageOptions.defaultInstance().service();
 BlobId blobId = BlobId.of("bucket", "blob_name");
-Blob blob = Blob.load(storage, blobId);
+Blob blob = Blob.get(storage, blobId);
 if (blob == null) {
   BlobInfo blobInfo = BlobInfo.builder(blobId).contentType("text/plain").build();
   storage.create(blobInfo, "Hello, Cloud Storage!".getBytes(UTF_8));
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
index d3db421619c4..facf5e659f99 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
@@ -131,7 +131,7 @@ public Dataset(BigQuery bigquery, DatasetInfo info) {
    * @return the {@code Dataset} object or {@code null} if not found
    * @throws BigQueryException upon failure
    */
-  public static Dataset load(BigQuery bigquery, String dataset, BigQuery.DatasetOption... options) {
+  public static Dataset get(BigQuery bigquery, String dataset, BigQuery.DatasetOption... options) {
     DatasetInfo info = bigquery.getDataset(dataset, options);
     return info != null ? new Dataset(bigquery, info) : null;
   }
@@ -162,7 +162,7 @@ public boolean exists() {
    * @throws BigQueryException upon failure
    */
   public Dataset reload(BigQuery.DatasetOption... options) {
-    return Dataset.load(bigquery, info.datasetId().dataset(), options);
+    return Dataset.get(bigquery, info.datasetId().dataset(), options);
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
index e6de2a9d7a4a..c0d7ddc29c37 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
@@ -52,7 +52,7 @@ public Job(BigQuery bigquery, JobInfo info) {
    * @return the {@code Job} object or {@code null} if not found
    * @throws BigQueryException upon failure
    */
-  public static Job load(BigQuery bigquery, String job, BigQuery.JobOption... options) {
+  public static Job get(BigQuery bigquery, String job, BigQuery.JobOption... options) {
     JobInfo info = bigquery.getJob(job, options);
     return info != null ? new Job(bigquery, info) : null;
   }
@@ -103,7 +103,7 @@ public boolean isDone() {
    * @throws BigQueryException upon failure
    */
   public Job reload(BigQuery.JobOption... options) {
-    return Job.load(bigquery, info.jobId().job(), options);
+    return Job.get(bigquery, info.jobId().job(), options);
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
index fd9a96e132b6..1662f266b5ec 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
@@ -61,9 +61,9 @@ public Table(BigQuery bigquery, BaseTableInfo info) {
    * @return the {@code Table} object or {@code null} if not found
    * @throws BigQueryException upon failure
    */
-  public static Table load(BigQuery bigquery, String dataset, String table,
+  public static Table get(BigQuery bigquery, String dataset, String table,
       BigQuery.TableOption... options) {
-    return load(bigquery, TableId.of(dataset, table), options);
+    return get(bigquery, TableId.of(dataset, table), options);
   }
 
   /**
@@ -76,7 +76,7 @@ public static Table load(BigQuery bigquery, String dataset, String table,
    * @return the {@code Table} object or {@code null} if not found
    * @throws BigQueryException upon failure
    */
-  public static Table load(BigQuery bigquery, TableId table, BigQuery.TableOption... options) {
+  public static Table get(BigQuery bigquery, TableId table, BigQuery.TableOption... options) {
     BaseTableInfo info = bigquery.getTable(table, options);
     return info != null ? new Table(bigquery, info) : null;
   }
@@ -106,7 +106,7 @@ public boolean exists() {
    * @throws BigQueryException upon failure
    */
   public Table reload(BigQuery.TableOption... options) {
-    return Table.load(bigquery, info.tableId(), options);
+    return Table.get(bigquery, info.tableId(), options);
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
index 05be4df39773..544fc2378b23 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
@@ -304,27 +304,27 @@ public void testCreateExternalTableWithOptions() throws Exception {
   }
 
   @Test
-  public void testLoad() throws Exception {
+  public void testStaticGet() throws Exception {
     expect(bigquery.getDataset(DATASET_INFO.datasetId().dataset())).andReturn(DATASET_INFO);
     replay(bigquery);
-    Dataset loadedDataset = Dataset.load(bigquery, DATASET_INFO.datasetId().dataset());
+    Dataset loadedDataset = Dataset.get(bigquery, DATASET_INFO.datasetId().dataset());
     assertNotNull(loadedDataset);
     assertEquals(DATASET_INFO, loadedDataset.info());
   }
 
   @Test
-  public void testLoadNull() throws Exception {
+  public void testStaticGetNull() throws Exception {
     expect(bigquery.getDataset(DATASET_INFO.datasetId().dataset())).andReturn(null);
     replay(bigquery);
-    assertNull(Dataset.load(bigquery, DATASET_INFO.datasetId().dataset()));
+    assertNull(Dataset.get(bigquery, DATASET_INFO.datasetId().dataset()));
   }
 
   @Test
-  public void testLoadWithOptions() throws Exception {
+  public void testStaticGetWithOptions() throws Exception {
     expect(bigquery.getDataset(DATASET_INFO.datasetId().dataset(), BigQuery.DatasetOption.fields()))
         .andReturn(DATASET_INFO);
     replay(bigquery);
-    Dataset loadedDataset = Dataset.load(bigquery, DATASET_INFO.datasetId().dataset(),
+    Dataset loadedDataset = Dataset.get(bigquery, DATASET_INFO.datasetId().dataset(),
         BigQuery.DatasetOption.fields());
     assertNotNull(loadedDataset);
     assertEquals(DATASET_INFO, loadedDataset.info());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
index d99176b6904c..6a5cef6508cc 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
@@ -148,27 +148,27 @@ public void testCancel() throws Exception {
   }
 
   @Test
-  public void testLoad() throws Exception {
+  public void testGet() throws Exception {
     expect(bigquery.getJob(JOB_INFO.jobId().job())).andReturn(JOB_INFO);
     replay(bigquery);
-    Job loadedJob = Job.load(bigquery, JOB_INFO.jobId().job());
+    Job loadedJob = Job.get(bigquery, JOB_INFO.jobId().job());
     assertNotNull(loadedJob);
     assertEquals(JOB_INFO, loadedJob.info());
   }
 
   @Test
-  public void testLoadNull() throws Exception {
+  public void testGetNull() throws Exception {
     expect(bigquery.getJob(JOB_INFO.jobId().job())).andReturn(null);
     replay(bigquery);
-    assertNull(Job.load(bigquery, JOB_INFO.jobId().job()));
+    assertNull(Job.get(bigquery, JOB_INFO.jobId().job()));
   }
 
   @Test
-  public void testLoadWithOptions() throws Exception {
+  public void testGetWithOptions() throws Exception {
     expect(bigquery.getJob(JOB_INFO.jobId().job(), BigQuery.JobOption.fields()))
         .andReturn(JOB_INFO);
     replay(bigquery);
-    Job loadedJob = Job.load(bigquery, JOB_INFO.jobId().job(), BigQuery.JobOption.fields());
+    Job loadedJob = Job.get(bigquery, JOB_INFO.jobId().job(), BigQuery.JobOption.fields());
     assertNotNull(loadedJob);
     assertEquals(JOB_INFO, loadedJob.info());
   }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
index e5b152a91a5f..dfcf17c90ab3 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
@@ -292,54 +292,54 @@ public void testExtractDataUris() throws Exception {
   }
 
   @Test
-  public void testLoadFromId() throws Exception {
+  public void testGetFromId() throws Exception {
     expect(bigquery.getTable(TABLE_INFO.tableId())).andReturn(TABLE_INFO);
     replay(bigquery);
-    Table loadedTable = Table.load(bigquery, TABLE_INFO.tableId());
+    Table loadedTable = Table.get(bigquery, TABLE_INFO.tableId());
     assertNotNull(loadedTable);
     assertEquals(TABLE_INFO, loadedTable.info());
   }
 
   @Test
-  public void testLoadFromStrings() throws Exception {
+  public void testGetFromStrings() throws Exception {
     expect(bigquery.getTable(TABLE_INFO.tableId())).andReturn(TABLE_INFO);
     replay(bigquery);
-    Table loadedTable = Table.load(bigquery, TABLE_ID1.dataset(), TABLE_ID1.table());
+    Table loadedTable = Table.get(bigquery, TABLE_ID1.dataset(), TABLE_ID1.table());
     assertNotNull(loadedTable);
     assertEquals(TABLE_INFO, loadedTable.info());
   }
 
   @Test
-  public void testLoadFromIdNull() throws Exception {
+  public void testGetFromIdNull() throws Exception {
     expect(bigquery.getTable(TABLE_INFO.tableId())).andReturn(null);
     replay(bigquery);
-    assertNull(Table.load(bigquery, TABLE_INFO.tableId()));
+    assertNull(Table.get(bigquery, TABLE_INFO.tableId()));
   }
 
   @Test
-  public void testLoadFromStringsNull() throws Exception {
+  public void testGetFromStringsNull() throws Exception {
     expect(bigquery.getTable(TABLE_INFO.tableId())).andReturn(null);
     replay(bigquery);
-    assertNull(Table.load(bigquery, TABLE_ID1.dataset(), TABLE_ID1.table()));
+    assertNull(Table.get(bigquery, TABLE_ID1.dataset(), TABLE_ID1.table()));
   }
 
   @Test
-  public void testLoadFromIdWithOptions() throws Exception {
+  public void testGetFromIdWithOptions() throws Exception {
     expect(bigquery.getTable(TABLE_INFO.tableId(), BigQuery.TableOption.fields()))
         .andReturn(TABLE_INFO);
     replay(bigquery);
-    Table loadedTable = Table.load(bigquery, TABLE_INFO.tableId(), BigQuery.TableOption.fields());
+    Table loadedTable = Table.get(bigquery, TABLE_INFO.tableId(), BigQuery.TableOption.fields());
     assertNotNull(loadedTable);
     assertEquals(TABLE_INFO, loadedTable.info());
   }
 
   @Test
-  public void testLoadFromStringsWithOptions() throws Exception {
+  public void testGetFromStringsWithOptions() throws Exception {
     expect(bigquery.getTable(TABLE_INFO.tableId(), BigQuery.TableOption.fields()))
         .andReturn(TABLE_INFO);
     replay(bigquery);
     Table loadedTable =
-        Table.load(bigquery, TABLE_ID1.dataset(), TABLE_ID1.table(), BigQuery.TableOption.fields());
+        Table.get(bigquery, TABLE_ID1.dataset(), TABLE_ID1.table(), BigQuery.TableOption.fields());
     assertNotNull(loadedTable);
     assertEquals(TABLE_INFO, loadedTable.info());
   }
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index 3ef8f8b4cc32..a6f65ec705e4 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -134,7 +134,7 @@ public void run(Storage storage, BlobId... blobIds) {
       if (blobIds.length == 1) {
         if (blobIds[0].name().isEmpty()) {
           // get Bucket
-          Bucket bucket = Bucket.load(storage, blobIds[0].bucket());
+          Bucket bucket = Bucket.get(storage, blobIds[0].bucket());
           if (bucket == null) {
             System.out.println("No such bucket");
             return;
@@ -142,7 +142,7 @@ public void run(Storage storage, BlobId... blobIds) {
           System.out.println("Bucket info: " + bucket.info());
         } else {
           // get Blob
-          Blob blob = Blob.load(storage, blobIds[0]);
+          Blob blob = Blob.get(storage, blobIds[0]);
           if (blob == null) {
             System.out.println("No such object");
             return;
@@ -151,7 +151,7 @@ public void run(Storage storage, BlobId... blobIds) {
         }
       } else {
         // use batch to get multiple blobs.
-        List blobs = Blob.get(storage, blobIds);
+        List blobs = Blob.get(storage, Arrays.asList(blobIds));
         for (Blob blob : blobs) {
           if (blob != null) {
             System.out.println(blob.info());
@@ -225,7 +225,7 @@ public void run(Storage storage, String bucketName) {
         }
       } else {
         // list a bucket's blobs
-        Bucket bucket = Bucket.load(storage, bucketName);
+        Bucket bucket = Bucket.get(storage, bucketName);
         if (bucket == null) {
           System.out.println("No such bucket");
           return;
@@ -312,7 +312,7 @@ public void run(Storage storage, Tuple tuple) throws IOException {
     }
 
     private void run(Storage storage, BlobId blobId, Path downloadTo) throws IOException {
-      Blob blob = Blob.load(storage, blobId);
+      Blob blob = Blob.get(storage, blobId);
       if (blob == null) {
         System.out.println("No such object");
         return;
@@ -439,7 +439,7 @@ public void run(Storage storage, Tuple> tuple)
     }
 
     private void run(Storage storage, BlobId blobId, Map metadata) {
-      Blob blob = Blob.load(storage, blobId);
+      Blob blob = Blob.get(storage, blobId);
       if (blob == null) {
         System.out.println("No such object");
         return;
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
index a3ff354b4a53..e329e1aa3714 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -40,12 +40,12 @@ public Project(ResourceManager resourceManager, ProjectInfo projectInfo) {
   }
 
   /**
-   * Constructs a Project object that contains project information loaded from the server.
+   * Constructs a Project object that contains project information got from the server.
    *
    * @return Project object containing the project's metadata or {@code null} if not found
    * @throws ResourceManagerException upon failure
    */
-  public static Project load(ResourceManager resourceManager, String projectId) {
+  public static Project get(ResourceManager resourceManager, String projectId) {
     ProjectInfo projectInfo = resourceManager.get(projectId);
     return projectInfo != null ? new Project(resourceManager, projectInfo) : null;
   }
@@ -72,7 +72,7 @@ public ResourceManager resourceManager() {
    * @throws ResourceManagerException upon failure
    */
   public Project reload() {
-    return Project.load(resourceManager, info.projectId());
+    return Project.get(resourceManager, info.projectId());
   }
 
   /**
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
index 5d765d20c313..077818bf2bb9 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
@@ -66,7 +66,7 @@ public void tearDown() throws Exception {
   public void testLoad() {
     expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(PROJECT_INFO);
     replay(resourceManager);
-    Project loadedProject = Project.load(resourceManager, PROJECT_INFO.projectId());
+    Project loadedProject = Project.get(resourceManager, PROJECT_INFO.projectId());
     assertEquals(PROJECT_INFO, loadedProject.info());
   }
 
@@ -84,7 +84,7 @@ public void testReload() {
   public void testLoadNull() {
     expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
     replay(resourceManager);
-    assertNull(Project.load(resourceManager, PROJECT_INFO.projectId()));
+    assertNull(Project.get(resourceManager, PROJECT_INFO.projectId()));
   }
 
   @Test
@@ -92,7 +92,7 @@ public void testReloadDeletedProject() {
     expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(PROJECT_INFO);
     expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
     replay(resourceManager);
-    Project loadedProject = Project.load(resourceManager, PROJECT_INFO.projectId());
+    Project loadedProject = Project.get(resourceManager, PROJECT_INFO.projectId());
     assertNotNull(loadedProject);
     Project reloadedProject = loadedProject.reload();
     assertNull(reloadedProject);
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index b85cbba7d869..5b305d15cee4 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -22,6 +22,7 @@
 import static com.google.gcloud.storage.Blob.BlobSourceOption.toSourceOptions;
 
 import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
@@ -165,9 +166,9 @@ public Blob(Storage storage, BlobInfo info) {
    * @return the {@code Blob} object or {@code null} if not found
    * @throws StorageException upon failure
    */
-  public static Blob load(Storage storage, String bucket, String blob,
+  public static Blob get(Storage storage, String bucket, String blob,
       Storage.BlobGetOption... options) {
-    return load(storage, BlobId.of(bucket, blob), options);
+    return get(storage, BlobId.of(bucket, blob), options);
   }
 
   /**
@@ -180,7 +181,7 @@ public static Blob load(Storage storage, String bucket, String blob,
    * @return the {@code Blob} object or {@code null} if not found
    * @throws StorageException upon failure
    */
-  public static Blob load(Storage storage, BlobId blobId, Storage.BlobGetOption... options) {
+  public static Blob get(Storage storage, BlobId blobId, Storage.BlobGetOption... options) {
     BlobInfo info = storage.get(blobId, options);
     return info != null ? new Blob(storage, info) : null;
   }
@@ -231,7 +232,7 @@ public byte[] content(Storage.BlobSourceOption... options) {
    * @throws StorageException upon failure
    */
   public Blob reload(BlobSourceOption... options) {
-    return Blob.load(storage, info.blobId(), toGetOptions(info, options));
+    return Blob.get(storage, info.blobId(), toGetOptions(info, options));
   }
 
   /**
@@ -369,18 +370,40 @@ public Storage storage() {
    * Gets the requested blobs. A batch request is used to fetch blobs.
    *
    * @param storage the storage service used to issue the request
-   * @param blobs the blobs to get
+   * @param first the first blob to get
+   * @param second the second blob to get
+   * @param other other blobs to get
    * @return an immutable list of {@code Blob} objects. If a blob does not exist or access to it has
    *     been denied the corresponding item in the list is {@code null}
    * @throws StorageException upon failure
    */
-  public static List get(final Storage storage, BlobId... blobs) {
+  public static List get(Storage storage, BlobId first, BlobId second, BlobId... other) {
+    checkNotNull(storage);
+    checkNotNull(first);
+    checkNotNull(second);
+    checkNotNull(other);
+    ImmutableList blobs = ImmutableList.builder()
+        .add(first)
+        .add(second)
+        .addAll(Arrays.asList(other))
+        .build();
+    return get(storage, blobs);
+  }
+
+  /**
+   * Gets the requested blobs. A batch request is used to fetch blobs.
+   *
+   * @param storage the storage service used to issue the request
+   * @param blobs list of blobs to get
+   * @return an immutable list of {@code Blob} objects. If a blob does not exist or access to it has
+   *     been denied the corresponding item in the list is {@code null}
+   * @throws StorageException upon failure
+   */
+  public static List get(final Storage storage, List blobs) {
     checkNotNull(storage);
     checkNotNull(blobs);
-    if (blobs.length == 0) {
-      return Collections.emptyList();
-    }
-    return Collections.unmodifiableList(Lists.transform(storage.get(blobs),
+    BlobId[] blobArray = blobs.toArray(new BlobId[blobs.size()]);
+    return Collections.unmodifiableList(Lists.transform(storage.get(blobArray),
         new Function() {
           @Override
           public Blob apply(BlobInfo blobInfo) {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 61ff1ec9d0a3..d0e823492ee3 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -214,7 +214,7 @@ public Bucket(Storage storage, BucketInfo info) {
    * @return the {@code Bucket} object or {@code null} if not found
    * @throws StorageException upon failure
    */
-  public static Bucket load(Storage storage, String bucket, Storage.BucketGetOption... options) {
+  public static Bucket get(Storage storage, String bucket, Storage.BucketGetOption... options) {
     BucketInfo info = storage.get(bucket, options);
     return info != null ? new Bucket(storage, info) : null;
   }
@@ -247,7 +247,7 @@ public boolean exists(BucketSourceOption... options) {
    * @throws StorageException upon failure
    */
   public Bucket reload(BucketSourceOption... options) {
-    return Bucket.load(storage, info.name(), toGetOptions(info, options));
+    return Bucket.get(storage, info.name(), toGetOptions(info, options));
   }
 
   /**
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
index 7938a0094419..fda14ea2e808 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
@@ -21,7 +21,7 @@
  * 
     {@code
  * Storage storage = StorageOptions.defaultInstance().service();
  * BlobId blobId = BlobId.of("bucket", "blob_name");
- * Blob blob = Blob.load(storage, blobId);
+ * Blob blob = Blob.get(storage, blobId);
  * if (blob == null) {
  *   BlobInfo blobInfo = BlobInfo.builder(blobId).contentType("text/plain").build();
  *   storage.create(blobInfo, "Hello, Cloud Storage!".getBytes(UTF_8));
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
index 45cf79e01278..bc6a4725d7e7 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
@@ -211,17 +211,23 @@ public void testSignUrl() throws Exception {
   }
 
   @Test
-  public void testGetNone() throws Exception {
+  public void testGetSome() throws Exception {
+    List blobInfoList = Arrays.asList(BLOB_INFO_ARRAY);
+    expect(storage.get(BLOB_ID_ARRAY)).andReturn(blobInfoList);
     replay(storage);
-    assertTrue(Blob.get(storage).isEmpty());
+    List result = Blob.get(storage, BLOB_ID_ARRAY[0], BLOB_ID_ARRAY[1], BLOB_ID_ARRAY[2]);
+    assertEquals(blobInfoList.size(), result.size());
+    for (int i = 0; i < blobInfoList.size(); i++) {
+      assertEquals(blobInfoList.get(i), result.get(i).info());
+    }
   }
 
   @Test
-  public void testGetSome() throws Exception {
+  public void testGetSomeList() throws Exception {
     List blobInfoList = Arrays.asList(BLOB_INFO_ARRAY);
     expect(storage.get(BLOB_ID_ARRAY)).andReturn(blobInfoList);
     replay(storage);
-    List result = Blob.get(storage, BLOB_ID_ARRAY);
+    List result = Blob.get(storage, Arrays.asList(BLOB_ID_ARRAY));
     assertEquals(blobInfoList.size(), result.size());
     for (int i = 0; i < blobInfoList.size(); i++) {
       assertEquals(blobInfoList.get(i), result.get(i).info());
@@ -233,7 +239,7 @@ public void testGetSomeNull() throws Exception {
     List blobInfoList = Arrays.asList(BLOB_INFO_ARRAY[0], null, BLOB_INFO_ARRAY[2]);
     expect(storage.get(BLOB_ID_ARRAY)).andReturn(blobInfoList);
     replay(storage);
-    List result = Blob.get(storage, BLOB_ID_ARRAY);
+    List result = Blob.get(storage, BLOB_ID_ARRAY[0], BLOB_ID_ARRAY[1], BLOB_ID_ARRAY[2]);
     assertEquals(blobInfoList.size(), result.size());
     for (int i = 0; i < blobInfoList.size(); i++) {
       if (blobInfoList.get(i) != null) {
@@ -302,53 +308,53 @@ public void testDeleteSome() throws Exception {
   }
 
   @Test
-  public void testLoadFromString() throws Exception {
+  public void testGetFromString() throws Exception {
     expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobGetOption[0])).andReturn(BLOB_INFO);
     replay(storage);
-    Blob loadedBlob = Blob.load(storage, BLOB_INFO.bucket(), BLOB_INFO.name());
+    Blob loadedBlob = Blob.get(storage, BLOB_INFO.bucket(), BLOB_INFO.name());
     assertEquals(BLOB_INFO, loadedBlob.info());
   }
 
   @Test
-  public void testLoadFromId() throws Exception {
+  public void testGetFromId() throws Exception {
     expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobGetOption[0])).andReturn(BLOB_INFO);
     replay(storage);
-    Blob loadedBlob = Blob.load(storage, BLOB_INFO.blobId());
+    Blob loadedBlob = Blob.get(storage, BLOB_INFO.blobId());
     assertNotNull(loadedBlob);
     assertEquals(BLOB_INFO, loadedBlob.info());
   }
 
   @Test
-  public void testLoadFromStringNull() throws Exception {
+  public void testGetFromStringNull() throws Exception {
     expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobGetOption[0])).andReturn(null);
     replay(storage);
-    assertNull(Blob.load(storage, BLOB_INFO.bucket(), BLOB_INFO.name()));
+    assertNull(Blob.get(storage, BLOB_INFO.bucket(), BLOB_INFO.name()));
   }
 
   @Test
-  public void testLoadFromIdNull() throws Exception {
+  public void testGetFromIdNull() throws Exception {
     expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobGetOption[0])).andReturn(null);
     replay(storage);
-    assertNull(Blob.load(storage, BLOB_INFO.blobId()));
+    assertNull(Blob.get(storage, BLOB_INFO.blobId()));
   }
 
   @Test
-  public void testLoadFromStringWithOptions() throws Exception {
+  public void testGetFromStringWithOptions() throws Exception {
     expect(storage.get(BLOB_INFO.blobId(), Storage.BlobGetOption.generationMatch(42L)))
         .andReturn(BLOB_INFO);
     replay(storage);
-    Blob loadedBlob = Blob.load(storage, BLOB_INFO.bucket(), BLOB_INFO.name(),
+    Blob loadedBlob = Blob.get(storage, BLOB_INFO.bucket(), BLOB_INFO.name(),
         Storage.BlobGetOption.generationMatch(42L));
     assertEquals(BLOB_INFO, loadedBlob.info());
   }
 
   @Test
-  public void testLoadFromIdWithOptions() throws Exception {
+  public void testGetFromIdWithOptions() throws Exception {
     expect(storage.get(BLOB_INFO.blobId(), Storage.BlobGetOption.generationMatch(42L)))
         .andReturn(BLOB_INFO);
     replay(storage);
     Blob loadedBlob =
-        Blob.load(storage, BLOB_INFO.blobId(), Storage.BlobGetOption.generationMatch(42L));
+        Blob.get(storage, BLOB_INFO.blobId(), Storage.BlobGetOption.generationMatch(42L));
     assertNotNull(loadedBlob);
     assertEquals(BLOB_INFO, loadedBlob.info());
   }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
index f1644bd8ea37..e67e7aff17dc 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -235,28 +235,28 @@ public void testCreateFromStreamNullContentType() throws Exception {
   }
 
   @Test
-  public void testLoad() throws Exception {
+  public void testStaticGet() throws Exception {
     expect(storage.get(BUCKET_INFO.name())).andReturn(BUCKET_INFO);
     replay(storage);
-    Bucket loadedBucket = Bucket.load(storage, BUCKET_INFO.name());
+    Bucket loadedBucket = Bucket.get(storage, BUCKET_INFO.name());
     assertNotNull(loadedBucket);
     assertEquals(BUCKET_INFO, loadedBucket.info());
   }
 
   @Test
-  public void testLoadNull() throws Exception {
+  public void testStaticGetNull() throws Exception {
     expect(storage.get(BUCKET_INFO.name())).andReturn(null);
     replay(storage);
-    assertNull(Bucket.load(storage, BUCKET_INFO.name()));
+    assertNull(Bucket.get(storage, BUCKET_INFO.name()));
   }
 
   @Test
-  public void testLoadWithOptions() throws Exception {
+  public void testStaticGetWithOptions() throws Exception {
     expect(storage.get(BUCKET_INFO.name(), Storage.BucketGetOption.fields()))
         .andReturn(BUCKET_INFO);
     replay(storage);
     Bucket loadedBucket =
-        Bucket.load(storage, BUCKET_INFO.name(), Storage.BucketGetOption.fields());
+        Bucket.get(storage, BUCKET_INFO.name(), Storage.BucketGetOption.fields());
     assertNotNull(loadedBucket);
     assertEquals(BUCKET_INFO, loadedBucket.info());
   }

From 701abb61984d8cc27a558b32a8fb10eadd7b9652 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 8 Jan 2016 14:00:09 +0100
Subject: [PATCH 267/322] Fix failing test by removing check

---
 .../src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index 981bc142a9d5..fa527df5aa75 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -462,7 +462,6 @@ public void testUpdateNonExistingTable() {
       assertNotNull(error);
       assertEquals("notFound", error.reason());
       assertNotNull(error.message());
-      assertNotNull(error.debugInfo());
     }
   }
 

From 01d386ac18a083e6e4e27616968a0446b3b3e302 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 8 Jan 2016 09:44:47 -0800
Subject: [PATCH 268/322] Add a link to SparkJava demo from website and README

---
 README.md                     |  2 ++
 src/site/resources/index.html | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/README.md b/README.md
index 8ad0d0deb379..4b5c34d9df11 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,8 @@ Example Applications
   - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/DatastoreExample.html).
 - [`ResourceManagerExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java) - A simple command line interface providing some of Cloud Resource Manager's functionality
   - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/ResourceManagerExample.html).
+- [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/managedvms/sparkjava) - An example of using gcloud-java-datastore from within the SparkJava and App Engine Managed VM frameworks.
+  - Read about how it works on the example's [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/managedvms/sparkjava#how-does-it-work).
 - [`StorageExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java) - A simple command line interface providing some of Cloud Storage's functionality
   - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/StorageExample.html).
 
diff --git a/src/site/resources/index.html b/src/site/resources/index.html
index 9e9c877c18df..8f40cfbcd97e 100644
--- a/src/site/resources/index.html
+++ b/src/site/resources/index.html
@@ -172,6 +172,18 @@ 
    Example: Retrieve Datastore Entries
    
                 
    
             
 
+            
    
+                
    
+                    
    Examples
    
+
+                    
      
+                        
    • 
+                          SparkJava demo - Use gcloud-java with App Engine Managed VMs, Datastore, and SparkJava.
+                        
      • 
+                    
    
+                
    
+            
    
+
             
    
                 
    
                     
    FAQ
    

From 863c57270d177fd0ccbc0dd6b84083ab2777f983 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 8 Jan 2016 17:14:02 -0800
Subject: [PATCH 269/322] Create simple forceDelete that can be used on
 AppEngine

---
 .../storage/testing/RemoteGcsHelper.java      | 17 ++++++++++
 .../gcloud/storage/RemoteGcsHelperTest.java   | 31 +++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
index 73bd66520182..e8ac3916e3e5 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
@@ -88,6 +88,23 @@ public static Boolean forceDelete(Storage storage, String bucket, long timeout,
     }
   }
 
+  /**
+   * Deletes a bucket, even if non-empty. Objects in the bucket are listed and deleted until bucket
+   * deletion succeeds. This method can be used to delete buckets from within App Engine.  Note that
+   * this method does not set a timeout.
+   *
+   * @param storage the storage service to be used to issue requests
+   * @param bucket the bucket to be deleted
+   * @throws StorageException if an exception is encountered during bucket deletion
+   */
+  public static void forceDelete(Storage storage, String bucket) throws StorageException {
+    try {
+      new DeleteBucketTask(storage, bucket).call();
+    } catch (Exception e) {
+      throw (StorageException) e;
+    }
+  }
+
   /**
    * Returns a bucket name generated using a random UUID.
    */
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
index 6b67a9576dc6..5d39c5c8eac5 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
@@ -140,6 +140,37 @@ public void testForceDeleteFail() throws InterruptedException, ExecutionExceptio
     }
   }
 
+
+  @Test
+  public void testForceDeleteNoTimeout() throws Exception {
+    Storage storageMock = EasyMock.createMock(Storage.class);
+    EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_PAGE);
+    for (BlobInfo info : BLOB_LIST) {
+      EasyMock.expect(storageMock.delete(BUCKET_NAME, info.name())).andReturn(true);
+    }
+    EasyMock.expect(storageMock.delete(BUCKET_NAME)).andReturn(true);
+    EasyMock.replay(storageMock);
+    RemoteGcsHelper.forceDelete(storageMock, BUCKET_NAME);
+    EasyMock.verify(storageMock);
+  }
+
+  @Test
+  public void testForceDeleteNoTimeoutFail() throws Exception {
+    Storage storageMock = EasyMock.createMock(Storage.class);
+    EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_PAGE);
+    for (BlobInfo info : BLOB_LIST) {
+      EasyMock.expect(storageMock.delete(BUCKET_NAME, info.name())).andReturn(true);
+    }
+    EasyMock.expect(storageMock.delete(BUCKET_NAME)).andThrow(FATAL_EXCEPTION);
+    EasyMock.replay(storageMock);
+    thrown.expect(StorageException.class);
+    try {
+      RemoteGcsHelper.forceDelete(storageMock, BUCKET_NAME);
+    } finally {
+      EasyMock.verify(storageMock);
+    }
+  }
+
   @Test
   public void testCreateFromStream() {
     RemoteGcsHelper helper = RemoteGcsHelper.create(PROJECT_ID, JSON_KEY_STREAM);

From 33f6ad862077eb45a9dec040e45a899cc462cbf6 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 11 Jan 2016 09:32:27 -0800
Subject: [PATCH 270/322] Use runtime exceptions for DeleteBucketTask.call()

---
 .../storage/testing/RemoteGcsHelper.java      | 26 ++++++++++---------
 .../gcloud/storage/RemoteGcsHelperTest.java   |  5 ++--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
index e8ac3916e3e5..024aa04eba1b 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
@@ -65,7 +65,10 @@ public StorageOptions options() {
 
   /**
    * Deletes a bucket, even if non-empty. Objects in the bucket are listed and deleted until bucket
-   * deletion succeeds or {@code timeout} expires.
+   * deletion succeeds or {@code timeout} expires. To allow for the timeout, this method uses a
+   * separate thread to send the delete requests. Use
+   * {@link #forceDelete(Storage storage, String bucket)} if spawning an additional thread is
+   * undesirable, such as in the App Engine production runtime.
    *
    * @param storage the storage service to be used to issue requests
    * @param bucket the bucket to be deleted
@@ -89,20 +92,14 @@ public static Boolean forceDelete(Storage storage, String bucket, long timeout,
   }
 
   /**
-   * Deletes a bucket, even if non-empty. Objects in the bucket are listed and deleted until bucket
-   * deletion succeeds. This method can be used to delete buckets from within App Engine.  Note that
-   * this method does not set a timeout.
+   * Deletes a bucket, even if non-empty. This method blocks until the deletion completes or fails.
    *
    * @param storage the storage service to be used to issue requests
    * @param bucket the bucket to be deleted
    * @throws StorageException if an exception is encountered during bucket deletion
    */
-  public static void forceDelete(Storage storage, String bucket) throws StorageException {
-    try {
-      new DeleteBucketTask(storage, bucket).call();
-    } catch (Exception e) {
-      throw (StorageException) e;
-    }
+  public static void forceDelete(Storage storage, String bucket) {
+    new DeleteBucketTask(storage, bucket).call();
   }
 
   /**
@@ -174,7 +171,7 @@ public DeleteBucketTask(Storage storage, String bucket) {
     }
 
     @Override
-    public Boolean call() throws Exception {
+    public Boolean call() {
       while (true) {
         for (BlobInfo info : storage.list(bucket).values()) {
           storage.delete(bucket, info.name());
@@ -184,7 +181,12 @@ public Boolean call() throws Exception {
           return true;
         } catch (StorageException e) {
           if (e.code() == 409) {
-            Thread.sleep(500);
+            try {
+              Thread.sleep(500);
+            } catch (InterruptedException interruptedException) {
+              Thread.currentThread().interrupt();
+              throw e;
+            }
           } else {
             throw e;
           }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
index 5d39c5c8eac5..05b7f5f6fd8c 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
@@ -140,9 +140,8 @@ public void testForceDeleteFail() throws InterruptedException, ExecutionExceptio
     }
   }
 
-
   @Test
-  public void testForceDeleteNoTimeout() throws Exception {
+  public void testForceDeleteNoTimeout() {
     Storage storageMock = EasyMock.createMock(Storage.class);
     EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_PAGE);
     for (BlobInfo info : BLOB_LIST) {
@@ -155,7 +154,7 @@ public void testForceDeleteNoTimeout() throws Exception {
   }
 
   @Test
-  public void testForceDeleteNoTimeoutFail() throws Exception {
+  public void testForceDeleteNoTimeoutFail() {
     Storage storageMock = EasyMock.createMock(Storage.class);
     EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_PAGE);
     for (BlobInfo info : BLOB_LIST) {

From dc1f9e7ac5b5000b087f517809d31462ec04926a Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 11 Jan 2016 15:07:44 -0800
Subject: [PATCH 271/322] Add known issue for mvn test and gcloud SDK

---
 CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d2684e6e111b..bf87d471e34a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,6 +30,8 @@ End-to-end tests should ensure that gcloud-java works when running on the
 
 When changes are made to authentication and project ID-related code, authentication and project ID inference should be tested using all relevant methods detailed in the [authentication docs](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) and [project ID docs](https://github.com/GoogleCloudPlatform/gcloud-java#specifying-a-project-id).
 
+Known issue: If you have installed the Google Cloud SDK, be sure to log in (using `gcloud auth login`) before running tests. Though the Datastore tests use a local Datastore emulator that doesn't require authentication, they will not run if you have the Google Cloud SDK installed but aren't authenticated.
+
 Adding Features
 ---------------
 In order to add a feature to gcloud-java:

From 1583312510a67b1f06cb4a5f623aeb17ce546c56 Mon Sep 17 00:00:00 2001
From: Martin Derka 
Date: Mon, 11 Jan 2016 15:49:10 -0800
Subject: [PATCH 272/322] Fixed #478 - Make DatastoreException informative.

Makes DatastoreException message more informative by preserving a cause.
Fixes #478
---
 .../src/main/java/com/google/gcloud/spi/DatastoreRpc.java | 8 ++++----
 .../java/com/google/gcloud/spi/DefaultDatastoreRpc.java   | 4 ++--
 .../google/gcloud/datastore/DatastoreExceptionTest.java   | 5 ++++-
 .../java/com/google/gcloud/datastore/DatastoreTest.java   | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java
index dffcc3f0e16f..3e875ff2b8ba 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java
@@ -79,12 +79,12 @@ public int httpStatus() {
     private final int httpStatus;
     private final boolean retryable;
 
-    public DatastoreRpcException(Reason reason) {
-      this(reason.name(), reason.httpStatus, reason.retryable, reason.description);
+    public DatastoreRpcException(Reason reason, Throwable cause) {
+      this(reason.name(), reason.httpStatus, reason.retryable, reason.description, cause);
     }
 
-    public DatastoreRpcException(String reason, int httpStatus, boolean retryable, String message) {
-      super(message);
+    public DatastoreRpcException(String reason, int httpStatus, boolean retryable, String message, Throwable cause) {
+      super(message, cause);
       this.reason = reason;
       this.httpStatus = httpStatus;
       this.retryable = retryable;
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
index 4771895eec99..fa993c508a0b 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -124,7 +124,7 @@ private static DatastoreRpcException translate(DatastoreException exception) {
       reason = HTTP_STATUS_TO_REASON.get(exception.getCode());
     }
     if (reason != null) {
-      return new DatastoreRpcException(reason);
+      return new DatastoreRpcException(reason, exception);
     } else {
       boolean retryable = false;
       reasonStr = "Unknown";
@@ -132,7 +132,7 @@ private static DatastoreRpcException translate(DatastoreException exception) {
         retryable = true;
         reasonStr = "Request timeout";
       }
-      return new DatastoreRpcException(reasonStr, exception.getCode(), retryable, message);
+      return new DatastoreRpcException(reasonStr, exception.getCode(), retryable, message, exception);
     }
   }
 
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
index 9ad836b15a4e..019d69cb737b 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
@@ -42,12 +42,15 @@ public void testDatastoreError() throws Exception {
 
   @Test
   public void testTranslateAndThrow() throws Exception {
+    DatastoreRpcException toTranslate = null; // should be preserved as a cause
     for (Reason reason : Reason.values()) {
       try {
-        DatastoreException.translateAndThrow(new DatastoreRpcException(reason));
+        toTranslate = new DatastoreRpcException(reason, null);
+        DatastoreException.translateAndThrow(toTranslate);
         fail("Exception expected");
       } catch (DatastoreException ex) {
         assertEquals(reason.name(), ex.datastoreError().name());
+        assertEquals(toTranslate, ex.getCause());
       }
     }
   }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index 029b161c1c38..9874054f5744 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -734,7 +734,7 @@ public void testRetryableException() throws Exception {
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class)))
         .andReturn(rpcMock);
     EasyMock.expect(rpcMock.lookup(requestPb))
-        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.UNAVAILABLE))
+        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.UNAVAILABLE, null))
         .andReturn(responsePb);
     EasyMock.replay(rpcFactoryMock, rpcMock);
     DatastoreOptions options = this.options.toBuilder()
@@ -756,7 +756,7 @@ public void testNonRetryableException() throws Exception {
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class)))
         .andReturn(rpcMock);
     EasyMock.expect(rpcMock.lookup(requestPb))
-        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.PERMISSION_DENIED))
+        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.PERMISSION_DENIED, null))
         .times(1);
     EasyMock.replay(rpcFactoryMock, rpcMock);
     RetryParams retryParams = RetryParams.builder().retryMinAttempts(2).build();

From 2d1e83693589a1b0658a50d044c8928430df90f0 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 11 Jan 2016 16:20:55 -0800
Subject: [PATCH 273/322] Set default retry strategy

---
 .../java/com/google/gcloud/bigquery/BigQueryImplTest.java    | 1 +
 .../src/main/java/com/google/gcloud/ServiceOptions.java      | 5 +++--
 .../test/java/com/google/gcloud/datastore/DatastoreTest.java | 1 +
 .../main/java/com/google/gcloud/examples/StorageExample.java | 4 +---
 .../gcloud/resourcemanager/ResourceManagerImplTest.java      | 3 ---
 .../com/google/gcloud/storage/BlobReadChannelImplTest.java   | 2 ++
 .../com/google/gcloud/storage/BlobWriteChannelImplTest.java  | 2 ++
 .../test/java/com/google/gcloud/storage/CopyWriterTest.java  | 2 ++
 .../test/java/com/google/gcloud/storage/StorageImplTest.java | 1 +
 9 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index 6a6a1c7cd6af..ed54e6a94111 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -262,6 +262,7 @@ public void setUp() {
     options = BigQueryOptions.builder()
         .projectId(PROJECT)
         .serviceRpcFactory(rpcFactoryMock)
+        .retryParams(RetryParams.noRetries())
         .build();
   }
 
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 6ed1d50ba364..84bb07195806 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -264,7 +264,8 @@ public B authCredentials(AuthCredentials authCredentials) {
 
     /**
      * Sets configuration parameters for request retries. If no configuration is set
-     * {@link RetryParams#noRetries()} is used.
+     * {@link RetryParams#defaultInstance()} is used. To disable retries, supply
+     * {@link RetryParams#noRetries()} here.
      *
      * @return the builder
      */
@@ -325,7 +326,7 @@ protected ServiceOptions(Class> ser
     authCredentials =
         builder.authCredentials != null ? builder.authCredentials : defaultAuthCredentials();
     authCredentialsState = authCredentials != null ? authCredentials.capture() : null;
-    retryParams = builder.retryParams;
+    retryParams = firstNonNull(builder.retryParams, RetryParams.defaultInstance());
     serviceFactory = firstNonNull(builder.serviceFactory,
         getFromServiceLoader(serviceFactoryClass, defaultServiceFactory()));
     serviceFactoryClassName = serviceFactory.getClass().getName();
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index 029b161c1c38..0e9b993483b0 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -125,6 +125,7 @@ public void setUp() {
     options = DatastoreOptions.builder()
         .projectId(PROJECT_ID)
         .host("http://localhost:" + PORT)
+        .retryParams(RetryParams.noRetries())
         .build();
     datastore = options.service();
     StructuredQuery query = Query.keyQueryBuilder().build();
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index a6f65ec705e4..dc3dba6c72ab 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -18,7 +18,6 @@
 
 import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
-import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 import com.google.gcloud.storage.Blob;
 import com.google.gcloud.storage.BlobId;
@@ -549,8 +548,7 @@ public static void main(String... args) throws Exception {
       printUsage();
       return;
     }
-    StorageOptions.Builder optionsBuilder =
-        StorageOptions.builder().retryParams(RetryParams.defaultInstance());
+    StorageOptions.Builder optionsBuilder = StorageOptions.builder();
     StorageAction action;
     String actionName;
     if (args.length >= 2 && !ACTIONS.containsKey(args[0])) {
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
index 1210e4ec81a7..fedd10eacdc6 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
@@ -25,7 +25,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.Page;
-import com.google.gcloud.RetryParams;
 import com.google.gcloud.resourcemanager.ProjectInfo.ResourceId;
 import com.google.gcloud.resourcemanager.ResourceManager.ProjectField;
 import com.google.gcloud.resourcemanager.ResourceManager.ProjectGetOption;
@@ -271,7 +270,6 @@ public void testRetryableException() {
     EasyMock.replay(rpcFactoryMock);
     ResourceManager resourceManagerMock = ResourceManagerOptions.builder()
         .serviceRpcFactory(rpcFactoryMock)
-        .retryParams(RetryParams.defaultInstance())
         .build()
         .service();
     EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.projectId(), EMPTY_RPC_OPTIONS))
@@ -291,7 +289,6 @@ public void testNonRetryableException() {
     EasyMock.replay(rpcFactoryMock);
     ResourceManager resourceManagerMock = ResourceManagerOptions.builder()
         .serviceRpcFactory(rpcFactoryMock)
-        .retryParams(RetryParams.defaultInstance())
         .build()
         .service();
     EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.projectId(), EMPTY_RPC_OPTIONS))
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
index d943715580c9..7daf4a6fb468 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
@@ -28,6 +28,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.RestorableState;
+import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpcFactory;
 
@@ -65,6 +66,7 @@ public void setUp() {
     options = StorageOptions.builder()
         .projectId("projectId")
         .serviceRpcFactory(rpcFactoryMock)
+        .retryParams(RetryParams.noRetries())
         .build();
   }
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
index 952be543a913..518ba8e14c65 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
@@ -32,6 +32,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.RestorableState;
+import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpcFactory;
 
@@ -74,6 +75,7 @@ public void setUp() {
     options = StorageOptions.builder()
         .projectId("projectid")
         .serviceRpcFactory(rpcFactoryMock)
+        .retryParams(RetryParams.noRetries())
         .build();
   }
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
index f14ee934638f..1b1ffd987de6 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java
@@ -26,6 +26,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.RestorableState;
+import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.RewriteRequest;
 import com.google.gcloud.spi.StorageRpc.RewriteResponse;
@@ -72,6 +73,7 @@ public void setUp() {
     options = StorageOptions.builder()
         .projectId("projectid")
         .serviceRpcFactory(rpcFactoryMock)
+        .retryParams(RetryParams.noRetries())
         .build();
   }
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 007ac4b2a15a..3aaec047714f 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -261,6 +261,7 @@ public void setUp() {
         .projectId("projectId")
         .clock(TIME_SOURCE)
         .serviceRpcFactory(rpcFactoryMock)
+        .retryParams(RetryParams.noRetries())
         .build();
   }
 

From 3ddbcf1f80fc497a155f0950b10eb58199f78d9d Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 12 Jan 2016 15:16:57 -0800
Subject: [PATCH 274/322] ServiceOptions tests + fix for default retry params

---
 .../com/google/gcloud/ServiceOptions.java     |   6 +-
 .../com/google/gcloud/ServiceOptionsTest.java | 234 ++++++++++++++++++
 2 files changed, 237 insertions(+), 3 deletions(-)
 create mode 100644 gcloud-java-core/src/test/java/com/google/gcloud/ServiceOptionsTest.java

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 84bb07195806..31e543809464 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -511,11 +511,11 @@ public AuthCredentials authCredentials() {
   }
 
   /**
-   * Returns configuration parameters for request retries. By default requests are not retried:
-   * {@link RetryParams#noRetries()} is used.
+   * Returns configuration parameters for request retries. By default requests are retried:
+   * {@link RetryParams#defaultInstance()} is used.
    */
   public RetryParams retryParams() {
-    return retryParams != null ? retryParams : RetryParams.noRetries();
+    return retryParams;
   }
 
   /**
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/ServiceOptionsTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/ServiceOptionsTest.java
new file mode 100644
index 000000000000..9b118197a5db
--- /dev/null
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/ServiceOptionsTest.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.google.gcloud.ServiceOptions.Clock;
+import com.google.gcloud.ServiceOptions.DefaultHttpTransportFactory;
+import com.google.gcloud.ServiceOptions.HttpTransportFactory;
+import com.google.gcloud.spi.ServiceRpcFactory;
+
+import org.easymock.EasyMock;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+
+@RunWith(JUnit4.class)
+public class ServiceOptionsTest {
+  private static final String JSON_KEY =
+      "{\n"
+      + "  \"private_key_id\": \"somekeyid\",\n"
+      + "  \"private_key\": \"-----BEGIN PRIVATE KEY-----\\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggS"
+      + "kAgEAAoIBAQC+K2hSuFpAdrJI\\nnCgcDz2M7t7bjdlsadsasad+fvRSW6TjNQZ3p5LLQY1kSZRqBqylRkzteMOyHg"
+      + "aR\\n0Pmxh3ILCND5men43j3h4eDbrhQBuxfEMalkG92sL+PNQSETY2tnvXryOvmBRwa/\\nQP/9dJfIkIDJ9Fw9N4"
+      + "Bhhhp6mCcRpdQjV38H7JsyJ7lih/oNjECgYAt\\nknddadwkwewcVxHFhcZJO+XWf6ofLUXpRwiTZakGMn8EE1uVa2"
+      + "LgczOjwWHGi99MFjxSer5m9\\n1tCa3/KEGKiS/YL71JvjwX3mb+cewlkcmweBKZHM2JPTk0ZednFSpVZMtycjkbLa"
+      + "\\ndYOS8V85AgMBewECggEBAKksaldajfDZDV6nGqbFjMiizAKJolr/M3OQw16K6o3/\\n0S31xIe3sSlgW0+UbYlF"
+      + "4U8KifhManD1apVSC3csafaspP4RZUHFhtBywLO9pR5c\\nr6S5aLp+gPWFyIp1pfXbWGvc5VY/v9x7ya1VEa6rXvL"
+      + "sKupSeWAW4tMj3eo/64ge\\nsdaceaLYw52KeBYiT6+vpsnYrEkAHO1fF/LavbLLOFJmFTMxmsNaG0tuiJHgjshB\\"
+      + "n82DpMCbXG9YcCgI/DbzuIjsdj2JC1cascSP//3PmefWysucBQe7Jryb6NQtASmnv\\nCdDw/0jmZTEjpe4S1lxfHp"
+      + "lAhHFtdgYTvyYtaLZiVVkCgYEA8eVpof2rceecw/I6\\n5ng1q3Hl2usdWV/4mZMvR0fOemacLLfocX6IYxT1zA1FF"
+      + "JlbXSRsJMf/Qq39mOR2\\nSpW+hr4jCoHeRVYLgsbggtrevGmILAlNoqCMpGZ6vDmJpq6ECV9olliDvpPgWOP+\\nm"
+      + "YPDreFBGxWvQrADNbRt2dmGsrsCgYEAyUHqB2wvJHFqdmeBsaacewzV8x9WgmeX\\ngUIi9REwXlGDW0Mz50dxpxcK"
+      + "CAYn65+7TCnY5O/jmL0VRxU1J2mSWyWTo1C+17L0\\n3fUqjxL1pkefwecxwecvC+gFFYdJ4CQ/MHHXU81Lwl1iWdF"
+      + "Cd2UoGddYaOF+KNeM\\nHC7cmqra+JsCgYEAlUNywzq8nUg7282E+uICfCB0LfwejuymR93CtsFgb7cRd6ak\\nECR"
+      + "8FGfCpH8ruWJINllbQfcHVCX47ndLZwqv3oVFKh6pAS/vVI4dpOepP8++7y1u\\ncoOvtreXCX6XqfrWDtKIvv0vjl"
+      + "HBhhhp6mCcRpdQjV38H7JsyJ7lih/oNjECgYAt\\nkndj5uNl5SiuVxHFhcZJO+XWf6ofLUregtevZakGMn8EE1uVa"
+      + "2AY7eafmoU/nZPT\\n00YB0TBATdCbn/nBSuKDESkhSg9s2GEKQZG5hBmL5uCMfo09z3SfxZIhJdlerreP\\nJ7gSi"
+      + "dI12N+EZxYd4xIJh/HFDgp7RRO87f+WJkofMQKBgGTnClK1VMaCRbJZPriw\\nEfeFCoOX75MxKwXs6xgrw4W//AYG"
+      + "GUjDt83lD6AZP6tws7gJ2IwY/qP7+lyhjEqN\\nHtfPZRGFkGZsdaksdlaksd323423d+15/UvrlRSFPNj1tWQmNKk"
+      + "XyRDW4IG1Oa2p\\nrALStNBx5Y9t0/LQnFI4w3aG\\n-----END PRIVATE KEY-----\\n\",\n"
+      + "  \"client_email\": \"someclientid@developer.gserviceaccount.com\",\n"
+      + "  \"client_id\": \"someclientid.apps.googleusercontent.com\",\n"
+      + "  \"type\": \"service_account\"\n"
+      + "}";
+  private static final InputStream JSON_KEY_STREAM = new ByteArrayInputStream(JSON_KEY.getBytes());
+  private static AuthCredentials authCredentials;
+  static {
+    try {
+      authCredentials = AuthCredentials.createForJson(JSON_KEY_STREAM);
+    } catch (IOException e) {
+      fail("Couldn't create fake JSON credentials.");
+    }
+  }
+  private static final HttpTransportFactory MOCK_HTTP_TRANSPORT_FACTORY =
+      EasyMock.createMock(HttpTransportFactory.class);
+  private static final TestServiceOptions OPTIONS =
+      TestServiceOptions.builder()
+          .authCredentials(authCredentials)
+          .connectTimeout(1234)
+          .host("host")
+          .httpTransportFactory(MOCK_HTTP_TRANSPORT_FACTORY)
+          .projectId("project-id")
+          .readTimeout(5678)
+          .retryParams(RetryParams.noRetries())
+          .build();
+  private static final TestServiceOptions DEFAULT_OPTIONS =
+      TestServiceOptions.builder().projectId("project-id").build();
+  private static final TestServiceOptions OPTIONS_COPY = OPTIONS.toBuilder().build();
+
+  interface TestService extends Service {}
+
+  static class TestServiceImpl
+      extends BaseService implements TestService {
+    TestServiceImpl(TestServiceOptions options) {
+      super(options);
+    }
+  }
+
+  interface TestServiceFactory extends ServiceFactory {}
+
+  static class DefaultTestServiceFactory implements TestServiceFactory {
+    private static final TestServiceFactory INSTANCE = new DefaultTestServiceFactory();
+
+    @Override
+    public TestService create(TestServiceOptions options) {
+      return new TestServiceImpl(options);
+    }
+  }
+
+  interface TestServiceRpcFactory
+      extends ServiceRpcFactory {}
+
+  static class DefaultTestServiceRpcFactory implements TestServiceRpcFactory {
+    private static final TestServiceRpcFactory INSTANCE = new DefaultTestServiceRpcFactory();
+
+    @Override
+    public TestServiceRpc create(TestServiceOptions options) {
+      return new DefaultTestServiceRpc(options);
+    }
+  }
+
+  interface TestServiceRpc {}
+
+  static class DefaultTestServiceRpc implements TestServiceRpc {
+    DefaultTestServiceRpc(TestServiceOptions options) {}
+  }
+
+  static class TestServiceOptions extends ServiceOptions {
+    static class Builder
+        extends ServiceOptions.Builder {
+      private Builder() {}
+
+      private Builder(TestServiceOptions options) {
+        super(options);
+      }
+
+      @Override
+      protected TestServiceOptions build() {
+        return new TestServiceOptions(this);
+      }
+    }
+
+    protected TestServiceOptions(Builder builder) {
+      super(TestServiceFactory.class, TestServiceRpcFactory.class, builder);
+    }
+
+    public static TestServiceOptions defaultInstance() {
+      return builder().build();
+    }
+
+    @Override
+    protected TestServiceFactory defaultServiceFactory() {
+      return DefaultTestServiceFactory.INSTANCE;
+    }
+
+    @Override
+    protected TestServiceRpcFactory defaultRpcFactory() {
+      return DefaultTestServiceRpcFactory.INSTANCE;
+    }
+
+    @Override
+    protected Set scopes() {
+      return null;
+    }
+
+    @Override
+    public Builder toBuilder() {
+      return new Builder(this);
+    }
+
+    public static Builder builder() {
+      return new Builder();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj instanceof TestServiceOptions && baseEquals((TestServiceOptions) obj);
+    }
+
+    @Override
+    public int hashCode() {
+      return baseHashCode();
+    }
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(authCredentials, OPTIONS.authCredentials());
+    assertEquals(Clock.defaultClock(), OPTIONS.clock());
+    assertEquals(1234, OPTIONS.connectTimeout());
+    assertEquals("host", OPTIONS.host());
+    assertEquals(MOCK_HTTP_TRANSPORT_FACTORY, OPTIONS.httpTransportFactory());
+    assertEquals("project-id", OPTIONS.projectId());
+    assertEquals(5678, OPTIONS.readTimeout());
+    assertEquals(RetryParams.noRetries(), OPTIONS.retryParams());
+
+    assertEquals(Clock.defaultClock(), DEFAULT_OPTIONS.clock());
+    assertEquals(-1, DEFAULT_OPTIONS.connectTimeout());
+    assertEquals("https://www.googleapis.com", DEFAULT_OPTIONS.host());
+    assertTrue(DEFAULT_OPTIONS.httpTransportFactory() instanceof DefaultHttpTransportFactory);
+    assertEquals(-1, DEFAULT_OPTIONS.readTimeout());
+    assertEquals(RetryParams.defaultInstance(), DEFAULT_OPTIONS.retryParams());
+  }
+
+  @Test
+  public void testGetProjectIdRequired() {
+    assertTrue(OPTIONS.projectIdRequired());
+  }
+
+  @Test
+  public void testService() {
+    assertTrue(OPTIONS.service() instanceof TestServiceImpl);
+  }
+
+  @Test
+  public void testRpc() {
+    assertTrue(OPTIONS.rpc() instanceof DefaultTestServiceRpc);
+  }
+
+  @Test
+  public void testBaseEquals() {
+    assertEquals(OPTIONS, OPTIONS_COPY);
+    assertNotEquals(DEFAULT_OPTIONS, OPTIONS);
+  }
+
+  @Test
+  public void testBaseHashCode() {
+    assertEquals(OPTIONS.hashCode(), OPTIONS_COPY.hashCode());
+    assertNotEquals(DEFAULT_OPTIONS.hashCode(), OPTIONS.hashCode());
+  }
+}

From b0d4c57e2b44b97b79c0dc50f54655849199d8e7 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 12 Jan 2016 15:46:53 -0800
Subject: [PATCH 275/322] Fix ServiceOptions tests

---
 .../com/google/gcloud/ServiceOptionsTest.java | 53 +++++++++++--------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/ServiceOptionsTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/ServiceOptionsTest.java
index 9b118197a5db..d0e3db2d2a55 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/ServiceOptionsTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/ServiceOptionsTest.java
@@ -18,6 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -76,9 +77,11 @@ public class ServiceOptionsTest {
   }
   private static final HttpTransportFactory MOCK_HTTP_TRANSPORT_FACTORY =
       EasyMock.createMock(HttpTransportFactory.class);
+  private static final Clock TEST_CLOCK = new TestClock();
   private static final TestServiceOptions OPTIONS =
       TestServiceOptions.builder()
           .authCredentials(authCredentials)
+          .clock(TEST_CLOCK)
           .connectTimeout(1234)
           .host("host")
           .httpTransportFactory(MOCK_HTTP_TRANSPORT_FACTORY)
@@ -90,18 +93,25 @@ public class ServiceOptionsTest {
       TestServiceOptions.builder().projectId("project-id").build();
   private static final TestServiceOptions OPTIONS_COPY = OPTIONS.toBuilder().build();
 
-  interface TestService extends Service {}
+  private static class TestClock extends Clock {
+    @Override
+    public long millis() {
+      return 123456789L;
+    }
+  }
 
-  static class TestServiceImpl
+  private interface TestService extends Service {}
+
+  private static class TestServiceImpl
       extends BaseService implements TestService {
-    TestServiceImpl(TestServiceOptions options) {
+    private TestServiceImpl(TestServiceOptions options) {
       super(options);
     }
   }
 
-  interface TestServiceFactory extends ServiceFactory {}
+  private interface TestServiceFactory extends ServiceFactory {}
 
-  static class DefaultTestServiceFactory implements TestServiceFactory {
+  private static class DefaultTestServiceFactory implements TestServiceFactory {
     private static final TestServiceFactory INSTANCE = new DefaultTestServiceFactory();
 
     @Override
@@ -110,10 +120,10 @@ public TestService create(TestServiceOptions options) {
     }
   }
 
-  interface TestServiceRpcFactory
+  private interface TestServiceRpcFactory
       extends ServiceRpcFactory {}
 
-  static class DefaultTestServiceRpcFactory implements TestServiceRpcFactory {
+  private static class DefaultTestServiceRpcFactory implements TestServiceRpcFactory {
     private static final TestServiceRpcFactory INSTANCE = new DefaultTestServiceRpcFactory();
 
     @Override
@@ -122,14 +132,15 @@ public TestServiceRpc create(TestServiceOptions options) {
     }
   }
 
-  interface TestServiceRpc {}
+  private interface TestServiceRpc {}
 
-  static class DefaultTestServiceRpc implements TestServiceRpc {
+  private static class DefaultTestServiceRpc implements TestServiceRpc {
     DefaultTestServiceRpc(TestServiceOptions options) {}
   }
 
-  static class TestServiceOptions extends ServiceOptions {
-    static class Builder
+  private static class TestServiceOptions
+      extends ServiceOptions {
+    private static class Builder
         extends ServiceOptions.Builder {
       private Builder() {}
 
@@ -143,14 +154,10 @@ protected TestServiceOptions build() {
       }
     }
 
-    protected TestServiceOptions(Builder builder) {
+    private TestServiceOptions(Builder builder) {
       super(TestServiceFactory.class, TestServiceRpcFactory.class, builder);
     }
 
-    public static TestServiceOptions defaultInstance() {
-      return builder().build();
-    }
-
     @Override
     protected TestServiceFactory defaultServiceFactory() {
       return DefaultTestServiceFactory.INSTANCE;
@@ -171,7 +178,7 @@ public Builder toBuilder() {
       return new Builder(this);
     }
 
-    public static Builder builder() {
+    private static Builder builder() {
       return new Builder();
     }
 
@@ -188,21 +195,21 @@ public int hashCode() {
 
   @Test
   public void testBuilder() {
-    assertEquals(authCredentials, OPTIONS.authCredentials());
-    assertEquals(Clock.defaultClock(), OPTIONS.clock());
+    assertSame(authCredentials, OPTIONS.authCredentials());
+    assertSame(TEST_CLOCK, OPTIONS.clock());
     assertEquals(1234, OPTIONS.connectTimeout());
     assertEquals("host", OPTIONS.host());
-    assertEquals(MOCK_HTTP_TRANSPORT_FACTORY, OPTIONS.httpTransportFactory());
+    assertSame(MOCK_HTTP_TRANSPORT_FACTORY, OPTIONS.httpTransportFactory());
     assertEquals("project-id", OPTIONS.projectId());
     assertEquals(5678, OPTIONS.readTimeout());
-    assertEquals(RetryParams.noRetries(), OPTIONS.retryParams());
+    assertSame(RetryParams.noRetries(), OPTIONS.retryParams());
 
-    assertEquals(Clock.defaultClock(), DEFAULT_OPTIONS.clock());
+    assertSame(Clock.defaultClock(), DEFAULT_OPTIONS.clock());
     assertEquals(-1, DEFAULT_OPTIONS.connectTimeout());
     assertEquals("https://www.googleapis.com", DEFAULT_OPTIONS.host());
     assertTrue(DEFAULT_OPTIONS.httpTransportFactory() instanceof DefaultHttpTransportFactory);
     assertEquals(-1, DEFAULT_OPTIONS.readTimeout());
-    assertEquals(RetryParams.defaultInstance(), DEFAULT_OPTIONS.retryParams());
+    assertSame(RetryParams.defaultInstance(), DEFAULT_OPTIONS.retryParams());
   }
 
   @Test

From a2e60abf83d6603ecf9f0e80b0c95082e8ce0fbb Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 13 Jan 2016 17:53:25 -0800
Subject: [PATCH 276/322] Populate cursorAfter in datastore v1beta2

---
 .../google/gcloud/datastore/QueryResults.java |  5 +-
 .../gcloud/datastore/QueryResultsImpl.java    |  2 +-
 .../gcloud/datastore/StructuredQuery.java     | 22 +++++
 .../gcloud/datastore/DatastoreTest.java       | 92 +++++++++++++++++++
 4 files changed, 118 insertions(+), 3 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
index b23c56a7c395..6a7e82bd5b2a 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
@@ -35,8 +35,9 @@ public interface QueryResults extends Iterator {
   Class resultClass();
 
   /**
-   * Returns the Cursor for point after the value returned in the last {@link #next} call.
-   * Not currently implemented (depends on v1beta3).
+   * Returns the Cursor for the point after the value returned in the last {@link #next} call. Until
+   * v1beta3 is supported, this field should only be used if you have set a limit and the number of
+   * results is equal to that limit.
    */
   Cursor cursorAfter();
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
index cd3fe9dd776b..40538af81409 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
@@ -100,6 +100,6 @@ public Class resultClass() {
   @Override
   public Cursor cursorAfter() {
     //return new Cursor(cursor); // only available in v1beta3
-    return null;
+    return new Cursor(queryResultBatchPb.getEndCursor());
   }
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
index 293c17cf3c57..c721398066d2 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -633,6 +633,20 @@ protected static class BaseBuilder> {
       this.resultType = resultType;
     }
 
+    BaseBuilder(StructuredQuery query) {
+      resultType = query.type();
+      namespace = query.namespace();
+      kind = query.kind;
+      projection.addAll(query.projection);
+      filter = query.filter;
+      groupBy.addAll(query.groupBy);
+      orderBy.addAll(query.orderBy);
+      startCursor = query.startCursor;
+      endCursor = query.endCursor;
+      offset = query.offset;
+      limit = query.limit;
+    }
+
     @SuppressWarnings("unchecked")
     B self() {
       return (B) this;
@@ -773,6 +787,10 @@ static final class Builder extends BaseBuilder> {
     Builder(ResultType resultType) {
       super(resultType);
     }
+
+    Builder(StructuredQuery query) {
+      super(query);
+    }
   }
 
   /**
@@ -953,6 +971,10 @@ public Integer limit() {
     return limit;
   }
 
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
   @Override
   void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb) {
     requestPb.setQuery(toPb());
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index 636fb3708926..612c97c845fd 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -27,6 +27,9 @@
 
 import com.google.api.services.datastore.DatastoreV1;
 import com.google.api.services.datastore.DatastoreV1.EntityResult;
+import com.google.api.services.datastore.DatastoreV1.QueryResultBatch;
+import com.google.api.services.datastore.DatastoreV1.RunQueryRequest;
+import com.google.api.services.datastore.DatastoreV1.RunQueryResponse;
 import com.google.common.collect.Iterators;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.datastore.Query.ResultType;
@@ -462,6 +465,95 @@ public void testRunStructuredQuery() {
     assertFalse(results4.hasNext());
   }
 
+  @Test
+  public void testQueryPaginationWithLimit() throws DatastoreRpcException {
+    DatastoreRpcFactory rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class);
+    DatastoreRpc rpcMock = EasyMock.createStrictMock(DatastoreRpc.class);
+    EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class)))
+        .andReturn(rpcMock);
+    List responses = buildResponsesForQueryPaginationWithLimit();
+    for (int i = 0; i < responses.size(); i++) {
+      EasyMock.expect(rpcMock.runQuery(EasyMock.anyObject(RunQueryRequest.class)))
+          .andReturn(responses.get(i));
+    }
+    EasyMock.replay(rpcFactoryMock, rpcMock);
+    Datastore mockDatastore =
+        this.options.toBuilder()
+            .retryParams(RetryParams.defaultInstance())
+            .serviceRpcFactory(rpcFactoryMock)
+            .build()
+            .service();
+    int limit = 2;
+    int totalCount = 0;
+    StructuredQuery query = Query.entityQueryBuilder().limit(limit).build();
+    while (true) {
+      QueryResults results = mockDatastore.run(query);
+      int resultCount = 0;
+      while (results.hasNext()) {
+        results.next();
+        resultCount++;
+        totalCount++;
+      }
+      if (resultCount < limit) {
+        break;
+      }
+      query = query.toBuilder().startCursor(results.cursorAfter()).build();
+    }
+    assertEquals(totalCount, 5);
+    EasyMock.verify(rpcFactoryMock, rpcMock);
+  }
+
+  private List buildResponsesForQueryPaginationWithLimit() {
+    Entity entity4 = Entity.builder(KEY4).set("value", StringValue.of("value")).build();
+    Entity entity5 = Entity.builder(KEY5).set("value", "value").build();
+    datastore.add(ENTITY3, entity4, entity5);
+    List responses = new ArrayList<>();
+    Query query = Query.entityQueryBuilder().build();
+    RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder();
+    query.populatePb(requestPb);
+    QueryResultBatch queryResultBatchPb =
+        RunQueryResponse.newBuilder()
+            .mergeFrom(((DatastoreImpl) datastore).runQuery(requestPb.build()))
+            .getBatch();
+    QueryResultBatch queryResultBatchPb1 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED)
+            .clearEntityResult()
+            .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(0, 1))
+            .setEndCursor(queryResultBatchPb.getEntityResultList().get(0).getCursor())
+            .build();
+    responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb1).build());
+    QueryResultBatch queryResultBatchPb2 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
+            .clearEntityResult()
+            .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(1, 2))
+            .setEndCursor(queryResultBatchPb.getEntityResultList().get(1).getCursor())
+            .build();
+    responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb2).build());
+    QueryResultBatch queryResultBatchPb3 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
+            .clearEntityResult()
+            .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(2, 4))
+            .setEndCursor(queryResultBatchPb.getEntityResultList().get(3).getCursor())
+            .build();
+    responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb3).build());
+    QueryResultBatch queryResultBatchPb4 =
+        QueryResultBatch.newBuilder()
+            .mergeFrom(queryResultBatchPb)
+            .setMoreResults(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS)
+            .clearEntityResult()
+            .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(4, 5))
+            .setEndCursor(queryResultBatchPb.getEntityResultList().get(4).getCursor())
+            .build();
+    responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb4).build());
+    return responses;
+  }
+
   @Test
   public void testAllocateId() {
     KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND1);

From 2219c82af21997fe66b952b062ff7fe7006503b9 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 13 Jan 2016 22:08:05 -0800
Subject: [PATCH 277/322] minor fixes to afterCursor + test

---
 .../main/java/com/google/gcloud/datastore/QueryResults.java  | 5 ++---
 .../java/com/google/gcloud/datastore/QueryResultsImpl.java   | 5 ++++-
 .../test/java/com/google/gcloud/datastore/DatastoreTest.java | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
index 6a7e82bd5b2a..8928398b76e2 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
@@ -35,9 +35,8 @@ public interface QueryResults extends Iterator {
   Class resultClass();
 
   /**
-   * Returns the Cursor for the point after the value returned in the last {@link #next} call. Until
-   * v1beta3 is supported, this field should only be used if you have set a limit and the number of
-   * results is equal to that limit.
+   * Returns the Cursor for the point after the value returned in the last {@link #next} call.
+   * Currently, {@code cursorAfter} returns null in all cases but the last result.
    */
   Cursor cursorAfter();
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
index 40538af81409..bae2e936f1c1 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
@@ -100,6 +100,9 @@ public Class resultClass() {
   @Override
   public Cursor cursorAfter() {
     //return new Cursor(cursor); // only available in v1beta3
-    return new Cursor(queryResultBatchPb.getEndCursor());
+    if (!hasNext()) {
+      return new Cursor(queryResultBatchPb.getEndCursor());
+    }
+    return null;
   }
 }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index 612c97c845fd..3ee83c1da059 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -478,7 +478,7 @@ public void testQueryPaginationWithLimit() throws DatastoreRpcException {
     }
     EasyMock.replay(rpcFactoryMock, rpcMock);
     Datastore mockDatastore =
-        this.options.toBuilder()
+        options.toBuilder()
             .retryParams(RetryParams.defaultInstance())
             .serviceRpcFactory(rpcFactoryMock)
             .build()

From ffbd3d71481a6c86291b1d417bb88ac87a060874 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 14 Jan 2016 13:41:29 -0800
Subject: [PATCH 278/322] Add link to bookshelf app

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4b5c34d9df11..5b738b00e847 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,8 @@ Example Applications
 
 - [`BigQueryExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java) - A simple command line interface providing some of Cloud BigQuery's functionality
   - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/BigQueryExample.html).
+- [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
+  - This app uses `gcloud-java` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
 - [`DatastoreExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java) - A simple command line interface for the Cloud Datastore
   - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/DatastoreExample.html).
 - [`ResourceManagerExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java) - A simple command line interface providing some of Cloud Resource Manager's functionality

From 663e54b356162b6890fd8175c9cc17a4a70dd097 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 15 Jan 2016 09:09:23 -0800
Subject: [PATCH 279/322] clarify batching in docs

---
 .../main/java/com/google/gcloud/datastore/QueryResults.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
index 8928398b76e2..b882131ba939 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
@@ -22,8 +22,9 @@
  * The result of a Google Cloud Datastore query submission.
  * When the result is not typed it is possible to cast it to its appropriate type according to
  * the {@link #resultClass} value.
- * Results are loaded lazily; therefore it is possible to get a {@code DatastoreException}
- * upon {@link Iterator#hasNext hasNext} or {@link Iterator#next next} calls.
+ * Results are loaded lazily in batches, where batch size is set by Cloud Datastore. As a result, it
+ * is possible to get a {@code DatastoreException} upon {@link Iterator#hasNext hasNext} or
+ * {@link Iterator#next next} calls.
  *
  * @param  the type of the results value.
  */

From e4113c47155b73d5be62e387a224ac43d1b6a43a Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 15 Jan 2016 10:43:30 -0800
Subject: [PATCH 280/322] avoid calling hasNext from afterCursor

---
 .../com/google/gcloud/datastore/QueryResultsImpl.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
index bae2e936f1c1..3c2e0d177f80 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
@@ -21,6 +21,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.AbstractIterator;
 import com.google.gcloud.datastore.Query.ResultType;
+import com.google.protobuf.ByteString;
 
 import java.util.Iterator;
 import java.util.Objects;
@@ -36,7 +37,7 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults
   private DatastoreV1.QueryResultBatch queryResultBatchPb;
   private boolean lastBatch;
   private Iterator entityResultPbIter;
-  //private ByteString cursor; // only available in v1beta3
+  private ByteString cursor; // only available in v1beta3
 
 
   QueryResultsImpl(DatastoreImpl datastore, DatastoreV1.ReadOptions readOptionsPb,
@@ -83,6 +84,7 @@ protected T computeNext() {
       sendRequest();
     }
     if (!entityResultPbIter.hasNext()) {
+      cursor = queryResultBatchPb.getEndCursor();
       return endOfData();
     }
     DatastoreV1.EntityResult entityResultPb = entityResultPbIter.next();
@@ -99,10 +101,7 @@ public Class resultClass() {
 
   @Override
   public Cursor cursorAfter() {
+    return cursor == null ? null : new Cursor(cursor);
     //return new Cursor(cursor); // only available in v1beta3
-    if (!hasNext()) {
-      return new Cursor(queryResultBatchPb.getEndCursor());
-    }
-    return null;
   }
 }

From 461f37529d3f6efd8d183e611ebbbd086f453f1e Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 15 Jan 2016 13:54:37 -0800
Subject: [PATCH 281/322] Minor style fixes

---
 .../gcloud/datastore/StructuredQuery.java     |  2 +-
 .../gcloud/datastore/DatastoreTest.java       | 78 +++++++++----------
 2 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
index c721398066d2..bbb73df4a79c 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -972,7 +972,7 @@ public Integer limit() {
   }
 
   public Builder toBuilder() {
-    return new Builder(this);
+    return new Builder<>(this);
   }
 
   @Override
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index 3ee83c1da059..e6f84c76ad40 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -477,12 +477,11 @@ public void testQueryPaginationWithLimit() throws DatastoreRpcException {
           .andReturn(responses.get(i));
     }
     EasyMock.replay(rpcFactoryMock, rpcMock);
-    Datastore mockDatastore =
-        options.toBuilder()
-            .retryParams(RetryParams.defaultInstance())
-            .serviceRpcFactory(rpcFactoryMock)
-            .build()
-            .service();
+    Datastore mockDatastore = options.toBuilder()
+        .retryParams(RetryParams.defaultInstance())
+        .serviceRpcFactory(rpcFactoryMock)
+        .build()
+        .service();
     int limit = 2;
     int totalCount = 0;
     StructuredQuery query = Query.entityQueryBuilder().limit(limit).build();
@@ -511,45 +510,40 @@ private List buildResponsesForQueryPaginationWithLimit() {
     Query query = Query.entityQueryBuilder().build();
     RunQueryRequest.Builder requestPb = RunQueryRequest.newBuilder();
     query.populatePb(requestPb);
-    QueryResultBatch queryResultBatchPb =
-        RunQueryResponse.newBuilder()
-            .mergeFrom(((DatastoreImpl) datastore).runQuery(requestPb.build()))
-            .getBatch();
-    QueryResultBatch queryResultBatchPb1 =
-        QueryResultBatch.newBuilder()
-            .mergeFrom(queryResultBatchPb)
-            .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED)
-            .clearEntityResult()
-            .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(0, 1))
-            .setEndCursor(queryResultBatchPb.getEntityResultList().get(0).getCursor())
-            .build();
+    QueryResultBatch queryResultBatchPb = RunQueryResponse.newBuilder()
+        .mergeFrom(((DatastoreImpl) datastore).runQuery(requestPb.build()))
+        .getBatch();
+    QueryResultBatch queryResultBatchPb1 = QueryResultBatch.newBuilder()
+        .mergeFrom(queryResultBatchPb)
+        .setMoreResults(QueryResultBatch.MoreResultsType.NOT_FINISHED)
+        .clearEntityResult()
+        .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(0, 1))
+        .setEndCursor(queryResultBatchPb.getEntityResultList().get(0).getCursor())
+        .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb1).build());
-    QueryResultBatch queryResultBatchPb2 =
-        QueryResultBatch.newBuilder()
-            .mergeFrom(queryResultBatchPb)
-            .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
-            .clearEntityResult()
-            .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(1, 2))
-            .setEndCursor(queryResultBatchPb.getEntityResultList().get(1).getCursor())
-            .build();
+    QueryResultBatch queryResultBatchPb2 = QueryResultBatch.newBuilder()
+        .mergeFrom(queryResultBatchPb)
+        .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
+        .clearEntityResult()
+        .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(1, 2))
+        .setEndCursor(queryResultBatchPb.getEntityResultList().get(1).getCursor())
+        .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb2).build());
-    QueryResultBatch queryResultBatchPb3 =
-        QueryResultBatch.newBuilder()
-            .mergeFrom(queryResultBatchPb)
-            .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
-            .clearEntityResult()
-            .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(2, 4))
-            .setEndCursor(queryResultBatchPb.getEntityResultList().get(3).getCursor())
-            .build();
+    QueryResultBatch queryResultBatchPb3 = QueryResultBatch.newBuilder()
+        .mergeFrom(queryResultBatchPb)
+        .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
+        .clearEntityResult()
+        .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(2, 4))
+        .setEndCursor(queryResultBatchPb.getEntityResultList().get(3).getCursor())
+        .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb3).build());
-    QueryResultBatch queryResultBatchPb4 =
-        QueryResultBatch.newBuilder()
-            .mergeFrom(queryResultBatchPb)
-            .setMoreResults(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS)
-            .clearEntityResult()
-            .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(4, 5))
-            .setEndCursor(queryResultBatchPb.getEntityResultList().get(4).getCursor())
-            .build();
+    QueryResultBatch queryResultBatchPb4 = QueryResultBatch.newBuilder()
+        .mergeFrom(queryResultBatchPb)
+        .setMoreResults(QueryResultBatch.MoreResultsType.NO_MORE_RESULTS)
+        .clearEntityResult()
+        .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(4, 5))
+        .setEndCursor(queryResultBatchPb.getEntityResultList().get(4).getCursor())
+        .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb4).build());
     return responses;
   }

From 76553010bebab7803dd6839941c90b9ee6b5d6fe Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 15 Jan 2016 16:18:03 -0800
Subject: [PATCH 282/322] Release version to 0.1.2

---
 gcloud-java-bigquery/pom.xml        | 2 +-
 gcloud-java-core/pom.xml            | 2 +-
 gcloud-java-datastore/pom.xml       | 2 +-
 gcloud-java-examples/pom.xml        | 2 +-
 gcloud-java-resourcemanager/pom.xml | 2 +-
 gcloud-java-storage/pom.xml         | 2 +-
 gcloud-java/pom.xml                 | 2 +-
 pom.xml                             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gcloud-java-bigquery/pom.xml b/gcloud-java-bigquery/pom.xml
index be459da08547..6761152e8770 100644
--- a/gcloud-java-bigquery/pom.xml
+++ b/gcloud-java-bigquery/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2-SNAPSHOT
+    0.1.2
   
   
     gcloud-java-bigquery
diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index ee39bcca1f72..248df370e170 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2-SNAPSHOT
+    0.1.2
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index 74cb36847486..a076bdf40e22 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2-SNAPSHOT
+    0.1.2
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index 8d7c8d870b97..dd1392488d0c 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2-SNAPSHOT
+    0.1.2
   
   
     gcloud-java-examples
diff --git a/gcloud-java-resourcemanager/pom.xml b/gcloud-java-resourcemanager/pom.xml
index 244edb0b77cf..571496067c55 100644
--- a/gcloud-java-resourcemanager/pom.xml
+++ b/gcloud-java-resourcemanager/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2-SNAPSHOT
+    0.1.2
   
   
     gcloud-java-resourcemanager
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index d901a328ac8a..350541a033f9 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2-SNAPSHOT
+    0.1.2
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index ee8662cf5a0e..762311113dd1 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2-SNAPSHOT
+    0.1.2
   
   
     
diff --git a/pom.xml b/pom.xml
index b27c9cc123a4..6c00d49af136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.1.2-SNAPSHOT
+  0.1.2
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From 3eb3fe866ba22487686048f45d927b8c8638ea3f Mon Sep 17 00:00:00 2001
From: travis-ci 
Date: Sat, 16 Jan 2016 00:37:15 +0000
Subject: [PATCH 283/322] Updating version in README files. [ci skip]

---
 README.md                             | 6 +++---
 gcloud-java-bigquery/README.md        | 6 +++---
 gcloud-java-core/README.md            | 6 +++---
 gcloud-java-datastore/README.md       | 6 +++---
 gcloud-java-examples/README.md        | 6 +++---
 gcloud-java-resourcemanager/README.md | 6 +++---
 gcloud-java-storage/README.md         | 6 +++---
 gcloud-java/README.md                 | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 5b738b00e847..520bf8b62c55 100644
--- a/README.md
+++ b/README.md
@@ -27,16 +27,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.1.1
+  0.1.2
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:0.1.1'
+compile 'com.google.gcloud:gcloud-java:0.1.2'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.1"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.2"
 ```
 
 Example Applications
diff --git a/gcloud-java-bigquery/README.md b/gcloud-java-bigquery/README.md
index 5456a01a5d71..af68402fbf70 100644
--- a/gcloud-java-bigquery/README.md
+++ b/gcloud-java-bigquery/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-bigquery
-  0.1.1
+  0.1.2
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-bigquery:0.1.1'
+compile 'com.google.gcloud:gcloud-java-bigquery:0.1.2'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-bigquery" % "0.1.1"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-bigquery" % "0.1.2"
 ```
 
 Example Application
diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index 89834e1c2361..f47d99779a05 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-core
-  0.1.1
+  0.1.2
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-core:0.1.1'
+compile 'com.google.gcloud:gcloud-java-core:0.1.2'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.1.1"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.1.2"
 ```
 
 Troubleshooting
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index 50b6451a71a0..15c2b3961dc2 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-datastore
-  0.1.1
+  0.1.2
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-datastore:0.1.1'
+compile 'com.google.gcloud:gcloud-java-datastore:0.1.2'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.1.1"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.1.2"
 ```
 
 Example Application
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index 031d18fc0c19..8d64c8ea202f 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-examples
-  0.1.1
+  0.1.2
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-examples:0.1.1'
+compile 'com.google.gcloud:gcloud-java-examples:0.1.2'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.1.1"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.1.2"
 ```
 
 To run examples from your command line:
diff --git a/gcloud-java-resourcemanager/README.md b/gcloud-java-resourcemanager/README.md
index 2eb4b3bdf44e..d0e58af85e4e 100644
--- a/gcloud-java-resourcemanager/README.md
+++ b/gcloud-java-resourcemanager/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-resourcemanager
-  0.1.1
+  0.1.2
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-resourcemanager:0.1.1'
+compile 'com.google.gcloud:gcloud-java-resourcemanager:0.1.2'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-resourcemanager" % "0.1.1"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-resourcemanager" % "0.1.2"
 ```
 
 Example Application
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 724dfd137e79..7e08264433c8 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-storage
-  0.1.1
+  0.1.2
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-storage:0.1.1'
+compile 'com.google.gcloud:gcloud-java-storage:0.1.2'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.1.1"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.1.2"
 ```
 
 Example Application
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index 4cb03390a91a..1f56696c3643 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.1.1
+  0.1.2
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:0.1.1'
+compile 'com.google.gcloud:gcloud-java:0.1.2'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.1"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.2"
 ```
 
 Troubleshooting

From d9ef14cf3eab199c7c9d84244a9893f1b746bd11 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 15 Jan 2016 17:19:16 -0800
Subject: [PATCH 284/322] Update version to 0.1.3-SNAPSHOT

---
 gcloud-java-bigquery/pom.xml        | 2 +-
 gcloud-java-core/pom.xml            | 2 +-
 gcloud-java-datastore/pom.xml       | 2 +-
 gcloud-java-examples/pom.xml        | 2 +-
 gcloud-java-resourcemanager/pom.xml | 2 +-
 gcloud-java-storage/pom.xml         | 2 +-
 gcloud-java/pom.xml                 | 2 +-
 pom.xml                             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gcloud-java-bigquery/pom.xml b/gcloud-java-bigquery/pom.xml
index 6761152e8770..aba002b6dce4 100644
--- a/gcloud-java-bigquery/pom.xml
+++ b/gcloud-java-bigquery/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2
+    0.1.3-SNAPSHOT
   
   
     gcloud-java-bigquery
diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index 248df370e170..d87e0d7eae85 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2
+    0.1.3-SNAPSHOT
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index a076bdf40e22..071dae4ad3f7 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2
+    0.1.3-SNAPSHOT
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index dd1392488d0c..a5f50b4fe89a 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2
+    0.1.3-SNAPSHOT
   
   
     gcloud-java-examples
diff --git a/gcloud-java-resourcemanager/pom.xml b/gcloud-java-resourcemanager/pom.xml
index 571496067c55..5101a963cf42 100644
--- a/gcloud-java-resourcemanager/pom.xml
+++ b/gcloud-java-resourcemanager/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2
+    0.1.3-SNAPSHOT
   
   
     gcloud-java-resourcemanager
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 350541a033f9..0dc525db4e63 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2
+    0.1.3-SNAPSHOT
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 762311113dd1..68dcdd661b6d 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.2
+    0.1.3-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 6c00d49af136..cd5c19720cd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.1.2
+  0.1.3-SNAPSHOT
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From b32e4b94a31584ea93b10c0cb3a87525c39df3e5 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Mon, 11 Jan 2016 16:56:52 +0100
Subject: [PATCH 285/322] Add support for BigQuery resumable uploads via a
 write channel - Move BlobWriteChannel and BlobReadChannel to core module -
 Rename BlobWriteChannel and BlobReadChannel to WriteChannel and ReadChannel -
 Add abstract class BaseWriteChannel implementing entity-agnostic channel
 functionality - Add BlobWriteChannel and BlobReadChannel implementation to
 gcloud-java-storage - Add LoadConfiguration and modify LoadJobInfo to take
 configuration as a parameter - Add BigQuery.writer method to return a writer
 given LoadConfiguration - Add BigQueryRpc.open and .write methods to
 implement write channel - Add TableDataWriteChannel class to support bigquery
 resumable streaming inserts - Add unit and integration tests - Update
 bigquery example with load-data action

---
 .../com/google/gcloud/bigquery/BigQuery.java  |   8 +
 .../google/gcloud/bigquery/BigQueryImpl.java  |  13 +-
 .../google/gcloud/bigquery/CopyJobInfo.java   |  16 +-
 .../gcloud/bigquery/LoadConfiguration.java    | 382 ++++++++++++++++++
 .../google/gcloud/bigquery/LoadJobInfo.java   | 347 ++--------------
 .../google/gcloud/bigquery/QueryJobInfo.java  |  16 +-
 .../com/google/gcloud/bigquery/Table.java     |   4 +-
 .../bigquery/TableDataWriteChannel.java       |  91 +++++
 .../com/google/gcloud/spi/BigQueryRpc.java    |  23 ++
 .../google/gcloud/spi/DefaultBigQueryRpc.java |  81 ++++
 .../gcloud/bigquery/BigQueryImplTest.java     |  19 +-
 .../gcloud/bigquery/ITBigQueryTest.java       |  85 +++-
 .../bigquery/LoadConfigurationTest.java       | 123 ++++++
 .../gcloud/bigquery/LoadJobInfoTest.java      |  87 ++--
 .../gcloud/bigquery/SerializationTest.java    |  49 ++-
 .../bigquery/TableDataWriteChannelTest.java   | 248 ++++++++++++
 .../com/google/gcloud/bigquery/TableTest.java |   6 +-
 .../com/google/gcloud/BaseWriteChannel.java   | 293 ++++++++++++++
 .../java/com/google/gcloud/ReadChannel.java   |  57 +++
 .../java/com/google/gcloud/WriteChannel.java  |  48 +++
 .../google/gcloud/BaseWriteChannelTest.java   | 144 +++++++
 .../gcloud/examples/BigQueryExample.java      |  56 ++-
 .../gcloud/examples/StorageExample.java       |   8 +-
 .../java/com/google/gcloud/storage/Blob.java  |  10 +-
 .../gcloud/storage/BlobReadChannel.java       | 286 +++++++++++--
 .../gcloud/storage/BlobReadChannelImpl.java   | 278 -------------
 .../gcloud/storage/BlobWriteChannel.java      |  94 +++--
 .../gcloud/storage/BlobWriteChannelImpl.java  | 273 -------------
 .../com/google/gcloud/storage/Storage.java    |   8 +-
 .../google/gcloud/storage/StorageImpl.java    |  11 +-
 ...ImplTest.java => BlobReadChannelTest.java} |  37 +-
 .../com/google/gcloud/storage/BlobTest.java   |   3 +-
 ...mplTest.java => BlobWriteChannelTest.java} |  46 +--
 .../google/gcloud/storage/ITStorageTest.java  |  33 +-
 .../gcloud/storage/SerializationTest.java     |  18 +-
 .../gcloud/storage/StorageImplTest.java       |  12 +-
 36 files changed, 2181 insertions(+), 1132 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableDataWriteChannel.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableDataWriteChannelTest.java
 create mode 100644 gcloud-java-core/src/main/java/com/google/gcloud/BaseWriteChannel.java
 create mode 100644 gcloud-java-core/src/main/java/com/google/gcloud/ReadChannel.java
 create mode 100644 gcloud-java-core/src/main/java/com/google/gcloud/WriteChannel.java
 create mode 100644 gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java
 delete mode 100644 gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java
 delete mode 100644 gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java
 rename gcloud-java-storage/src/test/java/com/google/gcloud/storage/{BlobReadChannelImplTest.java => BlobReadChannelTest.java} (86%)
 rename gcloud-java-storage/src/test/java/com/google/gcloud/storage/{BlobWriteChannelImplTest.java => BlobWriteChannelTest.java} (85%)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
index af5ced9d4230..aa516c31fb54 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
@@ -662,4 +662,12 @@ Page> listTableData(TableId tableId, TableDataListOption... opt
    * @throws BigQueryException upon failure
    */
   QueryResponse getQueryResults(JobId job, QueryResultsOption... options) throws BigQueryException;
+
+  /**
+   * Returns a channel to write data to be inserted into a BigQuery table. Data format and other
+   * options can be configured using the {@link LoadConfiguration} parameter.
+   *
+   * @throws BigQueryException upon failure
+   */
+  TableDataWriteChannel writer(LoadConfiguration loadConfiguration);
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
index 9bc89206889b..3a1cc658bef3 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -619,6 +619,10 @@ private static QueryResult.Builder transformQueryResults(JobId jobId, List
    •  optionMap(Option... options) {
     Map optionMap = Maps.newEnumMap(BigQueryRpc.Option.class);
     for (Option option : options) {
@@ -698,8 +702,7 @@ public TableId apply(TableId tableId) {
     if (job instanceof LoadJobInfo) {
       LoadJobInfo loadJob = (LoadJobInfo) job;
       LoadJobInfo.Builder loadBuilder = loadJob.toBuilder();
-      loadBuilder.destinationTable(setProjectId(loadJob.destinationTable()));
-      return loadBuilder.build();
+      return loadBuilder.configuration(setProjectId(loadJob.configuration())).build();
     }
     return job;
   }
@@ -711,4 +714,10 @@ private QueryRequest setProjectId(QueryRequest request) {
     }
     return builder.build();
   }
+
+  private LoadConfiguration setProjectId(LoadConfiguration configuration) {
+    LoadConfiguration.Builder builder = configuration.toBuilder();
+    builder.destinationTable(setProjectId(configuration.destinationTable()));
+    return builder.build();
+  }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
index a3247b78d5b8..bd346a8e1633 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
@@ -95,8 +95,8 @@ public Builder destinationTable(TableId destinationTable) {
     /**
      * Sets whether the job is allowed to create new tables.
      *
-     * @see 
-     *     Jobs: Link Configuration
+     * @see 
+     *     Create Disposition
      */
     public Builder createDisposition(CreateDisposition createDisposition) {
       this.createDisposition = createDisposition;
@@ -106,8 +106,8 @@ public Builder createDisposition(CreateDisposition createDisposition) {
     /**
      * Sets the action that should occur if the destination table already exists.
      *
-     * @see 
-     *     Jobs: Link Configuration
+     * @see 
+     *     Write Disposition
      */
     public Builder writeDisposition(WriteDisposition writeDisposition) {
       this.writeDisposition = writeDisposition;
@@ -145,8 +145,8 @@ public TableId destinationTable() {
   /**
    * Returns whether the job is allowed to create new tables.
    *
-   * @see 
-   *     Jobs: Copy Configuration
+   * @see 
+   *     Create Disposition
    */
   public CreateDisposition createDisposition() {
     return this.createDisposition;
@@ -155,8 +155,8 @@ public CreateDisposition createDisposition() {
   /**
    * Returns the action that should occur if the destination table already exists.
    *
-   * @see 
-   *     Jobs: Copy Configuration
+   * @see 
+   *     Write Disposition
    */
   public WriteDisposition writeDisposition() {
     return writeDisposition;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java
new file mode 100644
index 000000000000..18cb8ae6bedb
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java
@@ -0,0 +1,382 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.JobConfigurationLoad;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
+import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
+
+import java.io.Serializable;
+import java.nio.channels.SeekableByteChannel;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Configuration for a load operation. A load configuration can be used to build a
+ * {@link LoadJobInfo} or to load data into a table with a {@link com.google.gcloud.WriteChannel}
+ * ({@link BigQuery#writer(LoadConfiguration)}).
+ */
+public class LoadConfiguration implements Serializable {
+
+  private static final long serialVersionUID = 470267591917413578L;
+
+  private final TableId destinationTable;
+  private final CreateDisposition createDisposition;
+  private final WriteDisposition writeDisposition;
+  private final FormatOptions formatOptions;
+  private final Integer maxBadRecords;
+  private final Schema schema;
+  private final Boolean ignoreUnknownValues;
+  private final List projectionFields;
+
+  public static final class Builder {
+
+    private TableId destinationTable;
+    private CreateDisposition createDisposition;
+    private WriteDisposition writeDisposition;
+    private FormatOptions formatOptions;
+    private Integer maxBadRecords;
+    private Schema schema;
+    private Boolean ignoreUnknownValues;
+    private List projectionFields;
+
+    private Builder() {}
+
+    private Builder(LoadConfiguration loadConfiguration) {
+      this.destinationTable = loadConfiguration.destinationTable;
+      this.createDisposition = loadConfiguration.createDisposition;
+      this.writeDisposition = loadConfiguration.writeDisposition;
+      this.formatOptions = loadConfiguration.formatOptions;
+      this.maxBadRecords = loadConfiguration.maxBadRecords;
+      this.schema = loadConfiguration.schema;
+      this.ignoreUnknownValues = loadConfiguration.ignoreUnknownValues;
+      this.projectionFields = loadConfiguration.projectionFields;
+    }
+
+    private Builder(JobConfigurationLoad loadConfigurationPb) {
+      this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
+      if (loadConfigurationPb.getCreateDisposition() != null) {
+        this.createDisposition =
+            CreateDisposition.valueOf(loadConfigurationPb.getCreateDisposition());
+      }
+      if (loadConfigurationPb.getWriteDisposition() != null) {
+        this.writeDisposition = WriteDisposition.valueOf(loadConfigurationPb.getWriteDisposition());
+      }
+      if (loadConfigurationPb.getSourceFormat() != null) {
+        this.formatOptions = FormatOptions.of(loadConfigurationPb.getSourceFormat());
+      }
+      if (loadConfigurationPb.getAllowJaggedRows() != null
+          || loadConfigurationPb.getAllowQuotedNewlines() != null
+          || loadConfigurationPb.getEncoding() != null
+          || loadConfigurationPb.getFieldDelimiter() != null
+          || loadConfigurationPb.getQuote() != null
+          || loadConfigurationPb.getSkipLeadingRows() != null) {
+        CsvOptions.Builder builder = CsvOptions.builder()
+            .allowJaggedRows(loadConfigurationPb.getAllowJaggedRows())
+            .allowQuotedNewLines(loadConfigurationPb.getAllowQuotedNewlines())
+            .encoding(loadConfigurationPb.getEncoding())
+            .fieldDelimiter(loadConfigurationPb.getFieldDelimiter())
+            .quote(loadConfigurationPb.getQuote())
+            .skipLeadingRows(loadConfigurationPb.getSkipLeadingRows());
+        this.formatOptions = builder.build();
+      }
+      this.maxBadRecords = loadConfigurationPb.getMaxBadRecords();
+      if (loadConfigurationPb.getSchema() != null) {
+        this.schema = Schema.fromPb(loadConfigurationPb.getSchema());
+      }
+      this.ignoreUnknownValues = loadConfigurationPb.getIgnoreUnknownValues();
+      this.projectionFields = loadConfigurationPb.getProjectionFields();
+    }
+
+    /**
+     * Sets the destination table to load the data into.
+     */
+    public Builder destinationTable(TableId destinationTable) {
+      this.destinationTable = destinationTable;
+      return this;
+    }
+
+    /**
+     * Sets whether the job is allowed to create new tables.
+     *
+     * @see 
+     *     Create Disposition
+     */
+    public Builder createDisposition(CreateDisposition createDisposition) {
+      this.createDisposition = createDisposition;
+      return this;
+    }
+
+    /**
+     * Sets the action that should occur if the destination table already exists.
+     *
+     * @see 
+     *     Write Disposition
+     */
+    public Builder writeDisposition(WriteDisposition writeDisposition) {
+      this.writeDisposition = writeDisposition;
+      return this;
+    }
+
+    /**
+     * Sets the source format, and possibly some parsing options, of the external data. Supported
+     * formats are {@code CSV}, {@code NEWLINE_DELIMITED_JSON} and {@code DATASTORE_BACKUP}. If not
+     * specified, {@code CSV} format is assumed.
+     *
+     * 
+     *     Source Format
+     */
+    public Builder formatOptions(FormatOptions formatOptions) {
+      this.formatOptions = formatOptions;
+      return this;
+    }
+
+    /**
+     * Sets the maximum number of bad records that BigQuery can ignore when running the job. If the
+     * number of bad records exceeds this value, an invalid error is returned in the job result.
+     * By default no bad record is ignored.
+     */
+    public Builder maxBadRecords(Integer maxBadRecords) {
+      this.maxBadRecords = maxBadRecords;
+      return this;
+    }
+
+    /**
+     * Sets the schema for the destination table. The schema can be omitted if the destination table
+     * already exists, or if you're loading data from a Google Cloud Datastore backup (i.e.
+     * {@code DATASTORE_BACKUP} format option).
+     */
+    public Builder schema(Schema schema) {
+      this.schema = schema;
+      return this;
+    }
+
+    /**
+     * Sets whether BigQuery should allow extra values that are not represented in the table schema.
+     * If {@code true}, the extra values are ignored. If {@code false}, records with extra columns
+     * are treated as bad records, and if there are too many bad records, an invalid error is
+     * returned in the job result. By default unknown values are not allowed.
+     */
+    public Builder ignoreUnknownValues(Boolean ignoreUnknownValues) {
+      this.ignoreUnknownValues = ignoreUnknownValues;
+      return this;
+    }
+
+    /**
+     * Sets which entity properties to load into BigQuery from a Cloud Datastore backup. This field
+     * is only used if the source format is set to {@code DATASTORE_BACKUP}. Property names are case
+     * sensitive and must be top-level properties. If no properties are specified, BigQuery loads
+     * all properties. If any named property isn't found in the Cloud Datastore backup, an invalid
+     * error is returned in the job result.
+     */
+    public Builder projectionFields(List projectionFields) {
+      this.projectionFields =
+          projectionFields != null ? ImmutableList.copyOf(projectionFields) : null;
+      return this;
+    }
+
+    public LoadConfiguration build() {
+      return new LoadConfiguration(this);
+    }
+  }
+
+  private LoadConfiguration(Builder builder) {
+    this.destinationTable = checkNotNull(builder.destinationTable);
+    this.createDisposition = builder.createDisposition;
+    this.writeDisposition = builder.writeDisposition;
+    this.formatOptions = builder.formatOptions;
+    this.maxBadRecords = builder.maxBadRecords;
+    this.schema = builder.schema;
+    this.ignoreUnknownValues = builder.ignoreUnknownValues;
+    this.projectionFields = builder.projectionFields;
+  }
+
+  /**
+   * Returns the destination table to load the data into.
+   */
+  public TableId destinationTable() {
+    return destinationTable;
+  }
+
+  /**
+   * Returns whether the job is allowed to create new tables.
+   *
+   * @see 
+   *     Create Disposition
+   */
+  public CreateDisposition createDisposition() {
+    return this.createDisposition;
+  }
+
+  /**
+   * Returns the action that should occur if the destination table already exists.
+   *
+   * @see 
+   *     Write Disposition
+   */
+  public WriteDisposition writeDisposition() {
+    return writeDisposition;
+  }
+
+  /**
+   * Returns additional properties used to parse CSV data (used when {@link #format()} is set
+   * to CSV). Returns {@code null} if not set.
+   */
+  public CsvOptions csvOptions() {
+    return formatOptions instanceof CsvOptions ? (CsvOptions) formatOptions : null;
+  }
+
+  /**
+   * Returns the maximum number of bad records that BigQuery can ignore when running the job. If the
+   * number of bad records exceeds this value, an invalid error is returned in the job result.
+   * By default no bad record is ignored.
+   */
+  public Integer maxBadRecords() {
+    return maxBadRecords;
+  }
+
+  /**
+   * Returns the schema for the destination table, if set. Returns {@code null} otherwise.
+   */
+  public Schema schema() {
+    return schema;
+  }
+
+  /**
+   * Returns the format of the data files.
+   */
+  public String format() {
+    return formatOptions != null ? formatOptions.type() : null;
+  }
+
+  /**
+   * Returns whether BigQuery should allow extra values that are not represented in the table
+   * schema. If {@code true}, the extra values are ignored. If {@code true}, records with extra
+   * columns are treated as bad records, and if there are too many bad records, an invalid error is
+   * returned in the job result. By default unknown values are not allowed.
+   */
+  public Boolean ignoreUnknownValues() {
+    return ignoreUnknownValues;
+  }
+
+  /**
+   * Returns which entity properties to load into BigQuery from a Cloud Datastore backup. This field
+   * is only used if the source format is set to {@code DATASTORE_BACKUP}. Property names are case
+   * sensitive and must be top-level properties. If no properties are specified, BigQuery loads
+   * all properties. If any named property isn't found in the Cloud Datastore backup, an invalid
+   * error is returned in the job result.
+   */
+  public List projectionFields() {
+    return projectionFields;
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("destinationTable", destinationTable)
+        .add("createDisposition", createDisposition)
+        .add("writeDisposition", writeDisposition)
+        .add("formatOptions", formatOptions)
+        .add("maxBadRecords", maxBadRecords)
+        .add("schema", schema)
+        .add("ignoreUnknownValue", ignoreUnknownValues)
+        .add("projectionFields", projectionFields)
+        .toString();
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof LoadConfiguration
+        && Objects.equals(toPb(), ((LoadConfiguration) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(destinationTable, createDisposition, writeDisposition, formatOptions,
+        maxBadRecords, schema, ignoreUnknownValues, projectionFields);
+  }
+
+  JobConfigurationLoad toPb() {
+    JobConfigurationLoad loadConfigurationPb = new JobConfigurationLoad();
+    loadConfigurationPb.setDestinationTable(destinationTable.toPb());
+    if (createDisposition != null) {
+      loadConfigurationPb.setCreateDisposition(createDisposition.toString());
+    }
+    if (writeDisposition != null) {
+      loadConfigurationPb.setWriteDisposition(writeDisposition.toString());
+    }
+    if (csvOptions() != null) {
+      CsvOptions csvOptions = csvOptions();
+      loadConfigurationPb.setFieldDelimiter(csvOptions.fieldDelimiter())
+          .setAllowJaggedRows(csvOptions.allowJaggedRows())
+          .setAllowQuotedNewlines(csvOptions.allowQuotedNewLines())
+          .setEncoding(csvOptions.encoding())
+          .setQuote(csvOptions.quote())
+          .setSkipLeadingRows(csvOptions.skipLeadingRows());
+    }
+    if (schema != null) {
+      loadConfigurationPb.setSchema(schema.toPb());
+    }
+    if (formatOptions != null) {
+      loadConfigurationPb.setSourceFormat(formatOptions.type());
+    }
+    loadConfigurationPb.setMaxBadRecords(maxBadRecords);
+    loadConfigurationPb.setIgnoreUnknownValues(ignoreUnknownValues);
+    loadConfigurationPb.setProjectionFields(projectionFields);
+    return loadConfigurationPb;
+  }
+
+  static LoadConfiguration fromPb(JobConfigurationLoad configurationPb) {
+    return new Builder(configurationPb).build();
+  }
+
+  /**
+   * Creates a builder for a BigQuery Load Configuration given the destination table.
+   */
+  public static Builder builder(TableId destinationTable) {
+    return new Builder().destinationTable(destinationTable);
+  }
+
+  /**
+   * Creates a builder for a BigQuery Load Configuration given the destination table and format.
+   */
+  public static Builder builder(TableId destinationTable, FormatOptions format) {
+    return new Builder().destinationTable(destinationTable).formatOptions(format);
+  }
+
+  /**
+   * Returns a BigQuery Load Configuration for the given destination table.
+   */
+  public static LoadConfiguration of(TableId destinationTable) {
+    return builder(destinationTable).build();
+  }
+
+  /**
+   * Returns a BigQuery Load Configuration for the given destination table and format.
+   */
+  public static LoadConfiguration of(TableId destinationTable, FormatOptions format) {
+    return builder(destinationTable).formatOptions(format).build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
index 1120bbbacf3f..4f8d03cbc6a9 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
@@ -34,81 +34,29 @@
  */
 public class LoadJobInfo extends JobInfo {
 
-  private static final long serialVersionUID = 2515503817007974115L;
+  private static final long serialVersionUID = 6349304826867750535L;
 
   private final List sourceUris;
-  private final TableId destinationTable;
-  private final CreateDisposition createDisposition;
-  private final WriteDisposition writeDisposition;
-  private final FormatOptions formatOptions;
-  private final Integer maxBadRecords;
-  private final Schema schema;
-  private final Boolean ignoreUnknownValues;
-  private final List projectionFields;
+  private final LoadConfiguration configuration;
 
   public static final class Builder extends JobInfo.Builder {
 
     private List sourceUris;
-    private TableId destinationTable;
-    private CreateDisposition createDisposition;
-    private WriteDisposition writeDisposition;
-    private FormatOptions formatOptions;
-    private Integer maxBadRecords;
-    private Schema schema;
-    private Boolean ignoreUnknownValues;
-    private List projectionFields;
+    private LoadConfiguration configuration;
 
     private Builder() {}
 
     private Builder(LoadJobInfo jobInfo) {
       super(jobInfo);
       this.sourceUris = jobInfo.sourceUris;
-      this.destinationTable = jobInfo.destinationTable;
-      this.createDisposition = jobInfo.createDisposition;
-      this.writeDisposition = jobInfo.writeDisposition;
-      this.formatOptions = jobInfo.formatOptions;
-      this.maxBadRecords = jobInfo.maxBadRecords;
-      this.schema = jobInfo.schema;
-      this.ignoreUnknownValues = jobInfo.ignoreUnknownValues;
-      this.projectionFields = jobInfo.projectionFields;
+      this.configuration = jobInfo.configuration;
     }
 
     private Builder(Job jobPb) {
       super(jobPb);
       JobConfigurationLoad loadConfigurationPb = jobPb.getConfiguration().getLoad();
+      this.configuration = LoadConfiguration.fromPb(loadConfigurationPb);
       this.sourceUris = loadConfigurationPb.getSourceUris();
-      this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
-      if (loadConfigurationPb.getCreateDisposition() != null) {
-        this.createDisposition =
-            CreateDisposition.valueOf(loadConfigurationPb.getCreateDisposition());
-      }
-      if (loadConfigurationPb.getWriteDisposition() != null) {
-        this.writeDisposition = WriteDisposition.valueOf(loadConfigurationPb.getWriteDisposition());
-      }
-      if (loadConfigurationPb.getSourceFormat() != null) {
-        this.formatOptions = FormatOptions.of(loadConfigurationPb.getSourceFormat());
-      }
-      if (loadConfigurationPb.getAllowJaggedRows() != null
-          || loadConfigurationPb.getAllowQuotedNewlines() != null
-          || loadConfigurationPb.getEncoding() != null
-          || loadConfigurationPb.getFieldDelimiter() != null
-          || loadConfigurationPb.getQuote() != null
-          || loadConfigurationPb.getSkipLeadingRows() != null) {
-        CsvOptions.Builder builder = CsvOptions.builder()
-            .allowJaggedRows(loadConfigurationPb.getAllowJaggedRows())
-            .allowQuotedNewLines(loadConfigurationPb.getAllowQuotedNewlines())
-            .encoding(loadConfigurationPb.getEncoding())
-            .fieldDelimiter(loadConfigurationPb.getFieldDelimiter())
-            .quote(loadConfigurationPb.getQuote())
-            .skipLeadingRows(loadConfigurationPb.getSkipLeadingRows());
-        this.formatOptions = builder.build();
-      }
-      this.maxBadRecords = loadConfigurationPb.getMaxBadRecords();
-      if (loadConfigurationPb.getSchema() != null) {
-        this.schema = Schema.fromPb(loadConfigurationPb.getSchema());
-      }
-      this.ignoreUnknownValues = loadConfigurationPb.getIgnoreUnknownValues();
-      this.projectionFields = loadConfigurationPb.getProjectionFields();
     }
 
     /**
@@ -122,88 +70,10 @@ public Builder sourceUris(List sourceUris) {
     }
 
     /**
-     * Sets the destination table to load the data into.
+     * Sets the configuration for the BigQuery Load Job.
      */
-    public Builder destinationTable(TableId destinationTable) {
-      this.destinationTable = destinationTable;
-      return this;
-    }
-
-    /**
-     * Sets whether the job is allowed to create new tables.
-     *
-     * @see 
-     *     Jobs: Load Configuration
-     */
-    public Builder createDisposition(CreateDisposition createDisposition) {
-      this.createDisposition = createDisposition;
-      return this;
-    }
-
-    /**
-     * Sets the action that should occur if the destination table already exists.
-     *
-     * @see 
-     *     Jobs: Load Configuration
-     */
-    public Builder writeDisposition(WriteDisposition writeDisposition) {
-      this.writeDisposition = writeDisposition;
-      return this;
-    }
-
-    /**
-     * Sets the source format, and possibly some parsing options, of the external data. Supported
-     * formats are {@code CSV}, {@code NEWLINE_DELIMITED_JSON} and {@code DATASTORE_BACKUP}. If not
-     * specified, {@code CSV} format is assumed.
-     *
-     * 
-     *     Source Format
-     */
-    public Builder formatOptions(FormatOptions formatOptions) {
-      this.formatOptions = formatOptions;
-      return this;
-    }
-
-    /**
-     * Sets the maximum number of bad records that BigQuery can ignore when running the job. If the
-     * number of bad records exceeds this value, an invalid error is returned in the job result.
-     * By default no bad record is ignored.
-     */
-    public Builder maxBadRecords(Integer maxBadRecords) {
-      this.maxBadRecords = maxBadRecords;
-      return this;
-    }
-
-    /**
-     * Sets the schema for the destination table. The schema can be omitted if the destination table
-     * already exists, or if you're loading data from Google Cloud Datastore.
-     */
-    public Builder schema(Schema schema) {
-      this.schema = schema;
-      return this;
-    }
-
-    /**
-     * Sets whether BigQuery should allow extra values that are not represented in the table schema.
-     * If {@code true}, the extra values are ignored. If {@code true}, records with extra columns
-     * are treated as bad records, and if there are too many bad records, an invalid error is
-     * returned in the job result. By default unknown values are not allowed.
-     */
-    public Builder ignoreUnknownValues(Boolean ignoreUnknownValues) {
-      this.ignoreUnknownValues = ignoreUnknownValues;
-      return this;
-    }
-
-    /**
-     * Sets which entity properties to load into BigQuery from a Cloud Datastore backup. This field
-     * is only used if the source format is set to {@code DATASTORE_BACKUP}. Property names are case
-     * sensitive and must be top-level properties. If no properties are specified, BigQuery loads
-     * all properties. If any named property isn't found in the Cloud Datastore backup, an invalid
-     * error is returned in the job result.
-     */
-    public Builder projectionFields(List projectionFields) {
-      this.projectionFields =
-          projectionFields != null ? ImmutableList.copyOf(projectionFields) : null;
+    public Builder configuration(LoadConfiguration configuration) {
+      this.configuration = configuration;
       return this;
     }
 
@@ -216,14 +86,7 @@ public LoadJobInfo build() {
   private LoadJobInfo(Builder builder) {
     super(builder);
     this.sourceUris = builder.sourceUris;
-    this.destinationTable = checkNotNull(builder.destinationTable);
-    this.createDisposition = builder.createDisposition;
-    this.writeDisposition = builder.writeDisposition;
-    this.formatOptions = builder.formatOptions;
-    this.maxBadRecords = builder.maxBadRecords;
-    this.schema = builder.schema;
-    this.ignoreUnknownValues = builder.ignoreUnknownValues;
-    this.projectionFields = builder.projectionFields;
+    this.configuration = builder.configuration;
   }
 
   /**
@@ -236,82 +99,10 @@ public List sourceUris() {
   }
 
   /**
-   * Returns the destination table to load the data into.
+   * Returns the configuration for the BigQuery Load Job.
    */
-  public TableId destinationTable() {
-    return destinationTable;
-  }
-
-  /**
-   * Returns whether the job is allowed to create new tables.
-   *
-   * @see 
-   *     Jobs: Load Configuration
-   */
-  public CreateDisposition createDisposition() {
-    return this.createDisposition;
-  }
-
-  /**
-   * Returns the action that should occur if the destination table already exists.
-   *
-   * @see 
-   *     Jobs: Load Configuration
-   */
-  public WriteDisposition writeDisposition() {
-    return writeDisposition;
-  }
-
-  /**
-   * Returns additional properties used to parse CSV data (used when {@link #format()} is set
-   * to CSV). Returns {@code null} if not set.
-   */
-  public CsvOptions csvOptions() {
-    return formatOptions instanceof CsvOptions ? (CsvOptions) formatOptions : null;
-  }
-
-  /**
-   * Returns the maximum number of bad records that BigQuery can ignore when running the job. If the
-   * number of bad records exceeds this value, an invalid error is returned in the job result.
-   * By default no bad record is ignored.
-   */
-  public Integer maxBadRecords() {
-    return maxBadRecords;
-  }
-
-  /**
-   * Returns the schema for the destination table, if set. Returns {@code null} otherwise.
-   */
-  public Schema schema() {
-    return schema;
-  }
-
-  /**
-   * Returns the format of the data files.
-   */
-  public String format() {
-    return formatOptions != null ? formatOptions.type() : null;
-  }
-
-  /**
-   * Returns whether BigQuery should allow extra values that are not represented in the table
-   * schema. If {@code true}, the extra values are ignored. If {@code true}, records with extra
-   * columns are treated as bad records, and if there are too many bad records, an invalid error is
-   * returned in the job result. By default unknown values are not allowed.
-   */
-  public Boolean ignoreUnknownValues() {
-    return ignoreUnknownValues;
-  }
-
-  /**
-   * Returns which entity properties to load into BigQuery from a Cloud Datastore backup. This field
-   * is only used if the source format is set to {@code DATASTORE_BACKUP}. Property names are case
-   * sensitive and must be top-level properties. If no properties are specified, BigQuery loads
-   * all properties. If any named property isn't found in the Cloud Datastore backup, an invalid
-   * error is returned in the job result.
-   */
-  public List projectionFields() {
-    return projectionFields;
+  public LoadConfiguration configuration() {
+    return configuration;
   }
 
   @Override
@@ -321,16 +112,7 @@ public Builder toBuilder() {
 
   @Override
   ToStringHelper toStringHelper() {
-    return super.toStringHelper()
-        .add("destinationTable", destinationTable)
-        .add("sourceUris", sourceUris)
-        .add("createDisposition", createDisposition)
-        .add("writeDisposition", writeDisposition)
-        .add("formatOptions", formatOptions)
-        .add("maxBadRecords", maxBadRecords)
-        .add("schema", schema)
-        .add("ignoreUnknownValue", ignoreUnknownValues)
-        .add("projectionFields", projectionFields);
+    return super.toStringHelper().add("sourceUris", sourceUris).add("configuration", configuration);
   }
 
   @Override
@@ -340,122 +122,61 @@ public boolean equals(Object obj) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), sourceUris, destinationTable, createDisposition,
-        writeDisposition, formatOptions, maxBadRecords, schema, ignoreUnknownValues,
-        projectionFields);
+    return Objects.hash(super.hashCode(), sourceUris, configuration);
   }
 
   @Override
   Job toPb() {
-    JobConfigurationLoad loadConfigurationPb = new JobConfigurationLoad();
+    JobConfigurationLoad loadConfigurationPb = configuration.toPb();
     loadConfigurationPb.setSourceUris(sourceUris);
-    loadConfigurationPb.setDestinationTable(destinationTable.toPb());
-    if (createDisposition != null) {
-      loadConfigurationPb.setCreateDisposition(createDisposition.toString());
-    }
-    if (writeDisposition != null) {
-      loadConfigurationPb.setWriteDisposition(writeDisposition.toString());
-    }
-    if (csvOptions() != null) {
-      CsvOptions csvOptions = csvOptions();
-      loadConfigurationPb.setFieldDelimiter(csvOptions.fieldDelimiter())
-          .setAllowJaggedRows(csvOptions.allowJaggedRows())
-          .setAllowQuotedNewlines(csvOptions.allowQuotedNewLines())
-          .setEncoding(csvOptions.encoding())
-          .setQuote(csvOptions.quote())
-          .setSkipLeadingRows(csvOptions.skipLeadingRows());
-    }
-    if (schema != null) {
-      loadConfigurationPb.setSchema(schema.toPb());
-    }
-    if (formatOptions != null) {
-      loadConfigurationPb.setSourceFormat(formatOptions.type());
-    }
-    loadConfigurationPb.setMaxBadRecords(maxBadRecords);
-    loadConfigurationPb.setIgnoreUnknownValues(ignoreUnknownValues);
-    loadConfigurationPb.setProjectionFields(projectionFields);
     return super.toPb().setConfiguration(new JobConfiguration().setLoad(loadConfigurationPb));
   }
 
   /**
-   * Creates a builder for a BigQuery Load Job given destination table and source URI.
+   * Creates a builder for a BigQuery Load Job given the load configuration and source URI.
    */
-  public static Builder builder(TableId destinationTable, String sourceUri) {
-    return builder(destinationTable, ImmutableList.of(checkNotNull(sourceUri)));
+  public static Builder builder(LoadConfiguration configuration, String sourceUri) {
+    return builder(configuration, ImmutableList.of(checkNotNull(sourceUri)));
   }
 
   /**
-   * Creates a builder for a BigQuery Load Job given destination table and source URIs.
+   * Creates a builder for a BigQuery Load Job given the load configuration and source URIs.
    */
-  public static Builder builder(TableId destinationTable, List sourceUris) {
-    return new Builder().destinationTable(destinationTable).sourceUris(sourceUris);
+  public static Builder builder(LoadConfiguration configuration, List sourceUris) {
+    return new Builder().configuration(configuration).sourceUris(sourceUris);
   }
 
   /**
-   * Returns a BigQuery Load Job for the given destination table and source URI. Job's id is chosen
+   * Returns a BigQuery Load Job for the given load configuration and source URI. Job's id is chosen
    * by the service.
    */
-  public static LoadJobInfo of(TableId destinationTable, String sourceUri) {
-    return builder(destinationTable, sourceUri).build();
+  public static LoadJobInfo of(LoadConfiguration configuration, String sourceUri) {
+    return builder(configuration, sourceUri).build();
   }
 
   /**
-   * Returns a BigQuery Load Job for the given destination table and source URIs. Job's id is chosen
-   * by the service.
-   */
-  public static LoadJobInfo of(TableId destinationTable, List sourceUris) {
-    return builder(destinationTable, sourceUris).build();
-  }
-
-  /**
-   * Returns a BigQuery Load Job for the given destination table, format and source URI. Job's id is
+   * Returns a BigQuery Load Job for the given load configuration and source URIs. Job's id is
    * chosen by the service.
    */
-  public static LoadJobInfo of(TableId destinationTable, FormatOptions format, String sourceUri) {
-    return builder(destinationTable, sourceUri).formatOptions(format).build();
-  }
-
-  /**
-   * Returns a BigQuery Load Job for the given destination table, format and source URIs. Job's id
-   * is chosen by the service.
-   */
-  public static LoadJobInfo of(TableId destinationTable, FormatOptions format,
-      List sourceUris) {
-    return builder(destinationTable, sourceUris).formatOptions(format).build();
+  public static LoadJobInfo of(LoadConfiguration configuration, List sourceUris) {
+    return builder(configuration, sourceUris).build();
   }
 
   /**
-   * Returns a BigQuery Load Job for the given destination table and source URI. Job's id is set to
+   * Returns a BigQuery Load Job for the given load configuration and source URI. Job's id is set to
    * the provided value.
    */
-  public static LoadJobInfo of(JobId jobId, TableId destinationTable, String sourceUri) {
-    return builder(destinationTable, sourceUri).jobId(jobId).build();
-  }
-
-  /**
-   * Returns a BigQuery Load Job for the given destination table and source URIs. Job's id is set to
-   * the provided value.
-   */
-  public static LoadJobInfo of(JobId jobId, TableId destinationTable, List sourceUris) {
-    return builder(destinationTable, sourceUris).jobId(jobId).build();
-  }
-
-  /**
-   * Returns a BigQuery Load Job for the given destination table, format, and source URI. Job's id
-   * is set to the provided value.
-   */
-  public static LoadJobInfo of(JobId jobId, TableId destinationTable, FormatOptions format,
-      String sourceUri) {
-    return builder(destinationTable, sourceUri).formatOptions(format).jobId(jobId).build();
+  public static LoadJobInfo of(JobId jobId, LoadConfiguration configuration, String sourceUri) {
+    return builder(configuration, sourceUri).jobId(jobId).build();
   }
 
   /**
-   * Returns a BigQuery Load Job for the given destination table, format and source URIs. Job's id
-   * is set to the provided value.
+   * Returns a BigQuery Load Job for the given load configuration and source URIs. Job's id is set
+   * to the provided value.
    */
-  public static LoadJobInfo of(JobId jobId, TableId destinationTable, FormatOptions format,
+  public static LoadJobInfo of(JobId jobId, LoadConfiguration configuration,
       List sourceUris) {
-    return builder(destinationTable, sourceUris).formatOptions(format).jobId(jobId).build();
+    return builder(configuration, sourceUris).jobId(jobId).build();
   }
 
   @SuppressWarnings("unchecked")
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
index 5a8b822e87ef..e11e8d6aa8ad 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
@@ -197,8 +197,8 @@ public Builder userDefinedFunctions(List userDefinedFunctio
     /**
      * Sets whether the job is allowed to create tables.
      *
-     * @see 
-     *     Jobs: Query Configuration
+     * @see 
+     *     Create Disposition
      */
     public Builder createDisposition(CreateDisposition createDisposition) {
       this.createDisposition = createDisposition;
@@ -208,8 +208,8 @@ public Builder createDisposition(CreateDisposition createDisposition) {
     /**
      * Sets the action that should occur if the destination table already exists.
      *
-     * @see 
-     *     Jobs: Query Configuration
+     * @see 
+     *     Write Disposition
      */
     public Builder writeDisposition(WriteDisposition writeDisposition) {
       this.writeDisposition = writeDisposition;
@@ -319,8 +319,8 @@ public Boolean allowLargeResults() {
   /**
    * Returns whether the job is allowed to create new tables.
    *
-   * @see 
-   *     Jobs: Query Configuration
+   * @see 
+   *     Create Disposition
    */
   public CreateDisposition createDisposition() {
     return createDisposition;
@@ -399,8 +399,8 @@ public List userDefinedFunctions() {
   /**
    * Returns the action that should occur if the destination table already exists.
    *
-   * @see 
-   *     Jobs: Query Configuration
+   * @see 
+   *     Write Disposition
    */
   public WriteDisposition writeDisposition() {
     return writeDisposition;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
index 1662f266b5ec..b4cc1df1d997 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
@@ -262,8 +262,8 @@ Job load(FormatOptions format, String sourceUri, BigQuery.JobOption... options)
    */
   Job load(FormatOptions format, List sourceUris, BigQuery.JobOption... options)
       throws BigQueryException {
-    return new Job(bigquery, bigquery.create(LoadJobInfo.of(info.tableId(), format, sourceUris),
-        options));
+    LoadConfiguration configuration = LoadConfiguration.of(info.tableId(), format);
+    return new Job(bigquery, bigquery.create(LoadJobInfo.of(configuration, sourceUris), options));
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableDataWriteChannel.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableDataWriteChannel.java
new file mode 100644
index 000000000000..c4cee5a9a303
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableDataWriteChannel.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.gcloud.RetryHelper.runWithRetries;
+import static java.util.concurrent.Executors.callable;
+
+import com.google.gcloud.BaseWriteChannel;
+import com.google.gcloud.RestorableState;
+import com.google.gcloud.RetryHelper;
+import com.google.gcloud.WriteChannel;
+
+import java.util.Arrays;
+
+/**
+ * WriteChannel implementation to stream data into a BigQuery table.
+ */
+class TableDataWriteChannel extends BaseWriteChannel {
+
+  TableDataWriteChannel(BigQueryOptions options, LoadConfiguration loadConfiguration) {
+    this(options, loadConfiguration, options.rpc().open(loadConfiguration.toPb()));
+  }
+
+  TableDataWriteChannel(BigQueryOptions options, LoadConfiguration config, String uploadId) {
+    super(options, config, uploadId);
+  }
+
+  @Override
+  protected void flushBuffer(final int length, final boolean last) {
+    try {
+      runWithRetries(callable(new Runnable() {
+        @Override
+        public void run() {
+          options().rpc().write(uploadId(), buffer(), 0, position(), length, last);
+        }
+      }), options().retryParams(), BigQueryImpl.EXCEPTION_HANDLER);
+    } catch (RetryHelper.RetryHelperException e) {
+      throw BigQueryException.translateAndThrow(e);
+    }
+  }
+
+  protected StateImpl.Builder stateBuilder() {
+    return StateImpl.builder(options(), entity(), uploadId());
+  }
+
+  static class StateImpl extends BaseWriteChannel.BaseState {
+
+    private static final long serialVersionUID = -787362105981823738L;
+
+    StateImpl(Builder builder) {
+      super(builder);
+    }
+
+    static class Builder
+        extends BaseWriteChannel.BaseState.Builder {
+
+      private Builder(BigQueryOptions options, LoadConfiguration configuration, String uploadId) {
+        super(options, configuration, uploadId);
+      }
+
+      public RestorableState build() {
+        return new StateImpl(this);
+      }
+    }
+
+    static Builder builder(BigQueryOptions options, LoadConfiguration config, String uploadId) {
+      return new Builder(options, config, uploadId);
+    }
+
+    @Override
+    public WriteChannel restore() {
+      TableDataWriteChannel channel = new TableDataWriteChannel(serviceOptions, entity, uploadId);
+      channel.restore(this);
+      return channel;
+    }
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
index d53ad838b802..5f17f60f2bb5 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
@@ -19,6 +19,7 @@
 import com.google.api.services.bigquery.model.Dataset;
 import com.google.api.services.bigquery.model.GetQueryResultsResponse;
 import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.JobConfigurationLoad;
 import com.google.api.services.bigquery.model.QueryRequest;
 import com.google.api.services.bigquery.model.QueryResponse;
 import com.google.api.services.bigquery.model.Table;
@@ -185,4 +186,26 @@ GetQueryResultsResponse getQueryResults(String jobId, Map options)
       throws BigQueryException;
 
   QueryResponse query(QueryRequest request) throws BigQueryException;
+
+  /**
+   * Opens a resumable upload session to load data into a BigQuery table and returns an upload URI.
+   *
+   * @param configuration load configuration
+   * @throws BigQueryException upon failure
+   */
+  String open(JobConfigurationLoad configuration) throws BigQueryException;
+
+  /**
+   * Uploads the provided data to the resumable upload session at the specified position.
+   *
+   * @param uploadId the resumable upload session URI
+   * @param toWrite a byte array of data to upload
+   * @param toWriteOffset offset in the {@code toWrite} param to start writing from
+   * @param destOffset offset in the destination where to upload data to
+   * @param length the number of bytes to upload
+   * @param last {@code true} indicates that the last chunk is being uploaded
+   * @throws BigQueryException upon failure
+   */
+  void write(String uploadId, byte[] toWrite, int toWriteOffset, long destOffset, int length,
+      boolean last) throws BigQueryException;
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
index 04e481b345c2..74fdeb74bd64 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -20,12 +20,22 @@
 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 java.net.HttpURLConnection.HTTP_CREATED;
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
+import static java.net.HttpURLConnection.HTTP_OK;
 
 import com.google.api.client.googleapis.json.GoogleJsonError;
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
+import com.google.api.client.http.ByteArrayContent;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpRequestFactory;
 import com.google.api.client.http.HttpRequestInitializer;
+import com.google.api.client.http.HttpResponse;
+import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.json.JsonHttpContent;
+import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson.JacksonFactory;
 import com.google.api.services.bigquery.Bigquery;
 import com.google.api.services.bigquery.model.Dataset;
@@ -33,6 +43,8 @@
 import com.google.api.services.bigquery.model.DatasetReference;
 import com.google.api.services.bigquery.model.GetQueryResultsResponse;
 import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.JobConfiguration;
+import com.google.api.services.bigquery.model.JobConfigurationLoad;
 import com.google.api.services.bigquery.model.JobList;
 import com.google.api.services.bigquery.model.JobStatus;
 import com.google.api.services.bigquery.model.QueryRequest;
@@ -64,6 +76,10 @@ public class DefaultBigQueryRpc implements BigQueryRpc {
   public static final String DEFAULT_PROJECTION = "full";
   // see: https://cloud.google.com/bigquery/troubleshooting-errors
   private static final Set RETRYABLE_CODES = ImmutableSet.of(500, 502, 503, 504);
+  private static final String BASE_RESUMABLE_URI =
+      "https://www.googleapis.com/upload/bigquery/v2/projects/";
+  // see: https://cloud.google.com/bigquery/loading-data-post-request#resume-upload
+  private static final int HTTP_RESUME_INCOMPLETE = 308;
   private final BigQueryOptions options;
   private final Bigquery bigquery;
 
@@ -417,4 +433,69 @@ public QueryResponse query(QueryRequest request) throws BigQueryException {
       throw translate(ex);
     }
   }
+
+  @Override
+  public String open(JobConfigurationLoad configuration) throws BigQueryException {
+    try {
+      Job loadJob = new Job().setConfiguration(new JobConfiguration().setLoad(configuration));
+      StringBuilder builder = new StringBuilder()
+          .append(BASE_RESUMABLE_URI)
+          .append(options.projectId())
+          .append("/jobs");
+      GenericUrl url = new GenericUrl(builder.toString());
+      url.set("uploadType", "resumable");
+      JsonFactory jsonFactory = bigquery.getJsonFactory();
+      HttpRequestFactory requestFactory = bigquery.getRequestFactory();
+      HttpRequest httpRequest =
+          requestFactory.buildPostRequest(url, new JsonHttpContent(jsonFactory, loadJob));
+      httpRequest.getHeaders().set("X-Upload-Content-Value", "application/octet-stream");
+      HttpResponse response = httpRequest.execute();
+      return response.getHeaders().getLocation();
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
+
+  @Override
+  public void write(String uploadId, byte[] toWrite, int toWriteOffset, long destOffset, int length,
+      boolean last) throws BigQueryException {
+    try {
+      GenericUrl url = new GenericUrl(uploadId);
+      HttpRequest httpRequest = bigquery.getRequestFactory().buildPutRequest(url,
+          new ByteArrayContent(null, toWrite, toWriteOffset, length));
+      long limit = destOffset + length;
+      StringBuilder range = new StringBuilder("bytes ");
+      range.append(destOffset).append('-').append(limit - 1).append('/');
+      if (last) {
+        range.append(limit);
+      } else {
+        range.append('*');
+      }
+      httpRequest.getHeaders().setContentRange(range.toString());
+      int code;
+      String message;
+      IOException exception = null;
+      try {
+        HttpResponse response = httpRequest.execute();
+        code = response.getStatusCode();
+        message = response.getStatusMessage();
+      } catch (HttpResponseException ex) {
+        exception = ex;
+        code = ex.getStatusCode();
+        message = ex.getStatusMessage();
+      }
+      if (!last && code != HTTP_RESUME_INCOMPLETE
+          || last && !(code == HTTP_OK || code == HTTP_CREATED)) {
+        if (exception != null) {
+          throw exception;
+        }
+        GoogleJsonError error = new GoogleJsonError();
+        error.setCode(code);
+        error.setMessage(message);
+        throw translate(error);
+      }
+    } catch (IOException ex) {
+      throw translate(ex);
+    }
+  }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index ed54e6a94111..402edfc4a42f 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -41,6 +41,7 @@
 import com.google.common.collect.Lists;
 import com.google.gcloud.Page;
 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;
@@ -107,11 +108,11 @@ public class BigQueryImplTest {
   private static final TableInfo OTHER_TABLE_INFO = TableInfo.of(OTHER_TABLE_ID, TABLE_SCHEMA);
   private static final TableInfo TABLE_INFO_WITH_PROJECT =
       TableInfo.of(TABLE_ID_WITH_PROJECT, TABLE_SCHEMA);
-  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.of(TABLE_ID, "URI");
+  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.of(LoadConfiguration.of(TABLE_ID), "URI");
   private static final LoadJobInfo LOAD_JOB_WITH_PROJECT =
-      LoadJobInfo.of(TABLE_ID_WITH_PROJECT, "URI");
+      LoadJobInfo.of(LoadConfiguration.of(TABLE_ID_WITH_PROJECT), "URI");
   private static final LoadJobInfo COMPLETE_LOAD_JOB =
-      LoadJobInfo.builder(TABLE_ID_WITH_PROJECT, "URI")
+      LoadJobInfo.builder(LoadConfiguration.of(TABLE_ID_WITH_PROJECT), "URI")
           .jobId(JobId.of(PROJECT, JOB))
           .build();
   private static final CopyJobInfo COPY_JOB =
@@ -1006,6 +1007,18 @@ public void testGetQueryResultsWithOptions() {
     assertEquals("cursor", response.result().nextPageCursor());
   }
 
+  @Test
+  public void testWriter() {
+    LoadConfiguration loadConfiguration = LoadConfiguration.of(TABLE_ID);
+    EasyMock.expect(bigqueryRpcMock.open(LoadConfiguration.of(TABLE_ID_WITH_PROJECT).toPb()))
+        .andReturn("upload-id");
+    EasyMock.replay(bigqueryRpcMock);
+    bigquery = options.service();
+    WriteChannel channel = bigquery.writer(loadConfiguration);
+    assertNotNull(channel);
+    assertTrue(channel.isOpen());
+  }
+
   @Test
   public void testRetryableException() {
     EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index fa527df5aa75..528df30d0a61 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -16,6 +16,12 @@
 
 package com.google.gcloud.bigquery;
 
+import static com.google.gcloud.bigquery.BigQuery.DatasetField;
+import static com.google.gcloud.bigquery.BigQuery.JobField;
+import static com.google.gcloud.bigquery.BigQuery.JobListOption;
+import static com.google.gcloud.bigquery.BigQuery.JobOption;
+import static com.google.gcloud.bigquery.BigQuery.TableField;
+import static com.google.gcloud.bigquery.BigQuery.TableOption;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -27,9 +33,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.Page;
 import com.google.gcloud.bigquery.BigQuery.DatasetOption;
-import com.google.gcloud.bigquery.BigQuery.JobListOption;
-import com.google.gcloud.bigquery.BigQuery.JobOption;
-import com.google.gcloud.bigquery.BigQuery.TableOption;
 import com.google.gcloud.bigquery.testing.RemoteBigQueryHelper;
 import com.google.gcloud.storage.BlobInfo;
 import com.google.gcloud.storage.BucketInfo;
@@ -42,7 +45,9 @@
 import org.junit.Test;
 import org.junit.rules.Timeout;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.List;
@@ -147,11 +152,11 @@ public static void beforeClass() throws IOException, InterruptedException {
         JSON_CONTENT.getBytes(StandardCharsets.UTF_8));
     DatasetInfo info = DatasetInfo.builder(DATASET).description(DESCRIPTION).build();
     bigquery.create(info);
-    LoadJobInfo job = LoadJobInfo.builder(TABLE_ID, "gs://" + BUCKET + "/" + JSON_LOAD_FILE)
+    LoadConfiguration configuration = LoadConfiguration.builder(TABLE_ID, FormatOptions.json())
         .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
         .schema(TABLE_SCHEMA)
-        .formatOptions(FormatOptions.json())
         .build();
+    LoadJobInfo job = LoadJobInfo.of(configuration, "gs://" + BUCKET + "/" + JSON_LOAD_FILE);
     job = bigquery.create(job);
     while (job.status().state() != JobStatus.State.DONE) {
       Thread.sleep(1000);
@@ -188,7 +193,7 @@ public void testGetDataset() {
   @Test
   public void testGetDatasetWithSelectedFields() {
     DatasetInfo dataset = bigquery.getDataset(DATASET,
-        DatasetOption.fields(BigQuery.DatasetField.CREATION_TIME));
+        DatasetOption.fields(DatasetField.CREATION_TIME));
     assertEquals(bigquery.options().projectId(), dataset.datasetId().project());
     assertEquals(DATASET, dataset.datasetId().dataset());
     assertNotNull(dataset.creationTime());
@@ -229,7 +234,7 @@ public void testUpdateDatasetWithSelectedFields() {
     assertEquals("Some Description", dataset.description());
     DatasetInfo updatedDataset =
         bigquery.update(dataset.toBuilder().description("Updated Description").build(),
-            DatasetOption.fields(BigQuery.DatasetField.DESCRIPTION));
+            DatasetOption.fields(DatasetField.DESCRIPTION));
     assertEquals("Updated Description", updatedDataset.description());
     assertNull(updatedDataset.creationTime());
     assertNull(updatedDataset.defaultTableLifetime());
@@ -278,7 +283,7 @@ public void testCreateAndGetTableWithSelectedField() {
     assertEquals(DATASET, createdTableInfo.tableId().dataset());
     assertEquals(tableName, createdTableInfo.tableId().table());
     BaseTableInfo remoteTableInfo = bigquery.getTable(DATASET, tableName,
-        TableOption.fields(BigQuery.TableField.CREATION_TIME));
+        TableOption.fields(TableField.CREATION_TIME));
     assertNotNull(remoteTableInfo);
     assertTrue(remoteTableInfo instanceof TableInfo);
     assertEquals(createdTableInfo.tableId(), remoteTableInfo.tableId());
@@ -438,7 +443,7 @@ public void testUpdateTableWithSelectedFields() {
     BaseTableInfo createdTableInfo = bigquery.create(tableInfo);
     assertNotNull(createdTableInfo);
     BaseTableInfo updatedTableInfo = bigquery.update(tableInfo.toBuilder().description("newDescr")
-        .build(), TableOption.fields(BigQuery.TableField.DESCRIPTION));
+        .build(), TableOption.fields(TableField.DESCRIPTION));
     assertTrue(updatedTableInfo instanceof TableInfo);
     assertEquals(DATASET, updatedTableInfo.tableId().dataset());
     assertEquals(tableName, updatedTableInfo.tableId().table());
@@ -659,7 +664,7 @@ public void testListJobs() {
 
   @Test
   public void testListJobsWithSelectedFields() {
-    Page jobs = bigquery.listJobs(JobListOption.fields(BigQuery.JobField.USER_EMAIL));
+    Page jobs = bigquery.listJobs(JobListOption.fields(JobField.USER_EMAIL));
     for (JobInfo job : jobs.values()) {
       assertNotNull(job.jobId());
       assertNotNull(job.status());
@@ -709,7 +714,7 @@ public void testCreateAndGetJobWithSelectedFields() throws InterruptedException
     assertEquals(sourceTableName, createdTableInfo.tableId().table());
     TableId destinationTable = TableId.of(DATASET, destinationTableName);
     CopyJobInfo job = CopyJobInfo.of(destinationTable, sourceTable);
-    CopyJobInfo createdJob = bigquery.create(job, JobOption.fields(BigQuery.JobField.ETAG));
+    CopyJobInfo createdJob = bigquery.create(job, JobOption.fields(JobField.ETAG));
     assertNotNull(createdJob.jobId());
     assertNotNull(createdJob.sourceTables());
     assertNotNull(createdJob.destinationTable());
@@ -719,7 +724,7 @@ public void testCreateAndGetJobWithSelectedFields() throws InterruptedException
     assertNull(createdJob.selfLink());
     assertNull(createdJob.userEmail());
     CopyJobInfo remoteJob = bigquery.getJob(createdJob.jobId(),
-        JobOption.fields(BigQuery.JobField.ETAG));
+        JobOption.fields(JobField.ETAG));
     assertEquals(createdJob.jobId(), remoteJob.jobId());
     assertEquals(createdJob.sourceTables(), remoteJob.sourceTables());
     assertEquals(createdJob.destinationTable(), remoteJob.destinationTable());
@@ -810,10 +815,11 @@ public void testQueryJob() throws InterruptedException {
   public void testExtractJob() throws InterruptedException {
     String tableName = "test_export_job_table";
     TableId destinationTable = TableId.of(DATASET, tableName);
-    LoadJobInfo remoteLoadJob = bigquery.create(
-        LoadJobInfo.builder(destinationTable, "gs://" + BUCKET + "/" + LOAD_FILE)
-            .schema(SIMPLE_SCHEMA)
-            .build());
+    LoadConfiguration configuration = LoadConfiguration.builder(destinationTable)
+        .schema(SIMPLE_SCHEMA)
+        .build();
+    LoadJobInfo remoteLoadJob =
+        bigquery.create(LoadJobInfo.of(configuration, "gs://" + BUCKET + "/" + LOAD_FILE));
     while (remoteLoadJob.status().state() != JobStatus.State.DONE) {
       Thread.sleep(1000);
       remoteLoadJob = bigquery.getJob(remoteLoadJob.jobId());
@@ -857,4 +863,51 @@ public void testCancelJob() throws InterruptedException {
   public void testCancelNonExistingJob() throws InterruptedException {
     assertFalse(bigquery.cancel("test_cancel_non_existing_job"));
   }
+
+  @Test
+  public void testInsertFromFile() throws InterruptedException, FileNotFoundException {
+    String destinationTableName = "test_insert_from_file_table";
+    TableId tableId = TableId.of(DATASET, destinationTableName);
+    LoadConfiguration configuration = LoadConfiguration.builder(tableId)
+        .formatOptions(FormatOptions.json())
+        .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
+        .schema(TABLE_SCHEMA)
+        .build();
+    try (TableDataWriteChannel channel = bigquery.writer(configuration)) {
+      channel.write(ByteBuffer.wrap(JSON_CONTENT.getBytes(StandardCharsets.UTF_8)));
+    } catch (IOException e) {
+      fail("IOException was not expected");
+    }
+    // wait until the new table is created. If the table is never created the test will time-out
+    while (bigquery.getTable(tableId) == null) {
+      Thread.sleep(1000L);
+    }
+    Page> rows = bigquery.listTableData(tableId);
+    int rowCount = 0;
+    for (List row : rows.values()) {
+      FieldValue timestampCell = row.get(0);
+      FieldValue stringCell = row.get(1);
+      FieldValue integerCell = row.get(2);
+      FieldValue booleanCell = row.get(3);
+      FieldValue recordCell = row.get(4);
+      assertEquals(FieldValue.Attribute.PRIMITIVE, timestampCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, stringCell.attribute());
+      assertEquals(FieldValue.Attribute.REPEATED, integerCell.attribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, booleanCell.attribute());
+      assertEquals(FieldValue.Attribute.RECORD, recordCell.attribute());
+      assertEquals(1408452095220000L, timestampCell.timestampValue());
+      assertEquals("stringValue", stringCell.stringValue());
+      assertEquals(0, integerCell.repeatedValue().get(0).longValue());
+      assertEquals(1, integerCell.repeatedValue().get(1).longValue());
+      assertEquals(false, booleanCell.booleanValue());
+      assertEquals(-14182916000000L, recordCell.recordValue().get(0).timestampValue());
+      assertTrue(recordCell.recordValue().get(1).isNull());
+      assertEquals(1, recordCell.recordValue().get(2).repeatedValue().get(0).longValue());
+      assertEquals(0, recordCell.recordValue().get(2).repeatedValue().get(1).longValue());
+      assertEquals(true, recordCell.recordValue().get(3).booleanValue());
+      rowCount++;
+    }
+    assertEquals(2, rowCount);
+    assertTrue(bigquery.delete(DATASET, destinationTableName));
+  }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java
new file mode 100644
index 000000000000..e72101829cdf
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
+import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
+
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+public class LoadConfigurationTest {
+
+  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder()
+      .allowJaggedRows(true)
+      .allowQuotedNewLines(false)
+      .encoding(StandardCharsets.UTF_8)
+      .build();
+  private static final TableId TABLE_ID = TableId.of("dataset", "table");
+  private static final CreateDisposition CREATE_DISPOSITION = CreateDisposition.CREATE_IF_NEEDED;
+  private static final WriteDisposition WRITE_DISPOSITION = WriteDisposition.WRITE_APPEND;
+  private static final Integer MAX_BAD_RECORDS = 42;
+  private static final String FORMAT = "CSV";
+  private static final Boolean IGNORE_UNKNOWN_VALUES = true;
+  private static final List PROJECTION_FIELDS = ImmutableList.of("field1", "field2");
+  private static final Field FIELD_SCHEMA = Field.builder("IntegerField", Field.Type.integer())
+      .mode(Field.Mode.REQUIRED)
+      .description("FieldDescription")
+      .build();
+  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA);
+  private static final LoadConfiguration LOAD_CONFIGURATION = LoadConfiguration.builder(TABLE_ID)
+      .createDisposition(CREATE_DISPOSITION)
+      .writeDisposition(WRITE_DISPOSITION)
+      .formatOptions(CSV_OPTIONS)
+      .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+      .maxBadRecords(MAX_BAD_RECORDS)
+      .projectionFields(PROJECTION_FIELDS)
+      .schema(TABLE_SCHEMA)
+      .build();
+
+  @Test
+  public void testToBuilder() {
+    compareLoadConfiguration(LOAD_CONFIGURATION, LOAD_CONFIGURATION.toBuilder().build());
+    LoadConfiguration configuration = LOAD_CONFIGURATION.toBuilder()
+        .destinationTable(TableId.of("dataset", "newTable"))
+        .build();
+    assertEquals("newTable", configuration.destinationTable().table());
+    configuration = configuration.toBuilder().destinationTable(TABLE_ID).build();
+    compareLoadConfiguration(LOAD_CONFIGURATION, configuration);
+  }
+
+  @Test
+  public void testOf() {
+    LoadConfiguration configuration = LoadConfiguration.of(TABLE_ID);
+    assertEquals(TABLE_ID, configuration.destinationTable());
+    configuration = LoadConfiguration.of(TABLE_ID, CSV_OPTIONS);
+    assertEquals(TABLE_ID, configuration.destinationTable());
+    assertEquals(FORMAT, configuration.format());
+    assertEquals(CSV_OPTIONS, configuration.csvOptions());
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    LoadConfiguration configuration = LoadConfiguration.of(TABLE_ID);
+    compareLoadConfiguration(configuration, configuration.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(TABLE_ID, LOAD_CONFIGURATION.destinationTable());
+    assertEquals(CREATE_DISPOSITION, LOAD_CONFIGURATION.createDisposition());
+    assertEquals(WRITE_DISPOSITION, LOAD_CONFIGURATION.writeDisposition());
+    assertEquals(CSV_OPTIONS, LOAD_CONFIGURATION.csvOptions());
+    assertEquals(FORMAT, LOAD_CONFIGURATION.format());
+    assertEquals(IGNORE_UNKNOWN_VALUES, LOAD_CONFIGURATION.ignoreUnknownValues());
+    assertEquals(MAX_BAD_RECORDS, LOAD_CONFIGURATION.maxBadRecords());
+    assertEquals(PROJECTION_FIELDS, LOAD_CONFIGURATION.projectionFields());
+    assertEquals(TABLE_SCHEMA, LOAD_CONFIGURATION.schema());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    assertNull(LOAD_CONFIGURATION.toPb().getSourceUris());
+    compareLoadConfiguration(LOAD_CONFIGURATION,
+        LoadConfiguration.fromPb(LOAD_CONFIGURATION.toPb()));
+    LoadConfiguration configuration = LoadConfiguration.of(TABLE_ID);
+    compareLoadConfiguration(configuration, LoadConfiguration.fromPb(configuration.toPb()));
+  }
+
+  private void compareLoadConfiguration(LoadConfiguration expected, LoadConfiguration value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.destinationTable(), value.destinationTable());
+    assertEquals(expected.createDisposition(), value.createDisposition());
+    assertEquals(expected.writeDisposition(), value.writeDisposition());
+    assertEquals(expected.csvOptions(), value.csvOptions());
+    assertEquals(expected.format(), value.format());
+    assertEquals(expected.ignoreUnknownValues(), value.ignoreUnknownValues());
+    assertEquals(expected.maxBadRecords(), value.maxBadRecords());
+    assertEquals(expected.projectionFields(), value.projectionFields());
+    assertEquals(expected.schema(), value.schema());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
index 06ce0b42ad4b..499d0d939698 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
@@ -47,7 +47,6 @@ public class LoadJobInfoTest {
   private static final CreateDisposition CREATE_DISPOSITION = CreateDisposition.CREATE_IF_NEEDED;
   private static final WriteDisposition WRITE_DISPOSITION = WriteDisposition.WRITE_APPEND;
   private static final Integer MAX_BAD_RECORDS = 42;
-  private static final String FORMAT = "CSV";
   private static final Boolean IGNORE_UNKNOWN_VALUES = true;
   private static final List PROJECTION_FIELDS = ImmutableList.of("field1", "field2");
   private static final JobId JOB_ID = JobId.of("job");
@@ -66,13 +65,7 @@ public class LoadJobInfoTest {
       .inputBytes(2048L)
       .outputRows(24L)
       .build();
-  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.builder(TABLE_ID, SOURCE_URIS)
-      .etag(ETAG)
-      .id(ID)
-      .selfLink(SELF_LINK)
-      .userEmail(EMAIL)
-      .jobId(JOB_ID)
-      .status(JOB_STATUS)
+  private static final LoadConfiguration LOAD_CONFIGURATION = LoadConfiguration.builder(TABLE_ID)
       .createDisposition(CREATE_DISPOSITION)
       .writeDisposition(WRITE_DISPOSITION)
       .formatOptions(CSV_OPTIONS)
@@ -80,63 +73,47 @@ public class LoadJobInfoTest {
       .maxBadRecords(MAX_BAD_RECORDS)
       .projectionFields(PROJECTION_FIELDS)
       .schema(TABLE_SCHEMA)
+      .build();
+  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.builder(LOAD_CONFIGURATION, SOURCE_URIS)
+      .etag(ETAG)
+      .id(ID)
+      .selfLink(SELF_LINK)
+      .userEmail(EMAIL)
+      .jobId(JOB_ID)
+      .status(JOB_STATUS)
       .statistics(JOB_STATISTICS)
       .build();
 
   @Test
   public void testToBuilder() {
     compareLoadJobInfo(LOAD_JOB, LOAD_JOB.toBuilder().build());
-    LoadJobInfo job = LOAD_JOB.toBuilder()
-        .destinationTable(TableId.of("dataset", "newTable"))
-        .build();
-    assertEquals("newTable", job.destinationTable().table());
-    job = job.toBuilder().destinationTable(TABLE_ID).build();
+    LoadJobInfo job = LOAD_JOB.toBuilder().etag("newEtag").build();
+    assertEquals("newEtag", job.etag());
+    job = job.toBuilder().etag(ETAG).build();
     compareLoadJobInfo(LOAD_JOB, job);
   }
 
   @Test
   public void testOf() {
-    LoadJobInfo job = LoadJobInfo.of(TABLE_ID, SOURCE_URIS);
-    assertEquals(TABLE_ID, job.destinationTable());
-    assertEquals(SOURCE_URIS, job.sourceUris());
-    job = LoadJobInfo.of(TABLE_ID, SOURCE_URI);
-    assertEquals(TABLE_ID, job.destinationTable());
-    assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
-    job = LoadJobInfo.of(TABLE_ID, CSV_OPTIONS, SOURCE_URIS);
-    assertEquals(TABLE_ID, job.destinationTable());
+    LoadJobInfo job = LoadJobInfo.of(LOAD_CONFIGURATION, SOURCE_URIS);
+    assertEquals(LOAD_CONFIGURATION, job.configuration());
     assertEquals(SOURCE_URIS, job.sourceUris());
-    assertEquals(FORMAT, job.format());
-    assertEquals(CSV_OPTIONS, job.csvOptions());
-    job = LoadJobInfo.of(TABLE_ID, CSV_OPTIONS, SOURCE_URI);
-    assertEquals(TABLE_ID, job.destinationTable());
-    assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
-    assertEquals(FORMAT, job.format());
-    assertEquals(CSV_OPTIONS, job.csvOptions());
-    job = LoadJobInfo.of(JOB_ID, TABLE_ID, SOURCE_URIS);
-    assertEquals(JOB_ID, job.jobId());
-    assertEquals(TABLE_ID, job.destinationTable());
-    assertEquals(SOURCE_URIS, job.sourceUris());
-    job = LoadJobInfo.of(JOB_ID, TABLE_ID, SOURCE_URI);
-    assertEquals(JOB_ID, job.jobId());
-    assertEquals(TABLE_ID, job.destinationTable());
+    job = LoadJobInfo.of(LOAD_CONFIGURATION, SOURCE_URI);
+    assertEquals(LOAD_CONFIGURATION, job.configuration());
     assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
-    job = LoadJobInfo.of(JOB_ID, TABLE_ID, CSV_OPTIONS, SOURCE_URIS);
+    job = LoadJobInfo.of(JOB_ID, LOAD_CONFIGURATION, SOURCE_URIS);
     assertEquals(JOB_ID, job.jobId());
-    assertEquals(TABLE_ID, job.destinationTable());
+    assertEquals(LOAD_CONFIGURATION, job.configuration());
     assertEquals(SOURCE_URIS, job.sourceUris());
-    assertEquals(FORMAT, job.format());
-    assertEquals(CSV_OPTIONS, job.csvOptions());
-    job = LoadJobInfo.of(JOB_ID, TABLE_ID, CSV_OPTIONS, SOURCE_URI);
+    job = LoadJobInfo.of(JOB_ID, LOAD_CONFIGURATION, SOURCE_URI);
     assertEquals(JOB_ID, job.jobId());
-    assertEquals(TABLE_ID, job.destinationTable());
+    assertEquals(LOAD_CONFIGURATION, job.configuration());
     assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
-    assertEquals(FORMAT, job.format());
-    assertEquals(CSV_OPTIONS, job.csvOptions());
   }
 
   @Test
   public void testToBuilderIncomplete() {
-    LoadJobInfo job = LoadJobInfo.of(TABLE_ID, SOURCE_URIS);
+    LoadJobInfo job = LoadJobInfo.of(LOAD_CONFIGURATION, SOURCE_URIS);
     compareLoadJobInfo(job, job.toBuilder().build());
   }
 
@@ -148,16 +125,8 @@ public void testBuilder() {
     assertEquals(EMAIL, LOAD_JOB.userEmail());
     assertEquals(JOB_ID, LOAD_JOB.jobId());
     assertEquals(JOB_STATUS, LOAD_JOB.status());
-    assertEquals(TABLE_ID, LOAD_JOB.destinationTable());
+    assertEquals(LOAD_CONFIGURATION, LOAD_JOB.configuration());
     assertEquals(SOURCE_URIS, LOAD_JOB.sourceUris());
-    assertEquals(CREATE_DISPOSITION, LOAD_JOB.createDisposition());
-    assertEquals(WRITE_DISPOSITION, LOAD_JOB.writeDisposition());
-    assertEquals(CSV_OPTIONS, LOAD_JOB.csvOptions());
-    assertEquals(FORMAT, LOAD_JOB.format());
-    assertEquals(IGNORE_UNKNOWN_VALUES, LOAD_JOB.ignoreUnknownValues());
-    assertEquals(MAX_BAD_RECORDS, LOAD_JOB.maxBadRecords());
-    assertEquals(PROJECTION_FIELDS, LOAD_JOB.projectionFields());
-    assertEquals(TABLE_SCHEMA, LOAD_JOB.schema());
     assertEquals(JOB_STATISTICS, LOAD_JOB.statistics());
   }
 
@@ -170,7 +139,7 @@ public void testToPbAndFromPb() {
     assertEquals(JOB_STATISTICS, JobStatistics.fromPb(LOAD_JOB.toPb().getStatistics()));
     compareLoadJobInfo(LOAD_JOB, LoadJobInfo.fromPb(LOAD_JOB.toPb()));
     compareLoadJobInfo(LOAD_JOB, (LoadJobInfo) JobInfo.fromPb(LOAD_JOB.toPb()));
-    LoadJobInfo job = LoadJobInfo.of(TABLE_ID, SOURCE_URIS);
+    LoadJobInfo job = LoadJobInfo.of(LOAD_CONFIGURATION, SOURCE_URIS);
     compareLoadJobInfo(job, LoadJobInfo.fromPb(job.toPb()));
     compareLoadJobInfo(job, (LoadJobInfo) JobInfo.fromPb(job.toPb()));
   }
@@ -186,15 +155,7 @@ private void compareLoadJobInfo(LoadJobInfo expected, LoadJobInfo value) {
     assertEquals(expected.status(), value.status());
     assertEquals(expected.statistics(), value.statistics());
     assertEquals(expected.userEmail(), value.userEmail());
-    assertEquals(expected.destinationTable(), value.destinationTable());
+    assertEquals(expected.configuration(), value.configuration());
     assertEquals(expected.sourceUris(), value.sourceUris());
-    assertEquals(expected.createDisposition(), value.createDisposition());
-    assertEquals(expected.writeDisposition(), value.writeDisposition());
-    assertEquals(expected.csvOptions(), value.csvOptions());
-    assertEquals(expected.format(), value.format());
-    assertEquals(expected.ignoreUnknownValues(), value.ignoreUnknownValues());
-    assertEquals(expected.maxBadRecords(), value.maxBadRecords());
-    assertEquals(expected.projectionFields(), value.projectionFields());
-    assertEquals(expected.schema(), value.schema());
   }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 8c80bddbfefb..d407ac1630e3 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -22,7 +22,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.AuthCredentials;
+import com.google.gcloud.RestorableState;
 import com.google.gcloud.RetryParams;
+import com.google.gcloud.WriteChannel;
 import com.google.gcloud.bigquery.TableInfo.StreamingBuffer;
 
 import org.junit.Test;
@@ -99,9 +101,9 @@ public class SerializationTest {
   private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
   private static final ExternalDataConfiguration EXTERNAL_DATA_CONFIGURATION =
       ExternalDataConfiguration.builder(SOURCE_URIS, TABLE_SCHEMA, CSV_OPTIONS)
-      .ignoreUnknownValues(true)
-      .maxBadRecords(42)
-      .build();
+          .ignoreUnknownValues(true)
+          .maxBadRecords(42)
+          .build();
   private static final UserDefinedFunction INLINE_FUNCTION =
       new UserDefinedFunction.InlineFunction("inline");
   private static final UserDefinedFunction URI_FUNCTION =
@@ -130,10 +132,10 @@ public class SerializationTest {
           .id(ID)
           .build();
   private static final JobStatistics JOB_STATISTICS = JobStatistics.builder()
-          .creationTime(1L)
-          .endTime(3L)
-          .startTime(2L)
-          .build();
+      .creationTime(1L)
+      .endTime(3L)
+      .startTime(2L)
+      .build();
   private static final JobStatistics.ExtractStatistics EXTRACT_STATISTICS =
       JobStatistics.ExtractStatistics.builder()
           .creationTime(1L)
@@ -168,7 +170,15 @@ public class SerializationTest {
   private static final JobId JOB_ID = JobId.of("project", "job");
   private static final CopyJobInfo COPY_JOB = CopyJobInfo.of(TABLE_ID, TABLE_ID);
   private static final ExtractJobInfo EXTRACT_JOB = ExtractJobInfo.of(TABLE_ID, SOURCE_URIS);
-  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.of(TABLE_ID, SOURCE_URIS);
+  private static final LoadConfiguration LOAD_CONFIGURATION = LoadConfiguration.builder(TABLE_ID)
+      .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
+      .writeDisposition(JobInfo.WriteDisposition.WRITE_APPEND)
+      .formatOptions(CSV_OPTIONS)
+      .ignoreUnknownValues(true)
+      .maxBadRecords(10)
+      .schema(TABLE_SCHEMA)
+      .build();
+  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.of(LOAD_CONFIGURATION, SOURCE_URIS);
   private static final QueryJobInfo QUERY_JOB = QueryJobInfo.of("query");
   private static final Map CONTENT1 =
       ImmutableMap.of("key", "val1");
@@ -231,8 +241,8 @@ public void testModelAndRequests() throws Exception {
         DATASET_INFO, TABLE_ID, CSV_OPTIONS, STREAMING_BUFFER, EXTERNAL_DATA_CONFIGURATION,
         TABLE_SCHEMA, TABLE_INFO, VIEW_INFO, EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION,
         JOB_STATISTICS, EXTRACT_STATISTICS, LOAD_STATISTICS, QUERY_STATISTICS, BIGQUERY_ERROR,
-        JOB_STATUS, JOB_ID, COPY_JOB, EXTRACT_JOB, LOAD_JOB, QUERY_JOB, INSERT_ALL_REQUEST,
-        INSERT_ALL_RESPONSE, FIELD_VALUE, QUERY_REQUEST, QUERY_RESPONSE,
+        JOB_STATUS, JOB_ID, COPY_JOB, EXTRACT_JOB, LOAD_CONFIGURATION, LOAD_JOB, QUERY_JOB,
+        INSERT_ALL_REQUEST, INSERT_ALL_RESPONSE, FIELD_VALUE, QUERY_REQUEST, QUERY_RESPONSE,
         BigQuery.DatasetOption.fields(), BigQuery.DatasetDeleteOption.deleteContents(),
         BigQuery.DatasetListOption.all(), BigQuery.TableOption.fields(),
         BigQuery.TableListOption.maxResults(42L), BigQuery.JobOption.fields(),
@@ -246,8 +256,25 @@ public void testModelAndRequests() throws Exception {
     }
   }
 
+  @Test
+  public void testWriteChannelState() throws IOException, ClassNotFoundException {
+    BigQueryOptions options = BigQueryOptions.builder()
+        .projectId("p2")
+        .retryParams(RetryParams.defaultInstance())
+        .build();
+    // avoid closing when you don't want partial writes upon failure
+    @SuppressWarnings("resource")
+    TableDataWriteChannel writer =
+        new TableDataWriteChannel(options, LOAD_CONFIGURATION, "upload-id");
+    RestorableState state = writer.capture();
+    RestorableState deserializedState = serializeAndDeserialize(state);
+    assertEquals(state, deserializedState);
+    assertEquals(state.hashCode(), deserializedState.hashCode());
+    assertEquals(state.toString(), deserializedState.toString());
+  }
+
   @SuppressWarnings("unchecked")
-  private  T serializeAndDeserialize(T obj)
+  private  T serializeAndDeserialize(T obj)
       throws IOException, ClassNotFoundException {
     ByteArrayOutputStream bytes = new ByteArrayOutputStream();
     try (ObjectOutputStream output = new ObjectOutputStream(bytes)) {
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableDataWriteChannelTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableDataWriteChannelTest.java
new file mode 100644
index 000000000000..67933407e377
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableDataWriteChannelTest.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.captureLong;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.google.gcloud.RestorableState;
+import com.google.gcloud.WriteChannel;
+import com.google.gcloud.spi.BigQueryRpc;
+import com.google.gcloud.spi.BigQueryRpcFactory;
+
+import org.easymock.Capture;
+import org.easymock.CaptureType;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Random;
+
+public class TableDataWriteChannelTest {
+
+  private static final String UPLOAD_ID = "uploadid";
+  private static final TableId TABLE_ID = TableId.of("dataset", "table");
+  private static final LoadConfiguration LOAD_CONFIGURATION = LoadConfiguration.builder(TABLE_ID)
+      .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
+      .writeDisposition(JobInfo.WriteDisposition.WRITE_APPEND)
+      .formatOptions(FormatOptions.json())
+      .ignoreUnknownValues(true)
+      .maxBadRecords(10)
+      .build();
+  private static final int MIN_CHUNK_SIZE = 256 * 1024;
+  private static final int DEFAULT_CHUNK_SIZE = 8 * MIN_CHUNK_SIZE;
+  private static final int CUSTOM_CHUNK_SIZE = 4 * MIN_CHUNK_SIZE;
+  private static final Random RANDOM = new Random();
+
+  private BigQueryOptions options;
+  private BigQueryRpcFactory rpcFactoryMock;
+  private BigQueryRpc bigqueryRpcMock;
+  private TableDataWriteChannel writer;
+
+  @Before
+  public void setUp() {
+    rpcFactoryMock = createMock(BigQueryRpcFactory.class);
+    bigqueryRpcMock = createMock(BigQueryRpc.class);
+    expect(rpcFactoryMock.create(anyObject(BigQueryOptions.class)))
+        .andReturn(bigqueryRpcMock);
+    replay(rpcFactoryMock);
+    options = BigQueryOptions.builder()
+        .projectId("projectid")
+        .serviceRpcFactory(rpcFactoryMock)
+        .build();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    verify(rpcFactoryMock, bigqueryRpcMock);
+  }
+
+  @Test
+  public void testCreate() {
+    expect(bigqueryRpcMock.open(LOAD_CONFIGURATION.toPb())).andReturn(UPLOAD_ID);
+    replay(bigqueryRpcMock);
+    writer = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    assertTrue(writer.isOpen());
+  }
+
+  @Test
+  public void testWriteWithoutFlush() throws IOException {
+    expect(bigqueryRpcMock.open(LOAD_CONFIGURATION.toPb())).andReturn(UPLOAD_ID);
+    replay(bigqueryRpcMock);
+    writer = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    assertEquals(MIN_CHUNK_SIZE, writer.write(ByteBuffer.allocate(MIN_CHUNK_SIZE)));
+  }
+
+  @Test
+  public void testWriteWithFlush() throws IOException {
+    expect(bigqueryRpcMock.open(LOAD_CONFIGURATION.toPb())).andReturn(UPLOAD_ID);
+    Capture capturedBuffer = Capture.newInstance();
+    bigqueryRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L),
+        eq(CUSTOM_CHUNK_SIZE), eq(false));
+    replay(bigqueryRpcMock);
+    writer = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    writer.chunkSize(CUSTOM_CHUNK_SIZE);
+    ByteBuffer buffer = randomBuffer(CUSTOM_CHUNK_SIZE);
+    assertEquals(CUSTOM_CHUNK_SIZE, writer.write(buffer));
+    assertArrayEquals(buffer.array(), capturedBuffer.getValue());
+  }
+
+  @Test
+  public void testWritesAndFlush() throws IOException {
+    expect(bigqueryRpcMock.open(LOAD_CONFIGURATION.toPb())).andReturn(UPLOAD_ID);
+    Capture capturedBuffer = Capture.newInstance();
+    bigqueryRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L),
+        eq(DEFAULT_CHUNK_SIZE), eq(false));
+    replay(bigqueryRpcMock);
+    writer = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    ByteBuffer[] buffers = new ByteBuffer[DEFAULT_CHUNK_SIZE / MIN_CHUNK_SIZE];
+    for (int i = 0; i < buffers.length; i++) {
+      buffers[i] = randomBuffer(MIN_CHUNK_SIZE);
+      assertEquals(MIN_CHUNK_SIZE, writer.write(buffers[i]));
+    }
+    for (int i = 0; i < buffers.length; i++) {
+      assertArrayEquals(
+          buffers[i].array(),
+          Arrays.copyOfRange(
+              capturedBuffer.getValue(), MIN_CHUNK_SIZE * i, MIN_CHUNK_SIZE * (i + 1)));
+    }
+  }
+
+  @Test
+  public void testCloseWithoutFlush() throws IOException {
+    expect(bigqueryRpcMock.open(LOAD_CONFIGURATION.toPb())).andReturn(UPLOAD_ID);
+    Capture capturedBuffer = Capture.newInstance();
+    bigqueryRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L), eq(0), eq(true));
+    replay(bigqueryRpcMock);
+    writer = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    assertTrue(writer.isOpen());
+    writer.close();
+    assertArrayEquals(new byte[0], capturedBuffer.getValue());
+    assertTrue(!writer.isOpen());
+  }
+
+  @Test
+  public void testCloseWithFlush() throws IOException {
+    expect(bigqueryRpcMock.open(LOAD_CONFIGURATION.toPb())).andReturn(UPLOAD_ID);
+    Capture capturedBuffer = Capture.newInstance();
+    ByteBuffer buffer = randomBuffer(MIN_CHUNK_SIZE);
+    bigqueryRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L), eq(MIN_CHUNK_SIZE),
+        eq(true));
+    replay(bigqueryRpcMock);
+    writer = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    assertTrue(writer.isOpen());
+    writer.write(buffer);
+    writer.close();
+    assertEquals(DEFAULT_CHUNK_SIZE, capturedBuffer.getValue().length);
+    assertArrayEquals(buffer.array(), Arrays.copyOf(capturedBuffer.getValue(), MIN_CHUNK_SIZE));
+    assertTrue(!writer.isOpen());
+  }
+
+  @Test
+  public void testWriteClosed() throws IOException {
+    expect(bigqueryRpcMock.open(LOAD_CONFIGURATION.toPb())).andReturn(UPLOAD_ID);
+    Capture capturedBuffer = Capture.newInstance();
+    bigqueryRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L), eq(0), eq(true));
+    replay(bigqueryRpcMock);
+    writer = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    writer.close();
+    try {
+      writer.write(ByteBuffer.allocate(MIN_CHUNK_SIZE));
+      fail("Expected TableDataWriteChannel write to throw IOException");
+    } catch (IOException ex) {
+      // expected
+    }
+  }
+
+  @Test
+  public void testSaveAndRestore() throws IOException {
+    expect(bigqueryRpcMock.open(LOAD_CONFIGURATION.toPb())).andReturn(UPLOAD_ID);
+    Capture capturedBuffer = Capture.newInstance(CaptureType.ALL);
+    Capture capturedPosition = Capture.newInstance(CaptureType.ALL);
+    bigqueryRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0),
+        captureLong(capturedPosition), eq(DEFAULT_CHUNK_SIZE), eq(false));
+    expectLastCall().times(2);
+    replay(bigqueryRpcMock);
+    ByteBuffer buffer1 = randomBuffer(DEFAULT_CHUNK_SIZE);
+    ByteBuffer buffer2 = randomBuffer(DEFAULT_CHUNK_SIZE);
+    writer = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    assertEquals(DEFAULT_CHUNK_SIZE, writer.write(buffer1));
+    assertArrayEquals(buffer1.array(), capturedBuffer.getValues().get(0));
+    assertEquals(new Long(0L), capturedPosition.getValues().get(0));
+    RestorableState writerState = writer.capture();
+    WriteChannel restoredWriter = writerState.restore();
+    assertEquals(DEFAULT_CHUNK_SIZE, restoredWriter.write(buffer2));
+    assertArrayEquals(buffer2.array(), capturedBuffer.getValues().get(1));
+    assertEquals(new Long(DEFAULT_CHUNK_SIZE), capturedPosition.getValues().get(1));
+  }
+
+  @Test
+  public void testSaveAndRestoreClosed() throws IOException {
+    expect(bigqueryRpcMock.open(LOAD_CONFIGURATION.toPb())).andReturn(UPLOAD_ID);
+    Capture capturedBuffer = Capture.newInstance();
+    bigqueryRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L), eq(0), eq(true));
+    replay(bigqueryRpcMock);
+    writer = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    writer.close();
+    RestorableState writerState = writer.capture();
+    RestorableState expectedWriterState =
+        TableDataWriteChannel.StateImpl.builder(options, LOAD_CONFIGURATION, UPLOAD_ID)
+            .buffer(null)
+            .chunkSize(DEFAULT_CHUNK_SIZE)
+            .isOpen(false)
+            .position(0)
+            .build();
+    WriteChannel restoredWriter = writerState.restore();
+    assertArrayEquals(new byte[0], capturedBuffer.getValue());
+    assertEquals(expectedWriterState, restoredWriter.capture());
+  }
+
+  @Test
+  public void testStateEquals() {
+    expect(bigqueryRpcMock.open(LOAD_CONFIGURATION.toPb())).andReturn(UPLOAD_ID).times(2);
+    replay(bigqueryRpcMock);
+    writer = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    // avoid closing when you don't want partial writes upon failure
+    @SuppressWarnings("resource")
+    WriteChannel writer2 = new TableDataWriteChannel(options, LOAD_CONFIGURATION);
+    RestorableState state = writer.capture();
+    RestorableState state2 = writer2.capture();
+    assertEquals(state, state2);
+    assertEquals(state.hashCode(), state2.hashCode());
+    assertEquals(state.toString(), state2.toString());
+  }
+
+  private static ByteBuffer randomBuffer(int size) {
+    byte[] byteArray = new byte[size];
+    RANDOM.nextBytes(byteArray);
+    return ByteBuffer.wrap(byteArray);
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
index dfcf17c90ab3..c931d768def1 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
@@ -48,9 +48,9 @@ public class TableTest {
   private static final TableId TABLE_ID1 = TableId.of("dataset", "table1");
   private static final TableId TABLE_ID2 = TableId.of("dataset", "table2");
   private static final JobInfo COPY_JOB_INFO = CopyJobInfo.of(TABLE_ID2, TABLE_ID1);
-  private static final JobInfo LOAD_JOB_INFO =
-      LoadJobInfo.builder(TABLE_ID1, ImmutableList.of("URI"))
-          .formatOptions(FormatOptions.json())
+  private static final JobInfo LOAD_JOB_INFO = LoadJobInfo.builder(
+      LoadConfiguration.builder(TABLE_ID1).formatOptions(FormatOptions.json()).build(),
+      ImmutableList.of("URI"))
           .build();
   private static final JobInfo EXTRACT_JOB_INFO =
       ExtractJobInfo.builder(TABLE_ID1, ImmutableList.of("URI"))
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseWriteChannel.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseWriteChannel.java
new file mode 100644
index 000000000000..e05383a65826
--- /dev/null
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseWriteChannel.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud;
+
+import com.google.common.base.MoreObjects;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * Base implementation for a {@link WriteChannel}.
+ *
+ * @param  the service options used by the channel to issue RPC requests
+ * @param  the entity this channel writes data to. Possibly with additional configuration
+ */
+public abstract class BaseWriteChannel<
+    ServiceOptionsT extends ServiceOptions,
+    EntityT extends Serializable> implements WriteChannel {
+
+  private static final int MIN_CHUNK_SIZE = 256 * 1024;
+  private static final int DEFAULT_CHUNK_SIZE = 8 * MIN_CHUNK_SIZE;
+
+  private final ServiceOptionsT options;
+  private final EntityT entity;
+  private final String uploadId;
+  private int position;
+  private byte[] buffer = new byte[0];
+  private int limit;
+  private boolean isOpen = true;
+  private int chunkSize = defaultChunkSize();
+
+  protected int minChunkSize() {
+    return MIN_CHUNK_SIZE;
+  }
+
+  protected int defaultChunkSize() {
+    return DEFAULT_CHUNK_SIZE;
+  }
+
+  /**
+   * Writes {@code length} bytes of {@link #buffer()} to the {@link #uploadId()} URL.
+   *
+   * @param length the number of bytes to write from {@link #buffer()}
+   * @param last if {@code true} the resumable session is closed
+   */
+  protected abstract void flushBuffer(int length, boolean last);
+
+  protected ServiceOptionsT options() {
+    return options;
+  }
+
+  protected EntityT entity() {
+    return entity;
+  }
+
+  protected String uploadId() {
+    return uploadId;
+  }
+
+  protected int position() {
+    return position;
+  }
+
+  protected byte[] buffer() {
+    return buffer;
+  }
+
+  protected int limit() {
+    return limit;
+  }
+
+  protected int chunkSize() {
+    return chunkSize;
+  }
+
+  @Override
+  public final void chunkSize(int chunkSize) {
+    chunkSize = (chunkSize / minChunkSize()) * minChunkSize();
+    this.chunkSize = Math.max(minChunkSize(), chunkSize);
+  }
+
+  protected BaseWriteChannel(ServiceOptionsT options, EntityT entity, String uploadId) {
+    this.options = options;
+    this.entity = entity;
+    this.uploadId = uploadId;
+  }
+
+  private void flush() {
+    if (limit >= chunkSize) {
+      final int length = limit - limit % minChunkSize();
+      flushBuffer(length, false);
+      position += length;
+      limit -= length;
+      byte[] temp = new byte[chunkSize];
+      System.arraycopy(buffer, length, temp, 0, limit);
+      buffer = temp;
+    }
+  }
+
+  private void validateOpen() throws IOException {
+    if (!isOpen) {
+      throw new IOException("stream is closed");
+    }
+  }
+
+  @Override
+  public final int write(ByteBuffer byteBuffer) throws IOException {
+    validateOpen();
+    int toWrite = byteBuffer.remaining();
+    int spaceInBuffer = buffer.length - limit;
+    if (spaceInBuffer >= toWrite) {
+      byteBuffer.get(buffer, limit, toWrite);
+    } else {
+      buffer = Arrays.copyOf(buffer, Math.max(chunkSize, buffer.length + toWrite - spaceInBuffer));
+      byteBuffer.get(buffer, limit, toWrite);
+    }
+    limit += toWrite;
+    flush();
+    return toWrite;
+  }
+
+  @Override
+  public boolean isOpen() {
+    return isOpen;
+  }
+
+  @Override
+  public final void close() throws IOException {
+    if (isOpen) {
+      flushBuffer(limit, true);
+      position += buffer.length;
+      isOpen = false;
+      buffer = null;
+    }
+  }
+
+  /**
+   * Creates a {@link BaseState.Builder} for the current write channel.
+   */
+  protected abstract BaseState.Builder stateBuilder();
+
+  @Override
+  public RestorableState capture() {
+    byte[] bufferToSave = null;
+    if (isOpen) {
+      flush();
+      bufferToSave = Arrays.copyOf(buffer, limit);
+    }
+    return stateBuilder()
+        .position(position)
+        .buffer(bufferToSave)
+        .isOpen(isOpen)
+        .chunkSize(chunkSize)
+        .build();
+  }
+
+  /**
+   * Restores the state of the current write channel given a {@link BaseState} object.
+   */
+  protected void restore(BaseState state) {
+    if (state.buffer != null) {
+      this.buffer = state.buffer.clone();
+      this.limit = state.buffer.length;
+    }
+    this.position = state.position;
+    this.isOpen = state.isOpen;
+    this.chunkSize = state.chunkSize;
+  }
+
+  protected abstract static class BaseState<
+      ServiceOptionsT extends ServiceOptions, EntityT extends Serializable>
+      implements RestorableState, Serializable {
+
+    private static final long serialVersionUID = 8541062465055125619L;
+
+    protected final ServiceOptionsT serviceOptions;
+    protected final EntityT entity;
+    protected final String uploadId;
+    protected final int position;
+    protected final byte[] buffer;
+    protected final boolean isOpen;
+    protected final int chunkSize;
+
+    protected BaseState(Builder builder) {
+      this.serviceOptions = builder.serviceOptions;
+      this.entity = builder.entity;
+      this.uploadId = builder.uploadId;
+      this.position = builder.position;
+      this.buffer = builder.buffer;
+      this.isOpen = builder.isOpen;
+      this.chunkSize = builder.chunkSize;
+    }
+
+    /**
+     * Base builder for a write channel's state. Users are not supposed to access this class
+     * directly.
+     *
+     * @param  the service options used by the channel to issue RPC requests
+     * @param  the entity this channel writes data to. Possibly with additional
+     *     configuration
+     */
+    public abstract static class Builder<
+        ServiceOptionsT extends ServiceOptions,
+        EntityT extends Serializable> {
+      private final ServiceOptionsT serviceOptions;
+      private final EntityT entity;
+      private final String uploadId;
+      private int position;
+      private byte[] buffer;
+      private boolean isOpen;
+      private int chunkSize;
+
+      protected Builder(ServiceOptionsT options, EntityT entity, String uploadId) {
+        this.serviceOptions = options;
+        this.entity = entity;
+        this.uploadId = uploadId;
+      }
+
+      public Builder position(int position) {
+        this.position = position;
+        return this;
+      }
+
+      public Builder buffer(byte[] buffer) {
+        this.buffer = buffer;
+        return this;
+      }
+
+      public Builder isOpen(boolean isOpen) {
+        this.isOpen = isOpen;
+        return this;
+      }
+
+      public Builder chunkSize(int chunkSize) {
+        this.chunkSize = chunkSize;
+        return this;
+      }
+
+      public abstract RestorableState build();
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(serviceOptions, entity, uploadId, position, isOpen, chunkSize,
+          Arrays.hashCode(buffer));
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (obj == null) {
+        return false;
+      }
+      if (!(obj instanceof BaseState)) {
+        return false;
+      }
+      final BaseState other = (BaseState) obj;
+      return Objects.equals(this.serviceOptions, other.serviceOptions)
+          && Objects.equals(this.entity, other.entity)
+          && Objects.equals(this.uploadId, other.uploadId)
+          && Objects.deepEquals(this.buffer, other.buffer)
+          && this.position == other.position
+          && this.isOpen == other.isOpen
+          && this.chunkSize == other.chunkSize;
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("entity", entity)
+          .add("uploadId", uploadId)
+          .add("position", position)
+          .add("isOpen", isOpen)
+          .toString();
+    }
+  }
+}
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ReadChannel.java b/gcloud-java-core/src/main/java/com/google/gcloud/ReadChannel.java
new file mode 100644
index 000000000000..7537c5a8ce0b
--- /dev/null
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ReadChannel.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.nio.channels.ReadableByteChannel;
+
+/**
+ * A channel for reading data from a Google Cloud object.
+ *
+ * 
    Implementations of this class may buffer data internally to reduce remote calls. This
+ * interface implements {@link Restorable} to allow saving the reader's state to continue reading
+ * afterwards.
+ * 
    
+ */
+public interface ReadChannel extends ReadableByteChannel, Closeable, Restorable {
+
+  /**
+   * Overridden to remove IOException.
+   *
+   * @see java.nio.channels.Channel#close()
+   */
+  @Override
+  void close();
+
+  void seek(int position) throws IOException;
+
+  /**
+   * Sets the minimum size that will be read by a single RPC.
+   * Read data will be locally buffered until consumed.
+   */
+  void chunkSize(int chunkSize);
+
+  /**
+   * Captures the read channel state so that it can be saved and restored afterwards.
+   *
+   * @return a {@link RestorableState} object that contains the read channel state and can restore
+   *     it afterwards.
+   */
+  @Override
+  RestorableState capture();
+}
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/WriteChannel.java b/gcloud-java-core/src/main/java/com/google/gcloud/WriteChannel.java
new file mode 100644
index 000000000000..e6f06e23dc04
--- /dev/null
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/WriteChannel.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud;
+
+import java.io.Closeable;
+import java.nio.channels.WritableByteChannel;
+
+/**
+ * A channel for writing data to Google Cloud services.
+ *
+ * 
    Implementations of this class may further buffer data internally to reduce remote calls.
+ * Written data will only be visible after calling {@link #close()}. This interface implements
+ * {@link Restorable} to allow saving the writer's state to continue writing afterwards.
+ * 
    
+ */
+public interface WriteChannel extends WritableByteChannel, Closeable, Restorable {
+
+  /**
+   * Sets the minimum size that will be written by a single RPC.
+   * Written data will be buffered and only flushed upon reaching this size or closing the channel.
+   */
+  void chunkSize(int chunkSize);
+
+  /**
+   * Captures the write channel state so that it can be saved and restored afterwards. The original
+   * {@code WriteChannel} and the restored one should not both be used. Closing one channel
+   * causes the other channel to close; subsequent writes will fail.
+   *
+   * @return a {@link RestorableState} object that contains the write channel state and can restore
+   *     it afterwards.
+   */
+  @Override
+  RestorableState capture();
+}
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java
new file mode 100644
index 000000000000..e49a17b019e0
--- /dev/null
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud;
+
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import com.google.gcloud.spi.ServiceRpcFactory;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Random;
+
+public class BaseWriteChannelTest {
+
+  private abstract static class CustomService implements Service {}
+  private abstract static class CustomServiceOptions
+      extends ServiceOptions {
+
+    private static final long serialVersionUID = 3302358029307467197L;
+
+    protected CustomServiceOptions(
+        Class> serviceFactoryClass,
+        Class> rpcFactoryClass,
+        Builder builder) {
+      super(serviceFactoryClass, rpcFactoryClass, builder);
+    }
+  }
+
+  private static final Serializable ENTITY = 42L;
+  private static final String UPLOAD_ID = "uploadId";
+  private static final byte[] CONTENT = {0xD, 0xE, 0xA, 0xD};
+  private static final int MIN_CHUNK_SIZE = 256 * 1024;
+  private static final int DEFAULT_CHUNK_SIZE = 8 * MIN_CHUNK_SIZE;
+  private static final Random RANDOM = new Random();
+  private static BaseWriteChannel channel;
+
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
+
+  @Before
+  public void setUp() {
+    channel = new BaseWriteChannel(null, ENTITY, UPLOAD_ID) {
+      @Override
+      public RestorableState capture() {
+        return null;
+      }
+
+      @Override
+      protected void flushBuffer(int length, boolean last) {}
+
+      @Override
+      protected BaseState.Builder stateBuilder() {
+        return null;
+      }
+    };
+  }
+
+  @Test
+  public void testConstructor() throws IOException {
+    assertEquals(null, channel.options());
+    assertEquals(ENTITY, channel.entity());
+    assertEquals(0, channel.position());
+    assertEquals(UPLOAD_ID, channel.uploadId());
+    assertEquals(0, channel.limit());
+    assertTrue(channel.isOpen());
+    assertArrayEquals(new byte[0], channel.buffer());
+    assertEquals(DEFAULT_CHUNK_SIZE, channel.chunkSize());
+  }
+
+  @Test
+  public void testClose() throws IOException {
+    channel.close();
+    assertFalse(channel.isOpen());
+    assertNull(channel.buffer());
+  }
+
+  @Test
+  public void testValidateOpen() throws IOException {
+    channel.close();
+    thrown.expect(IOException.class);
+    thrown.expectMessage("stream is closed");
+    channel.write(ByteBuffer.allocate(42));
+  }
+
+  @Test
+  public void testChunkSize() throws IOException {
+    channel.chunkSize(42);
+    assertEquals(MIN_CHUNK_SIZE, channel.chunkSize());
+    channel.chunkSize(2 * MIN_CHUNK_SIZE);
+    assertEquals(2 * MIN_CHUNK_SIZE, channel.chunkSize());
+    channel.chunkSize(512 * 1025);
+    assertEquals(2 * MIN_CHUNK_SIZE, channel.chunkSize());
+  }
+
+  @Test
+  public void testWrite() throws IOException {
+    channel.write(ByteBuffer.wrap(CONTENT));
+    assertEquals(CONTENT.length, channel.limit());
+    assertEquals(DEFAULT_CHUNK_SIZE, channel.buffer().length);
+    assertArrayEquals(Arrays.copyOf(CONTENT, DEFAULT_CHUNK_SIZE), channel.buffer());
+  }
+
+  @Test
+  public void testWriteAndFlush() throws IOException {
+    ByteBuffer content = randomBuffer(DEFAULT_CHUNK_SIZE + 1);
+    channel.write(content);
+    assertEquals(DEFAULT_CHUNK_SIZE, channel.position());
+    assertEquals(1, channel.limit());
+    byte[] newContent = new byte[DEFAULT_CHUNK_SIZE];
+    newContent[0] = content.get(DEFAULT_CHUNK_SIZE);
+    assertArrayEquals(newContent, channel.buffer());
+  }
+
+  private static ByteBuffer randomBuffer(int size) {
+    byte[] byteArray = new byte[size];
+    RANDOM.nextBytes(byteArray);
+    return ByteBuffer.wrap(byteArray);
+  }
+}
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
index 1754be4df7dc..2f8a768f3669 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
@@ -17,6 +17,7 @@
 package com.google.gcloud.examples;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.WriteChannel;
 import com.google.gcloud.bigquery.BaseTableInfo;
 import com.google.gcloud.bigquery.BigQuery;
 import com.google.gcloud.bigquery.BigQueryError;
@@ -33,6 +34,7 @@
 import com.google.gcloud.bigquery.JobId;
 import com.google.gcloud.bigquery.JobInfo;
 import com.google.gcloud.bigquery.JobStatus;
+import com.google.gcloud.bigquery.LoadConfiguration;
 import com.google.gcloud.bigquery.LoadJobInfo;
 import com.google.gcloud.bigquery.QueryRequest;
 import com.google.gcloud.bigquery.QueryResponse;
@@ -42,6 +44,9 @@
 import com.google.gcloud.bigquery.ViewInfo;
 import com.google.gcloud.spi.BigQueryRpc.Tuple;
 
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -77,7 +82,8 @@
  *  copy     |
  *  load  
     + |
  *  extract  
     
     + |
- *  query "}
+ *  query  |
+ *  load-file  
     
     "}
  * 
  * 
  *
@@ -523,7 +529,7 @@ void run(BigQuery bigquery, JobInfo job) throws Exception {
         startedJob = bigquery.getJob(startedJob.jobId());
       }
       if (startedJob.status().error() == null) {
-        System.out.println("Job " + startedJob.jobId().job() + " suceeded");
+        System.out.println("Job " + startedJob.jobId().job() + " succeeded");
       } else {
         System.out.println("Job " + startedJob.jobId().job() + " failed");
         System.out.println("Error: " + startedJob.status().error());
@@ -544,8 +550,8 @@ LoadJobInfo parse(String... args) throws Exception {
         String table = args[1];
         String format = args[2];
         TableId tableId = TableId.of(dataset, table);
-        return LoadJobInfo.builder(tableId, Arrays.asList(args).subList(3, args.length))
-            .formatOptions(FormatOptions.of(format))
+        LoadConfiguration configuration = LoadConfiguration.of(tableId, FormatOptions.of(format));
+        return LoadJobInfo.builder(configuration, Arrays.asList(args).subList(3, args.length))
             .build();
       }
       throw new IllegalArgumentException("Missing required arguments.");
@@ -659,6 +665,47 @@ protected String params() {
     }
   }
 
+  /**
+   * This class demonstrates how to load data into a BigQuery Table from a local file.
+   *
+   * @see Resumable
+   *     Upload
+   */
+  private static class LoadFileAction extends BigQueryAction> {
+    @Override
+    void run(BigQuery bigquery, Tuple configuration) throws Exception {
+      System.out.println("Running insert");
+      try (FileChannel fileChannel = FileChannel.open(Paths.get(configuration.y()))) {
+        ByteBuffer buffer = ByteBuffer.allocate(256 * 1024);
+        WriteChannel writeChannel = bigquery.writer(configuration.x());
+        while (fileChannel.read(buffer) > 0) {
+          buffer.flip();
+          writeChannel.write(buffer);
+          buffer.clear();
+        }
+        writeChannel.close();
+      }
+    }
+
+    @Override
+    Tuple parse(String... args) throws Exception {
+      if (args.length == 4) {
+        String dataset = args[0];
+        String table = args[1];
+        String format = args[2];
+        TableId tableId = TableId.of(dataset, table);
+        LoadConfiguration configuration = LoadConfiguration.of(tableId, FormatOptions.of(format));
+        return Tuple.of(configuration, args[3]);
+      }
+      throw new IllegalArgumentException("Missing required arguments.");
+    }
+
+    @Override
+    protected String params() {
+      return " 
     
     ";
+    }
+  }
+
   static {
     CREATE_ACTIONS.put("dataset", new CreateDatasetAction());
     CREATE_ACTIONS.put("table", new CreateSimpleTableAction());
@@ -682,6 +729,7 @@ protected String params() {
     ACTIONS.put("extract", new ExtractAction());
     ACTIONS.put("copy", new CopyAction());
     ACTIONS.put("query", new QueryAction());
+    ACTIONS.put("load-file", new LoadFileAction());
   }
 
   private static void printUsage() {
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
index dc3dba6c72ab..e3bee626f49c 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -18,12 +18,12 @@
 
 import com.google.gcloud.AuthCredentials;
 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;
-import com.google.gcloud.storage.BlobReadChannel;
-import com.google.gcloud.storage.BlobWriteChannel;
 import com.google.gcloud.storage.Bucket;
 import com.google.gcloud.storage.BucketInfo;
 import com.google.gcloud.storage.CopyWriter;
@@ -258,7 +258,7 @@ private void run(Storage storage, Path uploadFrom, BlobInfo blobInfo) throws IOE
         // When content is not available or large (1MB or more) it is recommended
         // to write it in chunks via the blob's channel writer.
         Blob blob = new Blob(storage, blobInfo);
-        try (BlobWriteChannel writer = blob.writer()) {
+        try (WriteChannel writer = blob.writer()) {
           byte[] buffer = new byte[1024];
           try (InputStream input = Files.newInputStream(uploadFrom)) {
             int limit;
@@ -326,7 +326,7 @@ private void run(Storage storage, BlobId blobId, Path downloadTo) throws IOExcep
         writeTo.write(content);
       } else {
         // When Blob size is big or unknown use the blob's channel reader.
-        try (BlobReadChannel reader = blob.reader()) {
+        try (ReadChannel reader = blob.reader()) {
           WritableByteChannel channel = Channels.newChannel(writeTo);
           ByteBuffer bytes = ByteBuffer.allocate(64 * 1024);
           while (reader.read(bytes) > 0) {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index 5b305d15cee4..fe65f6ee010b 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -24,6 +24,8 @@
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import com.google.gcloud.ReadChannel;
+import com.google.gcloud.WriteChannel;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
 import com.google.gcloud.storage.Storage.BlobWriteOption;
@@ -321,24 +323,24 @@ public CopyWriter copyTo(String targetBucket, String targetBlob, BlobSourceOptio
   }
 
   /**
-   * Returns a {@code BlobReadChannel} object for reading this blob's content.
+   * Returns a {@code ReadChannel} object for reading this blob's content.
    *
    * @param options blob read options
    * @throws StorageException upon failure
    */
-  public BlobReadChannel reader(BlobSourceOption... options) {
+  public ReadChannel reader(BlobSourceOption... options) {
     return storage.reader(info.blobId(), toSourceOptions(info, options));
   }
 
   /**
-   * Returns a {@code BlobWriteChannel} object for writing to this blob. By default any md5 and
+   * Returns a {@code WriteChannel} object for writing to this blob. By default any md5 and
    * crc32c values in the current blob are ignored unless requested via the
    * {@code BlobWriteOption.md5Match} and {@code BlobWriteOption.crc32cMatch} options.
    *
    * @param options target blob options
    * @throws StorageException upon failure
    */
-  public BlobWriteChannel writer(BlobWriteOption... options) {
+  public WriteChannel writer(BlobWriteOption... options) {
     return storage.writer(info, options);
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
index 106d18466dac..984f5d1f72e9 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
@@ -16,46 +16,264 @@
 
 package com.google.gcloud.storage;
 
-import com.google.gcloud.Restorable;
+import static com.google.gcloud.RetryHelper.runWithRetries;
+
+import com.google.api.services.storage.model.StorageObject;
+import com.google.common.base.MoreObjects;
+import com.google.gcloud.ReadChannel;
 import com.google.gcloud.RestorableState;
+import com.google.gcloud.RetryHelper;
+import com.google.gcloud.spi.StorageRpc;
+import com.google.gcloud.spi.StorageRpc.Tuple;
 
-import java.io.Closeable;
 import java.io.IOException;
-import java.nio.channels.ReadableByteChannel;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Callable;
 
 /**
- * A channel for reading data from a Google Cloud Storage object.
- *
- * 
    Implementations of this class may buffer data internally to reduce remote calls. This
- * interface implements {@link Restorable} to allow saving the reader's state to continue reading
- * afterwards.
- * 
    
+ * Default implementation for ReadChannel.
  */
-public interface BlobReadChannel extends ReadableByteChannel, Closeable,
-    Restorable {
-
-  /**
-   * Overridden to remove IOException.
-   *
-   * @see java.nio.channels.Channel#close()
-   */
+class BlobReadChannel implements ReadChannel {
+
+  private static final int DEFAULT_CHUNK_SIZE = 2 * 1024 * 1024;
+
+  private final StorageOptions serviceOptions;
+  private final BlobId blob;
+  private final Map requestOptions;
+  private String lastEtag;
+  private int position;
+  private boolean isOpen;
+  private boolean endOfStream;
+  private int chunkSize = DEFAULT_CHUNK_SIZE;
+
+  private final StorageRpc storageRpc;
+  private final StorageObject storageObject;
+  private int bufferPos;
+  private byte[] buffer;
+
+  BlobReadChannel(StorageOptions serviceOptions, BlobId blob,
+                  Map requestOptions) {
+    this.serviceOptions = serviceOptions;
+    this.blob = blob;
+    this.requestOptions = requestOptions;
+    isOpen = true;
+    storageRpc = serviceOptions.rpc();
+    storageObject = blob.toPb();
+  }
+
+  @Override
+  public RestorableState capture() {
+    StateImpl.Builder builder = StateImpl.builder(serviceOptions, blob, requestOptions)
+        .position(position)
+        .isOpen(isOpen)
+        .endOfStream(endOfStream)
+        .chunkSize(chunkSize);
+    if (buffer != null) {
+      builder.position(position + bufferPos);
+      builder.endOfStream(false);
+    }
+    return builder.build();
+  }
+
   @Override
-  void close();
-
-  void seek(int position) throws IOException;
-
-  /**
-   * Sets the minimum size that will be read by a single RPC.
-   * Read data will be locally buffered until consumed.
-   */
-  void chunkSize(int chunkSize);
-
-  /**
-   * Captures the read channel state so that it can be saved and restored afterwards.
-   *
-   * @return a {@link RestorableState} object that contains the read channel state and can restore
-   *     it afterwards.
-   */
+  public boolean isOpen() {
+    return isOpen;
+  }
+
+  @Override
+  public void close() {
+    if (isOpen) {
+      buffer = null;
+      isOpen = false;
+    }
+  }
+
+  private void validateOpen() throws IOException {
+    if (!isOpen) {
+      throw new IOException("stream is closed");
+    }
+  }
+
+  @Override
+  public void seek(int position) throws IOException {
+    validateOpen();
+    this.position = position;
+    buffer = null;
+    bufferPos = 0;
+    endOfStream = false;
+  }
+
+  @Override
+  public void chunkSize(int chunkSize) {
+    this.chunkSize = chunkSize <= 0 ? DEFAULT_CHUNK_SIZE : chunkSize;
+  }
+
   @Override
-  RestorableState capture();
+  public int read(ByteBuffer byteBuffer) throws IOException {
+    validateOpen();
+    if (buffer == null) {
+      if (endOfStream) {
+        return -1;
+      }
+      final int toRead = Math.max(byteBuffer.remaining(), chunkSize);
+      try {
+        Tuple result = runWithRetries(new Callable>() {
+          @Override
+          public Tuple call() {
+            return storageRpc.read(storageObject, requestOptions, position, toRead);
+          }
+        }, serviceOptions.retryParams(), StorageImpl.EXCEPTION_HANDLER);
+        if (lastEtag != null && !Objects.equals(result.x(), lastEtag)) {
+          StringBuilder messageBuilder = new StringBuilder();
+          messageBuilder.append("Blob ").append(blob).append(" was updated while reading");
+          throw new StorageException(0, messageBuilder.toString(), false);
+        }
+        lastEtag = result.x();
+        buffer = result.y();
+      } catch (RetryHelper.RetryHelperException e) {
+        throw StorageException.translateAndThrow(e);
+      }
+      if (toRead > buffer.length) {
+        endOfStream = true;
+        if (buffer.length == 0) {
+          buffer = null;
+          return -1;
+        }
+      }
+    }
+    int toWrite = Math.min(buffer.length - bufferPos, byteBuffer.remaining());
+    byteBuffer.put(buffer, bufferPos, toWrite);
+    bufferPos += toWrite;
+    if (bufferPos >= buffer.length) {
+      position += buffer.length;
+      buffer = null;
+      bufferPos = 0;
+    }
+    return toWrite;
+  }
+
+  static class StateImpl implements RestorableState, Serializable {
+
+    private static final long serialVersionUID = 3889420316004453706L;
+
+    private final StorageOptions serviceOptions;
+    private final BlobId blob;
+    private final Map requestOptions;
+    private final String lastEtag;
+    private final int position;
+    private final boolean isOpen;
+    private final boolean endOfStream;
+    private final int chunkSize;
+
+    StateImpl(Builder builder) {
+      this.serviceOptions = builder.serviceOptions;
+      this.blob = builder.blob;
+      this.requestOptions = builder.requestOptions;
+      this.lastEtag = builder.lastEtag;
+      this.position = builder.position;
+      this.isOpen = builder.isOpen;
+      this.endOfStream = builder.endOfStream;
+      this.chunkSize = builder.chunkSize;
+    }
+
+    static class Builder {
+      private final StorageOptions serviceOptions;
+      private final BlobId blob;
+      private final Map requestOptions;
+      private String lastEtag;
+      private int position;
+      private boolean isOpen;
+      private boolean endOfStream;
+      private int chunkSize;
+
+      private Builder(StorageOptions options, BlobId blob, Map reqOptions) {
+        this.serviceOptions = options;
+        this.blob = blob;
+        this.requestOptions = reqOptions;
+      }
+
+      Builder lastEtag(String lastEtag) {
+        this.lastEtag = lastEtag;
+        return this;
+      }
+
+      Builder position(int position) {
+        this.position = position;
+        return this;
+      }
+
+      Builder isOpen(boolean isOpen) {
+        this.isOpen = isOpen;
+        return this;
+      }
+
+      Builder endOfStream(boolean endOfStream) {
+        this.endOfStream = endOfStream;
+        return this;
+      }
+
+      Builder chunkSize(int chunkSize) {
+        this.chunkSize = chunkSize;
+        return this;
+      }
+
+      RestorableState build() {
+        return new StateImpl(this);
+      }
+    }
+
+    static Builder builder(
+        StorageOptions options, BlobId blob, Map reqOptions) {
+      return new Builder(options, blob, reqOptions);
+    }
+
+    @Override
+    public ReadChannel restore() {
+      BlobReadChannel channel = new BlobReadChannel(serviceOptions, blob, requestOptions);
+      channel.lastEtag = lastEtag;
+      channel.position = position;
+      channel.isOpen = isOpen;
+      channel.endOfStream = endOfStream;
+      channel.chunkSize = chunkSize;
+      return channel;
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(serviceOptions, blob, requestOptions, lastEtag, position, isOpen,
+          endOfStream, chunkSize);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (obj == null) {
+        return false;
+      }
+      if (!(obj instanceof StateImpl)) {
+        return false;
+      }
+      final StateImpl other = (StateImpl) obj;
+      return Objects.equals(this.serviceOptions, other.serviceOptions)
+          && Objects.equals(this.blob, other.blob)
+          && Objects.equals(this.requestOptions, other.requestOptions)
+          && Objects.equals(this.lastEtag, other.lastEtag)
+          && this.position == other.position
+          && this.isOpen == other.isOpen
+          && this.endOfStream == other.endOfStream
+          && this.chunkSize == other.chunkSize;
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this)
+          .add("blob", blob)
+          .add("position", position)
+          .add("isOpen", isOpen)
+          .add("endOfStream", endOfStream)
+          .toString();
+    }
+  }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java
deleted file mode 100644
index 8fe6eae66d8f..000000000000
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.storage;
-
-import static com.google.gcloud.RetryHelper.runWithRetries;
-
-import com.google.api.services.storage.model.StorageObject;
-import com.google.common.base.MoreObjects;
-import com.google.gcloud.RestorableState;
-import com.google.gcloud.RetryHelper;
-import com.google.gcloud.spi.StorageRpc;
-import com.google.gcloud.spi.StorageRpc.Tuple;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.Callable;
-
-/**
- * Default implementation for BlobReadChannel.
- */
-class BlobReadChannelImpl implements BlobReadChannel {
-
-  private static final int DEFAULT_CHUNK_SIZE = 2 * 1024 * 1024;
-
-  private final StorageOptions serviceOptions;
-  private final BlobId blob;
-  private final Map requestOptions;
-  private String lastEtag;
-  private int position;
-  private boolean isOpen;
-  private boolean endOfStream;
-  private int chunkSize = DEFAULT_CHUNK_SIZE;
-
-  private final StorageRpc storageRpc;
-  private final StorageObject storageObject;
-  private int bufferPos;
-  private byte[] buffer;
-
-  BlobReadChannelImpl(StorageOptions serviceOptions, BlobId blob,
-      Map requestOptions) {
-    this.serviceOptions = serviceOptions;
-    this.blob = blob;
-    this.requestOptions = requestOptions;
-    isOpen = true;
-    storageRpc = serviceOptions.rpc();
-    storageObject = blob.toPb();
-  }
-
-  @Override
-  public RestorableState capture() {
-    StateImpl.Builder builder = StateImpl.builder(serviceOptions, blob, requestOptions)
-        .position(position)
-        .isOpen(isOpen)
-        .endOfStream(endOfStream)
-        .chunkSize(chunkSize);
-    if (buffer != null) {
-      builder.position(position + bufferPos);
-      builder.endOfStream(false);
-    }
-    return builder.build();
-  }
-
-  @Override
-  public boolean isOpen() {
-    return isOpen;
-  }
-
-  @Override
-  public void close() {
-    if (isOpen) {
-      buffer = null;
-      isOpen = false;
-    }
-  }
-
-  private void validateOpen() throws IOException {
-    if (!isOpen) {
-      throw new IOException("stream is closed");
-    }
-  }
-
-  @Override
-  public void seek(int position) throws IOException {
-    validateOpen();
-    this.position = position;
-    buffer = null;
-    bufferPos = 0;
-    endOfStream = false;
-  }
-
-  @Override
-  public void chunkSize(int chunkSize) {
-    this.chunkSize = chunkSize <= 0 ? DEFAULT_CHUNK_SIZE : chunkSize;
-  }
-
-  @Override
-  public int read(ByteBuffer byteBuffer) throws IOException {
-    validateOpen();
-    if (buffer == null) {
-      if (endOfStream) {
-        return -1;
-      }
-      final int toRead = Math.max(byteBuffer.remaining(), chunkSize);
-      try {
-        Tuple result = runWithRetries(new Callable>() {
-          @Override
-          public Tuple call() {
-            return storageRpc.read(storageObject, requestOptions, position, toRead);
-          }
-        }, serviceOptions.retryParams(), StorageImpl.EXCEPTION_HANDLER);
-        if (lastEtag != null && !Objects.equals(result.x(), lastEtag)) {
-          StringBuilder messageBuilder = new StringBuilder();
-          messageBuilder.append("Blob ").append(blob).append(" was updated while reading");
-          throw new StorageException(0, messageBuilder.toString(), false);
-        }
-        lastEtag = result.x();
-        buffer = result.y();
-      } catch (RetryHelper.RetryHelperException e) {
-        throw StorageException.translateAndThrow(e);
-      }
-      if (toRead > buffer.length) {
-        endOfStream = true;
-        if (buffer.length == 0) {
-          buffer = null;
-          return -1;
-        }
-      }
-    }
-    int toWrite = Math.min(buffer.length - bufferPos, byteBuffer.remaining());
-    byteBuffer.put(buffer, bufferPos, toWrite);
-    bufferPos += toWrite;
-    if (bufferPos >= buffer.length) {
-      position += buffer.length;
-      buffer = null;
-      bufferPos = 0;
-    }
-    return toWrite;
-  }
-
-  static class StateImpl implements RestorableState, Serializable {
-
-    private static final long serialVersionUID = 3889420316004453706L;
-
-    private final StorageOptions serviceOptions;
-    private final BlobId blob;
-    private final Map requestOptions;
-    private final String lastEtag;
-    private final int position;
-    private final boolean isOpen;
-    private final boolean endOfStream;
-    private final int chunkSize;
-
-    StateImpl(Builder builder) {
-      this.serviceOptions = builder.serviceOptions;
-      this.blob = builder.blob;
-      this.requestOptions = builder.requestOptions;
-      this.lastEtag = builder.lastEtag;
-      this.position = builder.position;
-      this.isOpen = builder.isOpen;
-      this.endOfStream = builder.endOfStream;
-      this.chunkSize = builder.chunkSize;
-    }
-
-    static class Builder {
-      private final StorageOptions serviceOptions;
-      private final BlobId blob;
-      private final Map requestOptions;
-      private String lastEtag;
-      private int position;
-      private boolean isOpen;
-      private boolean endOfStream;
-      private int chunkSize;
-
-      private Builder(StorageOptions options, BlobId blob, Map reqOptions) {
-        this.serviceOptions = options;
-        this.blob = blob;
-        this.requestOptions = reqOptions;
-      }
-
-      Builder lastEtag(String lastEtag) {
-        this.lastEtag = lastEtag;
-        return this;
-      }
-
-      Builder position(int position) {
-        this.position = position;
-        return this;
-      }
-
-      Builder isOpen(boolean isOpen) {
-        this.isOpen = isOpen;
-        return this;
-      }
-
-      Builder endOfStream(boolean endOfStream) {
-        this.endOfStream = endOfStream;
-        return this;
-      }
-
-      Builder chunkSize(int chunkSize) {
-        this.chunkSize = chunkSize;
-        return this;
-      }
-
-      RestorableState build() {
-        return new StateImpl(this);
-      }
-    }
-
-    static Builder builder(
-        StorageOptions options, BlobId blob, Map reqOptions) {
-      return new Builder(options, blob, reqOptions);
-    }
-
-    @Override
-    public BlobReadChannel restore() {
-      BlobReadChannelImpl channel = new BlobReadChannelImpl(serviceOptions, blob, requestOptions);
-      channel.lastEtag = lastEtag;
-      channel.position = position;
-      channel.isOpen = isOpen;
-      channel.endOfStream = endOfStream;
-      channel.chunkSize = chunkSize;
-      return channel;
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(serviceOptions, blob, requestOptions, lastEtag, position, isOpen,
-          endOfStream, chunkSize);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (obj == null) {
-        return false;
-      }
-      if (!(obj instanceof StateImpl)) {
-        return false;
-      }
-      final StateImpl other = (StateImpl) obj;
-      return Objects.equals(this.serviceOptions, other.serviceOptions)
-          && Objects.equals(this.blob, other.blob)
-          && Objects.equals(this.requestOptions, other.requestOptions)
-          && Objects.equals(this.lastEtag, other.lastEtag)
-          && this.position == other.position
-          && this.isOpen == other.isOpen
-          && this.endOfStream == other.endOfStream
-          && this.chunkSize == other.chunkSize;
-    }
-
-    @Override
-    public String toString() {
-      return MoreObjects.toStringHelper(this)
-          .add("blob", blob)
-          .add("position", position)
-          .add("isOpen", isOpen)
-          .add("endOfStream", endOfStream)
-          .toString();
-    }
-  }
-}
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java
index 9682c6345659..d1d12ec77638 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannel.java
@@ -16,37 +16,77 @@
 
 package com.google.gcloud.storage;
 
-import com.google.gcloud.Restorable;
+import static com.google.gcloud.RetryHelper.runWithRetries;
+import static java.util.concurrent.Executors.callable;
+
+import com.google.gcloud.BaseWriteChannel;
 import com.google.gcloud.RestorableState;
+import com.google.gcloud.RetryHelper;
+import com.google.gcloud.WriteChannel;
+import com.google.gcloud.spi.StorageRpc;
 
-import java.io.Closeable;
-import java.nio.channels.WritableByteChannel;
+import java.util.Map;
 
 /**
- * A channel for writing data to a Google Cloud Storage object.
- *
- * 
    Implementations of this class may further buffer data internally to reduce remote calls.
- * Written data will only be visible after calling {@link #close()}. This interface implements
- * {@link Restorable} to allow saving the writer's state to continue writing afterwards.
- * 
    
+ * Write channel implementation to upload Google Cloud Storage blobs.
  */
-public interface BlobWriteChannel extends WritableByteChannel, Closeable,
-    Restorable {
-
-  /**
-   * Sets the minimum size that will be written by a single RPC.
-   * Written data will be buffered and only flushed upon reaching this size or closing the channel.
-   */
-  void chunkSize(int chunkSize);
-
-  /**
-   * Captures the write channel state so that it can be saved and restored afterwards. The original
-   * {@code BlobWriteChannel} and the restored one should not both be used. Closing one channel
-   * causes the other channel to close, subsequent writes will fail.
-   *
-   * @return a {@link RestorableState} object that contains the write channel state and can restore
-   *     it afterwards.
-   */
+class BlobWriteChannel extends BaseWriteChannel {
+
+  BlobWriteChannel(StorageOptions options, BlobInfo blob, Map optionsMap) {
+    this(options, blob, options.rpc().open(blob.toPb(), optionsMap));
+  }
+
+  BlobWriteChannel(StorageOptions options, BlobInfo blobInfo, String uploadId) {
+    super(options, blobInfo, uploadId);
+  }
+
   @Override
-  RestorableState capture();
+  protected void flushBuffer(final int length, final boolean last) {
+    try {
+      runWithRetries(callable(new Runnable() {
+        @Override
+        public void run() {
+          options().rpc().write(uploadId(), buffer(), 0, position(), length, last);
+        }
+      }), options().retryParams(), StorageImpl.EXCEPTION_HANDLER);
+    } catch (RetryHelper.RetryHelperException e) {
+      throw StorageException.translateAndThrow(e);
+    }
+  }
+
+  protected StateImpl.Builder stateBuilder() {
+    return StateImpl.builder(options(), entity(), uploadId());
+  }
+
+  static class StateImpl extends BaseWriteChannel.BaseState {
+
+    private static final long serialVersionUID = -9028324143780151286L;
+
+    StateImpl(Builder builder) {
+      super(builder);
+    }
+
+    static class Builder extends BaseWriteChannel.BaseState.Builder {
+
+      private Builder(StorageOptions options, BlobInfo blobInfo, String uploadId) {
+        super(options, blobInfo, uploadId);
+      }
+
+      @Override
+      public RestorableState build() {
+        return new StateImpl(this);
+      }
+    }
+
+    static Builder builder(StorageOptions options, BlobInfo blobInfo, String uploadId) {
+      return new Builder(options, blobInfo, uploadId);
+    }
+
+    @Override
+    public WriteChannel restore() {
+      BlobWriteChannel channel = new BlobWriteChannel(serviceOptions, entity, uploadId);
+      channel.restore(this);
+      return channel;
+    }
+  }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java
deleted file mode 100644
index acde4178533c..000000000000
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriteChannelImpl.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.storage;
-
-import static com.google.gcloud.RetryHelper.runWithRetries;
-import static java.util.concurrent.Executors.callable;
-
-import com.google.api.services.storage.model.StorageObject;
-import com.google.common.base.MoreObjects;
-import com.google.gcloud.RestorableState;
-import com.google.gcloud.RetryHelper;
-import com.google.gcloud.spi.StorageRpc;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Default implementation for BlobWriteChannel.
- */
-class BlobWriteChannelImpl implements BlobWriteChannel {
-
-  private static final int MIN_CHUNK_SIZE = 256 * 1024;
-  private static final int DEFAULT_CHUNK_SIZE = 8 * MIN_CHUNK_SIZE;
-
-  private final StorageOptions options;
-  private final BlobInfo blobInfo;
-  private final String uploadId;
-  private int position;
-  private byte[] buffer = new byte[0];
-  private int limit;
-  private boolean isOpen = true;
-  private int chunkSize = DEFAULT_CHUNK_SIZE;
-
-  private final StorageRpc storageRpc;
-  private final StorageObject storageObject;
-
-  BlobWriteChannelImpl(StorageOptions options, BlobInfo blobInfo,
-      Map optionsMap) {
-    this.options = options;
-    this.blobInfo = blobInfo;
-    storageRpc = options.rpc();
-    storageObject = blobInfo.toPb();
-    uploadId = storageRpc.open(storageObject, optionsMap);
-  }
-
-  BlobWriteChannelImpl(StorageOptions options, BlobInfo blobInfo, String uploadId) {
-    this.options = options;
-    this.blobInfo = blobInfo;
-    this.uploadId = uploadId;
-    storageRpc = options.rpc();
-    storageObject = blobInfo.toPb();
-  }
-
-  @Override
-  public RestorableState capture() {
-    byte[] bufferToSave = null;
-    if (isOpen) {
-      flush();
-      bufferToSave = Arrays.copyOf(buffer, limit);
-    }
-    return StateImpl.builder(options, blobInfo, uploadId)
-        .position(position)
-        .buffer(bufferToSave)
-        .isOpen(isOpen)
-        .chunkSize(chunkSize)
-        .build();
-  }
-
-  private void flush() {
-    if (limit >= chunkSize) {
-      final int length = limit - limit % MIN_CHUNK_SIZE;
-      try {
-        runWithRetries(callable(new Runnable() {
-          @Override
-          public void run() {
-            storageRpc.write(uploadId, buffer, 0, position, length, false);
-          }
-        }), options.retryParams(), StorageImpl.EXCEPTION_HANDLER);
-      } catch (RetryHelper.RetryHelperException e) {
-        throw StorageException.translateAndThrow(e);
-      }
-      position += length;
-      limit -= length;
-      byte[] temp = new byte[chunkSize];
-      System.arraycopy(buffer, length, temp, 0, limit);
-      buffer = temp;
-    }
-  }
-
-  private void validateOpen() throws IOException {
-    if (!isOpen) {
-      throw new IOException("stream is closed");
-    }
-  }
-
-  @Override
-  public int write(ByteBuffer byteBuffer) throws IOException {
-    validateOpen();
-    int toWrite = byteBuffer.remaining();
-    int spaceInBuffer = buffer.length - limit;
-    if (spaceInBuffer >= toWrite) {
-      byteBuffer.get(buffer, limit, toWrite);
-    } else {
-      buffer = Arrays.copyOf(buffer, Math.max(chunkSize, buffer.length + toWrite - spaceInBuffer));
-      byteBuffer.get(buffer, limit, toWrite);
-    }
-    limit += toWrite;
-    flush();
-    return toWrite;
-  }
-
-  @Override
-  public boolean isOpen() {
-    return isOpen;
-  }
-
-  @Override
-  public void close() throws IOException {
-    if (isOpen) {
-      try {
-        runWithRetries(callable(new Runnable() {
-          @Override
-          public void run() {
-            storageRpc.write(uploadId, buffer, 0, position, limit, true);
-          }
-        }), options.retryParams(), StorageImpl.EXCEPTION_HANDLER);
-      } catch (RetryHelper.RetryHelperException e) {
-        throw StorageException.translateAndThrow(e);
-      }
-      position += buffer.length;
-      isOpen = false;
-      buffer = null;
-    }
-  }
-
-  @Override
-  public void chunkSize(int chunkSize) {
-    chunkSize = (chunkSize / MIN_CHUNK_SIZE) * MIN_CHUNK_SIZE;
-    this.chunkSize = Math.max(MIN_CHUNK_SIZE, chunkSize);
-  }
-
-  static class StateImpl implements RestorableState, Serializable {
-
-    private static final long serialVersionUID = 8541062465055125619L;
-
-    private final StorageOptions serviceOptions;
-    private final BlobInfo blobInfo;
-    private final String uploadId;
-    private final int position;
-    private final byte[] buffer;
-    private final boolean isOpen;
-    private final int chunkSize;
-
-    StateImpl(Builder builder) {
-      this.serviceOptions = builder.serviceOptions;
-      this.blobInfo = builder.blobInfo;
-      this.uploadId = builder.uploadId;
-      this.position = builder.position;
-      this.buffer = builder.buffer;
-      this.isOpen = builder.isOpen;
-      this.chunkSize = builder.chunkSize;
-    }
-
-    static class Builder {
-      private final StorageOptions serviceOptions;
-      private final BlobInfo blobInfo;
-      private final String uploadId;
-      private int position;
-      private byte[] buffer;
-      private boolean isOpen;
-      private int chunkSize;
-
-      private Builder(StorageOptions options, BlobInfo blobInfo, String uploadId) {
-        this.serviceOptions = options;
-        this.blobInfo = blobInfo;
-        this.uploadId = uploadId;
-      }
-
-      Builder position(int position) {
-        this.position = position;
-        return this;
-      }
-
-      Builder buffer(byte[] buffer) {
-        this.buffer = buffer;
-        return this;
-      }
-
-      Builder isOpen(boolean isOpen) {
-        this.isOpen = isOpen;
-        return this;
-      }
-
-      Builder chunkSize(int chunkSize) {
-        this.chunkSize = chunkSize;
-        return this;
-      }
-
-      RestorableState build() {
-        return new StateImpl(this);
-      }
-    }
-
-    static Builder builder(StorageOptions options, BlobInfo blobInfo, String uploadId) {
-      return new Builder(options, blobInfo, uploadId);
-    }
-
-    @Override
-    public BlobWriteChannel restore() {
-      BlobWriteChannelImpl channel = new BlobWriteChannelImpl(serviceOptions, blobInfo, uploadId);
-      if (buffer != null) {
-        channel.buffer = buffer.clone();
-        channel.limit = buffer.length;
-      }
-      channel.position = position;
-      channel.isOpen = isOpen;
-      channel.chunkSize = chunkSize;
-      return channel;
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(serviceOptions, blobInfo, uploadId, position, isOpen, chunkSize,
-          Arrays.hashCode(buffer));
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (obj == null) {
-        return false;
-      }
-      if (!(obj instanceof StateImpl)) {
-        return false;
-      }
-      final StateImpl other = (StateImpl) obj;
-      return Objects.equals(this.serviceOptions, other.serviceOptions)
-          && Objects.equals(this.blobInfo, other.blobInfo)
-          && Objects.equals(this.uploadId, other.uploadId)
-          && Objects.deepEquals(this.buffer, other.buffer)
-          && this.position == other.position
-          && this.isOpen == other.isOpen
-          && this.chunkSize == other.chunkSize;
-    }
-
-    @Override
-    public String toString() {
-      return MoreObjects.toStringHelper(this)
-          .add("blobInfo", blobInfo)
-          .add("uploadId", uploadId)
-          .add("position", position)
-          .add("isOpen", isOpen)
-          .toString();
-    }
-  }
-}
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 85e79a8e9abf..f8c90ff42930 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -26,7 +26,9 @@
 import com.google.common.collect.Sets;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.Page;
+import com.google.gcloud.ReadChannel;
 import com.google.gcloud.Service;
+import com.google.gcloud.WriteChannel;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 
@@ -1423,7 +1425,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    *
    * @throws StorageException upon failure
    */
-  BlobReadChannel reader(String bucket, String blob, BlobSourceOption... options);
+  ReadChannel reader(String bucket, String blob, BlobSourceOption... options);
 
   /**
    * Return a channel for reading the blob's content. If {@code blob.generation()} is set
@@ -1439,7 +1441,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    *
    * @throws StorageException upon failure
    */
-  BlobReadChannel reader(BlobId blob, BlobSourceOption... options);
+  ReadChannel reader(BlobId blob, BlobSourceOption... options);
 
   /**
    * Create a blob and return a channel for writing its content. By default any md5 and crc32c
@@ -1448,7 +1450,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    *
    * @throws StorageException upon failure
    */
-  BlobWriteChannel writer(BlobInfo blobInfo, BlobWriteOption... options);
+  WriteChannel writer(BlobInfo blobInfo, BlobWriteOption... options);
 
   /**
    * Generates a signed URL for a blob.
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index 93fc202febef..a6c851d0f638 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -49,6 +49,7 @@
 import com.google.gcloud.Page;
 import com.google.gcloud.PageImpl;
 import com.google.gcloud.PageImpl.NextPageFetcher;
+import com.google.gcloud.ReadChannel;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.RewriteResponse;
@@ -517,15 +518,15 @@ private  List> transformBatch
   }
 
   @Override
-  public BlobReadChannel reader(String bucket, String blob, BlobSourceOption... options) {
+  public ReadChannel reader(String bucket, String blob, BlobSourceOption... options) {
     Map optionsMap = optionMap(options);
-    return new BlobReadChannelImpl(options(), BlobId.of(bucket, blob), optionsMap);
+    return new BlobReadChannel(options(), BlobId.of(bucket, blob), optionsMap);
   }
 
   @Override
-  public BlobReadChannel reader(BlobId blob, BlobSourceOption... options) {
+  public ReadChannel reader(BlobId blob, BlobSourceOption... options) {
     Map optionsMap = optionMap(blob, options);
-    return new BlobReadChannelImpl(options(), blob, optionsMap);
+    return new BlobReadChannel(options(), blob, optionsMap);
   }
 
   @Override
@@ -536,7 +537,7 @@ public BlobWriteChannel writer(BlobInfo blobInfo, BlobWriteOption... options) {
 
   private BlobWriteChannel writer(BlobInfo blobInfo, BlobTargetOption... options) {
     final Map optionsMap = optionMap(blobInfo, options);
-    return new BlobWriteChannelImpl(options(), blobInfo, optionsMap);
+    return new BlobWriteChannel(options(), blobInfo, optionsMap);
   }
 
   @Override
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelTest.java
similarity index 86%
rename from gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
rename to gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelTest.java
index 7daf4a6fb468..ffb37e8c5032 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelTest.java
@@ -27,6 +27,7 @@
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.ReadChannel;
 import com.google.gcloud.RestorableState;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.StorageRpc;
@@ -42,7 +43,7 @@
 import java.util.Map;
 import java.util.Random;
 
-public class BlobReadChannelImplTest {
+public class BlobReadChannelTest {
 
   private static final String BUCKET_NAME = "b";
   private static final String BLOB_NAME = "n";
@@ -55,7 +56,7 @@ public class BlobReadChannelImplTest {
   private StorageOptions options;
   private StorageRpcFactory rpcFactoryMock;
   private StorageRpc storageRpcMock;
-  private BlobReadChannelImpl reader;
+  private BlobReadChannel reader;
 
   @Before
   public void setUp() {
@@ -78,13 +79,13 @@ public void tearDown() throws Exception {
   @Test
   public void testCreate() {
     replay(storageRpcMock);
-    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     assertTrue(reader.isOpen());
   }
 
   @Test
   public void testReadBuffered() throws IOException {
-    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     byte[] result = randomByteArray(DEFAULT_CHUNK_SIZE);
     ByteBuffer firstReadBuffer = ByteBuffer.allocate(42);
     ByteBuffer secondReadBuffer = ByteBuffer.allocate(42);
@@ -102,7 +103,7 @@ public void testReadBuffered() throws IOException {
 
   @Test
   public void testReadBig() throws IOException {
-    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     reader.chunkSize(CUSTOM_CHUNK_SIZE);
     byte[] firstResult = randomByteArray(DEFAULT_CHUNK_SIZE);
     byte[] secondResult = randomByteArray(DEFAULT_CHUNK_SIZE);
@@ -123,7 +124,7 @@ public void testReadBig() throws IOException {
 
   @Test
   public void testReadFinish() throws IOException {
-    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     byte[] result = {};
     ByteBuffer readBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
     expect(storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, 0, DEFAULT_CHUNK_SIZE))
@@ -134,7 +135,7 @@ public void testReadFinish() throws IOException {
 
   @Test
   public void testSeek() throws IOException {
-    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     reader.seek(42);
     byte[] result = randomByteArray(DEFAULT_CHUNK_SIZE);
     ByteBuffer readBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
@@ -148,7 +149,7 @@ public void testSeek() throws IOException {
   @Test
   public void testClose() {
     replay(storageRpcMock);
-    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     assertTrue(reader.isOpen());
     reader.close();
     assertTrue(!reader.isOpen());
@@ -157,7 +158,7 @@ public void testClose() {
   @Test
   public void testReadClosed() {
     replay(storageRpcMock);
-    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     reader.close();
     try {
       ByteBuffer readBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
@@ -171,7 +172,7 @@ public void testReadClosed() {
   @Test
   public void testReadGenerationChanged() throws IOException {
     BlobId blobId = BlobId.of(BUCKET_NAME, BLOB_NAME);
-    reader = new BlobReadChannelImpl(options, blobId, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannel(options, blobId, EMPTY_RPC_OPTIONS);
     byte[] firstResult = randomByteArray(DEFAULT_CHUNK_SIZE);
     byte[] secondResult = randomByteArray(DEFAULT_CHUNK_SIZE);
     ByteBuffer firstReadBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
@@ -185,7 +186,7 @@ public void testReadGenerationChanged() throws IOException {
     reader.read(firstReadBuffer);
     try {
       reader.read(secondReadBuffer);
-      fail("Expected BlobReadChannel read to throw StorageException");
+      fail("Expected ReadChannel read to throw StorageException");
     } catch (StorageException ex) {
       StringBuilder messageBuilder = new StringBuilder();
       messageBuilder.append("Blob ").append(blobId).append(" was updated while reading");
@@ -204,10 +205,10 @@ public void testSaveAndRestore() throws IOException {
     expect(storageRpcMock.read(BLOB_ID.toPb(), EMPTY_RPC_OPTIONS, 42, DEFAULT_CHUNK_SIZE))
         .andReturn(StorageRpc.Tuple.of("etag", secondResult));
     replay(storageRpcMock);
-    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     reader.read(firstReadBuffer);
-    RestorableState readerState = reader.capture();
-    BlobReadChannel restoredReader = readerState.restore();
+    RestorableState readerState = reader.capture();
+    ReadChannel restoredReader = readerState.restore();
     restoredReader.read(secondReadBuffer);
     assertArrayEquals(Arrays.copyOf(firstResult, firstReadBuffer.capacity()),
         firstReadBuffer.array());
@@ -217,11 +218,11 @@ public void testSaveAndRestore() throws IOException {
   @Test
   public void testStateEquals() {
     replay(storageRpcMock);
-    reader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    reader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     @SuppressWarnings("resource") // avoid closing when you don't want partial writes to GCS
-    BlobReadChannel secondReader = new BlobReadChannelImpl(options, BLOB_ID, EMPTY_RPC_OPTIONS);
-    RestorableState state = reader.capture();
-    RestorableState secondState = secondReader.capture();
+        ReadChannel secondReader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
+    RestorableState state = reader.capture();
+    RestorableState secondState = secondReader.capture();
     assertEquals(state, secondState);
     assertEquals(state.hashCode(), secondState.hashCode());
     assertEquals(state.toString(), secondState.toString());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
index bc6a4725d7e7..586e7fd0fd39 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java
@@ -31,6 +31,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.api.client.util.Lists;
+import com.google.gcloud.ReadChannel;
 import com.google.gcloud.storage.Storage.CopyRequest;
 
 import org.easymock.Capture;
@@ -188,7 +189,7 @@ public void testCopyToBlobId() throws Exception {
 
   @Test
   public void testReader() throws Exception {
-    BlobReadChannel channel = createMock(BlobReadChannel.class);
+    ReadChannel channel = createMock(ReadChannel.class);
     expect(storage.reader(BLOB_INFO.blobId())).andReturn(channel);
     replay(storage);
     assertSame(channel, blob.reader());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelTest.java
similarity index 85%
rename from gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
rename to gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelTest.java
index 518ba8e14c65..e499f6b9de52 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelTest.java
@@ -33,6 +33,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.RestorableState;
 import com.google.gcloud.RetryParams;
+import com.google.gcloud.WriteChannel;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpcFactory;
 
@@ -48,7 +49,7 @@
 import java.util.Map;
 import java.util.Random;
 
-public class BlobWriteChannelImplTest {
+public class BlobWriteChannelTest {
 
   private static final String BUCKET_NAME = "b";
   private static final String BLOB_NAME = "n";
@@ -63,7 +64,7 @@ public class BlobWriteChannelImplTest {
   private StorageOptions options;
   private StorageRpcFactory rpcFactoryMock;
   private StorageRpc storageRpcMock;
-  private BlobWriteChannelImpl writer;
+  private BlobWriteChannel writer;
 
   @Before
   public void setUp() {
@@ -88,7 +89,7 @@ public void tearDown() throws Exception {
   public void testCreate() {
     expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertTrue(writer.isOpen());
   }
 
@@ -96,7 +97,7 @@ public void testCreate() {
   public void testWriteWithoutFlush() throws IOException {
     expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID);
     replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertEquals(MIN_CHUNK_SIZE, writer.write(ByteBuffer.allocate(MIN_CHUNK_SIZE)));
   }
 
@@ -107,7 +108,7 @@ public void testWriteWithFlush() throws IOException {
     storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L),
         eq(CUSTOM_CHUNK_SIZE), eq(false));
     replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     writer.chunkSize(CUSTOM_CHUNK_SIZE);
     ByteBuffer buffer = randomBuffer(CUSTOM_CHUNK_SIZE);
     assertEquals(CUSTOM_CHUNK_SIZE, writer.write(buffer));
@@ -121,7 +122,7 @@ public void testWritesAndFlush() throws IOException {
     storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L),
         eq(DEFAULT_CHUNK_SIZE), eq(false));
     replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     ByteBuffer[] buffers = new ByteBuffer[DEFAULT_CHUNK_SIZE / MIN_CHUNK_SIZE];
     for (int i = 0; i < buffers.length; i++) {
       buffers[i] = randomBuffer(MIN_CHUNK_SIZE);
@@ -141,7 +142,7 @@ public void testCloseWithoutFlush() throws IOException {
     Capture capturedBuffer = Capture.newInstance();
     storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L), eq(0), eq(true));
     replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertTrue(writer.isOpen());
     writer.close();
     assertArrayEquals(new byte[0], capturedBuffer.getValue());
@@ -156,7 +157,7 @@ public void testCloseWithFlush() throws IOException {
     storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L), eq(MIN_CHUNK_SIZE),
         eq(true));
     replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertTrue(writer.isOpen());
     writer.write(buffer);
     writer.close();
@@ -171,7 +172,7 @@ public void testWriteClosed() throws IOException {
     Capture capturedBuffer = Capture.newInstance();
     storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L), eq(0), eq(true));
     replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     writer.close();
     try {
       writer.write(ByteBuffer.allocate(MIN_CHUNK_SIZE));
@@ -192,12 +193,12 @@ public void testSaveAndRestore() throws IOException {
     replay(storageRpcMock);
     ByteBuffer buffer1 = randomBuffer(DEFAULT_CHUNK_SIZE);
     ByteBuffer buffer2 = randomBuffer(DEFAULT_CHUNK_SIZE);
-    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     assertEquals(DEFAULT_CHUNK_SIZE, writer.write(buffer1));
     assertArrayEquals(buffer1.array(), capturedBuffer.getValues().get(0));
     assertEquals(new Long(0L), capturedPosition.getValues().get(0));
-    RestorableState writerState = writer.capture();
-    BlobWriteChannel restoredWriter = writerState.restore();
+    RestorableState writerState = writer.capture();
+    WriteChannel restoredWriter = writerState.restore();
     assertEquals(DEFAULT_CHUNK_SIZE, restoredWriter.write(buffer2));
     assertArrayEquals(buffer2.array(), capturedBuffer.getValues().get(1));
     assertEquals(new Long(DEFAULT_CHUNK_SIZE), capturedPosition.getValues().get(1));
@@ -209,32 +210,31 @@ public void testSaveAndRestoreClosed() throws IOException {
     Capture capturedBuffer = Capture.newInstance();
     storageRpcMock.write(eq(UPLOAD_ID), capture(capturedBuffer), eq(0), eq(0L), eq(0), eq(true));
     replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     writer.close();
-    RestorableState writerState = writer.capture();
-    RestorableState expectedWriterState =
-        BlobWriteChannelImpl.StateImpl.builder(options, BLOB_INFO, UPLOAD_ID)
+    RestorableState writerState = writer.capture();
+    RestorableState expectedWriterState =
+        BlobWriteChannel.StateImpl.builder(options, BLOB_INFO, UPLOAD_ID)
             .buffer(null)
             .chunkSize(DEFAULT_CHUNK_SIZE)
             .isOpen(false)
             .position(0)
             .build();
-    BlobWriteChannel restoredWriter = writerState.restore();
+    WriteChannel restoredWriter = writerState.restore();
     assertArrayEquals(new byte[0], capturedBuffer.getValue());
     assertEquals(expectedWriterState, restoredWriter.capture());
   }
 
   @Test
   public void testStateEquals() {
-    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID)
-        .times(2);
+    expect(storageRpcMock.open(BLOB_INFO.toPb(), EMPTY_RPC_OPTIONS)).andReturn(UPLOAD_ID).times(2);
     replay(storageRpcMock);
-    writer = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    writer = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
     // avoid closing when you don't want partial writes to GCS upon failure
     @SuppressWarnings("resource")
-    BlobWriteChannel writer2 = new BlobWriteChannelImpl(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
-    RestorableState state = writer.capture();
-    RestorableState state2 = writer2.capture();
+    WriteChannel writer2 = new BlobWriteChannel(options, BLOB_INFO, EMPTY_RPC_OPTIONS);
+    RestorableState state = writer.capture();
+    RestorableState state2 = writer2.capture();
     assertEquals(state, state2);
     assertEquals(state.hashCode(), state2.hashCode());
     assertEquals(state.toString(), state2.toString());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 30ce858dc20e..614ceee7b61e 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -29,7 +29,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.Page;
+import com.google.gcloud.ReadChannel;
 import com.google.gcloud.RestorableState;
+import com.google.gcloud.WriteChannel;
 import com.google.gcloud.storage.Storage.BlobField;
 import com.google.gcloud.storage.Storage.BucketField;
 import com.google.gcloud.storage.testing.RemoteGcsHelper;
@@ -702,14 +704,14 @@ public void testReadAndWriteChannels() throws IOException {
     String blobName = "test-read-and-write-channels-blob";
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     byte[] stringBytes;
-    try (BlobWriteChannel writer = storage.writer(blob)) {
+    try (WriteChannel writer = storage.writer(blob)) {
       stringBytes = BLOB_STRING_CONTENT.getBytes(UTF_8);
       writer.write(ByteBuffer.wrap(BLOB_BYTE_CONTENT));
       writer.write(ByteBuffer.wrap(stringBytes));
     }
     ByteBuffer readBytes;
     ByteBuffer readStringBytes;
-    try (BlobReadChannel reader = storage.reader(blob.blobId())) {
+    try (ReadChannel reader = storage.reader(blob.blobId())) {
       readBytes = ByteBuffer.allocate(BLOB_BYTE_CONTENT.length);
       readStringBytes = ByteBuffer.allocate(stringBytes.length);
       reader.read(readBytes);
@@ -725,21 +727,21 @@ public void testReadAndWriteCaptureChannels() throws IOException {
     String blobName = "test-read-and-write-capture-channels-blob";
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     byte[] stringBytes;
-    BlobWriteChannel writer = storage.writer(blob);
+    WriteChannel writer = storage.writer(blob);
     stringBytes = BLOB_STRING_CONTENT.getBytes(UTF_8);
     writer.write(ByteBuffer.wrap(BLOB_BYTE_CONTENT));
-    RestorableState writerState = writer.capture();
-    BlobWriteChannel secondWriter = writerState.restore();
+    RestorableState writerState = writer.capture();
+    WriteChannel secondWriter = writerState.restore();
     secondWriter.write(ByteBuffer.wrap(stringBytes));
     secondWriter.close();
     ByteBuffer readBytes;
     ByteBuffer readStringBytes;
-    BlobReadChannel reader = storage.reader(blob.blobId());
+    ReadChannel reader = storage.reader(blob.blobId());
     reader.chunkSize(BLOB_BYTE_CONTENT.length);
     readBytes = ByteBuffer.allocate(BLOB_BYTE_CONTENT.length);
     reader.read(readBytes);
-    RestorableState readerState = reader.capture();
-    BlobReadChannel secondReader = readerState.restore();
+    RestorableState readerState = reader.capture();
+    ReadChannel secondReader = readerState.restore();
     readStringBytes = ByteBuffer.allocate(stringBytes.length);
     secondReader.read(readStringBytes);
     reader.close();
@@ -754,14 +756,14 @@ public void testReadChannelFail() throws IOException {
     String blobName = "test-read-channel-blob-fail";
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     assertNotNull(storage.create(blob));
-    try (BlobReadChannel reader =
+    try (ReadChannel reader =
         storage.reader(blob.blobId(), Storage.BlobSourceOption.metagenerationMatch(-1L))) {
       reader.read(ByteBuffer.allocate(42));
       fail("StorageException was expected");
     } catch (StorageException ex) {
       // expected
     }
-    try (BlobReadChannel reader =
+    try (ReadChannel reader =
              storage.reader(blob.blobId(), Storage.BlobSourceOption.generationMatch(-1L))) {
       reader.read(ByteBuffer.allocate(42));
       fail("StorageException was expected");
@@ -769,7 +771,7 @@ public void testReadChannelFail() throws IOException {
       // expected
     }
     BlobId blobIdWrongGeneration = BlobId.of(BUCKET, blobName, -1L);
-    try (BlobReadChannel reader =
+    try (ReadChannel reader =
              storage.reader(blobIdWrongGeneration, Storage.BlobSourceOption.generationMatch())) {
       reader.read(ByteBuffer.allocate(42));
       fail("StorageException was expected");
@@ -791,13 +793,13 @@ public void testReadChannelFailUpdatedGeneration() throws IOException {
     BlobInfo remoteBlob = storage.create(blob, content);
     assertNotNull(remoteBlob);
     assertEquals(blobSize, (long) remoteBlob.size());
-    try (BlobReadChannel reader = storage.reader(blob.blobId())) {
+    try (ReadChannel reader = storage.reader(blob.blobId())) {
       reader.chunkSize(chunkSize);
       ByteBuffer readBytes = ByteBuffer.allocate(chunkSize);
       int numReadBytes = reader.read(readBytes);
       assertEquals(chunkSize, numReadBytes);
       assertArrayEquals(Arrays.copyOf(content, chunkSize), readBytes.array());
-      try (BlobWriteChannel writer = storage.writer(blob)) {
+      try (WriteChannel writer = storage.writer(blob)) {
         byte[] newContent = new byte[blobSize];
         random.nextBytes(newContent);
         int numWrittenBytes = writer.write(ByteBuffer.wrap(newContent));
@@ -819,8 +821,7 @@ public void testWriteChannelFail() throws IOException {
     String blobName = "test-write-channel-blob-fail";
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName, -1L).build();
     try {
-      try (BlobWriteChannel writer =
-          storage.writer(blob, Storage.BlobWriteOption.generationMatch())) {
+      try (WriteChannel writer = storage.writer(blob, Storage.BlobWriteOption.generationMatch())) {
         writer.write(ByteBuffer.allocate(42));
       }
       fail("StorageException was expected");
@@ -835,7 +836,7 @@ public void testWriteChannelExistingBlob() throws IOException {
     BlobInfo blob = BlobInfo.builder(BUCKET, blobName).build();
     BlobInfo remoteBlob = storage.create(blob);
     byte[] stringBytes;
-    try (BlobWriteChannel writer = storage.writer(remoteBlob)) {
+    try (WriteChannel writer = storage.writer(remoteBlob)) {
       stringBytes = BLOB_STRING_CONTENT.getBytes(UTF_8);
       writer.write(ByteBuffer.wrap(stringBytes));
     }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index 555e231f7f0e..8506e8b48f6b 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -22,8 +22,10 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.AuthCredentials;
 import com.google.gcloud.PageImpl;
+import com.google.gcloud.ReadChannel;
 import com.google.gcloud.RestorableState;
 import com.google.gcloud.RetryParams;
+import com.google.gcloud.WriteChannel;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.storage.Acl.Project.ProjectRole;
 
@@ -112,10 +114,10 @@ public void testReadChannelState() throws IOException, ClassNotFoundException {
         .projectId("p2")
         .retryParams(RetryParams.defaultInstance())
         .build();
-    BlobReadChannel reader =
-        new BlobReadChannelImpl(options, BlobId.of("b", "n"), EMPTY_RPC_OPTIONS);
-    RestorableState state = reader.capture();
-    RestorableState deserializedState = serializeAndDeserialize(state);
+    ReadChannel reader =
+        new BlobReadChannel(options, BlobId.of("b", "n"), EMPTY_RPC_OPTIONS);
+    RestorableState state = reader.capture();
+    RestorableState deserializedState = serializeAndDeserialize(state);
     assertEquals(state, deserializedState);
     assertEquals(state.hashCode(), deserializedState.hashCode());
     assertEquals(state.toString(), deserializedState.toString());
@@ -130,10 +132,10 @@ public void testWriteChannelState() throws IOException, ClassNotFoundException {
         .build();
     // avoid closing when you don't want partial writes to GCS upon failure
     @SuppressWarnings("resource")
-    BlobWriteChannelImpl writer = new BlobWriteChannelImpl(
-        options, BlobInfo.builder(BlobId.of("b", "n")).build(), "upload-id");
-    RestorableState state = writer.capture();
-    RestorableState deserializedState = serializeAndDeserialize(state);
+    BlobWriteChannel writer =
+        new BlobWriteChannel(options, BlobInfo.builder(BlobId.of("b", "n")).build(), "upload-id");
+    RestorableState state = writer.capture();
+    RestorableState deserializedState = serializeAndDeserialize(state);
     assertEquals(state, deserializedState);
     assertEquals(state.hashCode(), deserializedState.hashCode());
     assertEquals(state.toString(), deserializedState.toString());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 3aaec047714f..0e1f1a0b2f52 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -33,8 +33,10 @@
 import com.google.common.io.BaseEncoding;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.Page;
+import com.google.gcloud.ReadChannel;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.ServiceOptions;
+import com.google.gcloud.WriteChannel;
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 import com.google.gcloud.spi.StorageRpcFactory;
@@ -1011,7 +1013,7 @@ public Tuple apply(StorageObject f) {
   public void testReader() {
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    BlobReadChannel channel = storage.reader(BUCKET_NAME1, BLOB_NAME1);
+    ReadChannel channel = storage.reader(BUCKET_NAME1, BLOB_NAME1);
     assertNotNull(channel);
     assertTrue(channel.isOpen());
   }
@@ -1024,7 +1026,7 @@ public void testReaderWithOptions() throws IOException {
         .andReturn(StorageRpc.Tuple.of("etag", result));
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    BlobReadChannel channel = storage.reader(BUCKET_NAME1, BLOB_NAME2, BLOB_SOURCE_GENERATION,
+    ReadChannel channel = storage.reader(BUCKET_NAME1, BLOB_NAME2, BLOB_SOURCE_GENERATION,
         BLOB_SOURCE_METAGENERATION);
     assertNotNull(channel);
     assertTrue(channel.isOpen());
@@ -1039,7 +1041,7 @@ public void testReaderWithOptionsFromBlobId() throws IOException {
         .andReturn(StorageRpc.Tuple.of("etag", result));
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    BlobReadChannel channel = storage.reader(BLOB_INFO1.blobId(),
+    ReadChannel channel = storage.reader(BLOB_INFO1.blobId(),
         BLOB_SOURCE_GENERATION_FROM_BLOB_ID, BLOB_SOURCE_METAGENERATION);
     assertNotNull(channel);
     assertTrue(channel.isOpen());
@@ -1055,7 +1057,7 @@ public void testWriter() {
         .andReturn("upload-id");
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    BlobWriteChannel channel = storage.writer(infoWithHashes);
+    WriteChannel channel = storage.writer(infoWithHashes);
     assertNotNull(channel);
     assertTrue(channel.isOpen());
   }
@@ -1067,7 +1069,7 @@ public void testWriterWithOptions() {
         .andReturn("upload-id");
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    BlobWriteChannel channel = storage.writer(info, BLOB_WRITE_METAGENERATION, BLOB_WRITE_NOT_EXIST,
+    WriteChannel channel = storage.writer(info, BLOB_WRITE_METAGENERATION, BLOB_WRITE_NOT_EXIST,
         BLOB_WRITE_PREDEFINED_ACL, BLOB_WRITE_CRC2C, BLOB_WRITE_MD5_HASH);
     assertNotNull(channel);
     assertTrue(channel.isOpen());

From 03d5d30313281209550730375df7a0bbe8f4d284 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 15 Jan 2016 15:10:21 +0100
Subject: [PATCH 286/322] Refactor BaseServiceException

---
 .../java/com/google/gcloud/bigquery/Acl.java  |   2 +-
 .../gcloud/bigquery/BigQueryException.java    |  42 +++--
 .../google/gcloud/spi/DefaultBigQueryRpc.java |  34 +---
 .../bigquery/BigQueryExceptionTest.java       | 115 +++++++++++++
 .../gcloud/bigquery/BigQueryImplTest.java     |   4 +-
 .../google/gcloud/BaseServiceException.java   | 157 +++++++++++++++++-
 .../gcloud/BaseServiceExceptionTest.java      | 134 +++++++++++++--
 .../gcloud/datastore/DatastoreException.java  | 145 +++++-----------
 .../gcloud/datastore/DatastoreImpl.java       |  22 ++-
 .../gcloud/datastore/DatastoreOptions.java    |  23 +--
 .../com/google/gcloud/spi/DatastoreRpc.java   |  84 +---------
 .../gcloud/spi/DefaultDatastoreRpc.java       |  71 +++-----
 .../datastore/DatastoreExceptionTest.java     |  84 +++++++---
 .../gcloud/datastore/DatastoreTest.java       |  21 ++-
 .../ResourceManagerException.java             |  45 +++--
 .../gcloud/spi/DefaultResourceManagerRpc.java |  26 +--
 .../ResourceManagerExceptionTest.java         |  94 +++++++++++
 .../ResourceManagerImplTest.java              |   4 +-
 .../google/gcloud/spi/DefaultStorageRpc.java  |  24 +--
 .../gcloud/storage/BlobReadChannel.java       |   2 +-
 .../gcloud/storage/StorageException.java      |  47 ++++--
 .../gcloud/storage/RemoteGcsHelperTest.java   |   4 +-
 .../gcloud/storage/StorageExceptionTest.java  | 125 ++++++++++++++
 .../gcloud/storage/StorageImplTest.java       |   4 +-
 24 files changed, 873 insertions(+), 440 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryExceptionTest.java
 create mode 100644 gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerExceptionTest.java
 create mode 100644 gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageExceptionTest.java

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
index 2a042c108e00..c1fca9e3b350 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
@@ -104,7 +104,7 @@ static Entity fromPb(Access access) {
       }
       // Unreachable
       throw new BigQueryException(BigQueryException.UNKNOWN_CODE,
-          "Unrecognized access configuration", false);
+          "Unrecognized access configuration");
     }
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
index e92ffacd8f09..930d06d523ab 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
@@ -16,10 +16,14 @@
 
 package com.google.gcloud.bigquery;
 
+import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.BaseServiceException;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.RetryHelper.RetryInterruptedException;
 
+import java.io.IOException;
+import java.util.Set;
+
 /**
  * BigQuery service exception.
  *
@@ -28,20 +32,30 @@
  */
 public class BigQueryException extends BaseServiceException {
 
-  private static final long serialVersionUID = -5504832700512784654L;
-  public static final int UNKNOWN_CODE = -1;
+  // see: https://cloud.google.com/bigquery/troubleshooting-errors
+  private static final Set RETRYABLE_ERRORS = ImmutableSet.of(
+      new Error(500, null),
+      new Error(502, null),
+      new Error(503, null),
+      new Error(504, null));
+  private static final long serialVersionUID = -5006625989225438209L;
 
   private final BigQueryError error;
 
-  public BigQueryException(int code, String message, boolean retryable) {
-    this(code, message, retryable, null);
+  public BigQueryException(int code, String message) {
+    this(code, message, null);
   }
 
-  public BigQueryException(int code, String message, boolean retryable, BigQueryError error) {
-    super(code, message, retryable);
+  public BigQueryException(int code, String message, BigQueryError error) {
+    super(code, message, error != null ? error.reason() : null, true);
     this.error = error;
   }
 
+  public BigQueryException(IOException exception) {
+    super(exception, true);
+    this.error = null;
+  }
+
   /**
    * Returns the {@link BigQueryError} that caused this exception. Returns {@code null} if none
    * exists.
@@ -50,6 +64,11 @@ public BigQueryError error() {
     return error;
   }
 
+  @Override
+  protected Set retryableErrors() {
+    return RETRYABLE_ERRORS;
+  }
+
   /**
    * Translate RetryHelperException to the BigQueryException that caused the error. This method will
    * always throw an exception.
@@ -57,13 +76,8 @@ public BigQueryError error() {
    * @throws BigQueryException when {@code ex} was caused by a {@code BigQueryException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  static BigQueryException translateAndThrow(RetryHelperException ex) {
-    if (ex.getCause() instanceof BigQueryException) {
-      throw (BigQueryException) ex.getCause();
-    }
-    if (ex instanceof RetryInterruptedException) {
-      RetryInterruptedException.propagate();
-    }
-    throw new BigQueryException(UNKNOWN_CODE, ex.getMessage(), false);
+  public static BigQueryException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndThrow(ex);
+    throw new BigQueryException(UNKNOWN_CODE, ex.getMessage());
   }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
index 74fdeb74bd64..0a1dc046bf74 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -25,7 +25,6 @@
 import static java.net.HttpURLConnection.HTTP_OK;
 
 import com.google.api.client.googleapis.json.GoogleJsonError;
-import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.http.ByteArrayContent;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpRequest;
@@ -58,10 +57,8 @@
 import com.google.api.services.bigquery.model.TableRow;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 
-import com.google.gcloud.bigquery.BigQueryError;
 import com.google.gcloud.bigquery.BigQueryException;
 import com.google.gcloud.bigquery.BigQueryOptions;
 
@@ -69,13 +66,10 @@
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public class DefaultBigQueryRpc implements BigQueryRpc {
 
   public static final String DEFAULT_PROJECTION = "full";
-  // see: https://cloud.google.com/bigquery/troubleshooting-errors
-  private static final Set RETRYABLE_CODES = ImmutableSet.of(500, 502, 503, 504);
   private static final String BASE_RESUMABLE_URI =
       "https://www.googleapis.com/upload/bigquery/v2/projects/";
   // see: https://cloud.google.com/bigquery/loading-data-post-request#resume-upload
@@ -94,28 +88,7 @@ public DefaultBigQueryRpc(BigQueryOptions options) {
   }
 
   private static BigQueryException translate(IOException exception) {
-    BigQueryException translated;
-    if (exception instanceof GoogleJsonResponseException
-        && ((GoogleJsonResponseException) exception).getDetails() != null) {
-      translated = translate(((GoogleJsonResponseException) exception).getDetails());
-    } else {
-      translated =
-          new BigQueryException(BigQueryException.UNKNOWN_CODE, exception.getMessage(), false);
-    }
-    translated.initCause(exception);
-    return translated;
-  }
-
-  private static BigQueryException translate(GoogleJsonError exception) {
-    boolean retryable = RETRYABLE_CODES.contains(exception.getCode());
-    BigQueryError bigqueryError = null;
-    if (exception.getErrors() != null  && !exception.getErrors().isEmpty()) {
-      GoogleJsonError.ErrorInfo error = exception.getErrors().get(0);
-      bigqueryError = new BigQueryError(error.getReason(), error.getLocation(), error.getMessage(),
-          (String) error.get("debugInfo"));
-    }
-    return new BigQueryException(exception.getCode(), exception.getMessage(), retryable,
-        bigqueryError);
+    return new BigQueryException(exception);
   }
 
   @Override
@@ -489,10 +462,7 @@ public void write(String uploadId, byte[] toWrite, int toWriteOffset, long destO
         if (exception != null) {
           throw exception;
         }
-        GoogleJsonError error = new GoogleJsonError();
-        error.setCode(code);
-        error.setMessage(message);
-        throw translate(error);
+        throw new BigQueryException(code, message);
       }
     } catch (IOException ex) {
       throw translate(ex);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryExceptionTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryExceptionTest.java
new file mode 100644
index 000000000000..66e5289424e2
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryExceptionTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.gcloud.BaseServiceException;
+import com.google.gcloud.RetryHelper.RetryHelperException;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+
+public class BigQueryExceptionTest {
+
+  @Test
+  public void testBigqueryException() {
+    BigQueryException exception = new BigQueryException(500, "message");
+    assertEquals(500, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertNull(exception.error());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new BigQueryException(502, "message");
+    assertEquals(502, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertNull(exception.error());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new BigQueryException(503, "message");
+    assertEquals(503, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertNull(exception.error());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new BigQueryException(504, "message");
+    assertEquals(504, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertNull(exception.error());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new BigQueryException(400, "message");
+    assertEquals(400, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertNull(exception.error());
+    assertFalse(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    BigQueryError error = new BigQueryError("reason", null, null);
+    exception = new BigQueryException(504, "message", error);
+    assertEquals(504, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertEquals("reason", exception.reason());
+    assertEquals(error, exception.error());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    IOException cause = new SocketTimeoutException();
+    exception = new BigQueryException(cause);
+    assertNull(exception.reason());
+    assertNull(exception.getMessage());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertEquals(cause, exception.getCause());
+  }
+
+  @Test
+  public void testTranslateAndThrow() throws Exception {
+    BigQueryException cause = new BigQueryException(503, "message");
+    RetryHelperException exceptionMock = createMock(RetryHelperException.class);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      BigQueryException.translateAndThrow(exceptionMock);
+    } catch (BaseServiceException ex) {
+      assertEquals(503, ex.code());
+      assertEquals("message", ex.getMessage());
+      assertTrue(ex.retryable());
+      assertTrue(ex.idempotent());
+    } finally {
+      verify(exceptionMock);
+    }
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index 402edfc4a42f..b54a989fb5e5 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -1022,7 +1022,7 @@ public void testWriter() {
   @Test
   public void testRetryableException() {
     EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
-        .andThrow(new BigQueryException(500, "InternalError", true))
+        .andThrow(new BigQueryException(500, "InternalError"))
         .andReturn(DATASET_INFO_WITH_PROJECT.toPb());
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
@@ -1034,7 +1034,7 @@ public void testRetryableException() {
   public void testNonRetryableException() {
     String exceptionMessage = "Not Implemented";
     EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
-        .andThrow(new BigQueryException(501, exceptionMessage, false));
+        .andThrow(new BigQueryException(501, exceptionMessage));
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
     thrown.expect(BigQueryException.class);
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
index cd0933426756..9f4bfdab994d 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
@@ -16,26 +16,126 @@
 
 package com.google.gcloud;
 
+import com.google.api.client.googleapis.json.GoogleJsonError;
+import com.google.api.client.googleapis.json.GoogleJsonResponseException;
+import com.google.common.base.MoreObjects;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.SocketTimeoutException;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+
 /**
  * Base class for all service exceptions.
  */
 public class BaseServiceException extends RuntimeException {
 
-  private static final long serialVersionUID = 5028833760039966178L;
+  protected static final class Error implements Serializable {
+
+    private static final long serialVersionUID = -4019600198652965721L;
+
+    private final Integer code;
+    private final String reason;
+
+    public Error(Integer code, String reason) {
+      this.code = code;
+      this.reason = reason;
+    }
+
+    /**
+     * Returns the code associated with this exception.
+     */
+    public Integer code() {
+      return code;
+    }
+
+    /**
+     * Returns the reason that caused the exception.
+     */
+    public String reason() {
+      return reason;
+    }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this).add("code", code).add("reason", reason).toString();
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(code, reason);
+    }
+  }
+
+  private static final long serialVersionUID = 759921776378760835L;
+  public static final int UNKNOWN_CODE = 0;
 
   private final int code;
   private final boolean retryable;
+  private final String reason;
+  private final boolean idempotent;
 
-  public BaseServiceException(int code, String message, boolean retryable) {
-    super(message);
-    this.code = code;
-    this.retryable = retryable;
+  public BaseServiceException(IOException exception, boolean idempotent) {
+    super(message(exception), exception);
+    if (exception instanceof GoogleJsonResponseException) {
+      Error error = error(((GoogleJsonResponseException) exception).getDetails());
+      this.code = error.code;
+      this.reason = error.reason;
+      this.retryable = isRetryable(error);
+    } else {
+      this.code = UNKNOWN_CODE;
+      this.reason = null;
+      this.retryable = idempotent && isRetryable(exception);
+    }
+    this.idempotent = idempotent;
+  }
+
+  public BaseServiceException(GoogleJsonError error, boolean idempotent) {
+    super(error.getMessage());
+    this.code = error.getCode();
+    this.reason = reason(error);
+    this.idempotent = idempotent;
+    this.retryable = idempotent && isRetryable(error);
+  }
+
+  public BaseServiceException(int code, String message, String reason, boolean idempotent) {
+    this(code, message, reason, idempotent, null);
   }
 
-  public BaseServiceException(int code, String message, boolean retryable, Exception cause) {
+  public BaseServiceException(int code, String message, String reason, boolean idempotent,
+      Exception cause) {
     super(message, cause);
     this.code = code;
-    this.retryable = retryable;
+    this.reason = reason;
+    this.idempotent = idempotent;
+    this.retryable = idempotent && isRetryable(new Error(code, reason));
+  }
+
+  protected Set retryableErrors() {
+    return Collections.emptySet();
+  }
+
+  protected boolean isRetryable(GoogleJsonError error) {
+    return error != null && isRetryable(error(error));
+  }
+
+  protected boolean isRetryable(IOException exception) {
+    if (exception instanceof GoogleJsonResponseException) {
+      return isRetryable(((GoogleJsonResponseException) exception).getDetails());
+    }
+    return exception instanceof SocketTimeoutException;
+  }
+
+  protected boolean isRetryable(Error error) {
+    for (Error retryableError : retryableErrors()) {
+      if ((retryableError.code() == null || retryableError.code().equals(error.code()))
+          && (retryableError.reason() == null || retryableError.reason().equals(error.reason()))) {
+        return true;
+      }
+    }
+    return false;
   }
 
   /**
@@ -45,10 +145,53 @@ public int code() {
     return code;
   }
 
+  /**
+   * Returns the reason that caused the exception.
+   */
+  public String reason() {
+    return reason;
+  }
+
   /**
    * Returns {@code true} when it is safe to retry the operation that caused this exception.
    */
   public boolean retryable() {
     return retryable;
   }
+
+  /**
+   * Returns {@code true} when the operation that caused this exception had no side effects.
+   */
+  public boolean idempotent() {
+    return idempotent;
+  }
+
+  protected static String reason(GoogleJsonError error) {
+    if (error.getErrors() != null  && !error.getErrors().isEmpty()) {
+      return error.getErrors().get(0).getReason();
+    }
+    return null;
+  }
+
+  protected static Error error(GoogleJsonError error) {
+    return new Error(error.getCode(), reason(error));
+  }
+
+  protected static String message(IOException exception) {
+    if (exception instanceof GoogleJsonResponseException) {
+      return ((GoogleJsonResponseException) exception).getDetails().getMessage();
+    }
+    return exception.getMessage();
+  }
+
+  protected static BaseServiceException translateAndThrow(
+      RetryHelper.RetryHelperException ex) {
+    if (ex.getCause() instanceof BaseServiceException) {
+      throw (BaseServiceException) ex.getCause();
+    }
+    if (ex instanceof RetryHelper.RetryInterruptedException) {
+      RetryHelper.RetryInterruptedException.propagate();
+    }
+    return null;
+  }
 }
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
index f30fd3abfb79..a6e22866ed9f 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
@@ -16,30 +16,142 @@
 
 package com.google.gcloud;
 
+import static com.google.gcloud.BaseServiceException.UNKNOWN_CODE;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.api.client.googleapis.json.GoogleJsonError;
+import com.google.common.collect.ImmutableSet;
 
 import org.junit.Test;
 
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.util.Set;
+
 /**
  * Tests for {@link BaseServiceException}.
  */
 public class BaseServiceExceptionTest {
 
-  private final int code = 1;
-  private final String message = "some message";
-  private final boolean retryable = true;
+  private static final int CODE = 1;
+  private static final int CODE_NO_REASON = 2;
+  private static final String MESSAGE = "some message";
+  private static final String REASON = "some reason";
+  private static final boolean RETRYABLE = true;
+  private static final boolean IDEMPOTENT = true;
+  private static class CustomServiceException extends BaseServiceException {
+
+    private static final long serialVersionUID = -195251309124875103L;
+
+    public CustomServiceException(int code, String message, String reason, boolean idempotent) {
+      super(code, message, reason, idempotent);
+    }
+
+    @Override
+    protected Set retryableErrors() {
+      return ImmutableSet.of(new Error(CODE, REASON), new Error(null, REASON),
+          new Error(CODE_NO_REASON, null));
+    }
+  }
 
   @Test
   public void testBaseServiceException() {
-    BaseServiceException serviceException = new BaseServiceException(code, message, retryable);
-    assertEquals(serviceException.code(), code);
-    assertEquals(serviceException.getMessage(), message);
-    assertEquals(serviceException.getCause(), null);
+    BaseServiceException serviceException = new BaseServiceException(CODE, MESSAGE, REASON,
+         IDEMPOTENT);
+    assertEquals(CODE, serviceException.code());
+    assertEquals(MESSAGE, serviceException.getMessage());
+    assertEquals(REASON, serviceException.reason());
+    assertFalse(serviceException.retryable());
+    assertEquals(IDEMPOTENT, serviceException.idempotent());
+    assertNull(serviceException.getCause());
+
+    serviceException = new BaseServiceException(CODE, MESSAGE, REASON, IDEMPOTENT);
+    assertEquals(CODE, serviceException.code());
+    assertEquals(MESSAGE, serviceException.getMessage());
+    assertEquals(REASON, serviceException.reason());
+    assertFalse(serviceException.retryable());
+    assertEquals(IDEMPOTENT, serviceException.idempotent());
+    assertNull(serviceException.getCause());
 
     Exception cause = new RuntimeException();
-    serviceException = new BaseServiceException(code, message, retryable, cause);
-    assertEquals(serviceException.code(), code);
-    assertEquals(serviceException.getMessage(), message);
-    assertEquals(serviceException.getCause(), cause);
+    serviceException = new BaseServiceException(CODE, MESSAGE, REASON, IDEMPOTENT, cause);
+    assertEquals(CODE, serviceException.code());
+    assertEquals(MESSAGE, serviceException.getMessage());
+    assertEquals(REASON, serviceException.reason());
+    assertFalse(serviceException.retryable());
+    assertEquals(IDEMPOTENT, serviceException.idempotent());
+    assertEquals(cause, serviceException.getCause());
+
+    serviceException = new BaseServiceException(CODE, MESSAGE, REASON, false, cause);
+    assertEquals(CODE, serviceException.code());
+    assertEquals(MESSAGE, serviceException.getMessage());
+    assertEquals(REASON, serviceException.reason());
+    assertFalse(serviceException.retryable());
+    assertFalse(serviceException.idempotent());
+    assertEquals(cause, serviceException.getCause());
+
+    IOException exception = new SocketTimeoutException();
+    serviceException = new BaseServiceException(exception, true);
+    assertTrue(serviceException.retryable());
+    assertTrue(serviceException.idempotent());
+    assertEquals(exception, serviceException.getCause());
+
+    GoogleJsonError error = new GoogleJsonError();
+    error.setCode(CODE);
+    error.setMessage(MESSAGE);
+    serviceException = new BaseServiceException(error, true);
+    assertEquals(CODE, serviceException.code());
+    assertEquals(MESSAGE, serviceException.getMessage());
+    assertFalse(serviceException.retryable());
+    assertTrue(serviceException.idempotent());
+
+    serviceException = new CustomServiceException(CODE, MESSAGE, REASON, IDEMPOTENT);
+    assertEquals(CODE, serviceException.code());
+    assertEquals(MESSAGE, serviceException.getMessage());
+    assertEquals(REASON, serviceException.reason());
+    assertEquals(RETRYABLE, serviceException.retryable());
+    assertEquals(IDEMPOTENT, serviceException.idempotent());
+
+    serviceException = new CustomServiceException(CODE_NO_REASON, MESSAGE, null, IDEMPOTENT);
+    assertEquals(CODE_NO_REASON, serviceException.code());
+    assertEquals(MESSAGE, serviceException.getMessage());
+    assertNull(serviceException.reason());
+    assertEquals(RETRYABLE, serviceException.retryable());
+    assertEquals(IDEMPOTENT, serviceException.idempotent());
+
+    serviceException = new CustomServiceException(UNKNOWN_CODE, MESSAGE, REASON, IDEMPOTENT);
+    assertEquals(UNKNOWN_CODE, serviceException.code());
+    assertEquals(MESSAGE, serviceException.getMessage());
+    assertEquals(REASON, serviceException.reason());
+    assertEquals(RETRYABLE, serviceException.retryable());
+    assertEquals(IDEMPOTENT, serviceException.idempotent());
+  }
+
+  @Test
+  public void testTranslateAndThrow() throws Exception {
+    BaseServiceException cause = new BaseServiceException(CODE, MESSAGE, REASON, IDEMPOTENT);
+    RetryHelper.RetryHelperException exceptionMock = createMock(RetryHelper.RetryHelperException.class);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      BaseServiceException ex = BaseServiceException.translateAndThrow(exceptionMock);
+      if (ex != null) {
+        throw ex;
+      }
+    } catch (BaseServiceException ex) {
+      assertEquals(CODE, ex.code());
+      assertEquals(MESSAGE, ex.getMessage());
+      assertFalse(ex.retryable());
+      assertEquals(IDEMPOTENT, ex.idempotent());
+    } finally {
+      verify(exceptionMock);
+    }
   }
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
index ebef6b44f6b6..946fc9190fc3 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
@@ -16,141 +16,70 @@
 
 package com.google.gcloud.datastore;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.BaseServiceException;
-import com.google.gcloud.RetryHelper;
 import com.google.gcloud.RetryHelper.RetryHelperException;
-import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
-import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
+import com.google.gcloud.RetryHelper.RetryInterruptedException;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.io.IOException;
+import java.util.Set;
 
+/**
+ * Datastore service exception.
+ *
+ * @see Google Cloud
+ *      Datastore error codes
+ */
 public class DatastoreException extends BaseServiceException {
 
-  private static final long serialVersionUID = -2336749234060754893L;
-  private static final ImmutableMap REASON_TO_ERROR;
-  private static final ImmutableMap HTTP_TO_ERROR;
-
-  private final DatastoreError error;
-
-  /**
-   * Represents Datastore errors.
-   *
-   * @see Google Cloud
-   *     Datastore error codes
-   */
-  public enum DatastoreError {
-
-    ABORTED(Reason.ABORTED),
-    DEADLINE_EXCEEDED(Reason.DEADLINE_EXCEEDED),
-    UNAVAILABLE(Reason.UNAVAILABLE),
-    FAILED_PRECONDITION(Reason.FAILED_PRECONDITION),
-    INVALID_ARGUMENT(Reason.INVALID_ARGUMENT),
-    PERMISSION_DENIED(Reason.PERMISSION_DENIED),
-    UNAUTHORIZED(false, "Unauthorized", 401),
-    INTERNAL(Reason.INTERNAL),
-    RESOURCE_EXHAUSTED(Reason.RESOURCE_EXHAUSTED),
-    UNKNOWN(false, "Unknown failure", -1);
-
-    private final boolean retryable;
-    private final String description;
-    private final int httpStatus;
-
-    DatastoreError(Reason reason) {
-      this(reason.retryable(), reason.description(), reason.httpStatus());
-    }
-
-    DatastoreError(boolean retryable, String description, int httpStatus) {
-      this.retryable = retryable;
-      this.description = description;
-      this.httpStatus = httpStatus;
-    }
+  // see https://cloud.google.com/datastore/docs/concepts/errors#Error_Codes"
+  private static final Set RETRYABLE_ERRORS = ImmutableSet.of(
+      new Error(409, "ABORTED"),
+      new Error(403, "DEADLINE_EXCEEDED"),
+      new Error(503, "UNAVAILABLE"));
+  private static final long serialVersionUID = 2663750991205874435L;
 
-    String description() {
-      return description;
-    }
-
-    int httpStatus() {
-      return httpStatus;
-    }
-
-    boolean retryable() {
-      return retryable;
-    }
-
-    DatastoreException translate(DatastoreRpcException exception, String message) {
-      return new DatastoreException(this, message, exception);
-    }
-  }
-
-  static {
-    ImmutableMap.Builder builder = ImmutableMap.builder();
-    Map httpCodes = new HashMap<>();
-    for (DatastoreError error : DatastoreError.values()) {
-      builder.put(error.name(), error);
-      httpCodes.put(error.httpStatus(), error);
-    }
-    REASON_TO_ERROR = builder.build();
-    HTTP_TO_ERROR = ImmutableMap.copyOf(httpCodes);
+  public DatastoreException(int code, String message, String reason, Exception cause) {
+    super(code, message, reason, true, cause);
   }
 
-  public DatastoreException(DatastoreError error, String message, Exception cause) {
-    super(error.httpStatus(), MoreObjects.firstNonNull(message, error.description),
-        error.retryable(), cause);
-    this.error = error;
+  public DatastoreException(int code, String message, String reason) {
+    super(code, message, reason, true);
   }
 
-  public DatastoreException(DatastoreError error, String message) {
-    this(error, message, null);
+  public DatastoreException(IOException exception) {
+    super(exception, true);
   }
 
-  /**
-   * Returns the DatastoreError associated with this exception.
-   */
-  public DatastoreError datastoreError() {
-    return error;
-  }
-
-  static DatastoreException translateAndThrow(RetryHelperException ex) {
-    if (ex.getCause() instanceof DatastoreRpcException) {
-      return translateAndThrow((DatastoreRpcException) ex.getCause());
-    }
-    if (ex instanceof RetryHelper.RetryInterruptedException) {
-      RetryHelper.RetryInterruptedException.propagate();
-    }
-    throw new DatastoreException(DatastoreError.UNKNOWN, ex.getMessage(), ex);
+  @Override
+  protected Set retryableErrors() {
+    return RETRYABLE_ERRORS;
   }
 
   /**
-   * Translate DatastoreRpcExceptions to DatastoreExceptions based on their
-   * HTTP error codes. This method will always throw a new DatastoreException.
+   * Translate RetryHelperException to the DatastoreException that caused the error. This method
+   * will always throw an exception.
    *
-   * @throws DatastoreException every time
+   * @throws DatastoreException when {@code ex} was caused by a {@code DatastoreException}
+   * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  static DatastoreException translateAndThrow(DatastoreRpcException exception) {
-    String message = exception.getMessage();
-    DatastoreError error = REASON_TO_ERROR.get(exception.reason());
-    if (error == null) {
-      error = MoreObjects.firstNonNull(
-          HTTP_TO_ERROR.get(exception.httpStatus()), DatastoreError.UNKNOWN);
-    }
-    throw error.translate(exception, message);
+  public static DatastoreException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndThrow(ex);
+    throw new DatastoreException(UNKNOWN_CODE, ex.getMessage(), null);
   }
 
   /**
-   * Throw a DatastoreException with {@code FAILED_PRECONDITION} error and the {@code message}
-   * in a nested exception.
+   * Throw a DatastoreException with {@code FAILED_PRECONDITION} reason and the {@code message} in a
+   * nested exception.
    *
    * @throws DatastoreException every time
    */
   static DatastoreException throwInvalidRequest(String massage, Object... params) {
-    throw new DatastoreException(
-        DatastoreError.FAILED_PRECONDITION, String.format(massage, params));
+    throw new DatastoreException(UNKNOWN_CODE, String.format(massage, params),
+        "FAILED_PRECONDITION");
   }
 
   static DatastoreException propagateUserException(Exception ex) {
-    throw new DatastoreException(DatastoreError.UNKNOWN, ex.getMessage(), ex);
+    throw new DatastoreException(BaseServiceException.UNKNOWN_CODE, ex.getMessage(), null, ex);
   }
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java
index 43fd75396538..bfcba58f3f2f 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java
@@ -29,7 +29,6 @@
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.RetryParams;
 import com.google.gcloud.spi.DatastoreRpc;
-import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
 import com.google.protobuf.ByteString;
 
 import java.util.Arrays;
@@ -42,7 +41,6 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 
-
 final class DatastoreImpl extends BaseService
     implements Datastore {
 
@@ -58,15 +56,15 @@ public RetryResult afterEval(Exception exception, RetryResult retryResult) {
 
         @Override
         public RetryResult beforeEval(Exception exception) {
-          if (exception instanceof DatastoreRpcException) {
-            boolean retryable = ((DatastoreRpcException) exception).retryable();
+          if (exception instanceof DatastoreException) {
+            boolean retryable = ((DatastoreException) exception).retryable();
             return retryable ? Interceptor.RetryResult.RETRY : Interceptor.RetryResult.NO_RETRY;
           }
           return Interceptor.RetryResult.CONTINUE_EVALUATION;
         }
       };
   private static final ExceptionHandler EXCEPTION_HANDLER = ExceptionHandler.builder()
-      .abortOn(RuntimeException.class, DatastoreRpcException.class)
+      .abortOn(RuntimeException.class, DatastoreException.class)
       .interceptor(EXCEPTION_HANDLER_INTERCEPTOR).build();
 
   private final DatastoreRpc datastoreRpc;
@@ -105,7 +103,7 @@  QueryResults run(DatastoreV1.ReadOptions readOptionsPb, Query query) {
   DatastoreV1.RunQueryResponse runQuery(final DatastoreV1.RunQueryRequest requestPb) {
     try {
       return RetryHelper.runWithRetries(new Callable() {
-        @Override public DatastoreV1.RunQueryResponse call() throws DatastoreRpcException {
+        @Override public DatastoreV1.RunQueryResponse call() throws DatastoreException {
           return datastoreRpc.runQuery(requestPb);
         }
       }, retryParams, EXCEPTION_HANDLER);
@@ -139,7 +137,7 @@ public List allocateId(IncompleteKey... keys) {
   DatastoreV1.AllocateIdsResponse allocateIds(final DatastoreV1.AllocateIdsRequest requestPb) {
     try {
       return RetryHelper.runWithRetries(new Callable() {
-        @Override public DatastoreV1.AllocateIdsResponse call() throws DatastoreRpcException {
+        @Override public DatastoreV1.AllocateIdsResponse call() throws DatastoreException {
           return datastoreRpc.allocateIds(requestPb);
         }
       }, retryParams, EXCEPTION_HANDLER);
@@ -176,7 +174,7 @@ public List add(FullEntity... entities) {
       if (completeEntity != null) {
         if (completeEntities.put(completeEntity.key(), completeEntity) != null) {
           throw DatastoreException.throwInvalidRequest(
-              "Duplicate entity with the key %s", entity.key());
+            "Duplicate entity with the key %s", entity.key());
         }
         mutationPb.addInsert(completeEntity.toPb());
       } else {
@@ -263,7 +261,7 @@ protected Entity computeNext() {
   DatastoreV1.LookupResponse lookup(final DatastoreV1.LookupRequest requestPb) {
     try {
       return RetryHelper.runWithRetries(new Callable() {
-        @Override public DatastoreV1.LookupResponse call() throws DatastoreRpcException {
+        @Override public DatastoreV1.LookupResponse call() throws DatastoreException {
           return datastoreRpc.lookup(requestPb);
         }
       }, retryParams, EXCEPTION_HANDLER);
@@ -334,7 +332,7 @@ private DatastoreV1.CommitResponse commitMutation(DatastoreV1.Mutation.Builder m
   DatastoreV1.CommitResponse commit(final DatastoreV1.CommitRequest requestPb) {
     try {
       return RetryHelper.runWithRetries(new Callable() {
-        @Override public DatastoreV1.CommitResponse call() throws DatastoreRpcException {
+        @Override public DatastoreV1.CommitResponse call() throws DatastoreException {
           return datastoreRpc.commit(requestPb);
         }
       }, retryParams, EXCEPTION_HANDLER);
@@ -352,7 +350,7 @@ DatastoreV1.BeginTransactionResponse beginTransaction(
     try {
       return RetryHelper.runWithRetries(new Callable() {
         @Override
-        public DatastoreV1.BeginTransactionResponse call() throws DatastoreRpcException {
+        public DatastoreV1.BeginTransactionResponse call() throws DatastoreException {
           return datastoreRpc.beginTransaction(requestPb);
         }
       }, retryParams, EXCEPTION_HANDLER);
@@ -370,7 +368,7 @@ void rollbackTransaction(ByteString transaction) {
   void rollback(final DatastoreV1.RollbackRequest requestPb) {
     try {
       RetryHelper.runWithRetries(new Callable() {
-        @Override public Void call() throws DatastoreRpcException {
+        @Override public Void call() throws DatastoreException {
           datastoreRpc.rollback(requestPb);
           return null;
         }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
index 227419d8acc8..2ec0f2be8f2b 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -25,7 +25,6 @@
 import com.google.common.collect.Iterables;
 import com.google.gcloud.ServiceOptions;
 import com.google.gcloud.spi.DatastoreRpc;
-import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
 import com.google.gcloud.spi.DatastoreRpcFactory;
 import com.google.gcloud.spi.DefaultDatastoreRpc;
 
@@ -126,20 +125,16 @@ private DatastoreOptions normalize() {
         .addPathElement(DatastoreV1.Key.PathElement.newBuilder().setKind("__foo__").setName("bar"))
         .build();
     requestPb.addKey(key);
-    try {
-      LookupResponse responsePb = rpc().lookup(requestPb.build());
-      if (responsePb.getDeferredCount() > 0) {
-        key = responsePb.getDeferred(0);
-      } else {
-        Iterator combinedIter =
-            Iterables.concat(responsePb.getMissingList(), responsePb.getFoundList()).iterator();
-        key = combinedIter.next().getEntity().getKey();
-      }
-      builder.projectId(key.getPartitionId().getDatasetId());
-      return new DatastoreOptions(builder);
-    } catch (DatastoreRpcException e) {
-      throw DatastoreException.translateAndThrow(e);
+    LookupResponse responsePb = rpc().lookup(requestPb.build());
+    if (responsePb.getDeferredCount() > 0) {
+      key = responsePb.getDeferred(0);
+    } else {
+      Iterator combinedIter =
+          Iterables.concat(responsePb.getMissingList(), responsePb.getFoundList()).iterator();
+      key = combinedIter.next().getEntity().getKey();
     }
+    builder.projectId(key.getPartitionId().getDatasetId());
+    return new DatastoreOptions(builder);
   }
 
   @Override
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java
index 3e875ff2b8ba..fd916e0a1c87 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.gcloud.spi;
 
 import com.google.api.services.datastore.DatastoreV1.AllocateIdsRequest;
@@ -27,92 +28,23 @@
 import com.google.api.services.datastore.DatastoreV1.RollbackResponse;
 import com.google.api.services.datastore.DatastoreV1.RunQueryRequest;
 import com.google.api.services.datastore.DatastoreV1.RunQueryResponse;
+import com.google.gcloud.datastore.DatastoreException;
 
 /**
  * Provides access to the remote Datastore service.
  */
 public interface DatastoreRpc {
 
-  public class DatastoreRpcException extends Exception {
-
-    /**
-     * The reason for the exception.
-     *
-     * @see Google
-     *     Cloud Datastore error codes
-     */
-    public enum Reason {
-
-      ABORTED(true, "Request aborted", 409),
-      DEADLINE_EXCEEDED(true, "Deadline exceeded", 403),
-      FAILED_PRECONDITION(false, "Invalid request", 412),
-      INTERNAL(false, "Server returned an error", 500),
-      INVALID_ARGUMENT(false, "Request parameter has an invalid value", 400),
-      PERMISSION_DENIED(false, "Unauthorized request", 403),
-      RESOURCE_EXHAUSTED(false, "Quota exceeded", 402),
-      UNAVAILABLE(true, "Could not reach service", 503);
-
-      private final boolean retryable;
-      private final String description;
-      private final int httpStatus;
-
-      private Reason(boolean retryable, String description, int httpStatus) {
-        this.retryable = retryable;
-        this.description = description;
-        this.httpStatus = httpStatus;
-      }
-
-      public boolean retryable() {
-        return retryable;
-      }
-
-      public String description() {
-        return description;
-      }
-
-      public int httpStatus() {
-        return httpStatus;
-      }
-    }
-
-    private final String reason;
-    private final int httpStatus;
-    private final boolean retryable;
-
-    public DatastoreRpcException(Reason reason, Throwable cause) {
-      this(reason.name(), reason.httpStatus, reason.retryable, reason.description, cause);
-    }
-
-    public DatastoreRpcException(String reason, int httpStatus, boolean retryable, String message, Throwable cause) {
-      super(message, cause);
-      this.reason = reason;
-      this.httpStatus = httpStatus;
-      this.retryable = retryable;
-    }
-
-    public String reason() {
-      return reason;
-    }
-
-    public int httpStatus() {
-      return httpStatus;
-    }
-
-    public boolean retryable() {
-      return retryable;
-    }
-  }
-
-  AllocateIdsResponse allocateIds(AllocateIdsRequest request) throws DatastoreRpcException;
+  AllocateIdsResponse allocateIds(AllocateIdsRequest request) throws DatastoreException;
 
   BeginTransactionResponse beginTransaction(BeginTransactionRequest request)
-      throws DatastoreRpcException;
+      throws DatastoreException;
 
-  CommitResponse commit(CommitRequest request) throws DatastoreRpcException;
+  CommitResponse commit(CommitRequest request) throws DatastoreException;
 
-  LookupResponse lookup(LookupRequest request) throws DatastoreRpcException;
+  LookupResponse lookup(LookupRequest request) throws DatastoreException;
 
-  RollbackResponse rollback(RollbackRequest request) throws DatastoreRpcException;
+  RollbackResponse rollback(RollbackRequest request) throws DatastoreException;
 
-  RunQueryResponse runQuery(RunQueryRequest request) throws DatastoreRpcException;
+  RunQueryResponse runQuery(RunQueryRequest request) throws DatastoreException;
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
index fa993c508a0b..ac00d94692de 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -29,47 +29,28 @@
 import com.google.api.services.datastore.DatastoreV1.RunQueryRequest;
 import com.google.api.services.datastore.DatastoreV1.RunQueryResponse;
 import com.google.api.services.datastore.client.Datastore;
-import com.google.api.services.datastore.client.DatastoreException;
 import com.google.api.services.datastore.client.DatastoreFactory;
 import com.google.api.services.datastore.client.DatastoreOptions.Builder;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.datastore.DatastoreException;
 import com.google.gcloud.datastore.DatastoreOptions;
-import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
 
+import java.io.IOException;
 import java.net.InetAddress;
-import java.net.SocketTimeoutException;
 import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
 
 public class DefaultDatastoreRpc implements DatastoreRpc {
 
   private final Datastore client;
 
-  private static final ImmutableMap STR_TO_REASON;
-  private static final ImmutableMap HTTP_STATUS_TO_REASON;
-
-  static {
-    ImmutableMap.Builder builder = ImmutableMap.builder();
-    Map httpCodes = new HashMap<>();
-    for (Reason reason : Reason.values()) {
-      builder.put(reason.name(), reason);
-      httpCodes.put(reason.httpStatus(), reason);
-    }
-    STR_TO_REASON = builder.build();
-    HTTP_STATUS_TO_REASON = ImmutableMap.copyOf(httpCodes);
-  }
-
   public DefaultDatastoreRpc(DatastoreOptions options) {
     String normalizedHost = normalizeHost(options.host());
     client = DatastoreFactory.get().create(
         new Builder()
-            .transport(options.httpTransportFactory().create())
             .dataset(options.projectId())
             .host(normalizedHost)
             .initializer(options.httpRequestInitializer())
@@ -106,90 +87,82 @@ private static boolean includesScheme(String url) {
     return url.startsWith("http://") || url.startsWith("https://");
   }
 
-  private static DatastoreRpcException translate(DatastoreException exception) {
+  private static DatastoreException translate(
+      com.google.api.services.datastore.client.DatastoreException exception) {
     String message = exception.getMessage();
-    String reasonStr = "";
+    int code = exception.getCode();
+    String reason = "";
     if (message != null) {
       try {
         JSONObject json = new JSONObject(new JSONTokener(message));
         JSONObject error = json.getJSONObject("error").getJSONArray("errors").getJSONObject(0);
-        reasonStr = error.getString("reason");
+        reason = error.getString("reason");
         message = error.getString("message");
       } catch (JSONException ignore) {
         // ignore - will be converted to unknown
       }
     }
-    Reason reason = STR_TO_REASON.get(reasonStr);
     if (reason == null) {
-      reason = HTTP_STATUS_TO_REASON.get(exception.getCode());
-    }
-    if (reason != null) {
-      return new DatastoreRpcException(reason, exception);
-    } else {
-      boolean retryable = false;
-      reasonStr = "Unknown";
-      if (exception.getCause() instanceof SocketTimeoutException) {
-        retryable = true;
-        reasonStr = "Request timeout";
+      if (exception.getCause() instanceof IOException) {
+        return new DatastoreException((IOException) exception.getCause());
       }
-      return new DatastoreRpcException(reasonStr, exception.getCode(), retryable, message, exception);
     }
+    return new DatastoreException(code, message, reason);
   }
 
   @Override
   public AllocateIdsResponse allocateIds(AllocateIdsRequest request)
-      throws DatastoreRpcException {
+      throws DatastoreException {
     try {
       return client.allocateIds(request);
-    } catch (DatastoreException ex) {
+    } catch (com.google.api.services.datastore.client.DatastoreException ex) {
       throw translate(ex);
     }
   }
 
   @Override
   public BeginTransactionResponse beginTransaction(BeginTransactionRequest request)
-      throws DatastoreRpcException {
+      throws DatastoreException {
     try {
       return client.beginTransaction(request);
-    } catch (DatastoreException ex) {
+    } catch (com.google.api.services.datastore.client.DatastoreException ex) {
       throw translate(ex);
     }
   }
 
   @Override
-  public CommitResponse commit(CommitRequest request) throws DatastoreRpcException {
+  public CommitResponse commit(CommitRequest request) throws DatastoreException {
     try {
       return client.commit(request);
-    } catch (DatastoreException ex) {
+    } catch (com.google.api.services.datastore.client.DatastoreException ex) {
       throw translate(ex);
     }
   }
 
   @Override
-  public LookupResponse lookup(LookupRequest request) throws DatastoreRpcException {
+  public LookupResponse lookup(LookupRequest request) throws DatastoreException {
     try {
       return client.lookup(request);
-    } catch (DatastoreException ex) {
+    } catch (com.google.api.services.datastore.client.DatastoreException ex) {
       throw translate(ex);
     }
   }
 
   @Override
-  public RollbackResponse rollback(RollbackRequest request) throws DatastoreRpcException {
+  public RollbackResponse rollback(RollbackRequest request) throws DatastoreException {
     try {
       return client.rollback(request);
-    } catch (DatastoreException ex) {
+    } catch (com.google.api.services.datastore.client.DatastoreException ex) {
       throw translate(ex);
     }
   }
 
   @Override
-  public RunQueryResponse runQuery(RunQueryRequest request) throws DatastoreRpcException {
+  public RunQueryResponse runQuery(RunQueryRequest request) throws DatastoreException {
     try {
       return client.runQuery(request);
-    } catch (DatastoreException ex) {
+    } catch (com.google.api.services.datastore.client.DatastoreException ex) {
       throw translate(ex);
     }
   }
 }
-
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
index 019d69cb737b..4d62224172f9 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
@@ -16,42 +16,80 @@
 
 package com.google.gcloud.datastore;
 
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.gcloud.datastore.DatastoreException.DatastoreError;
-import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
-import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
+import com.google.gcloud.BaseServiceException;
+import com.google.gcloud.RetryHelper;
 
 import org.junit.Test;
 
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+
 public class DatastoreExceptionTest {
 
   @Test
-  public void testDatastoreError() throws Exception {
-    for (Reason reason : Reason.values()) {
-      DatastoreError error = DatastoreError.valueOf(reason.name());
-      assertEquals(reason.retryable(), error.retryable());
-      assertEquals(reason.description(), error.description());
-      assertEquals(reason.httpStatus(), error.httpStatus());
-    }
+  public void testDatastoreException() throws Exception {
+    DatastoreException exception = new DatastoreException(409, "message", "ABORTED");
+    assertEquals(409, exception.code());
+    assertEquals("ABORTED", exception.reason());
+    assertEquals("message", exception.getMessage());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new DatastoreException(403, "message", "DEADLINE_EXCEEDED");
+    assertEquals(403, exception.code());
+    assertEquals("DEADLINE_EXCEEDED", exception.reason());
+    assertEquals("message", exception.getMessage());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new DatastoreException(503, "message", "UNAVAILABLE");
+    assertEquals(503, exception.code());
+    assertEquals("UNAVAILABLE", exception.reason());
+    assertEquals("message", exception.getMessage());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new DatastoreException(500, "message", "INTERNAL");
+    assertEquals(500, exception.code());
+    assertEquals("INTERNAL", exception.reason());
+    assertEquals("message", exception.getMessage());
+    assertFalse(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    IOException cause = new SocketTimeoutException();
+    exception = new DatastoreException(cause);
+    assertNull(exception.reason());
+    assertNull(exception.getMessage());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
 
-    DatastoreException exception = new DatastoreException(DatastoreError.ABORTED, "bla");
-    assertEquals(DatastoreError.ABORTED, exception.datastoreError());
   }
 
   @Test
   public void testTranslateAndThrow() throws Exception {
-    DatastoreRpcException toTranslate = null; // should be preserved as a cause
-    for (Reason reason : Reason.values()) {
-      try {
-        toTranslate = new DatastoreRpcException(reason, null);
-        DatastoreException.translateAndThrow(toTranslate);
-        fail("Exception expected");
-      } catch (DatastoreException ex) {
-        assertEquals(reason.name(), ex.datastoreError().name());
-        assertEquals(toTranslate, ex.getCause());
-      }
+    DatastoreException cause = new DatastoreException(503, "message", "UNAVAILABLE");
+    RetryHelper.RetryHelperException exceptionMock = createMock(RetryHelper.RetryHelperException.class);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      DatastoreException.translateAndThrow(exceptionMock);
+    } catch (BaseServiceException ex) {
+      assertEquals(503, ex.code());
+      assertEquals("message", ex.getMessage());
+      assertTrue(ex.retryable());
+      assertTrue(ex.idempotent());
+    } finally {
+      verify(exceptionMock);
     }
   }
 
@@ -61,7 +99,7 @@ public void testThrowInvalidRequest() throws Exception {
       DatastoreException.throwInvalidRequest("message %s %d", "a", 1);
       fail("Exception expected");
     } catch (DatastoreException ex) {
-      assertEquals(DatastoreError.FAILED_PRECONDITION, ex.datastoreError());
+      assertEquals("FAILED_PRECONDITION", ex.reason());
       assertEquals("message a 1", ex.getMessage());
     }
   }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index e6f84c76ad40..8cb88f9e7795 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -38,8 +38,6 @@
 import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
 import com.google.gcloud.datastore.testing.LocalGcdHelper;
 import com.google.gcloud.spi.DatastoreRpc;
-import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
-import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
 import com.google.gcloud.spi.DatastoreRpcFactory;
 
 import org.easymock.EasyMock;
@@ -201,7 +199,7 @@ public void testTransactionWithRead() {
       transaction.commit();
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals(DatastoreException.DatastoreError.ABORTED, expected.datastoreError());
+      assertEquals("ABORTED", expected.reason());
     }
   }
 
@@ -229,7 +227,7 @@ public void testTransactionWithQuery() {
       transaction.commit();
       fail("Expecting a failure");
     } catch (DatastoreException expected) {
-      assertEquals(DatastoreException.DatastoreError.ABORTED, expected.datastoreError());
+      assertEquals("ABORTED", expected.reason());
     }
   }
 
@@ -466,7 +464,7 @@ public void testRunStructuredQuery() {
   }
 
   @Test
-  public void testQueryPaginationWithLimit() throws DatastoreRpcException {
+  public void testQueryPaginationWithLimit() throws DatastoreException {
     DatastoreRpcFactory rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class);
     DatastoreRpc rpcMock = EasyMock.createStrictMock(DatastoreRpc.class);
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class)))
@@ -639,7 +637,7 @@ public void testGetArrayNoDeferredResults() {
     assertFalse(result.hasNext());
   }
 
-  public void testGetArrayDeferredResults() throws DatastoreRpcException {
+  public void testGetArrayDeferredResults() throws DatastoreException {
     Set requestedKeys = new HashSet<>();
     requestedKeys.add(KEY1);
     requestedKeys.add(KEY2);
@@ -654,7 +652,7 @@ public void testGetArrayDeferredResults() throws DatastoreRpcException {
     assertEquals(requestedKeys, keysOfFoundEntities);
   }
 
-  public void testFetchArrayDeferredResults() throws DatastoreRpcException {
+  public void testFetchArrayDeferredResults() throws DatastoreException {
     List foundEntities =
         createDatastoreForDeferredLookup().fetch(KEY1, KEY2, KEY3, KEY4, KEY5);
     assertEquals(foundEntities.get(0).key(), KEY1);
@@ -665,7 +663,7 @@ public void testFetchArrayDeferredResults() throws DatastoreRpcException {
     assertEquals(foundEntities.size(), 5);
   }
 
-  private Datastore createDatastoreForDeferredLookup() throws DatastoreRpcException {
+  private Datastore createDatastoreForDeferredLookup() throws DatastoreException {
     List keysPb = new ArrayList<>();
     keysPb.add(KEY1.toPb());
     keysPb.add(KEY2.toPb());
@@ -821,7 +819,7 @@ public void testRetryableException() throws Exception {
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class)))
         .andReturn(rpcMock);
     EasyMock.expect(rpcMock.lookup(requestPb))
-        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.UNAVAILABLE, null))
+        .andThrow(new DatastoreException(503, "UNAVAILABLE", "UNAVAILABLE", null))
         .andReturn(responsePb);
     EasyMock.replay(rpcFactoryMock, rpcMock);
     DatastoreOptions options = this.options.toBuilder()
@@ -843,7 +841,8 @@ public void testNonRetryableException() throws Exception {
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class)))
         .andReturn(rpcMock);
     EasyMock.expect(rpcMock.lookup(requestPb))
-        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.PERMISSION_DENIED, null))
+        .andThrow(
+            new DatastoreException(DatastoreException.UNKNOWN_CODE, "denied", "PERMISSION_DENIED"))
         .times(1);
     EasyMock.replay(rpcFactoryMock, rpcMock);
     RetryParams retryParams = RetryParams.builder().retryMinAttempts(2).build();
@@ -853,7 +852,7 @@ public void testNonRetryableException() throws Exception {
         .build();
     Datastore datastore = options.service();
     thrown.expect(DatastoreException.class);
-    thrown.expectMessage(Reason.PERMISSION_DENIED.description());
+    thrown.expectMessage("denied");
     datastore.get(KEY1);
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
index 22b5e8bfed7c..3510f7728a8f 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
@@ -16,11 +16,14 @@
 
 package com.google.gcloud.resourcemanager;
 
+import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.BaseServiceException;
-import com.google.gcloud.RetryHelper;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.RetryHelper.RetryInterruptedException;
 
+import java.io.IOException;
+import java.util.Set;
+
 /**
  * Resource Manager service exception.
  *
@@ -29,11 +32,32 @@
  */
 public class ResourceManagerException extends BaseServiceException {
 
-  private static final long serialVersionUID = 6841689911565501705L;
-  private static final int UNKNOWN_CODE = -1;
+  // see https://cloud.google.com/resource-manager/v1/errors/core_errors
+  private static final Set RETRYABLE_ERRORS = ImmutableSet.of(
+      new Error(503, null),
+      new Error(500, null),
+      new Error(429, null),
+      new Error(403, "concurrentLimitExceeded"),
+      new Error(403, "limitExceeded"),
+      new Error(403, "rateLimitExceeded"),
+      new Error(403, "rateLimitExceededUnreg"),
+      new Error(403, "servingLimitExceeded"),
+      new Error(403, "userRateLimitExceeded"),
+      new Error(403, "userRateLimitExceededUnreg"),
+      new Error(403, "variableTermLimitExceeded"));
+  private static final long serialVersionUID = -9207194488966554136L;
+
+  public ResourceManagerException(int code, String message) {
+    super(code, message, null, true);
+  }
+
+  public ResourceManagerException(IOException exception) {
+    super(exception, true);
+  }
 
-  public ResourceManagerException(int code, String message, boolean retryable) {
-    super(code, message, retryable);
+  @Override
+  protected Set retryableErrors() {
+    return RETRYABLE_ERRORS;
   }
 
   /**
@@ -44,13 +68,8 @@ public ResourceManagerException(int code, String message, boolean retryable) {
    * ResourceManagerException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  static ResourceManagerException translateAndThrow(RetryHelperException ex) {
-    if (ex.getCause() instanceof ResourceManagerException) {
-      throw (ResourceManagerException) ex.getCause();
-    }
-    if (ex instanceof RetryHelper.RetryInterruptedException) {
-      RetryHelper.RetryInterruptedException.propagate();
-    }
-    throw new ResourceManagerException(UNKNOWN_CODE, ex.getMessage(), false);
+  public static ResourceManagerException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndThrow(ex);
+    throw new ResourceManagerException(UNKNOWN_CODE, ex.getMessage());
   }
 }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java
index ec95207c2e7b..61c622fa0c33 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java
@@ -7,30 +7,20 @@
 import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 
-import com.google.api.client.googleapis.json.GoogleJsonError;
-import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.jackson.JacksonFactory;
 import com.google.api.services.cloudresourcemanager.Cloudresourcemanager;
 import com.google.api.services.cloudresourcemanager.model.ListProjectsResponse;
 import com.google.api.services.cloudresourcemanager.model.Project;
-import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.resourcemanager.ResourceManagerException;
 import com.google.gcloud.resourcemanager.ResourceManagerOptions;
 
 import java.io.IOException;
 import java.util.Map;
-import java.util.Set;
 
 public class DefaultResourceManagerRpc implements ResourceManagerRpc {
 
-  // see https://cloud.google.com/resource-manager/v1/errors/core_errors
-  private static final Set RETRYABLE_CODES = ImmutableSet.of(503, 500, 429);
-  private static final Set RETRYABLE_REASONS = ImmutableSet.of("concurrentLimitExceeded",
-      "limitExceeded", "rateLimitExceeded", "rateLimitExceededUnreg", "servingLimitExceeded",
-      "userRateLimitExceeded", "userRateLimitExceededUnreg", "variableTermLimitExceeded");
-
   private final Cloudresourcemanager resourceManager;
 
   public DefaultResourceManagerRpc(ResourceManagerOptions options) {
@@ -44,21 +34,7 @@ public DefaultResourceManagerRpc(ResourceManagerOptions options) {
   }
 
   private static ResourceManagerException translate(IOException exception) {
-    ResourceManagerException translated;
-    if (exception instanceof GoogleJsonResponseException) {
-      translated = translate(((GoogleJsonResponseException) exception).getDetails());
-    } else {
-      translated = new ResourceManagerException(0, exception.getMessage(), false);
-    }
-    translated.initCause(exception);
-    return translated;
-  }
-
-  private static ResourceManagerException translate(GoogleJsonError exception) {
-    boolean retryable =
-        RETRYABLE_CODES.contains(exception.getCode()) || (!exception.getErrors().isEmpty()
-            && RETRYABLE_REASONS.contains(exception.getErrors().get(0).getReason()));
-    return new ResourceManagerException(exception.getCode(), exception.getMessage(), retryable);
+    return new ResourceManagerException(exception);
   }
 
   @Override
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerExceptionTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerExceptionTest.java
new file mode 100644
index 000000000000..388f38f31c35
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerExceptionTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.resourcemanager;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.gcloud.BaseServiceException;
+import com.google.gcloud.RetryHelper.RetryHelperException;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+
+public class ResourceManagerExceptionTest {
+
+  @Test
+  public void testResourceManagerException() {
+    ResourceManagerException exception = new ResourceManagerException(500, "message");
+    assertEquals(500, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new ResourceManagerException(503, "message");
+    assertEquals(503, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new ResourceManagerException(429, "message");
+    assertEquals(429, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new ResourceManagerException(403, "message");
+    assertEquals(403, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertFalse(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    IOException cause = new SocketTimeoutException();
+    exception = new ResourceManagerException(cause);
+    assertNull(exception.reason());
+    assertNull(exception.getMessage());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertEquals(cause, exception.getCause());
+  }
+
+  @Test
+  public void testTranslateAndThrow() throws Exception {
+    ResourceManagerException cause = new ResourceManagerException(503, "message");
+    RetryHelperException exceptionMock = createMock(RetryHelperException.class);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      ResourceManagerException.translateAndThrow(exceptionMock);
+    } catch (BaseServiceException ex) {
+      assertEquals(503, ex.code());
+      assertEquals("message", ex.getMessage());
+      assertTrue(ex.retryable());
+      assertTrue(ex.idempotent());
+    } finally {
+      verify(exceptionMock);
+    }
+  }
+}
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
index fedd10eacdc6..7d1e00496463 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
@@ -273,7 +273,7 @@ public void testRetryableException() {
         .build()
         .service();
     EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.projectId(), EMPTY_RPC_OPTIONS))
-        .andThrow(new ResourceManagerException(500, "Internal Error", true))
+        .andThrow(new ResourceManagerException(500, "Internal Error"))
         .andReturn(PARTIAL_PROJECT.toPb());
     EasyMock.replay(resourceManagerRpcMock);
     ProjectInfo returnedProject = resourceManagerMock.get(PARTIAL_PROJECT.projectId());
@@ -293,7 +293,7 @@ public void testNonRetryableException() {
         .service();
     EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.projectId(), EMPTY_RPC_OPTIONS))
         .andThrow(new ResourceManagerException(
-            403, "Project " + PARTIAL_PROJECT.projectId() + " not found.", false))
+            403, "Project " + PARTIAL_PROJECT.projectId() + " not found."))
         .once();
     EasyMock.replay(resourceManagerRpcMock);
     thrown.expect(ResourceManagerException.class);
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
index 29fdc651af9f..dc84a1de5559 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -34,7 +34,6 @@
 
 import com.google.api.client.googleapis.batch.json.JsonBatchCallback;
 import com.google.api.client.googleapis.json.GoogleJsonError;
-import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.http.ByteArrayContent;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpHeaders;
@@ -59,7 +58,6 @@
 import com.google.api.services.storage.model.StorageObject;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gcloud.storage.StorageException;
@@ -68,12 +66,10 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public class DefaultStorageRpc implements StorageRpc {
 
@@ -81,8 +77,6 @@ public class DefaultStorageRpc implements StorageRpc {
   private final StorageOptions options;
   private final Storage storage;
 
-  // see: https://cloud.google.com/storage/docs/concepts-techniques#practices
-  private static final Set RETRYABLE_CODES = ImmutableSet.of(504, 503, 502, 500, 429, 408);
   private static final long MEGABYTE = 1024L * 1024L;
   private static final int MAX_BATCH_DELETES = 100;
 
@@ -97,25 +91,11 @@ public DefaultStorageRpc(StorageOptions options) {
   }
 
   private static StorageException translate(IOException exception) {
-    StorageException translated;
-    if (exception instanceof GoogleJsonResponseException
-        && ((GoogleJsonResponseException) exception).getDetails() != null) {
-      translated = translate(((GoogleJsonResponseException) exception).getDetails());
-    } else {
-      boolean retryable = false;
-      if (exception instanceof SocketTimeoutException) {
-        retryable = true;
-      }
-      translated = new StorageException(0, exception.getMessage(), retryable);
-    }
-    translated.initCause(exception);
-    return translated;
+    return new StorageException(exception);
   }
 
   private static StorageException translate(GoogleJsonError exception) {
-    boolean retryable = RETRYABLE_CODES.contains(exception.getCode())
-        || "InternalError".equals(exception.getMessage());
-    return new StorageException(exception.getCode(), exception.getMessage(), retryable);
+    return new StorageException(exception);
   }
 
   @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
index 984f5d1f72e9..121f2eb63589 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
@@ -129,7 +129,7 @@ public Tuple call() {
         if (lastEtag != null && !Objects.equals(result.x(), lastEtag)) {
           StringBuilder messageBuilder = new StringBuilder();
           messageBuilder.append("Blob ").append(blob).append(" was updated while reading");
-          throw new StorageException(0, messageBuilder.toString(), false);
+          throw new StorageException(0, messageBuilder.toString());
         }
         lastEtag = result.x();
         buffer = result.y();
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
index c1075ae28c8b..e724d8ac6850 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
@@ -16,11 +16,15 @@
 
 package com.google.gcloud.storage;
 
+import com.google.api.client.googleapis.json.GoogleJsonError;
+import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.BaseServiceException;
-import com.google.gcloud.RetryHelper;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.RetryHelper.RetryInterruptedException;
 
+import java.io.IOException;
+import java.util.Set;
+
 /**
  * Storage service exception.
  *
@@ -29,11 +33,33 @@
  */
 public class StorageException extends BaseServiceException {
 
-  private static final long serialVersionUID = 8088235105953640145L;
-  private static final int UNKNOWN_CODE = -1;
+  // see: https://cloud.google.com/storage/docs/concepts-techniques#practices
+  private static final Set RETRYABLE_ERRORS = ImmutableSet.of(
+      new Error(504, null),
+      new Error(503, null),
+      new Error(502, null),
+      new Error(500, null),
+      new Error(429, null),
+      new Error(408, null),
+      new Error(null, "internalError"));
+
+  private static final long serialVersionUID = -4168430271327813063L;
+
+  public StorageException(int code, String message) {
+    super(code, message, null, true);
+  }
+
+  public StorageException(IOException exception) {
+    super(exception, true);
+  }
+
+  public StorageException(GoogleJsonError error) {
+    super(error, true);
+  }
 
-  public StorageException(int code, String message, boolean retryable) {
-    super(code, message, retryable);
+  @Override
+  protected Set retryableErrors() {
+    return RETRYABLE_ERRORS;
   }
 
   /**
@@ -43,13 +69,8 @@ public StorageException(int code, String message, boolean retryable) {
    * @throws StorageException when {@code ex} was caused by a {@code StorageException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  static StorageException translateAndThrow(RetryHelperException ex) {
-    if (ex.getCause() instanceof StorageException) {
-      throw (StorageException) ex.getCause();
-    }
-    if (ex instanceof RetryHelper.RetryInterruptedException) {
-      RetryHelper.RetryInterruptedException.propagate();
-    }
-    throw new StorageException(UNKNOWN_CODE, ex.getMessage(), false);
+  public static StorageException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndThrow(ex);
+    throw new StorageException(UNKNOWN_CODE, ex.getMessage());
   }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
index 05b7f5f6fd8c..d06f004fe84c 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
@@ -69,8 +69,8 @@ public class RemoteGcsHelperTest {
   private static final List BLOB_LIST = ImmutableList.of(
       BlobInfo.builder(BUCKET_NAME, "n1").build(),
       BlobInfo.builder(BUCKET_NAME, "n2").build());
-  private static final StorageException RETRYABLE_EXCEPTION = new StorageException(409, "", true);
-  private static final StorageException FATAL_EXCEPTION = new StorageException(500, "", false);
+  private static final StorageException RETRYABLE_EXCEPTION = new StorageException(409, "");
+  private static final StorageException FATAL_EXCEPTION = new StorageException(500, "");
   private static final Page BLOB_PAGE = new Page() {
 
     @Override
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageExceptionTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageExceptionTest.java
new file mode 100644
index 000000000000..cf1d4b394e57
--- /dev/null
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageExceptionTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.storage;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.api.client.googleapis.json.GoogleJsonError;
+import com.google.gcloud.BaseServiceException;
+import com.google.gcloud.RetryHelper.RetryHelperException;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+
+public class StorageExceptionTest {
+
+  @Test
+  public void testStorageException() {
+    StorageException exception = new StorageException(500, "message");
+    assertEquals(500, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new StorageException(502, "message");
+    assertEquals(502, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new StorageException(503, "message");
+    assertEquals(503, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new StorageException(504, "message");
+    assertEquals(504, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new StorageException(429, "message");
+    assertEquals(429, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new StorageException(408, "message");
+    assertEquals(408, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    exception = new StorageException(400, "message");
+    assertEquals(400, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertFalse(exception.retryable());
+    assertTrue(exception.idempotent());
+
+    IOException cause = new SocketTimeoutException();
+    exception = new StorageException(cause);
+    assertNull(exception.reason());
+    assertNull(exception.getMessage());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertEquals(cause, exception.getCause());
+
+    GoogleJsonError error = new GoogleJsonError();
+    error.setCode(503);
+    error.setMessage("message");
+    exception = new StorageException(error);
+    assertEquals(503, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+  }
+
+  @Test
+  public void testTranslateAndThrow() throws Exception {
+    StorageException cause = new StorageException(503, "message");
+    RetryHelperException exceptionMock = createMock(RetryHelperException.class);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      StorageException.translateAndThrow(exceptionMock);
+    } catch (BaseServiceException ex) {
+      assertEquals(503, ex.code());
+      assertEquals("message", ex.getMessage());
+      assertTrue(ex.retryable());
+      assertTrue(ex.idempotent());
+    } finally {
+      verify(exceptionMock);
+    }
+  }
+}
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index 0e1f1a0b2f52..b8da0580cd4a 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -1266,7 +1266,7 @@ public Tuple apply(StorageObject f) {
   public void testRetryableException() {
     BlobId blob = BlobId.of(BUCKET_NAME1, BLOB_NAME1);
     EasyMock.expect(storageRpcMock.get(blob.toPb(), EMPTY_RPC_OPTIONS))
-        .andThrow(new StorageException(500, "InternalError", true))
+        .andThrow(new StorageException(500, "internalError"))
         .andReturn(BLOB_INFO1.toPb());
     EasyMock.replay(storageRpcMock);
     storage = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
@@ -1279,7 +1279,7 @@ public void testNonRetryableException() {
     BlobId blob = BlobId.of(BUCKET_NAME1, BLOB_NAME1);
     String exceptionMessage = "Not Implemented";
     EasyMock.expect(storageRpcMock.get(blob.toPb(), EMPTY_RPC_OPTIONS))
-        .andThrow(new StorageException(501, exceptionMessage, false));
+        .andThrow(new StorageException(501, exceptionMessage));
     EasyMock.replay(storageRpcMock);
     storage = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
     thrown.expect(StorageException.class);

From acf260ce07f7fdd0729682d74c15c5c88abf7c84 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 15 Jan 2016 18:20:26 +0100
Subject: [PATCH 287/322] Move exception handler and interceptor to BaseService
 class

---
 .../google/gcloud/bigquery/BigQueryImpl.java  | 23 ---------------
 .../java/com/google/gcloud/BaseService.java   | 25 +++++++++++++++++
 .../gcloud/datastore/DatastoreImpl.java       | 28 +------------------
 .../resourcemanager/ResourceManagerImpl.java  | 25 -----------------
 .../google/gcloud/storage/StorageImpl.java    | 22 ---------------
 5 files changed, 26 insertions(+), 97 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
index 3a1cc658bef3..ad55056474fb 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -34,8 +34,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gcloud.BaseService;
-import com.google.gcloud.ExceptionHandler;
-import com.google.gcloud.ExceptionHandler.Interceptor;
 import com.google.gcloud.Page;
 import com.google.gcloud.PageImpl;
 import com.google.gcloud.PageImpl.NextPageFetcher;
@@ -49,27 +47,6 @@
 
 final class BigQueryImpl extends BaseService implements BigQuery {
 
-  private static final Interceptor EXCEPTION_HANDLER_INTERCEPTOR = new Interceptor() {
-
-    private static final long serialVersionUID = -7478333733015750774L;
-
-    @Override
-    public RetryResult afterEval(Exception exception, RetryResult retryResult) {
-      return Interceptor.RetryResult.CONTINUE_EVALUATION;
-    }
-
-    @Override
-    public RetryResult beforeEval(Exception exception) {
-      if (exception instanceof BigQueryException) {
-        boolean retriable = ((BigQueryException) exception).retryable();
-        return retriable ? Interceptor.RetryResult.RETRY : Interceptor.RetryResult.NO_RETRY;
-      }
-      return Interceptor.RetryResult.CONTINUE_EVALUATION;
-    }
-  };
-  static final ExceptionHandler EXCEPTION_HANDLER = ExceptionHandler.builder()
-      .abortOn(RuntimeException.class).interceptor(EXCEPTION_HANDLER_INTERCEPTOR).build();
-
   private static class DatasetPageFetcher implements NextPageFetcher {
 
     private static final long serialVersionUID = -3057564042439021278L;
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java
index c028eaede331..d9e6f2db7c95 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java
@@ -16,6 +16,8 @@
 
 package com.google.gcloud;
 
+import com.google.gcloud.ExceptionHandler.Interceptor;
+
 /**
  * Base class for service objects.
  *
@@ -24,6 +26,29 @@
 public abstract class BaseService>
     implements Service {
 
+  public static final Interceptor EXCEPTION_HANDLER_INTERCEPTOR = new Interceptor() {
+
+    private static final long serialVersionUID = -8429573486870467828L;
+
+    @Override
+    public RetryResult afterEval(Exception exception, RetryResult retryResult) {
+      return Interceptor.RetryResult.CONTINUE_EVALUATION;
+    }
+
+    @Override
+    public RetryResult beforeEval(Exception exception) {
+      if (exception instanceof BaseServiceException) {
+        boolean retriable = ((BaseServiceException) exception).retryable();
+        return retriable ? Interceptor.RetryResult.RETRY : Interceptor.RetryResult.NO_RETRY;
+      }
+      return Interceptor.RetryResult.CONTINUE_EVALUATION;
+    }
+  };
+  public static final ExceptionHandler EXCEPTION_HANDLER = ExceptionHandler.builder()
+      .abortOn(RuntimeException.class)
+      .interceptor(EXCEPTION_HANDLER_INTERCEPTOR)
+      .build();
+
   private final OptionsT options;
 
   protected BaseService(OptionsT options) {
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java
index bfcba58f3f2f..92d18ed4787c 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java
@@ -23,8 +23,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 import com.google.gcloud.BaseService;
-import com.google.gcloud.ExceptionHandler;
-import com.google.gcloud.ExceptionHandler.Interceptor;
 import com.google.gcloud.RetryHelper;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.RetryParams;
@@ -41,31 +39,7 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 
-final class DatastoreImpl extends BaseService
-    implements Datastore {
-
-  private static final Interceptor EXCEPTION_HANDLER_INTERCEPTOR =
-      new Interceptor() {
-
-        private static final long serialVersionUID = 6911242958397733203L;
-
-        @Override
-        public RetryResult afterEval(Exception exception, RetryResult retryResult) {
-          return Interceptor.RetryResult.CONTINUE_EVALUATION;
-        }
-
-        @Override
-        public RetryResult beforeEval(Exception exception) {
-          if (exception instanceof DatastoreException) {
-            boolean retryable = ((DatastoreException) exception).retryable();
-            return retryable ? Interceptor.RetryResult.RETRY : Interceptor.RetryResult.NO_RETRY;
-          }
-          return Interceptor.RetryResult.CONTINUE_EVALUATION;
-        }
-      };
-  private static final ExceptionHandler EXCEPTION_HANDLER = ExceptionHandler.builder()
-      .abortOn(RuntimeException.class, DatastoreException.class)
-      .interceptor(EXCEPTION_HANDLER_INTERCEPTOR).build();
+final class DatastoreImpl extends BaseService implements Datastore {
 
   private final DatastoreRpc datastoreRpc;
   private final RetryParams retryParams;
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
index 2a0e09d9fb31..22f2b350d2f3 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
@@ -25,8 +25,6 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.google.gcloud.BaseService;
-import com.google.gcloud.ExceptionHandler;
-import com.google.gcloud.ExceptionHandler.Interceptor;
 import com.google.gcloud.Page;
 import com.google.gcloud.PageImpl;
 import com.google.gcloud.PageImpl.NextPageFetcher;
@@ -40,29 +38,6 @@
 final class ResourceManagerImpl
     extends BaseService implements ResourceManager {
 
-  private static final Interceptor EXCEPTION_HANDLER_INTERCEPTOR = new Interceptor() {
-
-    private static final long serialVersionUID = 2091576149969931704L;
-
-    @Override
-    public RetryResult afterEval(Exception exception, RetryResult retryResult) {
-      return Interceptor.RetryResult.CONTINUE_EVALUATION;
-    }
-
-    @Override
-    public RetryResult beforeEval(Exception exception) {
-      if (exception instanceof ResourceManagerException) {
-        boolean retriable = ((ResourceManagerException) exception).retryable();
-        return retriable ? Interceptor.RetryResult.RETRY : Interceptor.RetryResult.NO_RETRY;
-      }
-      return Interceptor.RetryResult.CONTINUE_EVALUATION;
-    }
-  };
-  static final ExceptionHandler EXCEPTION_HANDLER = ExceptionHandler.builder()
-      .abortOn(RuntimeException.class)
-      .interceptor(EXCEPTION_HANDLER_INTERCEPTOR)
-      .build();
-
   private final ResourceManagerRpc resourceManagerRpc;
 
   ResourceManagerImpl(ResourceManagerOptions options) {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index a6c851d0f638..a4b6c56e5ede 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -44,8 +44,6 @@
 import com.google.common.primitives.Ints;
 import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
 import com.google.gcloud.BaseService;
-import com.google.gcloud.ExceptionHandler;
-import com.google.gcloud.ExceptionHandler.Interceptor;
 import com.google.gcloud.Page;
 import com.google.gcloud.PageImpl;
 import com.google.gcloud.PageImpl.NextPageFetcher;
@@ -76,26 +74,6 @@
 
 final class StorageImpl extends BaseService implements Storage {
 
-  private static final Interceptor EXCEPTION_HANDLER_INTERCEPTOR = new Interceptor() {
-
-    private static final long serialVersionUID = -7758580330857881124L;
-
-    @Override
-    public RetryResult afterEval(Exception exception, RetryResult retryResult) {
-      return Interceptor.RetryResult.CONTINUE_EVALUATION;
-    }
-
-    @Override
-    public RetryResult beforeEval(Exception exception) {
-      if (exception instanceof StorageException) {
-        boolean retriable = ((StorageException) exception).retryable();
-        return retriable ? Interceptor.RetryResult.RETRY : Interceptor.RetryResult.NO_RETRY;
-      }
-      return Interceptor.RetryResult.CONTINUE_EVALUATION;
-    }
-  };
-  static final ExceptionHandler EXCEPTION_HANDLER = ExceptionHandler.builder()
-      .abortOn(RuntimeException.class).interceptor(EXCEPTION_HANDLER_INTERCEPTOR).build();
   private static final byte[] EMPTY_BYTE_ARRAY = {};
   private static final String EMPTY_BYTE_ARRAY_MD5 = "1B2M2Y8AsgTpgAmY7PhCfg==";
   private static final String EMPTY_BYTE_ARRAY_CRC32C = "AAAAAA==";

From 67e5dfce1f7d6903fc75a67d472c85ebb900258e Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 20 Jan 2016 07:40:53 +0100
Subject: [PATCH 288/322] Rename translateAndThrow in BaseServiceException and
 make it package scope in other exceptions

---
 .../com/google/gcloud/bigquery/BigQueryException.java     | 4 ++--
 .../main/java/com/google/gcloud/BaseServiceException.java | 4 +---
 .../java/com/google/gcloud/BaseServiceExceptionTest.java  | 8 +++-----
 .../com/google/gcloud/datastore/DatastoreException.java   | 4 ++--
 .../gcloud/resourcemanager/ResourceManagerException.java  | 4 ++--
 .../java/com/google/gcloud/storage/StorageException.java  | 4 ++--
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
index 930d06d523ab..b0cca68e3e0a 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
@@ -76,8 +76,8 @@ protected Set retryableErrors() {
    * @throws BigQueryException when {@code ex} was caused by a {@code BigQueryException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  public static BigQueryException translateAndThrow(RetryHelperException ex) {
-    BaseServiceException.translateAndThrow(ex);
+  static BaseServiceException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndPropagateIfPossible(ex);
     throw new BigQueryException(UNKNOWN_CODE, ex.getMessage());
   }
 }
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
index 9f4bfdab994d..351ad6cd188a 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
@@ -184,14 +184,12 @@ protected static String message(IOException exception) {
     return exception.getMessage();
   }
 
-  protected static BaseServiceException translateAndThrow(
-      RetryHelper.RetryHelperException ex) {
+  protected static void translateAndPropagateIfPossible(RetryHelper.RetryHelperException ex) {
     if (ex.getCause() instanceof BaseServiceException) {
       throw (BaseServiceException) ex.getCause();
     }
     if (ex instanceof RetryHelper.RetryInterruptedException) {
       RetryHelper.RetryInterruptedException.propagate();
     }
-    return null;
   }
 }
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
index a6e22866ed9f..e3c6abb7d1ee 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
@@ -137,14 +137,12 @@ public void testBaseServiceException() {
   @Test
   public void testTranslateAndThrow() throws Exception {
     BaseServiceException cause = new BaseServiceException(CODE, MESSAGE, REASON, IDEMPOTENT);
-    RetryHelper.RetryHelperException exceptionMock = createMock(RetryHelper.RetryHelperException.class);
+    RetryHelper.RetryHelperException exceptionMock =
+        createMock(RetryHelper.RetryHelperException.class);
     expect(exceptionMock.getCause()).andReturn(cause).times(2);
     replay(exceptionMock);
     try {
-      BaseServiceException ex = BaseServiceException.translateAndThrow(exceptionMock);
-      if (ex != null) {
-        throw ex;
-      }
+      BaseServiceException.translateAndPropagateIfPossible(exceptionMock);
     } catch (BaseServiceException ex) {
       assertEquals(CODE, ex.code());
       assertEquals(MESSAGE, ex.getMessage());
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
index 946fc9190fc3..a7e6785b8a8c 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
@@ -63,8 +63,8 @@ protected Set retryableErrors() {
    * @throws DatastoreException when {@code ex} was caused by a {@code DatastoreException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  public static DatastoreException translateAndThrow(RetryHelperException ex) {
-    BaseServiceException.translateAndThrow(ex);
+  static DatastoreException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndPropagateIfPossible(ex);
     throw new DatastoreException(UNKNOWN_CODE, ex.getMessage(), null);
   }
 
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
index 3510f7728a8f..32a2998791c9 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
@@ -68,8 +68,8 @@ protected Set retryableErrors() {
    * ResourceManagerException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  public static ResourceManagerException translateAndThrow(RetryHelperException ex) {
-    BaseServiceException.translateAndThrow(ex);
+  static ResourceManagerException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndPropagateIfPossible(ex);
     throw new ResourceManagerException(UNKNOWN_CODE, ex.getMessage());
   }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
index e724d8ac6850..0c952c9a65d6 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
@@ -69,8 +69,8 @@ protected Set retryableErrors() {
    * @throws StorageException when {@code ex} was caused by a {@code StorageException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  public static StorageException translateAndThrow(RetryHelperException ex) {
-    BaseServiceException.translateAndThrow(ex);
+  static StorageException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndPropagateIfPossible(ex);
     throw new StorageException(UNKNOWN_CODE, ex.getMessage());
   }
 }

From 34e6806becf14f1b9bf0aeac1f7cc11d2aad95b1 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 20 Jan 2016 07:55:39 +0100
Subject: [PATCH 289/322] Add throwable cause to DatastoreException

---
 .../src/main/java/com/google/gcloud/BaseServiceException.java   | 2 +-
 .../java/com/google/gcloud/datastore/DatastoreException.java    | 2 +-
 .../main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
index 351ad6cd188a..b91090f94e82 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
@@ -105,7 +105,7 @@ public BaseServiceException(int code, String message, String reason, boolean ide
   }
 
   public BaseServiceException(int code, String message, String reason, boolean idempotent,
-      Exception cause) {
+      Throwable cause) {
     super(message, cause);
     this.code = code;
     this.reason = reason;
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
index a7e6785b8a8c..ecad69ac635b 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
@@ -39,7 +39,7 @@ public class DatastoreException extends BaseServiceException {
       new Error(503, "UNAVAILABLE"));
   private static final long serialVersionUID = 2663750991205874435L;
 
-  public DatastoreException(int code, String message, String reason, Exception cause) {
+  public DatastoreException(int code, String message, String reason, Throwable cause) {
     super(code, message, reason, true, cause);
   }
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
index ac00d94692de..c82ff9689f68 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -107,7 +107,7 @@ private static DatastoreException translate(
         return new DatastoreException((IOException) exception.getCause());
       }
     }
-    return new DatastoreException(code, message, reason);
+    return new DatastoreException(code, message, reason, exception);
   }
 
   @Override

From 3c81f1679e7f6880d9f3c4a9b89a5831c90fb02f Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 20 Jan 2016 09:28:40 +0100
Subject: [PATCH 290/322] Move isRetryable method to BaseServiceException.Error

---
 .../google/gcloud/BaseServiceException.java   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
index b91090f94e82..0222a0d2258c 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
@@ -58,6 +58,16 @@ public String reason() {
       return reason;
     }
 
+    boolean isRetryable(Set retryableErrors) {
+      for (Error retryableError : retryableErrors) {
+        if ((retryableError.code() == null || retryableError.code().equals(this.code()))
+            && (retryableError.reason() == null || retryableError.reason().equals(this.reason()))) {
+          return true;
+        }
+      }
+      return false;
+    }
+
     @Override
     public String toString() {
       return MoreObjects.toStringHelper(this).add("code", code).add("reason", reason).toString();
@@ -83,7 +93,7 @@ public BaseServiceException(IOException exception, boolean idempotent) {
       Error error = error(((GoogleJsonResponseException) exception).getDetails());
       this.code = error.code;
       this.reason = error.reason;
-      this.retryable = isRetryable(error);
+      this.retryable = error.isRetryable(retryableErrors());
     } else {
       this.code = UNKNOWN_CODE;
       this.reason = null;
@@ -110,7 +120,7 @@ public BaseServiceException(int code, String message, String reason, boolean ide
     this.code = code;
     this.reason = reason;
     this.idempotent = idempotent;
-    this.retryable = idempotent && isRetryable(new Error(code, reason));
+    this.retryable = idempotent && new Error(code, reason).isRetryable(retryableErrors());
   }
 
   protected Set retryableErrors() {
@@ -118,7 +128,7 @@ protected Set retryableErrors() {
   }
 
   protected boolean isRetryable(GoogleJsonError error) {
-    return error != null && isRetryable(error(error));
+    return error != null && error(error).isRetryable(retryableErrors());
   }
 
   protected boolean isRetryable(IOException exception) {
@@ -128,16 +138,6 @@ protected boolean isRetryable(IOException exception) {
     return exception instanceof SocketTimeoutException;
   }
 
-  protected boolean isRetryable(Error error) {
-    for (Error retryableError : retryableErrors()) {
-      if ((retryableError.code() == null || retryableError.code().equals(error.code()))
-          && (retryableError.reason() == null || retryableError.reason().equals(error.reason()))) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   /**
    * Returns the code associated with this exception.
    */

From 3026e77428e35d47f2e68541849082710394a8c8 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 21 Jan 2016 09:32:43 +0100
Subject: [PATCH 291/322] Rename Storage.apply to Storage.submit

---
 .../main/java/com/google/gcloud/storage/Bucket.java    |  2 +-
 .../main/java/com/google/gcloud/storage/Storage.java   |  2 +-
 .../java/com/google/gcloud/storage/StorageImpl.java    |  8 ++++----
 .../java/com/google/gcloud/storage/BucketTest.java     |  2 +-
 .../java/com/google/gcloud/storage/ITStorageTest.java  | 10 +++++-----
 .../com/google/gcloud/storage/StorageImplTest.java     |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index d0e823492ee3..3acd3f5d79b9 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -319,7 +319,7 @@ public List get(String blobName1, String blobName2, String... blobNames) {
       batch.get(info.name(), name);
     }
     List blobs = new ArrayList<>(blobNames.length);
-    BatchResponse response = storage.apply(batch.build());
+    BatchResponse response = storage.submit(batch.build());
     for (BatchResponse.Result result : response.gets()) {
       BlobInfo blobInfo = result.get();
       blobs.add(blobInfo != null ? new Blob(storage, blobInfo) : null);
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index f8c90ff42930..272c5fdef223 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -1412,7 +1412,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    * @return the batch response
    * @throws StorageException upon failure
    */
-  BatchResponse apply(BatchRequest batchRequest);
+  BatchResponse submit(BatchRequest batchRequest);
 
   /**
    * Return a channel for reading the blob's content. The blob's latest generation is read. If the
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
index a4b6c56e5ede..b6a833f26ab4 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -441,7 +441,7 @@ public byte[] call() {
   }
 
   @Override
-  public BatchResponse apply(BatchRequest batchRequest) {
+  public BatchResponse submit(BatchRequest batchRequest) {
     List>> toDelete =
         Lists.newArrayListWithCapacity(batchRequest.toDelete().size());
     for (Map.Entry> entry : batchRequest.toDelete().entrySet()) {
@@ -592,7 +592,7 @@ public List get(BlobId... blobIds) {
     for (BlobId blob : blobIds) {
       requestBuilder.get(blob);
     }
-    BatchResponse response = apply(requestBuilder.build());
+    BatchResponse response = submit(requestBuilder.build());
     return Collections.unmodifiableList(transformResultList(response.gets(), null));
   }
 
@@ -602,7 +602,7 @@ public List update(BlobInfo... blobInfos) {
     for (BlobInfo blobInfo : blobInfos) {
       requestBuilder.update(blobInfo);
     }
-    BatchResponse response = apply(requestBuilder.build());
+    BatchResponse response = submit(requestBuilder.build());
     return Collections.unmodifiableList(transformResultList(response.updates(), null));
   }
 
@@ -612,7 +612,7 @@ public List delete(BlobId... blobIds) {
     for (BlobId blob : blobIds) {
       requestBuilder.delete(blob);
     }
-    BatchResponse response = apply(requestBuilder.build());
+    BatchResponse response = submit(requestBuilder.build());
     return Collections.unmodifiableList(transformResultList(response.deletes(), Boolean.FALSE));
   }
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
index e67e7aff17dc..4e253033c6f2 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -175,7 +175,7 @@ public void testGetAll() throws Exception {
     }
     BatchResponse response = new BatchResponse(Collections.>emptyList(),
         Collections.>emptyList(), batchResultList);
-    expect(storage.apply(capture(capturedBatchRequest))).andReturn(response);
+    expect(storage.submit(capture(capturedBatchRequest))).andReturn(response);
     replay(storage);
     List blobs = bucket.get("n1", "n2", "n3");
     Set blobInfoSet = capturedBatchRequest.getValue().toGet().keySet();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
index 614ceee7b61e..63b9d739b686 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -584,7 +584,7 @@ public void testBatchRequest() {
         .update(updatedBlob1)
         .update(updatedBlob2)
         .build();
-    BatchResponse updateResponse = storage.apply(updateRequest);
+    BatchResponse updateResponse = storage.submit(updateRequest);
     assertEquals(2, updateResponse.updates().size());
     assertEquals(0, updateResponse.deletes().size());
     assertEquals(0, updateResponse.gets().size());
@@ -602,7 +602,7 @@ public void testBatchRequest() {
         .get(BUCKET, sourceBlobName1)
         .get(BUCKET, sourceBlobName2)
         .build();
-    BatchResponse getResponse = storage.apply(getRequest);
+    BatchResponse getResponse = storage.submit(getRequest);
     assertEquals(2, getResponse.gets().size());
     assertEquals(0, getResponse.deletes().size());
     assertEquals(0, getResponse.updates().size());
@@ -616,7 +616,7 @@ public void testBatchRequest() {
         .delete(BUCKET, sourceBlobName1)
         .delete(BUCKET, sourceBlobName2)
         .build();
-    BatchResponse deleteResponse = storage.apply(deleteRequest);
+    BatchResponse deleteResponse = storage.submit(deleteRequest);
     assertEquals(2, deleteResponse.deletes().size());
     assertEquals(0, deleteResponse.gets().size());
     assertEquals(0, deleteResponse.updates().size());
@@ -646,7 +646,7 @@ public void testBatchRequestManyDeletes() {
         .get(BUCKET, sourceBlobName1)
         .update(updatedBlob2)
         .build();
-    BatchResponse response = storage.apply(updateRequest);
+    BatchResponse response = storage.submit(updateRequest);
     assertEquals(2 * MAX_BATCH_DELETES, response.deletes().size());
     assertEquals(1, response.updates().size());
     assertEquals(1, response.gets().size());
@@ -685,7 +685,7 @@ public void testBatchRequestFail() {
         .get(BUCKET, blobName, Storage.BlobGetOption.generationMatch(-1L))
         .get(BlobId.of(BUCKET, blobName, -1L))
         .build();
-    BatchResponse batchResponse = storage.apply(batchRequest);
+    BatchResponse batchResponse = storage.submit(batchRequest);
     assertEquals(1, batchResponse.updates().size());
     assertEquals(2, batchResponse.deletes().size());
     assertEquals(2, batchResponse.gets().size());
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
index b8da0580cd4a..f32a51507857 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -975,7 +975,7 @@ public Tuple apply(StorageObject f) {
     EasyMock.expect(storageRpcMock.batch(EasyMock.capture(capturedBatchRequest))).andReturn(res);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    BatchResponse batchResponse = storage.apply(req);
+    BatchResponse batchResponse = storage.submit(req);
 
     // Verify captured StorageRpc.BatchRequest
     List>> capturedToDelete =

From 2e38f0219904e8d52bbd10de15610d5814f5e30b Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 21 Jan 2016 11:09:32 +0100
Subject: [PATCH 292/322] Add code to initialize BigQueryError in
 BigQueryException

---
 .../google/gcloud/bigquery/BigQueryException.java   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
index b0cca68e3e0a..d07843583bee 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
@@ -16,6 +16,8 @@
 
 package com.google.gcloud.bigquery;
 
+import com.google.api.client.googleapis.json.GoogleJsonError;
+import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.BaseServiceException;
 import com.google.gcloud.RetryHelper.RetryHelperException;
@@ -53,7 +55,16 @@ public BigQueryException(int code, String message, BigQueryError error) {
 
   public BigQueryException(IOException exception) {
     super(exception, true);
-    this.error = null;
+    BigQueryError bigqueryError = null;
+    if (exception instanceof GoogleJsonResponseException) {
+      GoogleJsonError error = ((GoogleJsonResponseException) exception).getDetails();
+      if (error != null && error.getErrors() != null  && !error.getErrors().isEmpty()) {
+        GoogleJsonError.ErrorInfo errorInfo = error.getErrors().get(0);
+        bigqueryError = new BigQueryError(errorInfo.getReason(), errorInfo.getLocation(),
+            errorInfo.getMessage(), (String) error.get("debugInfo"));
+      }
+    }
+    this.error = bigqueryError;
   }
 
   /**

From 3521bf59218bc7a0c59d53566546af3cbe1d8b52 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 21 Jan 2016 11:59:29 +0100
Subject: [PATCH 293/322] Add equals and hashCode to BaseTableInfo subclasses

---
 .../google/gcloud/bigquery/ExternalTableInfo.java   | 13 +++++++++++++
 .../java/com/google/gcloud/bigquery/TableInfo.java  | 10 ++++++++++
 .../java/com/google/gcloud/bigquery/ViewInfo.java   | 11 +++++++++++
 3 files changed, 34 insertions(+)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
index 177f8a7db2b8..21ccb3fc1642 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
@@ -21,6 +21,8 @@
 import com.google.api.services.bigquery.model.Table;
 import com.google.common.base.MoreObjects.ToStringHelper;
 
+import java.util.Objects;
+
 /**
  * Google BigQuery External Table information. BigQuery's external tables are tables whose data
  * reside outside of BigQuery but can be queried as normal BigQuery tables. External tables are
@@ -103,6 +105,17 @@ ToStringHelper toStringHelper() {
     return super.toStringHelper().add("configuration", configuration);
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ExternalTableInfo
+        && Objects.equals(toPb(), ((ExternalTableInfo) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), configuration);
+  }
+
   @Override
   Table toPb() {
     Table tablePb = super.toPb();
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index 05fb6908a51b..54258abc6ddd 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -213,6 +213,16 @@ ToStringHelper toStringHelper() {
         .add("streamingBuffer", streamingBuffer);
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof TableInfo && Objects.equals(toPb(), ((TableInfo) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), location, streamingBuffer);
+  }
+
   @Override
   Table toPb() {
     Table tablePb = super.toPb();
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
index 771a7a679c11..9af9e9d7a08e 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
@@ -25,6 +25,7 @@
 import com.google.common.collect.Lists;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Google BigQuery View Table information. BigQuery's views are logical views, not materialized
@@ -143,6 +144,16 @@ ToStringHelper toStringHelper() {
         .add("userDefinedFunctions", userDefinedFunctions);
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ViewInfo && Objects.equals(toPb(), ((ViewInfo) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), query, userDefinedFunctions);
+  }
+
   @Override
   Table toPb() {
     Table tablePb = super.toPb();

From e27b5b3d81c52c1a77e9e2c8a5b6f05a8544516e Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 21 Jan 2016 20:35:31 +0100
Subject: [PATCH 294/322] Minor fixes to bigquery - Add defaultDataset to
 QueryJobInfo and QueryRequest that takes a string - Rename jobComplete to
 jobCompleted in QueryResult - Use FileChannel.transferTo in bigquery example
 to upload file

---
 .../com/google/gcloud/bigquery/BigQuery.java  |  2 +-
 .../google/gcloud/bigquery/BigQueryImpl.java  |  6 ++---
 .../google/gcloud/bigquery/QueryJobInfo.java  |  8 +++++++
 .../google/gcloud/bigquery/QueryRequest.java  | 17 +++++++++-----
 .../google/gcloud/bigquery/QueryResponse.java | 22 +++++++++----------
 .../gcloud/bigquery/BigQueryImplTest.java     |  8 +++----
 .../gcloud/bigquery/ITBigQueryTest.java       |  8 +++----
 .../gcloud/bigquery/QueryResponseTest.java    | 10 ++++-----
 .../gcloud/bigquery/SerializationTest.java    |  2 +-
 .../gcloud/examples/BigQueryExample.java      | 14 ++++++------
 10 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
index aa516c31fb54..d3c712229348 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
@@ -443,7 +443,7 @@ public static QueryResultsOption startIndex(long startIndex) {
     /**
      * Returns an option that sets how long to wait for the query to complete, in milliseconds,
      * before returning. Default is 10 seconds. If the timeout passes before the job completes,
-     * {@link QueryResponse#jobComplete()} will be {@code false}.
+     * {@link QueryResponse#jobCompleted()} will be {@code false}.
      */
     public static QueryResultsOption maxWaitTime(long maxWaitTime) {
       checkArgument(maxWaitTime >= 0);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
index ad55056474fb..18368b6fa4f7 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -514,10 +514,10 @@ public com.google.api.services.bigquery.model.QueryResponse call() {
       QueryResponse.Builder builder = QueryResponse.builder();
       JobId completeJobId = JobId.fromPb(results.getJobReference());
       builder.jobId(completeJobId);
-      builder.jobComplete(results.getJobComplete());
+      builder.jobCompleted(results.getJobComplete());
       List rowsPb = results.getRows();
       if (results.getJobComplete()) {
-        builder.jobComplete(true);
+        builder.jobCompleted(true);
         QueryResult.Builder resultBuilder = transformQueryResults(completeJobId, rowsPb,
             results.getPageToken(), options(), ImmutableMap.of());
         resultBuilder.totalBytesProcessed(results.getTotalBytesProcessed());
@@ -561,7 +561,7 @@ public GetQueryResultsResponse call() {
       JobId completeJobId = JobId.fromPb(results.getJobReference());
       builder.jobId(completeJobId);
       builder.etag(results.getEtag());
-      builder.jobComplete(results.getJobComplete());
+      builder.jobCompleted(results.getJobComplete());
       List rowsPb = results.getRows();
       if (results.getJobComplete()) {
         QueryResult.Builder resultBuilder = transformQueryResults(completeJobId, rowsPb,
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
index e11e8d6aa8ad..ad76d229bf2d 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
@@ -225,6 +225,14 @@ public Builder defaultDataset(DatasetId defaultDataset) {
       return self();
     }
 
+    /**
+     * Sets the default dataset. This dataset is used for all unqualified table names used in the
+     * query.
+     */
+    public Builder defaultDataset(String defaultDataset) {
+      return defaultDataset(DatasetId.of(defaultDataset));
+    }
+
     /**
      * Sets a priority for the query. If not specified the priority is assumed to be
      * {@link Priority#INTERACTIVE}.
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
index 0c0cf3de761d..64fbb3e931fc 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
@@ -29,10 +29,10 @@
  * a temporary table that is deleted approximately 24 hours after the query is run. The query is run
  * through a BigQuery Job whose identity can be accessed via {@link QueryResponse#jobId()}. If the
  * query does not complete within the provided {@link Builder#maxWaitTime(Long)}, the response
- * returned by {@link BigQuery#query(QueryRequest)} will have {@link QueryResponse#jobComplete()}
+ * returned by {@link BigQuery#query(QueryRequest)} will have {@link QueryResponse#jobCompleted()}
  * set to {@code false} and {@link QueryResponse#result()} set to {@code null}. To obtain query
  * results you can use {@link BigQuery#getQueryResults(JobId, BigQuery.QueryResultsOption...)} until
- * {@link QueryResponse#jobComplete()} returns {@code true}.
+ * {@link QueryResponse#jobCompleted()} returns {@code true}.
  *
  * 
    Example usage of a query request:
  * 
        {@code
@@ -43,7 +43,7 @@
  *      .maxResults(1000L)
  *      .build();
  *    QueryResponse response = bigquery.query(request);
- *    while (!response.jobComplete()) {
+ *    while (!response.jobCompleted()) {
  *      Thread.sleep(1000);
  *      response = bigquery.getQueryResults(response.jobId());
  *    }
@@ -109,11 +109,18 @@ public Builder defaultDataset(DatasetId defaultDataset) {
       return this;
     }
 
+    /**
+     * Sets the default dataset to assume for any unqualified table names in the query.
+     */
+    public Builder defaultDataset(String defaultDataset) {
+      return defaultDataset(DatasetId.of(defaultDataset));
+    }
+
     /**
      * Sets how long to wait for the query to complete, in milliseconds, before the request times
      * out and returns. Note that this is only a timeout for the request, not the query. If the
      * query takes longer to run than the timeout value, the call returns without any results and
-     * with the {@link QueryResponse#jobComplete()} set to {@code false}. If not set, a wait time of
+     * with the {@link QueryResponse#jobCompleted()} set to {@code false}. If not set, a wait time of
      * 10000 milliseconds (10 seconds) is used.
      */
     public Builder maxWaitTime(Long maxWaitTime) {
@@ -182,7 +189,7 @@ public DatasetId defaultDataset() {
    * Returns how long to wait for the query to complete, in milliseconds, before the request times
    * out and returns. Note that this is only a timeout for the request, not the query. If the
    * query takes longer to run than the timeout value, the call returns without any results and
-   * with the {@link QueryResponse#jobComplete()} set to {@code false}. You can call
+   * with the {@link QueryResponse#jobCompleted()} set to {@code false}. You can call
    * {@link BigQuery#getQueryResults(JobId, BigQuery.QueryResultsOption...)} to wait for the query
    * to complete and read the results. If not set, a wait time of 10000 milliseconds (10 seconds)
    * is used.
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
index 8ef8351d9e1a..77386747754f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
@@ -31,7 +31,7 @@
  * 
    Example usage of a query response:
  * 
        {@code
  *    QueryResponse response = bigquery.query(request);
- *    while (!response.jobComplete()) {
+ *    while (!response.jobCompleted()) {
  *      Thread.sleep(1000);
  *      response = bigquery.getQueryResults(response.jobId());
  *    }
@@ -56,7 +56,7 @@ public class QueryResponse implements Serializable {
   private final QueryResult result;
   private final String etag;
   private final JobId jobId;
-  private final boolean jobComplete;
+  private final boolean jobCompleted;
   private final List executionErrors;
 
   static final class Builder {
@@ -64,7 +64,7 @@ static final class Builder {
     private QueryResult result;
     private String etag;
     private JobId jobId;
-    private boolean jobComplete;
+    private boolean jobCompleted;
     private List executionErrors;
 
     private Builder() {}
@@ -84,8 +84,8 @@ Builder jobId(JobId jobId) {
       return this;
     }
 
-    Builder jobComplete(boolean jobComplete) {
-      this.jobComplete = jobComplete;
+    Builder jobCompleted(boolean jobCompleted) {
+      this.jobCompleted = jobCompleted;
       return this;
     }
 
@@ -103,13 +103,13 @@ private QueryResponse(Builder builder) {
     this.result = builder.result;
     this.etag = builder.etag;
     this.jobId = builder.jobId;
-    this.jobComplete = builder.jobComplete;
+    this.jobCompleted = builder.jobCompleted;
     this.executionErrors = builder.executionErrors != null ? builder.executionErrors
       : ImmutableList.of();
   }
 
   /**
-   * Returns the result of the query. Returns {@code null} if {@link #jobComplete()} is {@code
+   * Returns the result of the query. Returns {@code null} if {@link #jobCompleted()} is {@code
    * false}.
    */
   public QueryResult result() {
@@ -137,8 +137,8 @@ public JobId jobId() {
    * {@link #result()} returns {@code null}. This method can be used to check if query execution
    * completed and results are available.
    */
-  public boolean jobComplete() {
-    return jobComplete;
+  public boolean jobCompleted() {
+    return jobCompleted;
   }
 
   /**
@@ -164,7 +164,7 @@ public String toString() {
         .add("result", result)
         .add("etag", etag)
         .add("jobId", jobId)
-        .add("jobComplete", jobComplete)
+        .add("jobCompleted", jobCompleted)
         .add("executionErrors", executionErrors)
         .toString();
   }
@@ -183,7 +183,7 @@ public boolean equals(Object obj) {
       return false;
     }
     QueryResponse response = (QueryResponse) obj;
-    return jobComplete == response.jobComplete
+    return jobCompleted == response.jobCompleted
         && Objects.equals(etag, response.etag)
         && Objects.equals(result, response.result)
         && Objects.equals(jobId, response.jobId)
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index b54a989fb5e5..021c356320da 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -902,7 +902,7 @@ public void testQueryRequest() {
     assertNull(response.etag());
     assertNull(response.result());
     assertEquals(queryJob, response.jobId());
-    assertEquals(false, response.jobComplete());
+    assertEquals(false, response.jobCompleted());
     assertEquals(ImmutableList.of(), response.executionErrors());
     assertFalse(response.hasErrors());
     assertEquals(null, response.result());
@@ -926,7 +926,7 @@ public void testQueryRequestCompleted() {
     QueryResponse response = bigquery.query(QUERY_REQUEST);
     assertNull(response.etag());
     assertEquals(queryJob, response.jobId());
-    assertEquals(true, response.jobComplete());
+    assertEquals(true, response.jobCompleted());
     assertEquals(false, response.result().cacheHit());
     assertEquals(ImmutableList.of(), response.executionErrors());
     assertFalse(response.hasErrors());
@@ -959,7 +959,7 @@ public void testGetQueryResults() {
     QueryResponse response = bigquery.getQueryResults(queryJob);
     assertEquals("etag", response.etag());
     assertEquals(queryJob, response.jobId());
-    assertEquals(true, response.jobComplete());
+    assertEquals(true, response.jobCompleted());
     assertEquals(false, response.result().cacheHit());
     assertEquals(ImmutableList.of(), response.executionErrors());
     assertFalse(response.hasErrors());
@@ -993,7 +993,7 @@ public void testGetQueryResultsWithOptions() {
         QUERY_RESULTS_OPTION_INDEX, QUERY_RESULTS_OPTION_MAX_RESULTS,
         QUERY_RESULTS_OPTION_PAGE_TOKEN);
     assertEquals(queryJob, response.jobId());
-    assertEquals(true, response.jobComplete());
+    assertEquals(true, response.jobCompleted());
     assertEquals(false, response.result().cacheHit());
     assertEquals(ImmutableList.of(), response.executionErrors());
     assertFalse(response.hasErrors());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index 528df30d0a61..f672815bcb7a 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -320,7 +320,7 @@ public void testCreateExternalTable() throws InterruptedException {
         .maxResults(1000L)
         .build();
     QueryResponse response = bigquery.query(request);
-    while (!response.jobComplete()) {
+    while (!response.jobCompleted()) {
       response = bigquery.getQueryResults(response.jobId());
       Thread.sleep(1000);
     }
@@ -382,7 +382,7 @@ public void testCreateViewTable() throws InterruptedException {
         .maxResults(1000L)
         .build();
     QueryResponse response = bigquery.query(request);
-    while (!response.jobComplete()) {
+    while (!response.jobCompleted()) {
       response = bigquery.getQueryResults(response.jobId());
       Thread.sleep(1000);
     }
@@ -627,7 +627,7 @@ public void testQuery() throws InterruptedException {
         .maxResults(1000L)
         .build();
     QueryResponse response = bigquery.query(request);
-    while (!response.jobComplete()) {
+    while (!response.jobCompleted()) {
       Thread.sleep(1000);
       response = bigquery.getQueryResults(response.jobId());
     }
@@ -786,7 +786,7 @@ public void testQueryJob() throws InterruptedException {
     assertNull(remoteJob.status().error());
 
     QueryResponse response = bigquery.getQueryResults(remoteJob.jobId());
-    while (!response.jobComplete()) {
+    while (!response.jobCompleted()) {
       Thread.sleep(1000);
       response = bigquery.getQueryResults(response.jobId());
     }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
index 3ecae9b76e18..08e885c8b3aa 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryResponseTest.java
@@ -64,7 +64,7 @@ public QueryResult nextPage() {
   private static final QueryResponse QUERY_RESPONSE = QueryResponse.builder()
       .etag(ETAG)
       .jobId(JOB_ID)
-      .jobComplete(JOB_COMPLETE)
+      .jobCompleted(JOB_COMPLETE)
       .executionErrors(ERRORS)
       .result(QUERY_RESULT)
       .build();
@@ -74,18 +74,18 @@ public void testBuilder() {
     assertEquals(ETAG, QUERY_RESPONSE.etag());
     assertEquals(QUERY_RESULT, QUERY_RESPONSE.result());
     assertEquals(JOB_ID, QUERY_RESPONSE.jobId());
-    assertEquals(JOB_COMPLETE, QUERY_RESPONSE.jobComplete());
+    assertEquals(JOB_COMPLETE, QUERY_RESPONSE.jobCompleted());
     assertEquals(ERRORS, QUERY_RESPONSE.executionErrors());
     assertTrue(QUERY_RESPONSE.hasErrors());
   }
 
   @Test
   public void testBuilderIncomplete() {
-    QueryResponse queryResponse = QueryResponse.builder().jobComplete(false).build();
+    QueryResponse queryResponse = QueryResponse.builder().jobCompleted(false).build();
     assertNull(queryResponse.etag());
     assertNull(queryResponse.result());
     assertNull(queryResponse.jobId());
-    assertFalse(queryResponse.jobComplete());
+    assertFalse(queryResponse.jobCompleted());
     assertEquals(ImmutableList.of(), queryResponse.executionErrors());
     assertFalse(queryResponse.hasErrors());
   }
@@ -100,7 +100,7 @@ private void compareQueryResponse(QueryResponse expected, QueryResponse value) {
     assertEquals(expected.etag(), value.etag());
     assertEquals(expected.result(), value.result());
     assertEquals(expected.jobId(), value.jobId());
-    assertEquals(expected.jobComplete(), value.jobComplete());
+    assertEquals(expected.jobCompleted(), value.jobCompleted());
     assertEquals(expected.executionErrors(), value.executionErrors());
     assertEquals(expected.hasErrors(), value.hasErrors());
   }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index d407ac1630e3..6068f2332866 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -213,7 +213,7 @@ public class SerializationTest {
   private static final QueryResponse QUERY_RESPONSE = QueryResponse.builder()
       .etag(ETAG)
       .jobId(JOB_ID)
-      .jobComplete(true)
+      .jobCompleted(true)
       .result(QUERY_RESULT)
       .build();
 
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
index 2f8a768f3669..895502e3d6d5 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
@@ -44,7 +44,6 @@
 import com.google.gcloud.bigquery.ViewInfo;
 import com.google.gcloud.spi.BigQueryRpc.Tuple;
 
-import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -99,6 +98,7 @@
  */
 public class BigQueryExample {
 
+  private static final int CHUNK_SIZE = 8 * 256 * 1024;
   private static final Map CREATE_ACTIONS = new HashMap<>();
   private static final Map INFO_ACTIONS = new HashMap<>();
   private static final Map LIST_ACTIONS = new HashMap<>();
@@ -627,7 +627,7 @@ private static class QueryAction extends BigQueryAction {
     void run(BigQuery bigquery, QueryRequest queryRequest) throws Exception {
       System.out.println("Running query");
       QueryResponse queryResponse = bigquery.query(queryRequest);
-      while (!queryResponse.jobComplete()) {
+      while (!queryResponse.jobCompleted()) {
         System.out.println("Waiting for query job " + queryResponse.jobId() + " to complete");
         Thread.sleep(1000L);
         queryResponse = bigquery.getQueryResults(queryResponse.jobId());
@@ -676,12 +676,12 @@ private static class LoadFileAction extends BigQueryAction configuration) throws Exception {
       System.out.println("Running insert");
       try (FileChannel fileChannel = FileChannel.open(Paths.get(configuration.y()))) {
-        ByteBuffer buffer = ByteBuffer.allocate(256 * 1024);
         WriteChannel writeChannel = bigquery.writer(configuration.x());
-        while (fileChannel.read(buffer) > 0) {
-          buffer.flip();
-          writeChannel.write(buffer);
-          buffer.clear();
+        long position = 0;
+        long written = fileChannel.transferTo(position, CHUNK_SIZE, writeChannel);
+        while (written > 0) {
+          position += written;
+          written = fileChannel.transferTo(position, CHUNK_SIZE, writeChannel);
         }
         writeChannel.close();
       }

From 555cc711ba3b939b792ee232ecff814e1ab10f12 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 21 Jan 2016 13:06:03 -0800
Subject: [PATCH 295/322] Run coveralls for PRs in branches

---
 utilities/after_success.sh | 58 ++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/utilities/after_success.sh b/utilities/after_success.sh
index 05ab5fb373d6..73f5fa95dec3 100755
--- a/utilities/after_success.sh
+++ b/utilities/after_success.sh
@@ -8,36 +8,38 @@ echo "Travis branch:       " ${TRAVIS_BRANCH}
 echo "Travis pull request: " ${TRAVIS_PULL_REQUEST}
 echo "Travis JDK version:  " ${TRAVIS_JDK_VERSION}
 
-if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" ]; then
+if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" ]; then
     mvn clean cobertura:cobertura coveralls:report
-    if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then 
-      SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)')
-      if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then
-          # Deploy site if not a SNAPSHOT
-          git config --global user.name "travis-ci"
-          git config --global user.email "travis@travis-ci.org"
-          git clone --branch gh-pages --single-branch https://github.com/GoogleCloudPlatform/gcloud-java/ tmp_gh-pages
-          mkdir -p tmp_gh-pages/$SITE_VERSION
-          mvn site -DskipTests=true
-          mvn site:stage -DtopSiteURL=http://googlecloudplatform.github.io/gcloud-java/site/${SITE_VERSION}/
-          cd tmp_gh-pages
-          cp -r ../target/staging/$SITE_VERSION/* $SITE_VERSION/
-          sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" ${SITE_VERSION}/index.html # Update "Quickstart with Maven" to reflect version change
-          git add $SITE_VERSION
-          echo "" > index.html
-          git add index.html
-          echo "" > apidocs/index.html
-          git add apidocs/index.html
-          git commit -m "Added a new site for version $SITE_VERSION and updated the root directory's redirect."
-          git config --global push.default simple
-          git push --quiet "https://${CI_DEPLOY_USERNAME}:${CI_DEPLOY_PASSWORD}@github.com/GoogleCloudPlatform/gcloud-java.git" > /dev/null 2>&1
+    if [ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_BRANCH}" == "master" ]; then
+        SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)')
+        if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then
+            # Deploy site if not a SNAPSHOT
+            git config --global user.name "travis-ci"
+            git config --global user.email "travis@travis-ci.org"
+            git clone --branch gh-pages --single-branch https://github.com/GoogleCloudPlatform/gcloud-java/ tmp_gh-pages
+            mkdir -p tmp_gh-pages/$SITE_VERSION
+            mvn site -DskipTests=true
+            mvn site:stage -DtopSiteURL=http://googlecloudplatform.github.io/gcloud-java/site/${SITE_VERSION}/
+            cd tmp_gh-pages
+            cp -r ../target/staging/$SITE_VERSION/* $SITE_VERSION/
+            sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" ${SITE_VERSION}/index.html # Update "Quickstart with Maven" to reflect version change
+            git add $SITE_VERSION
+            echo "" > index.html
+            git add index.html
+            echo "" > apidocs/index.html
+            git add apidocs/index.html
+            git commit -m "Added a new site for version $SITE_VERSION and updated the root directory's redirect."
+            git config --global push.default simple
+            git push --quiet "https://${CI_DEPLOY_USERNAME}:${CI_DEPLOY_PASSWORD}@github.com/GoogleCloudPlatform/gcloud-java.git" > /dev/null 2>&1
 
-          cd ..
-          utilities/update_docs_version.sh # Update version in READMEs
-          mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
-      else
-          mvn clean deploy -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml
-      fi
+            cd ..
+            utilities/update_docs_version.sh # Update version in READMEs
+            mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
+        else
+            mvn clean deploy -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml
+        fi
+    else
+        echo "Not deploying artifacts. This is only done with non-pull-request commits to master branch with Oracle Java 7 builds."
     fi
 else
     echo "Not deploying artifacts. This is only done with non-pull-request commits to master branch with Oracle Java 7 builds."

From 55ee5aa0aaeb0d4adcb9228119f6239e6e5442e4 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 22 Jan 2016 09:47:26 +0100
Subject: [PATCH 296/322] Add location() and debugInfo() to
 BaseServiceException

---
 .../gcloud/bigquery/BigQueryException.java    | 13 ++----
 .../google/gcloud/BaseServiceException.java   | 44 +++++++++++++++----
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
index d07843583bee..c42bbd96db66 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
@@ -55,16 +55,11 @@ public BigQueryException(int code, String message, BigQueryError error) {
 
   public BigQueryException(IOException exception) {
     super(exception, true);
-    BigQueryError bigqueryError = null;
-    if (exception instanceof GoogleJsonResponseException) {
-      GoogleJsonError error = ((GoogleJsonResponseException) exception).getDetails();
-      if (error != null && error.getErrors() != null  && !error.getErrors().isEmpty()) {
-        GoogleJsonError.ErrorInfo errorInfo = error.getErrors().get(0);
-        bigqueryError = new BigQueryError(errorInfo.getReason(), errorInfo.getLocation(),
-            errorInfo.getMessage(), (String) error.get("debugInfo"));
-      }
+    BigQueryError error = null;
+    if (reason() != null) {
+      error = new BigQueryError(reason(), location(), getMessage(), debugInfo());
     }
-    this.error = bigqueryError;
+    this.error = error;
   }
 
   /**
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
index 0222a0d2258c..579340f1256e 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
@@ -86,20 +86,32 @@ public int hashCode() {
   private final boolean retryable;
   private final String reason;
   private final boolean idempotent;
+  private final String location;
+  private final String debugInfo;
 
   public BaseServiceException(IOException exception, boolean idempotent) {
     super(message(exception), exception);
+    int code = UNKNOWN_CODE;
+    String reason = null;
+    String location = null;
+    String debugInfo = null;
     if (exception instanceof GoogleJsonResponseException) {
-      Error error = error(((GoogleJsonResponseException) exception).getDetails());
-      this.code = error.code;
-      this.reason = error.reason;
-      this.retryable = error.isRetryable(retryableErrors());
-    } else {
-      this.code = UNKNOWN_CODE;
-      this.reason = null;
-      this.retryable = idempotent && isRetryable(exception);
+      GoogleJsonError jsonError = ((GoogleJsonResponseException) exception).getDetails();
+      Error error = error(jsonError);
+      code = error.code;
+      reason = error.reason;
+      if (reason != null) {
+        GoogleJsonError.ErrorInfo errorInfo = jsonError.getErrors().get(0);
+        location = errorInfo.getLocation();
+        debugInfo = (String) errorInfo.get("debugInfo");
+      }
     }
+    this.code = code;
+    this.retryable = idempotent && isRetryable(exception);
+    this.reason = reason;
     this.idempotent = idempotent;
+    this.location = location;
+    this.debugInfo = debugInfo;
   }
 
   public BaseServiceException(GoogleJsonError error, boolean idempotent) {
@@ -108,6 +120,8 @@ public BaseServiceException(GoogleJsonError error, boolean idempotent) {
     this.reason = reason(error);
     this.idempotent = idempotent;
     this.retryable = idempotent && isRetryable(error);
+    this.location = null;
+    this.debugInfo = null;
   }
 
   public BaseServiceException(int code, String message, String reason, boolean idempotent) {
@@ -121,6 +135,8 @@ public BaseServiceException(int code, String message, String reason, boolean ide
     this.reason = reason;
     this.idempotent = idempotent;
     this.retryable = idempotent && new Error(code, reason).isRetryable(retryableErrors());
+    this.location = null;
+    this.debugInfo = null;
   }
 
   protected Set retryableErrors() {
@@ -166,6 +182,18 @@ public boolean idempotent() {
     return idempotent;
   }
 
+  /**
+   * Returns the service location where the error causing the exception occurred. Returns
+   * {@code null} if not set.
+   */
+  public String location() {
+    return location;
+  }
+
+  protected String debugInfo() {
+    return debugInfo;
+  }
+
   protected static String reason(GoogleJsonError error) {
     if (error.getErrors() != null  && !error.getErrors().isEmpty()) {
       return error.getErrors().get(0).getReason();

From 973639a7b4092449106d5e300de16cc217da8eb1 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 22 Jan 2016 10:34:30 +0100
Subject: [PATCH 297/322] Add Acl.of method to storage module

---
 .../java/com/google/gcloud/storage/Acl.java   | 22 +++++++++++--------
 .../com/google/gcloud/storage/AclTest.java    |  4 ++--
 .../google/gcloud/storage/BlobInfoTest.java   |  4 ++--
 .../google/gcloud/storage/BucketInfoTest.java |  6 ++---
 .../gcloud/storage/SerializationTest.java     | 10 ++++-----
 5 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java
index 0eca39f3b3e5..4203d79351b7 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java
@@ -274,13 +274,7 @@ String toPb() {
     }
   }
 
-  /**
-   * Creates an ACL object.
-   *
-   * @param entity the entity for this ACL object
-   * @param role the role to associate to the {@code entity} object
-   */
-  public Acl(Entity entity, Role role) {
+  private Acl(Entity entity, Role role) {
     this.entity = entity;
     this.role = role;
   }
@@ -299,6 +293,16 @@ public Role role() {
     return role;
   }
 
+  /**
+   * Returns an Acl object.
+   *
+   * @param entity the entity for this ACL object
+   * @param role the role to associate to the {@code entity} object
+   */
+  public static Acl of(Entity entity, Role role) {
+    return new Acl(entity, role);
+  }
+
   @Override
   public int hashCode() {
     return Objects.hash(entity, role);
@@ -333,11 +337,11 @@ ObjectAccessControl toObjectPb() {
 
   static Acl fromPb(ObjectAccessControl objectAccessControl) {
     Role role = Role.valueOf(objectAccessControl.getRole());
-    return new Acl(Entity.fromPb(objectAccessControl.getEntity()), role);
+    return Acl.of(Entity.fromPb(objectAccessControl.getEntity()), role);
   }
 
   static Acl fromPb(BucketAccessControl bucketAccessControl) {
     Role role = Role.valueOf(bucketAccessControl.getRole());
-    return new Acl(Entity.fromPb(bucketAccessControl.getEntity()), role);
+    return Acl.of(Entity.fromPb(bucketAccessControl.getEntity()), role);
   }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/AclTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/AclTest.java
index 6a11fb0b2810..1c62805b2a1b 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/AclTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/AclTest.java
@@ -82,8 +82,8 @@ public void testRawEntity() {
 
 
   @Test
-  public void testAcl() {
-    Acl acl = new Acl(User.ofAllUsers(), Role.READER);
+  public void testOf() {
+    Acl acl = Acl.of(User.ofAllUsers(), Role.READER);
     assertEquals(User.ofAllUsers(), acl.entity());
     assertEquals(Role.READER, acl.role());
     ObjectAccessControl objectPb = acl.toObjectPb();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java
index 36b027dc7278..a1cc01f4287c 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java
@@ -34,8 +34,8 @@
 public class BlobInfoTest {
 
   private static final List ACL = ImmutableList.of(
-      new Acl(User.ofAllAuthenticatedUsers(), READER),
-      new Acl(new Project(VIEWERS, "p1"), WRITER));
+      Acl.of(User.ofAllAuthenticatedUsers(), READER),
+      Acl.of(new Project(VIEWERS, "p1"), WRITER));
   private static final Integer COMPONENT_COUNT = 2;
   private static final String CONTENT_TYPE = "text/html";
   private static final String CACHE_CONTROL = "cache";
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
index b705685a04b1..bd6bcdbbcff2 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
@@ -41,8 +41,8 @@
 public class BucketInfoTest {
 
   private static final List ACL = ImmutableList.of(
-      new Acl(User.ofAllAuthenticatedUsers(), Role.READER),
-      new Acl(new Project(VIEWERS, "p1"), Role.WRITER));
+      Acl.of(User.ofAllAuthenticatedUsers(), Role.READER),
+      Acl.of(new Project(VIEWERS, "p1"), Role.WRITER));
   private static final String ETAG = "0xFF00";
   private static final String ID = "B/N:1";
   private static final Long META_GENERATION = 10L;
@@ -51,7 +51,7 @@ public class BucketInfoTest {
   private static final Long CREATE_TIME = System.currentTimeMillis();
   private static final List CORS = Collections.singletonList(Cors.builder().build());
   private static final List DEFAULT_ACL =
-      Collections.singletonList(new Acl(User.ofAllAuthenticatedUsers(), Role.WRITER));
+      Collections.singletonList(Acl.of(User.ofAllAuthenticatedUsers(), Role.WRITER));
   private static final List DELETE_RULES =
       Collections.singletonList(new AgeDeleteRule(5));
   private static final String INDEX_PAGE = "index.html";
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
index 8506e8b48f6b..8bef27cb0cd0 100644
--- a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
+++ b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -47,6 +47,7 @@ public class SerializationTest {
   private static final Acl.Project ACL_PROJECT_ = new Acl.Project(ProjectRole.VIEWERS, "pid");
   private static final Acl.User ACL_USER = new Acl.User("user");
   private static final Acl.RawEntity ACL_RAW = new Acl.RawEntity("raw");
+  private static final Acl ACL = Acl.of(ACL_DOMAIN, Acl.Role.OWNER);
   private static final BlobInfo BLOB_INFO = BlobInfo.builder("b", "n").build();
   private static final BucketInfo BUCKET_INFO = BucketInfo.of("b");
   private static final Cors.Origin ORIGIN = Cors.Origin.any();
@@ -94,11 +95,10 @@ public void testServiceOptions() throws Exception {
 
   @Test
   public void testModelAndRequests() throws Exception {
-    Serializable[] objects = {ACL_DOMAIN, ACL_GROUP, ACL_PROJECT_, ACL_USER, ACL_RAW, BLOB_INFO,
-        BUCKET_INFO,
-        ORIGIN, CORS, BATCH_REQUEST, BATCH_RESPONSE, PAGE_RESULT, BLOB_LIST_OPTIONS,
-        BLOB_SOURCE_OPTIONS, BLOB_TARGET_OPTIONS, BUCKET_LIST_OPTIONS, BUCKET_SOURCE_OPTIONS,
-        BUCKET_TARGET_OPTIONS};
+    Serializable[] objects = {ACL_DOMAIN, ACL_GROUP, ACL_PROJECT_, ACL_USER, ACL_RAW, ACL,
+        BLOB_INFO, BUCKET_INFO, ORIGIN, CORS, BATCH_REQUEST, BATCH_RESPONSE, PAGE_RESULT,
+        BLOB_LIST_OPTIONS, BLOB_SOURCE_OPTIONS, BLOB_TARGET_OPTIONS, BUCKET_LIST_OPTIONS,
+        BUCKET_SOURCE_OPTIONS, BUCKET_TARGET_OPTIONS};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);

From c411b23813dc56e0d2a11271655cf6fb7717ca7c Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 22 Jan 2016 10:35:01 +0100
Subject: [PATCH 298/322] Add Acl.of method to bigquery module

---
 .../java/com/google/gcloud/bigquery/Acl.java  | 32 +++++++++++--------
 .../google/gcloud/bigquery/BigQueryImpl.java  |  2 +-
 .../com/google/gcloud/bigquery/AclTest.java   |  6 ++--
 .../gcloud/bigquery/BigQueryImplTest.java     |  8 ++---
 .../gcloud/bigquery/DatasetInfoTest.java      |  4 +--
 .../gcloud/bigquery/SerializationTest.java    |  8 ++---
 6 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
index c1fca9e3b350..b8e9926ce8c8 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
@@ -370,22 +370,11 @@ Access toPb() {
     }
   }
 
-  /**
-   * Build an ACL for an {@code entity} and a {@code role}.
-   */
-  public Acl(Entity entity, Role role) {
+  private Acl(Entity entity, Role role) {
     this.entity = checkNotNull(entity);
     this.role = role;
   }
 
-  /**
-   * Build an ACL for a view entity.
-   */
-  public Acl(View view) {
-    this.entity = checkNotNull(view);
-    this.role = null;
-  }
-
   /**
    * Returns the entity for this ACL.
    */
@@ -400,6 +389,23 @@ public Role role() {
     return role;
   }
 
+  /**
+   * Returns an Acl object.
+   *
+   * @param entity the entity for this ACL object
+   * @param role the role to associate to the {@code entity} object
+   */
+  public static Acl of(Entity entity, Role role) {
+    return new Acl(entity, role);
+  }
+
+  /**
+   * Returns an Acl object for a view entity.
+   */
+  public static Acl of(View view) {
+    return new Acl(view, null);
+  }
+
   @Override
   public int hashCode() {
     return Objects.hash(entity, role);
@@ -432,7 +438,7 @@ Access toPb() {
   }
 
   static Acl fromPb(Access access) {
-    return new Acl(Entity.fromPb(access),
+    return Acl.of(Entity.fromPb(access),
         access.getRole() != null ? Role.valueOf(access.getRole()) : null);
   }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
index 18368b6fa4f7..dde918d1f516 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -621,7 +621,7 @@ private DatasetInfo setProjectId(DatasetInfo dataset) {
           if (viewReferencePb.getProjectId() == null) {
             viewReferencePb.setProjectId(options().projectId());
           }
-          acls.add(new Acl(new Acl.View(TableId.fromPb(viewReferencePb))));
+          acls.add(Acl.of(new Acl.View(TableId.fromPb(viewReferencePb))));
         } else {
           acls.add(acl);
         }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java
index 52159b0665ac..438526b95b6e 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java
@@ -81,14 +81,14 @@ public void testViewEntity() {
   }
 
   @Test
-  public void testAcl() {
-    Acl acl = new Acl(Group.ofAllAuthenticatedUsers(), Role.READER);
+  public void testOf() {
+    Acl acl = Acl.of(Group.ofAllAuthenticatedUsers(), Role.READER);
     assertEquals(Group.ofAllAuthenticatedUsers(), acl.entity());
     assertEquals(Role.READER, acl.role());
     Dataset.Access pb = acl.toPb();
     assertEquals(acl, Acl.fromPb(pb));
     View view = new View(TableId.of("project", "dataset", "view"));
-    acl = new Acl(view);
+    acl = Acl.of(view);
     assertEquals(view, acl.entity());
     assertEquals(null, acl.role());
   }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index 021c356320da..3fe1824fd3c2 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -68,11 +68,11 @@ public class BigQueryImplTest {
   private static final String OTHER_TABLE = "otherTable";
   private static final String OTHER_DATASET = "otherDataset";
   private static final List ACCESS_RULES = ImmutableList.of(
-      new Acl(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
-      new Acl(new Acl.View(TableId.of("dataset", "table")), Acl.Role.WRITER));
+      Acl.of(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
+      Acl.of(new Acl.View(TableId.of("dataset", "table")), Acl.Role.WRITER));
   private static final List ACCESS_RULES_WITH_PROJECT = ImmutableList.of(
-      new Acl(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
-      new Acl(new Acl.View(TableId.of(PROJECT, "dataset", "table"))));
+      Acl.of(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
+      Acl.of(new Acl.View(TableId.of(PROJECT, "dataset", "table"))));
   private static final DatasetInfo DATASET_INFO = DatasetInfo.builder(DATASET)
       .acl(ACCESS_RULES)
       .description("description")
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
index 43c80f6afe83..733253a2d790 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
@@ -28,8 +28,8 @@
 public class DatasetInfoTest {
 
   private static final List ACCESS_RULES = ImmutableList.of(
-      new Acl(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
-      new Acl(new Acl.View(TableId.of("project", "dataset", "table")), Acl.Role.WRITER));
+      Acl.of(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
+      Acl.of(new Acl.View(TableId.of("project", "dataset", "table")), Acl.Role.WRITER));
   private static final Long CREATION_TIME = System.currentTimeMillis();
   private static final Long DEFAULT_TABLE_EXPIRATION = CREATION_TIME + 100;
   private static final String DESCRIPTION = "description";
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 6068f2332866..1a20682aa447 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -42,12 +42,12 @@
 public class SerializationTest {
 
   private static final Acl DOMAIN_ACCESS =
-      new Acl(new Acl.Domain("domain"), Acl.Role.WRITER);
+      Acl.of(new Acl.Domain("domain"), Acl.Role.WRITER);
   private static final Acl GROUP_ACCESS =
-      new Acl(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER);
-  private static final Acl USER_ACCESS = new Acl(new Acl.User("user"), Acl.Role.OWNER);
+      Acl.of(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER);
+  private static final Acl USER_ACCESS = Acl.of(new Acl.User("user"), Acl.Role.OWNER);
   private static final Acl VIEW_ACCESS =
-      new Acl(new Acl.View(TableId.of("project", "dataset", "table")), Acl.Role.WRITER);
+      Acl.of(new Acl.View(TableId.of("project", "dataset", "table")), Acl.Role.WRITER);
   private static final List ACCESS_RULES = ImmutableList.of(DOMAIN_ACCESS, GROUP_ACCESS,
       VIEW_ACCESS, USER_ACCESS);
   private static final Long CREATION_TIME = System.currentTimeMillis() - 10;

From e1ddedb296a9bd42c5e2f49983e99120e0c17a07 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 22 Jan 2016 19:50:59 +0100
Subject: [PATCH 299/322] Rename equals to baseEquals and hashCode to
 baseHashCode in BaseTableInfo

---
 .../java/com/google/gcloud/bigquery/BaseTableInfo.java    | 8 +++-----
 .../com/google/gcloud/bigquery/ExternalTableInfo.java     | 5 ++---
 .../main/java/com/google/gcloud/bigquery/TableInfo.java   | 4 ++--
 .../main/java/com/google/gcloud/bigquery/ViewInfo.java    | 4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
index 1b49a026ac14..977da0981d2a 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
@@ -386,14 +386,12 @@ public String toString() {
     return toStringHelper().toString();
   }
 
-  @Override
-  public int hashCode() {
+  protected final int baseHashCode() {
     return Objects.hash(tableId);
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof BaseTableInfo && Objects.equals(toPb(), ((BaseTableInfo) obj).toPb());
+  protected final boolean baseEquals(BaseTableInfo tableInfo) {
+    return Objects.equals(toPb(), tableInfo.toPb());
   }
 
   Table toPb() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
index 21ccb3fc1642..80a094425484 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
@@ -107,13 +107,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ExternalTableInfo
-        && Objects.equals(toPb(), ((ExternalTableInfo) obj).toPb());
+    return obj instanceof ExternalTableInfo && baseEquals((ExternalTableInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), configuration);
+    return Objects.hash(baseHashCode(), configuration);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index 54258abc6ddd..aeb1eadd9771 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -215,12 +215,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof TableInfo && Objects.equals(toPb(), ((TableInfo) obj).toPb());
+    return obj instanceof TableInfo && baseEquals((TableInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), location, streamingBuffer);
+    return Objects.hash(baseHashCode(), location, streamingBuffer);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
index 9af9e9d7a08e..2698921bc034 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
@@ -146,12 +146,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ViewInfo && Objects.equals(toPb(), ((ViewInfo) obj).toPb());
+    return obj instanceof ViewInfo && baseEquals((ViewInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), query, userDefinedFunctions);
+    return Objects.hash(baseHashCode(), query, userDefinedFunctions);
   }
 
   @Override

From e11a5aeffe778314c02ba84f06dd00d65bf063da Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 22 Jan 2016 20:01:39 +0100
Subject: [PATCH 300/322] Rename equals to baseEquals and hashCode to
 baseHashCode in JobInfo

---
 .../main/java/com/google/gcloud/bigquery/CopyJobInfo.java | 4 ++--
 .../java/com/google/gcloud/bigquery/ExtractJobInfo.java   | 4 ++--
 .../src/main/java/com/google/gcloud/bigquery/JobInfo.java | 8 +++-----
 .../main/java/com/google/gcloud/bigquery/LoadJobInfo.java | 4 ++--
 .../java/com/google/gcloud/bigquery/QueryJobInfo.java     | 4 ++--
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
index bd346a8e1633..d42c90455e50 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
@@ -178,12 +178,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof CopyJobInfo && Objects.equals(toPb(), ((CopyJobInfo) obj).toPb());
+    return obj instanceof CopyJobInfo && baseEquals((CopyJobInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), sourceTables, destinationTable, createDisposition,
+    return Objects.hash(baseHashCode(), sourceTables, destinationTable, createDisposition,
         writeDisposition);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
index effdab84f265..67f643ce4e19 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
@@ -212,12 +212,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ExtractJobInfo && Objects.equals(toPb(), ((ExtractJobInfo) obj).toPb());
+    return obj instanceof ExtractJobInfo && baseEquals((ExtractJobInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,
+    return Objects.hash(baseHashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,
         format, compression);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
index de33c483393d..e623aec26dd2 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -264,14 +264,12 @@ public String toString() {
     return toStringHelper().toString();
   }
 
-  @Override
-  public int hashCode() {
+  protected final int baseHashCode() {
     return Objects.hash(jobId);
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof JobInfo && Objects.equals(toPb(), ((JobInfo) obj).toPb());
+  protected final boolean baseEquals(JobInfo jobInfo) {
+    return Objects.equals(toPb(), jobInfo.toPb());
   }
 
   Job toPb() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
index 4f8d03cbc6a9..21fe51baa4ae 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
@@ -117,12 +117,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof LoadJobInfo && Objects.equals(toPb(), ((LoadJobInfo) obj).toPb());
+    return obj instanceof LoadJobInfo && baseEquals((LoadJobInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), sourceUris, configuration);
+    return Objects.hash(baseHashCode(), sourceUris, configuration);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
index ad76d229bf2d..e2a505ffc4dd 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
@@ -447,12 +447,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof QueryJobInfo && Objects.equals(toPb(), ((QueryJobInfo) obj).toPb());
+    return obj instanceof QueryJobInfo && baseEquals((QueryJobInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), allowLargeResults, createDisposition, destinationTable,
+    return Objects.hash(baseHashCode(), allowLargeResults, createDisposition, destinationTable,
         defaultDataset, flattenResults, priority, query, tableDefinitions, useQueryCache,
         userDefinedFunctions, writeDisposition, dryRun);
   }

From bbd3aad2df3e3111be2a1066df00eb62ae899d86 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 22 Jan 2016 16:52:48 -0800
Subject: [PATCH 301/322] Source IT env vars only when necessary

---
 utilities/after_success.sh | 2 +-
 utilities/verify.sh        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/utilities/after_success.sh b/utilities/after_success.sh
index 73f5fa95dec3..be7484806c46 100755
--- a/utilities/after_success.sh
+++ b/utilities/after_success.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-source ./utilities/integration_test_env.sh
 
 # This script is used by Travis-CI to publish artifacts (binary, sorce and javadoc jars) when releasing snapshots.
 # This script is referenced in .travis.yml.
@@ -11,6 +10,7 @@ echo "Travis JDK version:  " ${TRAVIS_JDK_VERSION}
 if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" ]; then
     mvn clean cobertura:cobertura coveralls:report
     if [ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_BRANCH}" == "master" ]; then
+        source ./utilities/integration_test_env.sh
         SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)')
         if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then
             # Deploy site if not a SNAPSHOT
diff --git a/utilities/verify.sh b/utilities/verify.sh
index d98e4ab53513..b29ab8d8f747 100755
--- a/utilities/verify.sh
+++ b/utilities/verify.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
-source ./utilities/integration_test_env.sh
-
 # This script is used by Travis-CI to run tests.
 # This script is referenced in .travis.yml.
 
 if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
+    source ./utilities/integration_test_env.sh
     # Get signing tools and API keyfile
     openssl aes-256-cbc -K $encrypted_631490ecae8f_key -iv $encrypted_631490ecae8f_iv -in target/travis/signing-tools.tar.enc -out $TRAVIS_BUILD_DIR/signing-tools.tar -d
     mkdir $TRAVIS_BUILD_DIR/signing-tools

From f11195303f281414fa10b74ca402c0a99bf77313 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 25 Jan 2016 09:34:46 -0800
Subject: [PATCH 302/322] remove check for valid utf-8 cursor

---
 .../com/google/gcloud/datastore/Cursor.java     |  2 --
 .../google/gcloud/datastore/DatastoreTest.java  | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java
index 667f3cc5e427..39963d1a543d 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java
@@ -23,7 +23,6 @@
 import com.google.api.services.datastore.DatastoreV1.Value;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Preconditions;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.TextFormat;
@@ -44,7 +43,6 @@ public final class Cursor extends Serializable {
   private final transient ByteString byteString;
 
   Cursor(ByteString byteString) {
-    Preconditions.checkArgument(byteString.isValidUtf8(), "content is not a valid UTF-8");
     this.byteString = byteString;
   }
 
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index 8cb88f9e7795..e9eed027e8e0 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -39,6 +39,7 @@
 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;
 import org.junit.AfterClass;
@@ -496,7 +497,7 @@ public void testQueryPaginationWithLimit() throws DatastoreException {
       }
       query = query.toBuilder().startCursor(results.cursorAfter()).build();
     }
-    assertEquals(totalCount, 5);
+    assertEquals(5, totalCount);
     EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 
@@ -524,7 +525,8 @@ private List buildResponsesForQueryPaginationWithLimit() {
         .setMoreResults(QueryResultBatch.MoreResultsType.MORE_RESULTS_AFTER_LIMIT)
         .clearEntityResult()
         .addAllEntityResult(queryResultBatchPb.getEntityResultList().subList(1, 2))
-        .setEndCursor(queryResultBatchPb.getEntityResultList().get(1).getCursor())
+        .setEndCursor(
+            ByteString.copyFrom(new byte[] {(byte) 0x80})) // test invalid UTF-8 string
         .build();
     responses.add(RunQueryResponse.newBuilder().setBatch(queryResultBatchPb2).build());
     QueryResultBatch queryResultBatchPb3 = QueryResultBatch.newBuilder()
@@ -546,6 +548,17 @@ private List buildResponsesForQueryPaginationWithLimit() {
     return responses;
   }
 
+  @Test
+  public void testToUrlSafe() {
+    byte[][] invalidUtf8 =
+        new byte[][] {{(byte) 0xfe}, {(byte) 0xc1, (byte) 0xbf}, {(byte) 0xc0}, {(byte) 0x80}};
+    for (byte[] bytes : invalidUtf8) {
+      assertFalse(ByteString.copyFrom(bytes).isValidUtf8());
+      Cursor cursor = new Cursor(ByteString.copyFrom(bytes));
+      assertEquals(cursor, Cursor.fromUrlSafe(cursor.toUrlSafe()));
+    }
+  }
+
   @Test
   public void testAllocateId() {
     KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND1);

From 03ca1bfbf214900f5c0dbd06fb982fe396425426 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 25 Jan 2016 12:44:49 -0800
Subject: [PATCH 303/322] Simplify to/from url safe and fix access issue in
 workaround

---
 .../com/google/gcloud/datastore/Cursor.java   | 21 ++++---------------
 .../gcloud/datastore/StructuredQuery.java     |  2 +-
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java
index 39963d1a543d..5e577f7feb6c 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java
@@ -17,20 +17,14 @@
 package com.google.gcloud.datastore;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.services.datastore.DatastoreV1;
 import com.google.api.services.datastore.DatastoreV1.Value;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.io.BaseEncoding;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.TextFormat;
-import com.google.protobuf.TextFormat.ParseException;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 
 /**
  * A Google Cloud Datastore cursor.
@@ -74,11 +68,7 @@ ByteString byteString() {
    * Returns the cursor in an encoded form that can be used as part of a URL.
    */
   public String toUrlSafe() {
-    try {
-      return URLEncoder.encode(TextFormat.printToString(toPb()), UTF_8.name());
-    } catch (UnsupportedEncodingException e) {
-      throw new IllegalStateException("Unexpected encoding exception", e);
-    }
+    return BaseEncoding.base64Url().encode(byteString.toByteArray());
   }
 
   /**
@@ -86,11 +76,8 @@ public String toUrlSafe() {
    */
   public static Cursor fromUrlSafe(String urlSafe) {
     try {
-      String utf8Str = URLDecoder.decode(urlSafe, UTF_8.name());
-      DatastoreV1.Value.Builder builder = DatastoreV1.Value.newBuilder();
-      TextFormat.merge(utf8Str, builder);
-      return fromPb(builder.build());
-    } catch (UnsupportedEncodingException | ParseException e) {
+      return Cursor.copyFrom(BaseEncoding.base64Url().decode(urlSafe));
+    } catch (IllegalArgumentException e) {
       throw new IllegalStateException("Unexpected decoding exception", e);
     }
   }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
index bbb73df4a79c..b8d9dfe87902 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -782,7 +782,7 @@ public StructuredQuery build() {
     }
   }
 
-  static final class Builder extends BaseBuilder> {
+  public static final class Builder extends BaseBuilder> {
 
     Builder(ResultType resultType) {
       super(resultType);

From 830d87ce8376f4641ad6abe236836004597ab1f8 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 25 Jan 2016 16:23:17 -0800
Subject: [PATCH 304/322] Use pagination in DatastoreExample and fix readme bug
 and formatting

---
 gcloud-java-examples/README.md                | 94 +++++++++----------
 .../gcloud/examples/DatastoreExample.java     | 38 +++++---
 2 files changed, 71 insertions(+), 61 deletions(-)

diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index 8d64c8ea202f..3d9baadf0b6b 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -39,54 +39,54 @@ To run examples from your command line:
 
 4. Run an example using Maven from command line.
 
-  Here's an example run of `BigQueryExample`.
-
-  Before running the example, go to the [Google Developers Console][developers-console] to ensure
-  that BigQuery API is enabled. You can upload a CSV file `my_csv_file` to the `my_bucket` bucket
-  (replace `my_csv_file` and `my_bucket` with actual file and bucket names) using the GCS
-  [web browser](https://console.developers.google.com/storage/browser). The CSV file will be used to
-  load data into a BigQuery table and should look something like:
-  ```csv
-  value1
-  value2
-  value3
-  ```
-  Then you are ready to run the following example:
-  ```
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="create dataset new_dataset_id"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="create table new_dataset_id new_table_id field_name:string"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="list tables new_dataset_id"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="load new_dataset_id new_table_id CSV gs://my_bucket/my_csv_file"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="query 'select * from new_dataset_id.new_table_id'"
-  ```
-
-  Here's an example run of `DatastoreExample`.
+  * Here's an example run of `BigQueryExample`.
+
+    Before running the example, go to the [Google Developers Console][developers-console] to ensure
+    that BigQuery API is enabled. You can upload a CSV file `my_csv_file` to the `my_bucket` bucket
+    (replace `my_csv_file` and `my_bucket` with actual file and bucket names) using the GCS
+    [web browser](https://console.developers.google.com/storage/browser). The CSV file will be used to
+    load data into a BigQuery table and should look something like:
+    ```csv
+    value1
+    value2
+    value3
+    ```
+    Then you are ready to run the following example:
+    ```
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="create dataset new_dataset_id"
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="create table new_dataset_id new_table_id field_name:string"
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="list tables new_dataset_id"
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="load new_dataset_id new_table_id CSV gs://my_bucket/my_csv_file"
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.BigQueryExample" -Dexec.args="query 'select * from new_dataset_id.new_table_id'"
+    ```
+
+  * Here's an example run of `DatastoreExample`.
   
-  Note that you have to enable the Google Cloud Datastore API on the [Google Developers Console][developers-console] before running the following commands.
-  ```
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.DatastoreExample" -Dexec.args="my_name add my\ comment"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.DatastoreExample" -Dexec.args="my_name display"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.DatastoreExample" -Dexec.args="my_name delete"
-  ```
-
-  Here's an example run of `ResourceManagerExample`.
-
-  Be sure to change the placeholder project ID "my-project-id" with your own globally unique project ID.
-  ```
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" -Dexec.args="create my-project-id"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" -Dexec.args="list"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" -Dexec.args="get my-project-id"
-  ```
-
-  Here's an example run of `StorageExample`.
-
-  Before running the example, go to the [Google Developers Console][developers-console] to ensure that Google Cloud Storage API is enabled and that you have a bucket.  Also ensure that you have a test file (`test.txt` is chosen here) to upload to Cloud Storage stored locally on your machine.
-  ```
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="upload /path/to/test.txt "
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="list "
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="download  test.txt"
-  $mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="delete  test.txt"
-  ```
+    Be sure to change the placeholder project ID "your-project-id" with your own project ID. Also note that you have to enable the Google Cloud Datastore API on the [Google Developers Console][developers-console] before running the following commands.
+    ```
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.DatastoreExample" -Dexec.args="your-project-id my_name add my\ comment"
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.DatastoreExample" -Dexec.args="your-project-id my_name display"
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.DatastoreExample" -Dexec.args="your-project-id my_name delete"
+    ```
+
+  * Here's an example run of `ResourceManagerExample`.
+
+    Be sure to change the placeholder project ID "your-project-id" with your own globally unique project ID.
+    ```
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" -Dexec.args="create your-project-id"
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" -Dexec.args="list"
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.ResourceManagerExample" -Dexec.args="get your-project-id"
+    ```
+
+  * Here's an example run of `StorageExample`.
+
+    Before running the example, go to the [Google Developers Console][developers-console] to ensure that Google Cloud Storage API is enabled and that you have a bucket.  Also ensure that you have a test file (`test.txt` is chosen here) to upload to Cloud Storage stored locally on your machine.
+    ```
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="upload /path/to/test.txt "
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="list "
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="download  test.txt"
+    mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample" -Dexec.args="delete  test.txt"
+    ```
 
 Troubleshooting
 ---------------
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
index e408bab1338e..62d39c32204d 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
@@ -25,8 +25,8 @@
 import com.google.gcloud.datastore.Key;
 import com.google.gcloud.datastore.KeyFactory;
 import com.google.gcloud.datastore.Query;
-import com.google.gcloud.datastore.Query.ResultType;
 import com.google.gcloud.datastore.QueryResults;
+import com.google.gcloud.datastore.StructuredQuery;
 import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
 import com.google.gcloud.datastore.Transaction;
 
@@ -100,21 +100,31 @@ public void run(Transaction tx, Key userKey, String... args) {
         return;
       }
       System.out.printf("User '%s' has %d comment[s].%n", userKey.name(), user.getLong("count"));
-      // ORDER BY timestamp";
-      String gql = "SELECT * FROM " + COMMENT_KIND + " WHERE __key__ HAS ANCESTOR @1";
-      Query query = Query.gqlQueryBuilder(ResultType.ENTITY, gql)
-          .namespace(NAMESPACE)
-          .addBinding(userKey)
-          .build();
-      QueryResults results = tx.run(query);
-      // We could have added "ORDER BY timestamp" to the query to avoid the sorting bellow
-      // but that would require adding an ancestor index for timestamp
-      // see: https://cloud.google.com/datastore/docs/tools/indexconfig
+      int limit = 10;
       Map sortedComments = new TreeMap<>();
-      while (results.hasNext()) {
-        Entity result = results.next();
-        sortedComments.put(result.getDateTime("timestamp"), result.getString("content"));
+      StructuredQuery query =
+          Query.entityQueryBuilder()
+              .namespace(NAMESPACE)
+              .kind(COMMENT_KIND)
+              .filter(PropertyFilter.hasAncestor(userKey))
+              .limit(limit)
+              .build();
+      while (true) {
+        QueryResults results = tx.run(query);
+        int resultCount = 0;
+        while (results.hasNext()) {
+          Entity result = results.next();
+          sortedComments.put(result.getDateTime("timestamp"), result.getString("content"));
+          resultCount++;
+        }
+        if (resultCount < limit) {
+          break;
+        }
+        query = query.toBuilder().startCursor(results.cursorAfter()).build();
       }
+      // We could have added "ORDER BY timestamp" to the query to avoid sorting, but that would
+      // require adding an ancestor index for timestamp.
+      // See: https://cloud.google.com/datastore/docs/tools/indexconfig
       for (Map.Entry entry : sortedComments.entrySet()) {
         System.out.printf("\t%s: %s%n", entry.getKey(), entry.getValue());
       }

From 360e048824a322a0b065e71380be9a28caa81788 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 25 Jan 2016 16:51:13 -0800
Subject: [PATCH 305/322] Increase limit on query size

---
 .../main/java/com/google/gcloud/examples/DatastoreExample.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
index 62d39c32204d..1e65a018a1fb 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java
@@ -100,7 +100,7 @@ public void run(Transaction tx, Key userKey, String... args) {
         return;
       }
       System.out.printf("User '%s' has %d comment[s].%n", userKey.name(), user.getLong("count"));
-      int limit = 10;
+      int limit = 200;
       Map sortedComments = new TreeMap<>();
       StructuredQuery query =
           Query.entityQueryBuilder()

From 84402ac4ffc4e817b67ebeae9382683e7ce12b89 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Tue, 26 Jan 2016 16:29:46 +0100
Subject: [PATCH 306/322] Remove JobInfo hierarchy, add JobConfiguration
 hierarchy

---
 .../com/google/gcloud/bigquery/BigQuery.java  |  15 +-
 .../google/gcloud/bigquery/BigQueryImpl.java  |  86 +++--
 .../gcloud/bigquery/CopyJobConfiguration.java | 225 +++++++++++
 .../google/gcloud/bigquery/CopyJobInfo.java   | 258 -------------
 ...Info.java => ExtractJobConfiguration.java} | 141 +++----
 .../gcloud/bigquery/JobConfiguration.java     |  50 +++
 .../com/google/gcloud/bigquery/JobInfo.java   | 177 +++++----
 .../google/gcloud/bigquery/JobStatistics.java |   2 +-
 .../gcloud/bigquery/LoadConfiguration.java    | 102 ++---
 .../gcloud/bigquery/LoadJobConfiguration.java | 190 ++++++++++
 .../google/gcloud/bigquery/LoadJobInfo.java   | 186 ---------
 ...obInfo.java => QueryJobConfiguration.java} | 135 ++++---
 .../google/gcloud/bigquery/QueryRequest.java  |   4 +-
 .../com/google/gcloud/bigquery/Table.java     |  13 +-
 .../com/google/gcloud/spi/BigQueryRpc.java    |   4 +-
 .../google/gcloud/spi/DefaultBigQueryRpc.java |   4 +-
 .../gcloud/bigquery/BigQueryImplTest.java     | 105 +++---
 .../bigquery/CopyJobConfigurationTest.java    | 121 ++++++
 .../gcloud/bigquery/CopyJobInfoTest.java      | 174 ---------
 .../bigquery/ExtractJobConfigurationTest.java | 133 +++++++
 .../gcloud/bigquery/ExtractJobInfoTest.java   | 201 ----------
 .../gcloud/bigquery/ITBigQueryTest.java       |  90 +++--
 .../google/gcloud/bigquery/JobInfoTest.java   | 354 ++++++++++++++++++
 .../com/google/gcloud/bigquery/JobTest.java   |   3 +-
 .../bigquery/LoadConfigurationTest.java       |   2 +-
 .../bigquery/LoadJobConfigurationTest.java    | 134 +++++++
 .../gcloud/bigquery/LoadJobInfoTest.java      | 161 --------
 ...st.java => QueryJobConfigurationTest.java} | 130 +++----
 .../gcloud/bigquery/SerializationTest.java    |  18 +-
 .../com/google/gcloud/bigquery/TableTest.java |  14 +-
 .../gcloud/examples/BigQueryExample.java      |  26 +-
 31 files changed, 1739 insertions(+), 1519 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
 delete mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
 rename gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/{ExtractJobInfo.java => ExtractJobConfiguration.java} (61%)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
 delete mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
 rename gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/{QueryJobInfo.java => QueryJobConfiguration.java} (84%)
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java
 delete mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobInfoTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java
 delete mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
 create mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java
 delete mode 100644 gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
 rename gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/{QueryJobInfoTest.java => QueryJobConfigurationTest.java} (54%)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
index d3c712229348..f5009c83eb41 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
@@ -371,8 +371,9 @@ public static JobListOption startPageToken(String pageToken) {
      * is not provided all job's fields are returned. {@code JobOption.fields()} can be used to
      * specify only the fields of interest. {@link JobInfo#jobId()}, {@link JobStatus#state()},
      * {@link JobStatus#error()} as well as type-specific configuration (e.g.
-     * {@link QueryJobInfo#query()} for Query Jobs) are always returned, even if not specified.
-     * {@link JobField#SELF_LINK} and {@link JobField#ETAG} can not be selected when listing jobs.
+     * {@link QueryJobConfiguration#query()} for Query Jobs) are always returned, even if not
+     * specified. {@link JobField#SELF_LINK} and {@link JobField#ETAG} can not be selected when
+     * listing jobs.
      */
     public static JobListOption fields(JobField... fields) {
       String selector = JobField.selector(fields);
@@ -397,8 +398,8 @@ private JobOption(BigQueryRpc.Option option, Object value) {
      * Returns an option to specify the job's fields to be returned by the RPC call. If this option
      * is not provided all job's fields are returned. {@code JobOption.fields()} can be used to
      * specify only the fields of interest. {@link JobInfo#jobId()} as well as type-specific
-     * configuration (e.g. {@link QueryJobInfo#query()} for Query Jobs) are always returned, even if
-     * not specified.
+     * configuration (e.g. {@link QueryJobConfiguration#query()} for Query Jobs) are always
+     * returned, even if not specified.
      */
     public static JobOption fields(JobField... fields) {
       return new JobOption(BigQueryRpc.Option.FIELDS, JobField.selector(fields));
@@ -470,7 +471,7 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
    *
    * @throws BigQueryException upon failure
    */
-   T create(T job, JobOption... options) throws BigQueryException;
+  JobInfo create(JobInfo job, JobOption... options) throws BigQueryException;
 
   /**
    * Returns the requested dataset or {@code null} if not found.
@@ -611,14 +612,14 @@ Page> listTableData(TableId tableId, TableDataListOption... opt
    *
    * @throws BigQueryException upon failure
    */
-   T getJob(String jobId, JobOption... options) throws BigQueryException;
+  JobInfo getJob(String jobId, JobOption... options) throws BigQueryException;
 
   /**
    * Returns the requested job or {@code null} if not found.
    *
    * @throws BigQueryException upon failure
    */
-   T getJob(JobId jobId, JobOption... options) throws BigQueryException;
+  JobInfo getJob(JobId jobId, JobOption... options) throws BigQueryException;
 
   /**
    * Lists the jobs.
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
index dde918d1f516..a3f708bb4c96 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -191,7 +191,7 @@ public Table call() {
   }
 
   @Override
-  public  T create(T job, JobOption... options) throws BigQueryException {
+  public JobInfo create(JobInfo job, JobOption... options) throws BigQueryException {
     final Job jobPb = setProjectId(job).toPb();
     final Map optionsMap = optionMap(options);
     try {
@@ -442,12 +442,12 @@ public List apply(TableRow rowPb) {
   }
 
   @Override
-  public  T getJob(String jobId, JobOption... options) throws BigQueryException {
+  public JobInfo getJob(String jobId, JobOption... options) throws BigQueryException {
     return getJob(JobId.of(jobId), options);
   }
 
   @Override
-  public  T getJob(final JobId jobId, JobOption... options)
+  public JobInfo getJob(final JobId jobId, JobOption... options)
       throws BigQueryException {
     final Map optionsMap = optionMap(options);
     try {
@@ -457,7 +457,7 @@ public Job call() {
           return bigQueryRpc.getJob(jobId.job(), optionsMap);
         }
       }, options().retryParams(), EXCEPTION_HANDLER);
-      return answer == null ? null : JobInfo.fromPb(answer);
+      return answer == null ? null : JobInfo.fromPb(answer);
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
     }
@@ -646,42 +646,48 @@ private TableId setProjectId(TableId table) {
   }
 
   private JobInfo setProjectId(JobInfo job) {
-    if (job instanceof CopyJobInfo) {
-      CopyJobInfo copyJob = (CopyJobInfo) job;
-      CopyJobInfo.Builder copyBuilder = copyJob.toBuilder();
-      copyBuilder.destinationTable(setProjectId(copyJob.destinationTable()));
-      copyBuilder.sourceTables(
-          Lists.transform(copyJob.sourceTables(), new Function() {
-            @Override
-            public TableId apply(TableId tableId) {
-              return setProjectId(tableId);
-            }
-          }));
-      return copyBuilder.build();
-    }
-    if (job instanceof QueryJobInfo) {
-      QueryJobInfo queryJob = (QueryJobInfo) job;
-      QueryJobInfo.Builder queryBuilder = queryJob.toBuilder();
-      if (queryJob.destinationTable() != null) {
-        queryBuilder.destinationTable(setProjectId(queryJob.destinationTable()));
-      }
-      if (queryJob.defaultDataset() != null) {
-        queryBuilder.defaultDataset(setProjectId(queryJob.defaultDataset()));
-      }
-      return queryBuilder.build();
-    }
-    if (job instanceof ExtractJobInfo) {
-      ExtractJobInfo extractJob = (ExtractJobInfo) job;
-      ExtractJobInfo.Builder extractBuilder = extractJob.toBuilder();
-      extractBuilder.sourceTable(setProjectId(extractJob.sourceTable()));
-      return extractBuilder.build();
-    }
-    if (job instanceof LoadJobInfo) {
-      LoadJobInfo loadJob = (LoadJobInfo) job;
-      LoadJobInfo.Builder loadBuilder = loadJob.toBuilder();
-      return loadBuilder.configuration(setProjectId(loadJob.configuration())).build();
-    }
-    return job;
+    JobConfiguration configuration = job.configuration();
+    JobInfo.Builder jobBuilder = job.toBuilder();
+    switch (configuration.type()) {
+      case COPY:
+        CopyJobConfiguration copyConfiguration = (CopyJobConfiguration) configuration;
+        CopyJobConfiguration.Builder copyBuilder = copyConfiguration.toBuilder();
+        copyBuilder.sourceTables(
+            Lists.transform(copyConfiguration.sourceTables(), new Function() {
+              @Override
+              public TableId apply(TableId tableId) {
+                return setProjectId(tableId);
+              }
+            }));
+        copyBuilder.destinationTable(setProjectId(copyConfiguration.destinationTable()));
+        jobBuilder.configuration(copyBuilder.build());
+        break;
+      case QUERY:
+        QueryJobConfiguration queryConfiguration = (QueryJobConfiguration) configuration;
+        QueryJobConfiguration.Builder queryBuilder = queryConfiguration.toBuilder();
+        if (queryConfiguration.destinationTable() != null) {
+          queryBuilder.destinationTable(setProjectId(queryConfiguration.destinationTable()));
+        }
+        if (queryConfiguration.defaultDataset() != null) {
+          queryBuilder.defaultDataset(setProjectId(queryConfiguration.defaultDataset()));
+        }
+        jobBuilder.configuration(queryBuilder.build());
+        break;
+      case EXTRACT:
+        ExtractJobConfiguration extractConfiguration = (ExtractJobConfiguration) configuration;
+        ExtractJobConfiguration.Builder extractBuilder = extractConfiguration.toBuilder();
+        extractBuilder.sourceTable(setProjectId(extractConfiguration.sourceTable()));
+        jobBuilder.configuration(extractBuilder.build());
+        break;
+      case LOAD:
+        LoadJobConfiguration loadConfiguration = (LoadJobConfiguration) configuration;
+        jobBuilder.configuration((LoadJobConfiguration) setProjectId(loadConfiguration));
+        break;
+      default:
+        // never reached
+        throw new IllegalArgumentException("Job configuration is not supported");
+    }
+    return jobBuilder.build();
   }
 
   private QueryRequest setProjectId(QueryRequest request) {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
new file mode 100644
index 000000000000..88d420b38054
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
@@ -0,0 +1,225 @@
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.JobConfigurationTableCopy;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Copy Job configuration. A Copy Job copies an existing table to another new or
+ * existing table.
+ */
+public final class CopyJobConfiguration implements JobConfiguration, Serializable {
+
+  private static final long serialVersionUID = 1140509641399762967L;
+
+  private final List sourceTables;
+  private final TableId destinationTable;
+  private final JobInfo.CreateDisposition createDisposition;
+  private final JobInfo.WriteDisposition writeDisposition;
+
+  public static final class Builder {
+
+    private List sourceTables;
+    private TableId destinationTable;
+    private JobInfo.CreateDisposition createDisposition;
+    private JobInfo.WriteDisposition writeDisposition;
+
+    private Builder() {}
+
+    private Builder(CopyJobConfiguration jobConfiguration) {
+      this.sourceTables = jobConfiguration.sourceTables;
+      this.destinationTable = jobConfiguration.destinationTable;
+      this.createDisposition = jobConfiguration.createDisposition;
+      this.writeDisposition = jobConfiguration.writeDisposition;
+    }
+
+    private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+      JobConfigurationTableCopy copyConfigurationPb = configurationPb.getCopy();
+      this.destinationTable = TableId.fromPb(copyConfigurationPb.getDestinationTable());
+      if (copyConfigurationPb.getSourceTables() != null) {
+        this.sourceTables =
+            Lists.transform(copyConfigurationPb.getSourceTables(), TableId.FROM_PB_FUNCTION);
+      } else {
+        this.sourceTables = ImmutableList.of(TableId.fromPb(copyConfigurationPb.getSourceTable()));
+      }
+      if (copyConfigurationPb.getCreateDisposition() != null) {
+        this.createDisposition =
+            JobInfo.CreateDisposition.valueOf(copyConfigurationPb.getCreateDisposition());
+      }
+      if (copyConfigurationPb.getWriteDisposition() != null) {
+        this.writeDisposition = JobInfo.WriteDisposition.valueOf(
+            copyConfigurationPb.getWriteDisposition());
+      }
+    }
+
+    /**
+     * Sets the source tables to copy.
+     */
+    public Builder sourceTables(List sourceTables) {
+      this.sourceTables = sourceTables != null ? ImmutableList.copyOf(sourceTables) : null;
+      return this;
+    }
+
+    /**
+     * Sets the destination table of the copy job.
+     */
+    public Builder destinationTable(TableId destinationTable) {
+      this.destinationTable = destinationTable;
+      return this;
+    }
+
+    /**
+     * Sets whether the job is allowed to create new tables.
+     *
+     * @see 
+     *     Create Disposition
+     */
+    public Builder createDisposition(JobInfo.CreateDisposition createDisposition) {
+      this.createDisposition = createDisposition;
+      return this;
+    }
+
+    /**
+     * Sets the action that should occur if the destination table already exists.
+     *
+     * @see 
+     *     Write Disposition
+     */
+    public Builder writeDisposition(JobInfo.WriteDisposition writeDisposition) {
+      this.writeDisposition = writeDisposition;
+      return this;
+    }
+
+    public CopyJobConfiguration build() {
+      return new CopyJobConfiguration(this);
+    }
+  }
+
+  private CopyJobConfiguration(Builder builder) {
+    this.sourceTables = checkNotNull(builder.sourceTables);
+    this.destinationTable = checkNotNull(builder.destinationTable);
+    this.createDisposition = builder.createDisposition;
+    this.writeDisposition = builder.writeDisposition;
+  }
+
+  @Override
+  public Type type() {
+    return Type.COPY;
+  }
+
+  /**
+   * Returns the source tables to copy.
+   */
+  public List sourceTables() {
+    return sourceTables;
+  }
+
+  /**
+   * Returns the destination table to load the data into.
+   */
+  public TableId destinationTable() {
+    return destinationTable;
+  }
+
+  /**
+   * Returns whether the job is allowed to create new tables.
+   *
+   * @see 
+   *     Create Disposition
+   */
+  public JobInfo.CreateDisposition createDisposition() {
+    return this.createDisposition;
+  }
+
+  /**
+   * Returns the action that should occur if the destination table already exists.
+   *
+   * @see 
+   *     Write Disposition
+   */
+  public JobInfo.WriteDisposition writeDisposition() {
+    return writeDisposition;
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("sourceTables", sourceTables)
+        .add("destinationTable", destinationTable)
+        .add("createDisposition", createDisposition)
+        .add("writeDisposition", writeDisposition)
+        .toString();
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof CopyJobConfiguration
+        && Objects.equals(toPb(), ((CopyJobConfiguration) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(sourceTables, destinationTable, createDisposition, writeDisposition);
+  }
+
+  com.google.api.services.bigquery.model.JobConfiguration toPb() {
+    JobConfigurationTableCopy configurationPb = new JobConfigurationTableCopy();
+    configurationPb.setDestinationTable(destinationTable.toPb());
+    if (sourceTables.size() == 1) {
+      configurationPb.setSourceTable(sourceTables.get(0).toPb());
+    } else {
+      configurationPb.setSourceTables(Lists.transform(sourceTables, TableId.TO_PB_FUNCTION));
+    }
+    if (createDisposition != null) {
+      configurationPb.setCreateDisposition(createDisposition.toString());
+    }
+    if (writeDisposition != null) {
+      configurationPb.setWriteDisposition(writeDisposition.toString());
+    }
+    return new com.google.api.services.bigquery.model.JobConfiguration().setCopy(configurationPb);
+  }
+
+  /**
+   * Creates a builder for a BigQuery Copy Job configuration given destination and source table.
+   */
+  public static Builder builder(TableId destinationTable, TableId sourceTable) {
+    return builder(destinationTable, ImmutableList.of(checkNotNull(sourceTable)));
+  }
+
+  /**
+   * Creates a builder for a BigQuery Copy Job configuration given destination and source tables.
+   */
+  public static Builder builder(TableId destinationTable, List sourceTables) {
+    return new Builder().destinationTable(destinationTable).sourceTables(sourceTables);
+  }
+
+  /**
+   * Returns a BigQuery Copy Job configuration for the given destination and source table.
+   */
+  public static CopyJobConfiguration of(TableId destinationTable, TableId sourceTable) {
+    return builder(destinationTable, sourceTable).build();
+  }
+
+  /**
+   * Returns a BigQuery Copy Job configuration for the given destination and source tables.
+   */
+  public static CopyJobConfiguration of(TableId destinationTable, List sourceTables) {
+    return builder(destinationTable, sourceTables).build();
+  }
+
+  static CopyJobConfiguration fromPb(
+      com.google.api.services.bigquery.model.JobConfiguration jobPb) {
+    return new Builder(jobPb).build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
deleted file mode 100644
index d42c90455e50..000000000000
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.api.services.bigquery.model.Job;
-import com.google.api.services.bigquery.model.JobConfiguration;
-import com.google.api.services.bigquery.model.JobConfigurationTableCopy;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Google BigQuery Copy Job. A Copy Job copies an existing table to another new or existing table.
- */
-public class CopyJobInfo extends JobInfo {
-
-  private static final long serialVersionUID = 7830335512951916299L;
-
-  private final List sourceTables;
-  private final TableId destinationTable;
-  private final CreateDisposition createDisposition;
-  private final WriteDisposition writeDisposition;
-
-  public static final class Builder extends JobInfo.Builder {
-
-    private List sourceTables;
-    private TableId destinationTable;
-    private CreateDisposition createDisposition;
-    private WriteDisposition writeDisposition;
-
-    private Builder() {}
-
-    private Builder(CopyJobInfo jobInfo) {
-      super(jobInfo);
-      this.sourceTables = jobInfo.sourceTables;
-      this.destinationTable = jobInfo.destinationTable;
-      this.createDisposition = jobInfo.createDisposition;
-      this.writeDisposition = jobInfo.writeDisposition;
-    }
-
-    private Builder(Job jobPb) {
-      super(jobPb);
-      JobConfigurationTableCopy copyConfigurationPb = jobPb.getConfiguration().getCopy();
-      this.destinationTable = TableId.fromPb(copyConfigurationPb.getDestinationTable());
-      if (copyConfigurationPb.getSourceTables() != null) {
-        this.sourceTables =
-            Lists.transform(copyConfigurationPb.getSourceTables(), TableId.FROM_PB_FUNCTION);
-      } else {
-        this.sourceTables = ImmutableList.of(TableId.fromPb(copyConfigurationPb.getSourceTable()));
-      }
-      if (copyConfigurationPb.getCreateDisposition() != null) {
-        this.createDisposition =
-            CreateDisposition.valueOf(copyConfigurationPb.getCreateDisposition());
-      }
-      if (copyConfigurationPb.getWriteDisposition() != null) {
-        this.writeDisposition = WriteDisposition.valueOf(copyConfigurationPb.getWriteDisposition());
-      }
-    }
-
-    /**
-     * Sets the source tables to copy.
-     */
-    public Builder sourceTables(List sourceTables) {
-      this.sourceTables = sourceTables != null ? ImmutableList.copyOf(sourceTables) : null;
-      return self();
-    }
-
-    /**
-     * Sets the destination table of the copy job.
-     */
-    public Builder destinationTable(TableId destinationTable) {
-      this.destinationTable = destinationTable;
-      return self();
-    }
-
-    /**
-     * Sets whether the job is allowed to create new tables.
-     *
-     * @see 
-     *     Create Disposition
-     */
-    public Builder createDisposition(CreateDisposition createDisposition) {
-      this.createDisposition = createDisposition;
-      return self();
-    }
-
-    /**
-     * Sets the action that should occur if the destination table already exists.
-     *
-     * @see 
-     *     Write Disposition
-     */
-    public Builder writeDisposition(WriteDisposition writeDisposition) {
-      this.writeDisposition = writeDisposition;
-      return self();
-    }
-
-    @Override
-    public CopyJobInfo build() {
-      return new CopyJobInfo(this);
-    }
-  }
-
-  private CopyJobInfo(Builder builder) {
-    super(builder);
-    this.sourceTables = checkNotNull(builder.sourceTables);
-    this.destinationTable = checkNotNull(builder.destinationTable);
-    this.createDisposition = builder.createDisposition;
-    this.writeDisposition = builder.writeDisposition;
-  }
-
-  /**
-   * Returns the source tables to copy.
-   */
-  public List sourceTables() {
-    return sourceTables;
-  }
-
-  /**
-   * Returns the destination table to load the data into.
-   */
-  public TableId destinationTable() {
-    return destinationTable;
-  }
-
-  /**
-   * Returns whether the job is allowed to create new tables.
-   *
-   * @see 
-   *     Create Disposition
-   */
-  public CreateDisposition createDisposition() {
-    return this.createDisposition;
-  }
-
-  /**
-   * Returns the action that should occur if the destination table already exists.
-   *
-   * @see 
-   *     Write Disposition
-   */
-  public WriteDisposition writeDisposition() {
-    return writeDisposition;
-  }
-
-  @Override
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  @Override
-  ToStringHelper toStringHelper() {
-    return super.toStringHelper()
-        .add("sourceTables", sourceTables)
-        .add("destinationTable", destinationTable)
-        .add("createDisposition", createDisposition)
-        .add("writeDisposition", writeDisposition);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof CopyJobInfo && baseEquals((CopyJobInfo) obj);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(baseHashCode(), sourceTables, destinationTable, createDisposition,
-        writeDisposition);
-  }
-
-  @Override
-  Job toPb() {
-    JobConfigurationTableCopy copyConfigurationPb = new JobConfigurationTableCopy();
-    copyConfigurationPb.setDestinationTable(destinationTable.toPb());
-    if (sourceTables.size() == 1) {
-      copyConfigurationPb.setSourceTable(sourceTables.get(0).toPb());
-    } else {
-      copyConfigurationPb.setSourceTables(Lists.transform(sourceTables, TableId.TO_PB_FUNCTION));
-    }
-    if (createDisposition != null) {
-      copyConfigurationPb.setCreateDisposition(createDisposition.toString());
-    }
-    if (writeDisposition != null) {
-      copyConfigurationPb.setWriteDisposition(writeDisposition.toString());
-    }
-    return super.toPb().setConfiguration(new JobConfiguration().setCopy(copyConfigurationPb));
-  }
-
-  /**
-   * Creates a builder for a BigQuery Copy Job given destination and source table.
-   */
-  public static Builder builder(TableId destinationTable, TableId sourceTable) {
-    return builder(destinationTable, ImmutableList.of(checkNotNull(sourceTable)));
-  }
-
-  /**
-   * Creates a builder for a BigQuery Copy Job given destination and source tables.
-   */
-  public static Builder builder(TableId destinationTable, List sourceTables) {
-    return new Builder().destinationTable(destinationTable).sourceTables(sourceTables);
-  }
-
-  /**
-   * Returns a BigQuery Copy Job for the given destination and source table. Job's id is chosen by
-   * the service.
-   */
-  public static CopyJobInfo of(TableId destinationTable, TableId sourceTable) {
-    return builder(destinationTable, sourceTable).build();
-  }
-
-  /**
-   * Returns a BigQuery Copy Job for the given destination and source tables. Job's id is chosen by
-   * the service.
-   */
-  public static CopyJobInfo of(TableId destinationTable, List sourceTables) {
-    return builder(destinationTable, sourceTables).build();
-  }
-
-  /**
-   * Returns a BigQuery Copy Job for the given destination and source table. Job's id is set to the
-   * provided value.
-   */
-  public static CopyJobInfo of(JobId jobId, TableId destinationTable, TableId sourceTable) {
-    return builder(destinationTable, sourceTable).jobId(jobId).build();
-  }
-
-  /**
-   * Returns a BigQuery Copy Job for the given destination and source tables. Job's id is set to the
-   * provided value.
-   */
-  public static CopyJobInfo of(JobId jobId, TableId destinationTable, List sourceTables) {
-    return builder(destinationTable, sourceTables).jobId(jobId).build();
-  }
-
-  @SuppressWarnings("unchecked")
-  static CopyJobInfo fromPb(Job jobPb) {
-    return new Builder(jobPb).build();
-  }
-}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
similarity index 61%
rename from gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
rename to gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
index 67f643ce4e19..04f493d4af20 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
@@ -18,23 +18,22 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.api.services.bigquery.model.Job;
-import com.google.api.services.bigquery.model.JobConfiguration;
 import com.google.api.services.bigquery.model.JobConfigurationExtract;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
-import com.google.gcloud.bigquery.JobStatistics.ExtractStatistics;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 
 /**
- * Google BigQuery Extract Jobs. An Extract Job exports a BigQuery table to Google Cloud Storage.
- * The extract destination provided as URIs that point to objects in Google Cloud Storage.
+ * Google BigQuery Extract Job configuration. An Extract Job exports a BigQuery table to Google
+ * Cloud Storage. The extract destination provided as URIs that point to objects in Google Cloud
+ * Storage.
  */
-public class ExtractJobInfo extends JobInfo {
+public final class ExtractJobConfiguration  implements JobConfiguration, Serializable {
 
-  private static final long serialVersionUID = -9126951217071361576L;
+  private static final long serialVersionUID = 4147749733166593761L;
 
   private final TableId sourceTable;
   private final List destinationUris;
@@ -43,8 +42,7 @@ public class ExtractJobInfo extends JobInfo {
   private final String format;
   private final String compression;
 
-  public static final class Builder extends JobInfo.Builder {
+  public static final class Builder {
 
     private TableId sourceTable;
     private List destinationUris;
@@ -55,8 +53,7 @@ public static final class Builder extends JobInfo.Builder destinationUris) {
       this.destinationUris = destinationUris != null ? ImmutableList.copyOf(destinationUris) : null;
-      return self();
+      return this;
     }
 
     /**
@@ -98,7 +94,7 @@ public Builder destinationUris(List destinationUris) {
      */
     public Builder printHeader(Boolean printHeader) {
       this.printHeader = printHeader;
-      return self();
+      return this;
     }
 
     /**
@@ -106,7 +102,7 @@ public Builder printHeader(Boolean printHeader) {
      */
     public Builder fieldDelimiter(String fieldDelimiter) {
       this.fieldDelimiter = fieldDelimiter;
-      return self();
+      return this;
     }
 
     /**
@@ -117,7 +113,7 @@ public Builder fieldDelimiter(String fieldDelimiter) {
      */
     public Builder format(String format) {
       this.format = format;
-      return self();
+      return this;
     }
 
     /**
@@ -129,17 +125,15 @@ public Builder format(String format) {
      */
     public Builder compression(String compression) {
       this.compression = compression;
-      return self();
+      return this;
     }
 
-    @Override
-    public ExtractJobInfo build() {
-      return new ExtractJobInfo(this);
+    public ExtractJobConfiguration build() {
+      return new ExtractJobConfiguration(this);
     }
   }
 
-  private ExtractJobInfo(Builder builder) {
-    super(builder);
+  private ExtractJobConfiguration(Builder builder) {
     this.sourceTable = checkNotNull(builder.sourceTable);
     this.destinationUris = checkNotNull(builder.destinationUris);
     this.printHeader = builder.printHeader;
@@ -148,6 +142,11 @@ private ExtractJobInfo(Builder builder) {
     this.compression = builder.compression;
   }
 
+  @Override
+  public Type type() {
+    return Type.EXTRACT;
+  }
+
   /**
    * Returns the table to export.
    */
@@ -194,35 +193,35 @@ public String compression() {
     return compression;
   }
 
-  @Override
   public Builder toBuilder() {
     return new Builder(this);
   }
 
   @Override
-  ToStringHelper toStringHelper() {
-    return super.toStringHelper()
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
         .add("sourceTable", sourceTable)
         .add("destinationUris", destinationUris)
         .add("format", format)
         .add("printHeader", printHeader)
         .add("fieldDelimiter", fieldDelimiter)
-        .add("compression", compression);
+        .add("compression", compression)
+        .toString();
   }
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ExtractJobInfo && baseEquals((ExtractJobInfo) obj);
+    return obj instanceof ExtractJobConfiguration
+        && Objects.equals(toPb(), ((ExtractJobConfiguration) obj).toPb());
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(baseHashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,
+    return Objects.hash(sourceTable, destinationUris, printHeader, fieldDelimiter,
         format, compression);
   }
 
-  @Override
-  Job toPb() {
+  com.google.api.services.bigquery.model.JobConfiguration toPb() {
     JobConfigurationExtract extractConfigurationPb = new JobConfigurationExtract();
     extractConfigurationPb.setDestinationUris(destinationUris);
     extractConfigurationPb.setSourceTable(sourceTable.toPb());
@@ -230,92 +229,60 @@ Job toPb() {
     extractConfigurationPb.setFieldDelimiter(fieldDelimiter);
     extractConfigurationPb.setDestinationFormat(format);
     extractConfigurationPb.setCompression(compression);
-    return super.toPb().setConfiguration(new JobConfiguration().setExtract(extractConfigurationPb));
+    return new com.google.api.services.bigquery.model.JobConfiguration()
+        .setExtract(extractConfigurationPb);
   }
 
   /**
-   * Creates a builder for a BigQuery Extract Job given source table and destination URI.
+   * Creates a builder for a BigQuery Extract Job configuration given source table and destination
+   * URI.
    */
   public static Builder builder(TableId sourceTable, String destinationUri) {
     return builder(sourceTable, ImmutableList.of(checkNotNull(destinationUri)));
   }
 
   /**
-   * Creates a builder for a BigQuery Extract Job given source table and destination URIs.
+   * Creates a builder for a BigQuery Extract Job configuration given source table and destination
+   * URIs.
    */
   public static Builder builder(TableId sourceTable, List destinationUris) {
     return new Builder().sourceTable(sourceTable).destinationUris(destinationUris);
   }
 
   /**
-   * Returns a BigQuery Extract Job for the given source table and destination URI. Job's id is
-   * chosen by the service.
+   * Returns a BigQuery Extract Job configuration for the given source table and destination URI.
    */
-  public static ExtractJobInfo of(TableId sourceTable, String destinationUri) {
+  public static ExtractJobConfiguration of(TableId sourceTable, String destinationUri) {
     return builder(sourceTable, destinationUri).build();
   }
 
   /**
-   * Returns a BigQuery Extract Job for the given source table and destination URIs. Job's id is
-   * chosen by the service.
+   * Returns a BigQuery Extract Job configuration for the given source table and destination URIs.
    */
-  public static ExtractJobInfo of(TableId sourceTable, List destinationUris) {
+  public static ExtractJobConfiguration of(TableId sourceTable, List destinationUris) {
     return builder(sourceTable, destinationUris).build();
   }
 
   /**
-   * Returns a BigQuery Extract Job for the given source table, format and destination URI. Job's id
-   * is chosen by the service.
+   * Returns a BigQuery Extract Job configuration for the given source table, format and destination
+   * URI.
    */
-  public static ExtractJobInfo of(TableId sourceTable, String format, String destinationUri) {
+  public static ExtractJobConfiguration of(TableId sourceTable, String destinationUri,
+      String format) {
     return builder(sourceTable, destinationUri).format(format).build();
   }
 
   /**
-   * Returns a BigQuery Extract Job for the given source table, format and destination URIs. Job's
-   * id is chosen by the service.
+   * Returns a BigQuery Extract Job configuration for the given source table, format and destination
+   * URIs.
    */
-  public static ExtractJobInfo of(TableId sourceTable, String format,
-      List destinationUris) {
+  public static ExtractJobConfiguration of(TableId sourceTable, List destinationUris,
+      String format) {
     return builder(sourceTable, destinationUris).format(format).build();
   }
 
-  /**
-   * Returns a BigQuery Extract Job for the given source table and destination URI. Job's id is set
-   * to the provided value.
-   */
-  public static ExtractJobInfo of(JobId jobId, TableId sourceTable, String destinationUri) {
-    return builder(sourceTable, destinationUri).jobId(jobId).build();
-  }
-
-  /**
-   * Returns a BigQuery Extract Job for the given source table and destination URIs. Job's id is set
-   * to the provided value.
-   */
-  public static ExtractJobInfo of(JobId jobId, TableId sourceTable, List destinationUris) {
-    return builder(sourceTable, destinationUris).jobId(jobId).build();
-  }
-
-  /**
-   * Returns a BigQuery Extract Job for the given source table, format and destination URI. Job's id
-   * is set to the provided value.
-   */
-  public static ExtractJobInfo of(JobId jobId, TableId sourceTable, String format,
-      String destinationUri) {
-    return builder(sourceTable, destinationUri).format(format).jobId(jobId).build();
-  }
-
-  /**
-   * Returns a BigQuery Extract Job for the given source table, format and destination URIs. Job's
-   * id is set to the provided value.
-   */
-  public static ExtractJobInfo of(JobId jobId, TableId sourceTable, String format,
-      List destinationUris) {
-    return builder(sourceTable, destinationUris).format(format).jobId(jobId).build();
-  }
-
-  @SuppressWarnings("unchecked")
-  static ExtractJobInfo fromPb(Job jobPb) {
-    return new Builder(jobPb).build();
+  static ExtractJobConfiguration fromPb(
+      com.google.api.services.bigquery.model.JobConfiguration confPb) {
+    return new Builder(confPb).build();
   }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
new file mode 100644
index 000000000000..ea19a6d9cb67
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+/**
+ * Common interface for a BigQuery Job configuration.
+ */
+public interface JobConfiguration {
+
+  /**
+   * Type of a BigQuery Job.
+   */
+  enum Type {
+    /**
+     * A Copy Job copies an existing table to another new or existing table.
+     */
+    COPY,
+    /**
+     * An Extract Job exports a BigQuery table to Google Cloud Storage.
+     */
+    EXTRACT,
+    /**
+     * A Load Job loads data from one of several formats into a table.
+     */
+    LOAD,
+    /**
+     * A Query Job runs a query against BigQuery data.
+     */
+    QUERY
+  }
+
+  /**
+   * Returns the type of the job configuration.
+   */
+  Type type();
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
index e623aec26dd2..519f3bf6163b 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -19,23 +19,20 @@
 import com.google.api.services.bigquery.model.Job;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
 
 import java.io.Serializable;
 import java.util.Objects;
 
 /**
- * Base class for Google BigQuery Job information. Jobs are objects that manage asynchronous tasks
- * such as running queries, loading data, and exporting data. Use {@link CopyJobInfo} for a job that
- * copies an existing table. Use {@link ExtractJobInfo} for a job that exports a table to Google
- * Cloud Storage. Use {@link LoadJobInfo} for a job that loads data from Google Cloud Storage into
- * a table. Use {@link QueryJobInfo} for a job that runs a query.
+ * Google BigQuery Job information. Jobs are objects that manage asynchronous tasks such as running
+ * queries, loading data, and exporting data. Use {@link CopyJobConfiguration} for a job that
+ * copies an existing table. Use {@link ExtractJobConfiguration} for a job that exports a table to
+ * Google Cloud Storage. Use {@link LoadJobConfiguration} for a job that loads data from Google
+ * Cloud Storage into a table. Use {@link QueryJobConfiguration} for a job that runs a query.
  *
  * @see Jobs
- *
- * @param  the statistics type
  */
-public abstract class JobInfo implements Serializable {
+public final class JobInfo implements Serializable {
 
   static final Function FROM_PB_FUNCTION =
       new Function() {
@@ -44,7 +41,7 @@ public JobInfo apply(Job pb) {
           return JobInfo.fromPb(pb);
         }
       };
-  private static final long serialVersionUID = -7086529810736715842L;
+  private static final long serialVersionUID = -3272941007234620265L;
 
   /**
    * Specifies whether the job is allowed to create new tables.
@@ -86,30 +83,24 @@ public enum WriteDisposition {
   private final JobId jobId;
   private final String selfLink;
   private final JobStatus status;
-  private final S statistics;
+  private final JobStatistics statistics;
   private final String userEmail;
+  private final JobConfiguration configuration;
 
-  /**
-   * Base builder for jobs.
-   *
-   * @param  the job type
-   * @param  the job statistics type
-   * @param  the job builder
-   */
-  public abstract static class Builder> {
+  public static final class Builder {
 
     private String etag;
     private String id;
     private JobId jobId;
     private String selfLink;
     private JobStatus status;
-    private S statistics;
+    private JobStatistics statistics;
     private String userEmail;
+    private JobConfiguration configuration;
 
-    protected Builder() {}
+    private Builder() {}
 
-    protected Builder(JobInfo jobInfo) {
+    private Builder(JobInfo jobInfo) {
       this.etag = jobInfo.etag;
       this.id = jobInfo.id;
       this.jobId = jobInfo.jobId;
@@ -117,7 +108,7 @@ protected Builder(JobInfo jobInfo) {
       this.status = jobInfo.status;
       this.statistics = jobInfo.statistics;
       this.userEmail = jobInfo.userEmail;
-
+      this.configuration = jobInfo.configuration;
     }
 
     protected Builder(Job jobPb) {
@@ -134,55 +125,70 @@ protected Builder(Job jobPb) {
         this.statistics = JobStatistics.fromPb(jobPb.getStatistics());
       }
       this.userEmail = jobPb.getUserEmail();
+      com.google.api.services.bigquery.model.JobConfiguration confPb = jobPb.getConfiguration();
+      if (confPb.getCopy() != null) {
+        this.configuration = CopyJobConfiguration.fromPb(confPb);
+      } else if (confPb.getExtract() != null) {
+        this.configuration = ExtractJobConfiguration.fromPb(confPb);
+      } else if (confPb.getLoad() != null) {
+        this.configuration = LoadJobConfiguration.fromPb(confPb);
+      } else if (confPb.getQuery() != null) {
+        this.configuration = QueryJobConfiguration.fromPb(confPb);
+      } else {
+        // never reached
+        throw new IllegalArgumentException("Job configuration is not supported");
+      }
     }
 
-    @SuppressWarnings("unchecked")
-    protected B self() {
-      return (B) this;
-    }
-
-    B etag(String etag) {
+    Builder etag(String etag) {
       this.etag = etag;
-      return self();
+      return this;
     }
 
-    B id(String id) {
+    Builder id(String id) {
       this.id = id;
-      return self();
+      return this;
     }
 
     /**
      * Sets the job identity.
      */
-    public B jobId(JobId jobId) {
+    public Builder jobId(JobId jobId) {
       this.jobId = jobId;
-      return self();
+      return this;
     }
 
-    B selfLink(String selfLink) {
+    Builder selfLink(String selfLink) {
       this.selfLink = selfLink;
-      return self();
+      return this;
     }
 
-    B status(JobStatus status) {
+    Builder status(JobStatus status) {
       this.status = status;
-      return self();
+      return this;
     }
 
-    B statistics(S statistics) {
+    Builder statistics(JobStatistics statistics) {
       this.statistics = statistics;
-      return self();
+      return this;
     }
 
-    B userEmail(String userEmail) {
+    Builder userEmail(String userEmail) {
       this.userEmail = userEmail;
-      return self();
+      return this;
+    }
+
+    public Builder configuration(JobConfiguration configuration) {
+      this.configuration = configuration;
+      return this;
     }
 
-    public abstract T build();
+    public JobInfo build() {
+      return new JobInfo(this);
+    }
   }
 
-  protected JobInfo(Builder builder) {
+  private JobInfo(Builder builder) {
     this.jobId = builder.jobId;
     this.etag = builder.etag;
     this.id = builder.id;
@@ -190,6 +196,7 @@ protected JobInfo(Builder builder) {
     this.status = builder.status;
     this.statistics = builder.statistics;
     this.userEmail = builder.userEmail;
+    this.configuration = builder.configuration;
   }
 
   /**
@@ -232,8 +239,9 @@ public JobStatus status() {
   /**
    * Returns information about the job, including starting time and ending time of the job.
    */
-  public S statistics() {
-    return statistics;
+  @SuppressWarnings("unchecked")
+  public  S statistics() {
+    return (S) statistics;
   }
 
   /**
@@ -243,12 +251,23 @@ public String userEmail() {
     return userEmail;
   }
 
+  /**
+   * Returns the job's configuration.
+   */
+  @SuppressWarnings("unchecked")
+  public  C configuration() {
+    return (C) configuration;
+  }
+
   /**
    * Returns a builder for the job.
    */
-  public abstract Builder toBuilder();
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
 
-  ToStringHelper toStringHelper() {
+  @Override
+  public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("job", jobId)
         .add("status", status)
@@ -256,20 +275,19 @@ ToStringHelper toStringHelper() {
         .add("userEmail", userEmail)
         .add("etag", etag)
         .add("id", id)
-        .add("selfLink", selfLink);
+        .add("selfLink", selfLink)
+        .add("configuration", configuration)
+        .toString();
   }
 
   @Override
-  public String toString() {
-    return toStringHelper().toString();
-  }
-
-  protected final int baseHashCode() {
+  public int hashCode() {
     return Objects.hash(jobId);
   }
 
-  protected final boolean baseEquals(JobInfo jobInfo) {
-    return Objects.equals(toPb(), jobInfo.toPb());
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof JobInfo && Objects.equals(toPb(), ((JobInfo) obj).toPb());
   }
 
   Job toPb() {
@@ -287,22 +305,39 @@ Job toPb() {
     if (statistics != null) {
       jobPb.setStatistics(statistics.toPb());
     }
+    switch (configuration.type()) {
+      case COPY:
+        jobPb.setConfiguration(this.configuration().toPb());
+        break;
+      case EXTRACT:
+        jobPb.setConfiguration(this.configuration().toPb());
+        break;
+      case LOAD:
+        jobPb.setConfiguration(this.configuration().toPb());
+        break;
+      case QUERY:
+        jobPb.setConfiguration(this.configuration().toPb());
+        break;
+      default:
+        // never reached
+        throw new IllegalArgumentException("Job configuration is not supported");
+    }
     return jobPb;
   }
 
-  @SuppressWarnings("unchecked")
-  static  T fromPb(Job jobPb) {
-    if (jobPb.getConfiguration().getLoad() != null) {
-      return (T) LoadJobInfo.fromPb(jobPb);
-    } else if (jobPb.getConfiguration().getCopy() != null) {
-      return (T) CopyJobInfo.fromPb(jobPb);
-    } else if (jobPb.getConfiguration().getExtract() != null) {
-      return (T) ExtractJobInfo.fromPb(jobPb);
-    } else  if (jobPb.getConfiguration().getQuery() != null) {
-      return (T) QueryJobInfo.fromPb(jobPb);
-    } else {
-      // never reached
-      throw new IllegalArgumentException("Job configuration is not supported");
-    }
+  public static Builder builder(JobConfiguration configuration) {
+    return new Builder().configuration(configuration);
+  }
+
+  public static JobInfo of(JobConfiguration configuration) {
+    return builder(configuration).build();
+  }
+
+  public static JobInfo of(JobId jobId, JobConfiguration configuration) {
+    return builder(configuration).jobId(jobId).build();
+  }
+
+  static JobInfo fromPb(Job jobPb) {
+    return new Builder(jobPb).build();
   }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
index b2d50882aabb..34e4917921ba 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
@@ -61,7 +61,7 @@ private ExtractStatistics(Builder builder) {
     /**
      * Returns the number of files per destination URI or URI pattern specified in the extract job.
      * These values will be in the same order as the URIs specified by
-     * {@link ExtractJobInfo#destinationUris()}.
+     * {@link ExtractJobConfiguration#destinationUris()}.
      */
     public List destinationUriFileCounts() {
       return destinationUriFileCounts;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java
index 18cb8ae6bedb..115701a5932f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java
@@ -25,29 +25,28 @@
 import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
 
 import java.io.Serializable;
-import java.nio.channels.SeekableByteChannel;
 import java.util.List;
 import java.util.Objects;
 
 /**
- * Google BigQuery Configuration for a load operation. A load configuration can be used to build a
- * {@link LoadJobInfo} or to load data into a table with a {@link com.google.gcloud.WriteChannel}
+ * Google BigQuery Configuration for a load operation. A load configuration can be used to load data
+ * into a table with a {@link com.google.gcloud.WriteChannel}
  * ({@link BigQuery#writer(LoadConfiguration)}).
  */
 public class LoadConfiguration implements Serializable {
 
   private static final long serialVersionUID = 470267591917413578L;
 
-  private final TableId destinationTable;
-  private final CreateDisposition createDisposition;
-  private final WriteDisposition writeDisposition;
-  private final FormatOptions formatOptions;
-  private final Integer maxBadRecords;
-  private final Schema schema;
-  private final Boolean ignoreUnknownValues;
-  private final List projectionFields;
+  protected final TableId destinationTable;
+  protected final CreateDisposition createDisposition;
+  protected final WriteDisposition writeDisposition;
+  protected final FormatOptions formatOptions;
+  protected final Integer maxBadRecords;
+  protected final Schema schema;
+  protected final Boolean ignoreUnknownValues;
+  protected final List projectionFields;
 
-  public static final class Builder {
+  public static class Builder {
 
     private TableId destinationTable;
     private CreateDisposition createDisposition;
@@ -58,9 +57,9 @@ public static final class Builder {
     private Boolean ignoreUnknownValues;
     private List projectionFields;
 
-    private Builder() {}
+    protected Builder() {}
 
-    private Builder(LoadConfiguration loadConfiguration) {
+    protected Builder(LoadConfiguration loadConfiguration) {
       this.destinationTable = loadConfiguration.destinationTable;
       this.createDisposition = loadConfiguration.createDisposition;
       this.writeDisposition = loadConfiguration.writeDisposition;
@@ -71,7 +70,8 @@ private Builder(LoadConfiguration loadConfiguration) {
       this.projectionFields = loadConfiguration.projectionFields;
     }
 
-    private Builder(JobConfigurationLoad loadConfigurationPb) {
+    protected Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+      JobConfigurationLoad loadConfigurationPb = configurationPb.getLoad();
       this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
       if (loadConfigurationPb.getCreateDisposition() != null) {
         this.createDisposition =
@@ -106,12 +106,17 @@ private Builder(JobConfigurationLoad loadConfigurationPb) {
       this.projectionFields = loadConfigurationPb.getProjectionFields();
     }
 
+    @SuppressWarnings("unchecked")
+    B self() {
+      return (B) this;
+    }
+
     /**
      * Sets the destination table to load the data into.
      */
-    public Builder destinationTable(TableId destinationTable) {
+    public B destinationTable(TableId destinationTable) {
       this.destinationTable = destinationTable;
-      return this;
+      return self();
     }
 
     /**
@@ -120,9 +125,9 @@ public Builder destinationTable(TableId destinationTable) {
      * @see 
      *     Create Disposition
      */
-    public Builder createDisposition(CreateDisposition createDisposition) {
+    public B createDisposition(CreateDisposition createDisposition) {
       this.createDisposition = createDisposition;
-      return this;
+      return self();
     }
 
     /**
@@ -131,9 +136,9 @@ public Builder createDisposition(CreateDisposition createDisposition) {
      * @see 
      *     Write Disposition
      */
-    public Builder writeDisposition(WriteDisposition writeDisposition) {
+    public B writeDisposition(WriteDisposition writeDisposition) {
       this.writeDisposition = writeDisposition;
-      return this;
+      return self();
     }
 
     /**
@@ -144,9 +149,9 @@ public Builder writeDisposition(WriteDisposition writeDisposition) {
      * 
      *     Source Format
      */
-    public Builder formatOptions(FormatOptions formatOptions) {
+    public B formatOptions(FormatOptions formatOptions) {
       this.formatOptions = formatOptions;
-      return this;
+      return self();
     }
 
     /**
@@ -154,9 +159,9 @@ public Builder formatOptions(FormatOptions formatOptions) {
      * number of bad records exceeds this value, an invalid error is returned in the job result.
      * By default no bad record is ignored.
      */
-    public Builder maxBadRecords(Integer maxBadRecords) {
+    public B maxBadRecords(Integer maxBadRecords) {
       this.maxBadRecords = maxBadRecords;
-      return this;
+      return self();
     }
 
     /**
@@ -164,9 +169,9 @@ public Builder maxBadRecords(Integer maxBadRecords) {
      * already exists, or if you're loading data from a Google Cloud Datastore backup (i.e.
      * {@code DATASTORE_BACKUP} format option).
      */
-    public Builder schema(Schema schema) {
+    public B schema(Schema schema) {
       this.schema = schema;
-      return this;
+      return self();
     }
 
     /**
@@ -175,9 +180,9 @@ public Builder schema(Schema schema) {
      * are treated as bad records, and if there are too many bad records, an invalid error is
      * returned in the job result. By default unknown values are not allowed.
      */
-    public Builder ignoreUnknownValues(Boolean ignoreUnknownValues) {
+    public B ignoreUnknownValues(Boolean ignoreUnknownValues) {
       this.ignoreUnknownValues = ignoreUnknownValues;
-      return this;
+      return self();
     }
 
     /**
@@ -187,18 +192,20 @@ public Builder ignoreUnknownValues(Boolean ignoreUnknownValues) {
      * all properties. If any named property isn't found in the Cloud Datastore backup, an invalid
      * error is returned in the job result.
      */
-    public Builder projectionFields(List projectionFields) {
+    public B projectionFields(List projectionFields) {
       this.projectionFields =
           projectionFields != null ? ImmutableList.copyOf(projectionFields) : null;
-      return this;
+      return self();
     }
 
-    public LoadConfiguration build() {
-      return new LoadConfiguration(this);
+    @SuppressWarnings("unchecked")
+    public T build() {
+      return (T) new LoadConfiguration(this);
     }
   }
 
-  private LoadConfiguration(Builder builder) {
+  @SuppressWarnings("unchecked")
+  protected LoadConfiguration(Builder builder) {
     this.destinationTable = checkNotNull(builder.destinationTable);
     this.createDisposition = builder.createDisposition;
     this.writeDisposition = builder.writeDisposition;
@@ -206,7 +213,7 @@ private LoadConfiguration(Builder builder) {
     this.maxBadRecords = builder.maxBadRecords;
     this.schema = builder.schema;
     this.ignoreUnknownValues = builder.ignoreUnknownValues;
-    this.projectionFields = builder.projectionFields;
+    this.projectionFields = (List) builder.projectionFields;
   }
 
   /**
@@ -292,8 +299,7 @@ public Builder toBuilder() {
     return new Builder(this);
   }
 
-  @Override
-  public String toString() {
+  MoreObjects.ToStringHelper toStringHelper() {
     return MoreObjects.toStringHelper(this)
         .add("destinationTable", destinationTable)
         .add("createDisposition", createDisposition)
@@ -302,8 +308,12 @@ public String toString() {
         .add("maxBadRecords", maxBadRecords)
         .add("schema", schema)
         .add("ignoreUnknownValue", ignoreUnknownValues)
-        .add("projectionFields", projectionFields)
-        .toString();
+        .add("projectionFields", projectionFields);
+  }
+
+  @Override
+  public String toString() {
+    return toStringHelper().toString();
   }
 
   @Override
@@ -318,7 +328,7 @@ public int hashCode() {
         maxBadRecords, schema, ignoreUnknownValues, projectionFields);
   }
 
-  JobConfigurationLoad toPb() {
+  com.google.api.services.bigquery.model.JobConfiguration toPb() {
     JobConfigurationLoad loadConfigurationPb = new JobConfigurationLoad();
     loadConfigurationPb.setDestinationTable(destinationTable.toPb());
     if (createDisposition != null) {
@@ -345,25 +355,27 @@ JobConfigurationLoad toPb() {
     loadConfigurationPb.setMaxBadRecords(maxBadRecords);
     loadConfigurationPb.setIgnoreUnknownValues(ignoreUnknownValues);
     loadConfigurationPb.setProjectionFields(projectionFields);
-    return loadConfigurationPb;
+    return new com.google.api.services.bigquery.model.JobConfiguration()
+        .setLoad(loadConfigurationPb);
   }
 
-  static LoadConfiguration fromPb(JobConfigurationLoad configurationPb) {
-    return new Builder(configurationPb).build();
+  static LoadConfiguration fromPb(
+      com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+    return new Builder<>(configurationPb).build();
   }
 
   /**
    * Creates a builder for a BigQuery Load Configuration given the destination table.
    */
   public static Builder builder(TableId destinationTable) {
-    return new Builder().destinationTable(destinationTable);
+    return new Builder<>().destinationTable(destinationTable);
   }
 
   /**
    * Creates a builder for a BigQuery Load Configuration given the destination table and format.
    */
   public static Builder builder(TableId destinationTable, FormatOptions format) {
-    return new Builder().destinationTable(destinationTable).formatOptions(format);
+    return new Builder<>().destinationTable(destinationTable).formatOptions(format);
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
new file mode 100644
index 000000000000..93ac10d4385b
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.collect.ImmutableList;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Load Job configuration. A Load Job loads data from one of several formats into a
+ * table. Data is provided as URIs that point to objects in Google Cloud Storage.
+ */
+public class LoadJobConfiguration extends LoadConfiguration
+    implements JobConfiguration, Serializable {
+
+  private static final long serialVersionUID = -2673554846792429829L;
+
+  private final List sourceUris;
+
+  public static final class Builder
+      extends LoadConfiguration.Builder {
+
+    private List sourceUris;
+
+    private Builder() {
+      super();
+    }
+
+    private Builder(LoadJobConfiguration loadConfiguration) {
+      super(loadConfiguration);
+      this.sourceUris = loadConfiguration.sourceUris;
+    }
+
+    private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+      super(configurationPb);
+      if (configurationPb.getLoad().getSourceUris() != null) {
+        this.sourceUris = ImmutableList.copyOf(configurationPb.getLoad().getSourceUris());
+      }
+    }
+
+    /**
+     * Sets the fully-qualified URIs that point to source data in Google Cloud Storage (e.g.
+     * gs://bucket/path). Each URI can contain one '*' wildcard character and it must come after the
+     * 'bucket' name.
+     */
+    public Builder sourceUris(List sourceUris) {
+      this.sourceUris = sourceUris != null ? ImmutableList.copyOf(sourceUris) : null;
+      return this;
+    }
+
+    @Override
+    public LoadJobConfiguration build() {
+      return new LoadJobConfiguration(this);
+    }
+  }
+
+  private LoadJobConfiguration(Builder builder) {
+    super(builder);
+    this.sourceUris = builder.sourceUris;
+  }
+
+  @Override
+  public Type type() {
+    return Type.LOAD;
+  }
+
+  /**
+   * Returns the fully-qualified URIs that point to source data in Google Cloud Storage (e.g.
+   * gs://bucket/path). Each URI can contain one '*' wildcard character and it must come after the
+   * 'bucket' name.
+   */
+  public List sourceUris() {
+    return sourceUris;
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  ToStringHelper toStringHelper() {
+    return super.toStringHelper().add("sourceUris", sourceUris);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof LoadJobConfiguration
+        && Objects.equals(toPb(), ((LoadJobConfiguration) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), sourceUris);
+  }
+
+  com.google.api.services.bigquery.model.JobConfiguration toPb() {
+    com.google.api.services.bigquery.model.JobConfiguration configurationPb = super.toPb();
+    if (sourceUris != null) {
+      configurationPb.getLoad().setSourceUris(ImmutableList.copyOf(sourceUris));
+    }
+    return configurationPb;
+  }
+
+  /**
+   * Creates a builder for a BigQuery Load Job configuration given the destination table and source
+   * URIs.
+   */
+  public static Builder builder(TableId destinationTable, List sourceUris) {
+    return new Builder().destinationTable(destinationTable).sourceUris(sourceUris);
+  }
+
+  /**
+   * Creates a builder for a BigQuery Load Job configuration given the destination table and source
+   * URI.
+   */
+  public static Builder builder(TableId destinationTable, String sourceUri) {
+    return builder(destinationTable, ImmutableList.of(sourceUri));
+  }
+
+  /**
+   * Creates a builder for a BigQuery Load Job configuration given the destination table, format and
+   * source URIs.
+   */
+  public static Builder builder(TableId destinationTable, List sourceUris,
+      FormatOptions format) {
+    return builder(destinationTable, sourceUris).formatOptions(format);
+  }
+
+  /**
+   * Creates a builder for a BigQuery Load Job configuration given the destination table, format and
+   * source URI.
+   */
+  public static Builder builder(TableId destinationTable, String sourceUri, FormatOptions format) {
+    return builder(destinationTable, ImmutableList.of(sourceUri), format);
+  }
+
+  /**
+   * Returns a BigQuery Load Job Configuration for the given destination table and source URIs.
+   */
+  public static LoadJobConfiguration of(TableId destinationTable, List sourceUris) {
+    return builder(destinationTable, sourceUris).build();
+  }
+
+  /**
+   * Returns a BigQuery Load Job Configuration for the given destination table and source URI.
+   */
+  public static LoadJobConfiguration of(TableId destinationTable, String sourceUri) {
+    return of(destinationTable, ImmutableList.of(sourceUri));
+  }
+
+  /**
+   * Returns a BigQuery Load Job Configuration for the given destination table, format and source
+   * URI.
+   */
+  public static LoadJobConfiguration of(TableId destinationTable, List sourceUris,
+      FormatOptions format) {
+    return builder(destinationTable, sourceUris, format).build();
+  }
+
+  /**
+   * Returns a BigQuery Load Job Configuration for the given destination table, format and source
+   * URI.
+   */
+  public static LoadJobConfiguration of(TableId destinationTable, String sourceUri,
+      FormatOptions format) {
+    return of(destinationTable, ImmutableList.of(sourceUri), format);
+  }
+
+  static LoadJobConfiguration fromPb(
+      com.google.api.services.bigquery.model.JobConfiguration confPb) {
+    return new Builder(confPb).build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
deleted file mode 100644
index 21fe51baa4ae..000000000000
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.api.services.bigquery.model.Job;
-import com.google.api.services.bigquery.model.JobConfiguration;
-import com.google.api.services.bigquery.model.JobConfigurationLoad;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.gcloud.bigquery.JobStatistics.LoadStatistics;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Google BigQuery Load Job. A Load Job loads data from one of several formats into a table. Data is
- * provided as URIs that point to objects in Google Cloud Storage.
- */
-public class LoadJobInfo extends JobInfo {
-
-  private static final long serialVersionUID = 6349304826867750535L;
-
-  private final List sourceUris;
-  private final LoadConfiguration configuration;
-
-  public static final class Builder extends JobInfo.Builder {
-
-    private List sourceUris;
-    private LoadConfiguration configuration;
-
-    private Builder() {}
-
-    private Builder(LoadJobInfo jobInfo) {
-      super(jobInfo);
-      this.sourceUris = jobInfo.sourceUris;
-      this.configuration = jobInfo.configuration;
-    }
-
-    private Builder(Job jobPb) {
-      super(jobPb);
-      JobConfigurationLoad loadConfigurationPb = jobPb.getConfiguration().getLoad();
-      this.configuration = LoadConfiguration.fromPb(loadConfigurationPb);
-      this.sourceUris = loadConfigurationPb.getSourceUris();
-    }
-
-    /**
-     * Sets the fully-qualified URIs that point to source data in Google Cloud Storage (e.g.
-     * gs://bucket/path). Each URI can contain one '*' wildcard character and it must come after the
-     * 'bucket' name.
-     */
-    public Builder sourceUris(List sourceUris) {
-      this.sourceUris = sourceUris != null ? ImmutableList.copyOf(sourceUris) : null;
-      return this;
-    }
-
-    /**
-     * Sets the configuration for the BigQuery Load Job.
-     */
-    public Builder configuration(LoadConfiguration configuration) {
-      this.configuration = configuration;
-      return this;
-    }
-
-    @Override
-    public LoadJobInfo build() {
-      return new LoadJobInfo(this);
-    }
-  }
-
-  private LoadJobInfo(Builder builder) {
-    super(builder);
-    this.sourceUris = builder.sourceUris;
-    this.configuration = builder.configuration;
-  }
-
-  /**
-   * Returns the fully-qualified URIs that point to source data in Google Cloud Storage (e.g.
-   * gs://bucket/path). Each URI can contain one '*' wildcard character and it must come after the
-   * 'bucket' name.
-   */
-  public List sourceUris() {
-    return sourceUris;
-  }
-
-  /**
-   * Returns the configuration for the BigQuery Load Job.
-   */
-  public LoadConfiguration configuration() {
-    return configuration;
-  }
-
-  @Override
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  @Override
-  ToStringHelper toStringHelper() {
-    return super.toStringHelper().add("sourceUris", sourceUris).add("configuration", configuration);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof LoadJobInfo && baseEquals((LoadJobInfo) obj);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(baseHashCode(), sourceUris, configuration);
-  }
-
-  @Override
-  Job toPb() {
-    JobConfigurationLoad loadConfigurationPb = configuration.toPb();
-    loadConfigurationPb.setSourceUris(sourceUris);
-    return super.toPb().setConfiguration(new JobConfiguration().setLoad(loadConfigurationPb));
-  }
-
-  /**
-   * Creates a builder for a BigQuery Load Job given the load configuration and source URI.
-   */
-  public static Builder builder(LoadConfiguration configuration, String sourceUri) {
-    return builder(configuration, ImmutableList.of(checkNotNull(sourceUri)));
-  }
-
-  /**
-   * Creates a builder for a BigQuery Load Job given the load configuration and source URIs.
-   */
-  public static Builder builder(LoadConfiguration configuration, List sourceUris) {
-    return new Builder().configuration(configuration).sourceUris(sourceUris);
-  }
-
-  /**
-   * Returns a BigQuery Load Job for the given load configuration and source URI. Job's id is chosen
-   * by the service.
-   */
-  public static LoadJobInfo of(LoadConfiguration configuration, String sourceUri) {
-    return builder(configuration, sourceUri).build();
-  }
-
-  /**
-   * Returns a BigQuery Load Job for the given load configuration and source URIs. Job's id is
-   * chosen by the service.
-   */
-  public static LoadJobInfo of(LoadConfiguration configuration, List sourceUris) {
-    return builder(configuration, sourceUris).build();
-  }
-
-  /**
-   * Returns a BigQuery Load Job for the given load configuration and source URI. Job's id is set to
-   * the provided value.
-   */
-  public static LoadJobInfo of(JobId jobId, LoadConfiguration configuration, String sourceUri) {
-    return builder(configuration, sourceUri).jobId(jobId).build();
-  }
-
-  /**
-   * Returns a BigQuery Load Job for the given load configuration and source URIs. Job's id is set
-   * to the provided value.
-   */
-  public static LoadJobInfo of(JobId jobId, LoadConfiguration configuration,
-      List sourceUris) {
-    return builder(configuration, sourceUris).jobId(jobId).build();
-  }
-
-  @SuppressWarnings("unchecked")
-  static LoadJobInfo fromPb(Job jobPb) {
-    return new Builder(jobPb).build();
-  }
-}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
similarity index 84%
rename from gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
rename to gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
index e2a505ffc4dd..0cf12f546258 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
@@ -18,26 +18,26 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.api.services.bigquery.model.Job;
-import com.google.api.services.bigquery.model.JobConfiguration;
 import com.google.api.services.bigquery.model.JobConfigurationQuery;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.gcloud.bigquery.JobStatistics.QueryStatistics;
+import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
+import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 /**
- * Google BigQuery Query Job. A Query Job runs a query against BigQuery data.
+ * Google BigQuery Query Job configuration. A Query Job runs a query against BigQuery data.
  */
-public class QueryJobInfo extends JobInfo {
+public final class QueryJobConfiguration implements JobConfiguration, Serializable {
 
-  private static final long serialVersionUID = -8708709356039780158L;
+  private static final long serialVersionUID = -1108948249081804890L;
 
   /**
    * Priority levels for a query. If not specified the priority is assumed to be
@@ -72,8 +72,7 @@ public enum Priority {
   private final Boolean flattenResults;
   private final Boolean dryRun;
 
-  public static final class Builder extends JobInfo.Builder {
+  public static final class Builder {
 
     private String query;
     private TableId destinationTable;
@@ -90,30 +89,28 @@ public static final class Builder extends JobInfo.Builder tableDefinitions) {
       this.tableDefinitions = tableDefinitions != null ? Maps.newHashMap(tableDefinitions) : null;
-      return self();
+      return this;
     }
 
     /**
@@ -180,7 +179,7 @@ public Builder addTableDefinition(String tableName, ExternalDataConfiguration ta
         this.tableDefinitions = Maps.newHashMap();
       }
       this.tableDefinitions.put(checkNotNull(tableName), checkNotNull(tableDefinition));
-      return self();
+      return this;
     }
 
     /**
@@ -191,7 +190,7 @@ public Builder addTableDefinition(String tableName, ExternalDataConfiguration ta
     public Builder userDefinedFunctions(List userDefinedFunctions) {
       this.userDefinedFunctions =
           userDefinedFunctions != null ? ImmutableList.copyOf(userDefinedFunctions) : null;
-      return self();
+      return this;
     }
 
     /**
@@ -202,7 +201,7 @@ public Builder userDefinedFunctions(List userDefinedFunctio
      */
     public Builder createDisposition(CreateDisposition createDisposition) {
       this.createDisposition = createDisposition;
-      return self();
+      return this;
     }
 
     /**
@@ -213,7 +212,7 @@ public Builder createDisposition(CreateDisposition createDisposition) {
      */
     public Builder writeDisposition(WriteDisposition writeDisposition) {
       this.writeDisposition = writeDisposition;
-      return self();
+      return this;
     }
 
     /**
@@ -222,7 +221,7 @@ public Builder writeDisposition(WriteDisposition writeDisposition) {
      */
     public Builder defaultDataset(DatasetId defaultDataset) {
       this.defaultDataset = defaultDataset;
-      return self();
+      return this;
     }
 
     /**
@@ -239,7 +238,7 @@ public Builder defaultDataset(String defaultDataset) {
      */
     public Builder priority(Priority priority) {
       this.priority = priority;
-      return self();
+      return this;
     }
 
     /**
@@ -252,7 +251,7 @@ public Builder priority(Priority priority) {
      */
     public Builder allowLargeResults(Boolean allowLargeResults) {
       this.allowLargeResults = allowLargeResults;
-      return self();
+      return this;
     }
 
     /**
@@ -264,7 +263,7 @@ public Builder allowLargeResults(Boolean allowLargeResults) {
      */
     public Builder useQueryCache(Boolean useQueryCache) {
       this.useQueryCache = useQueryCache;
-      return self();
+      return this;
     }
 
     /**
@@ -276,7 +275,7 @@ public Builder useQueryCache(Boolean useQueryCache) {
      */
     public Builder flattenResults(Boolean flattenResults) {
       this.flattenResults = flattenResults;
-      return self();
+      return this;
     }
 
     /**
@@ -286,17 +285,15 @@ public Builder flattenResults(Boolean flattenResults) {
      */
     public Builder dryRun(Boolean dryRun) {
       this.dryRun = dryRun;
-      return self();
+      return this;
     }
 
-    @Override
-    public QueryJobInfo build() {
-      return new QueryJobInfo(this);
+    public QueryJobConfiguration build() {
+      return new QueryJobConfiguration(this);
     }
   }
 
-  private QueryJobInfo(Builder builder) {
-    super(builder);
+  private QueryJobConfiguration(Builder builder) {
     this.query = checkNotNull(builder.query);
     this.allowLargeResults = builder.allowLargeResults;
     this.createDisposition = builder.createDisposition;
@@ -312,6 +309,11 @@ private QueryJobInfo(Builder builder) {
     this.dryRun = builder.dryRun;
   }
 
+  @Override
+  public Type type() {
+    return Type.QUERY;
+  }
+
   /**
    * Returns whether the job is enabled to create arbitrarily large results. If {@code true}
    * the query is allowed to create large results at a slight cost in performance.
@@ -423,14 +425,13 @@ public Boolean dryRun() {
     return dryRun;
   }
 
-  @Override
   public Builder toBuilder() {
     return new Builder(this);
   }
 
   @Override
-  ToStringHelper toStringHelper() {
-    return super.toStringHelper()
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
         .add("query", query)
         .add("destinationTable", destinationTable)
         .add("defaultDataset", defaultDataset)
@@ -442,24 +443,26 @@ ToStringHelper toStringHelper() {
         .add("userDefinedFunctions", userDefinedFunctions)
         .add("createDisposition", createDisposition)
         .add("writeDisposition", writeDisposition)
-        .add("dryRun", dryRun);
+        .add("dryRun", dryRun)
+        .toString();
   }
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof QueryJobInfo && baseEquals((QueryJobInfo) obj);
+    return obj instanceof QueryJobConfiguration
+        && Objects.equals(toPb(), ((QueryJobConfiguration) obj).toPb());
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(baseHashCode(), allowLargeResults, createDisposition, destinationTable,
-        defaultDataset, flattenResults, priority, query, tableDefinitions, useQueryCache,
-        userDefinedFunctions, writeDisposition, dryRun);
+    return Objects.hash(allowLargeResults, createDisposition, destinationTable, defaultDataset,
+        flattenResults, priority, query, tableDefinitions, useQueryCache, userDefinedFunctions,
+        writeDisposition, dryRun);
   }
 
-  @Override
-  Job toPb() {
-    JobConfiguration configurationPb = new JobConfiguration();
+  com.google.api.services.bigquery.model.JobConfiguration toPb() {
+    com.google.api.services.bigquery.model.JobConfiguration configurationPb =
+        new com.google.api.services.bigquery.model.JobConfiguration();
     JobConfigurationQuery queryConfigurationPb = new JobConfigurationQuery();
     queryConfigurationPb.setQuery(query);
     configurationPb.setDryRun(dryRun());
@@ -495,7 +498,7 @@ Job toPb() {
     if (writeDisposition != null) {
       queryConfigurationPb.setWriteDisposition(writeDisposition.toString());
     }
-    return super.toPb().setConfiguration(configurationPb.setQuery(queryConfigurationPb));
+    return configurationPb.setQuery(queryConfigurationPb);
   }
 
   /**
@@ -509,20 +512,12 @@ public static Builder builder(String query) {
    * Returns a BigQuery Copy Job for the given the query to be run. Job's id is chosen by the
    * service.
    */
-  public static QueryJobInfo of(String query) {
+  public static QueryJobConfiguration of(String query) {
     return builder(query).build();
   }
 
-  /**
-   * Returns a BigQuery Copy Job for the given the query to be run. Job's id is set to the provided
-   * value.
-   */
-  public static QueryJobInfo of(JobId jobId, String query) {
-    return builder(query).jobId(jobId).build();
-  }
-
-  @SuppressWarnings("unchecked")
-  static QueryJobInfo fromPb(Job jobPb) {
+  static QueryJobConfiguration fromPb(
+      com.google.api.services.bigquery.model.JobConfiguration jobPb) {
     return new Builder(jobPb).build();
   }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
index 64fbb3e931fc..3655c2aba453 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
@@ -120,8 +120,8 @@ public Builder defaultDataset(String defaultDataset) {
      * Sets how long to wait for the query to complete, in milliseconds, before the request times
      * out and returns. Note that this is only a timeout for the request, not the query. If the
      * query takes longer to run than the timeout value, the call returns without any results and
-     * with the {@link QueryResponse#jobCompleted()} set to {@code false}. If not set, a wait time of
-     * 10000 milliseconds (10 seconds) is used.
+     * with the {@link QueryResponse#jobCompleted()} set to {@code false}. If not set, a wait time
+     * of 10000 milliseconds (10 seconds) is used.
      */
     public Builder maxWaitTime(Long maxWaitTime) {
       this.maxWaitTime = maxWaitTime;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
index b4cc1df1d997..1344b31c9b68 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
@@ -200,8 +200,8 @@ Job copy(String destinationDataset, String destinationTable, BigQuery.JobOption.
    * @throws BigQueryException upon failure
    */
   Job copy(TableId destinationTable, BigQuery.JobOption... options) throws BigQueryException {
-    JobInfo job = bigquery.create(CopyJobInfo.of(destinationTable, info.tableId()), options);
-    return new Job(bigquery, job);
+    CopyJobConfiguration configuration = CopyJobConfiguration.of(destinationTable, info.tableId());
+    return new Job(bigquery, bigquery.create(JobInfo.of(configuration), options));
   }
 
   /**
@@ -231,8 +231,9 @@ Job extract(String format, String destinationUri, BigQuery.JobOption... options)
    */
   Job extract(String format, List destinationUris, BigQuery.JobOption... options)
       throws BigQueryException {
-    return new Job(bigquery,
-        bigquery.create(ExtractJobInfo.of(info.tableId(), format, destinationUris), options));
+    ExtractJobConfiguration extractConfiguration =
+        ExtractJobConfiguration.of(info.tableId(), destinationUris, format);
+    return new Job(bigquery, bigquery.create(JobInfo.of(extractConfiguration), options));
   }
 
   /**
@@ -262,8 +263,8 @@ Job load(FormatOptions format, String sourceUri, BigQuery.JobOption... options)
    */
   Job load(FormatOptions format, List sourceUris, BigQuery.JobOption... options)
       throws BigQueryException {
-    LoadConfiguration configuration = LoadConfiguration.of(info.tableId(), format);
-    return new Job(bigquery, bigquery.create(LoadJobInfo.of(configuration, sourceUris), options));
+    LoadJobConfiguration loadConfig = LoadJobConfiguration.of(info.tableId(), sourceUris, format);
+    return new Job(bigquery, bigquery.create(JobInfo.of(loadConfig), options));
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
index 5f17f60f2bb5..6062e19950e0 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
@@ -19,7 +19,7 @@
 import com.google.api.services.bigquery.model.Dataset;
 import com.google.api.services.bigquery.model.GetQueryResultsResponse;
 import com.google.api.services.bigquery.model.Job;
-import com.google.api.services.bigquery.model.JobConfigurationLoad;
+import com.google.api.services.bigquery.model.JobConfiguration;
 import com.google.api.services.bigquery.model.QueryRequest;
 import com.google.api.services.bigquery.model.QueryResponse;
 import com.google.api.services.bigquery.model.Table;
@@ -193,7 +193,7 @@ GetQueryResultsResponse getQueryResults(String jobId, Map options)
    * @param configuration load configuration
    * @throws BigQueryException upon failure
    */
-  String open(JobConfigurationLoad configuration) throws BigQueryException;
+  String open(JobConfiguration configuration) throws BigQueryException;
 
   /**
    * Uploads the provided data to the resumable upload session at the specified position.
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
index 0a1dc046bf74..592ae1b93d6d 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -408,9 +408,9 @@ public QueryResponse query(QueryRequest request) throws BigQueryException {
   }
 
   @Override
-  public String open(JobConfigurationLoad configuration) throws BigQueryException {
+  public String open(JobConfiguration configuration) throws BigQueryException {
     try {
-      Job loadJob = new Job().setConfiguration(new JobConfiguration().setLoad(configuration));
+      Job loadJob = new Job().setConfiguration(configuration);
       StringBuilder builder = new StringBuilder()
           .append(BASE_RESUMABLE_URI)
           .append(options.projectId())
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index 3fe1824fd3c2..862dd5b930fa 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -108,42 +108,42 @@ public class BigQueryImplTest {
   private static final TableInfo OTHER_TABLE_INFO = TableInfo.of(OTHER_TABLE_ID, TABLE_SCHEMA);
   private static final TableInfo TABLE_INFO_WITH_PROJECT =
       TableInfo.of(TABLE_ID_WITH_PROJECT, TABLE_SCHEMA);
-  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.of(LoadConfiguration.of(TABLE_ID), "URI");
-  private static final LoadJobInfo LOAD_JOB_WITH_PROJECT =
-      LoadJobInfo.of(LoadConfiguration.of(TABLE_ID_WITH_PROJECT), "URI");
-  private static final LoadJobInfo COMPLETE_LOAD_JOB =
-      LoadJobInfo.builder(LoadConfiguration.of(TABLE_ID_WITH_PROJECT), "URI")
-          .jobId(JobId.of(PROJECT, JOB))
-          .build();
-  private static final CopyJobInfo COPY_JOB =
-      CopyJobInfo.of(TABLE_ID, ImmutableList.of(TABLE_ID, TABLE_ID));
-  private static final CopyJobInfo COPY_JOB_WITH_PROJECT =
-      CopyJobInfo.of(TABLE_ID_WITH_PROJECT, ImmutableList.of(TABLE_ID_WITH_PROJECT,
+  private static final LoadJobConfiguration LOAD_JOB_CONFIGURATION =
+      LoadJobConfiguration.of(TABLE_ID, "URI");
+  private static final LoadJobConfiguration LOAD_JOB_CONFIGURATION_WITH_PROJECT =
+      LoadJobConfiguration.of(TABLE_ID_WITH_PROJECT, "URI");
+  private static final JobInfo LOAD_JOB =
+      JobInfo.of(LOAD_JOB_CONFIGURATION);
+  private static final JobInfo COMPLETE_LOAD_JOB =
+      JobInfo.of(JobId.of(PROJECT, JOB), LOAD_JOB_CONFIGURATION_WITH_PROJECT);
+  private static final CopyJobConfiguration COPY_JOB_CONFIGURATION =
+      CopyJobConfiguration.of(TABLE_ID, ImmutableList.of(TABLE_ID, TABLE_ID));
+  private static final CopyJobConfiguration COPY_JOB_CONFIGURATION_WITH_PROJECT =
+      CopyJobConfiguration.of(TABLE_ID_WITH_PROJECT, ImmutableList.of(TABLE_ID_WITH_PROJECT,
           TABLE_ID_WITH_PROJECT));
-  private static final CopyJobInfo COMPLETE_COPY_JOB =
-      CopyJobInfo.builder(TABLE_ID_WITH_PROJECT, ImmutableList.of(TABLE_ID_WITH_PROJECT,
-          TABLE_ID_WITH_PROJECT))
-          .jobId(JobId.of(PROJECT, JOB))
+  private static final JobInfo COPY_JOB = JobInfo.of(COPY_JOB_CONFIGURATION);
+  private static final JobInfo COMPLETE_COPY_JOB =
+      JobInfo.of(JobId.of(PROJECT, JOB), COPY_JOB_CONFIGURATION_WITH_PROJECT);
+  private static final QueryJobConfiguration QUERY_JOB_CONFIGURATION =
+      QueryJobConfiguration.builder("SQL")
+          .defaultDataset(DatasetId.of(DATASET))
+          .destinationTable(TABLE_ID)
           .build();
-  private static final QueryJobInfo QUERY_JOB = QueryJobInfo.builder("SQL")
-      .defaultDataset(DatasetId.of(DATASET))
-      .destinationTable(TABLE_ID)
-      .build();
-  private static final QueryJobInfo QUERY_JOB_WITH_PROJECT = QueryJobInfo.builder("SQL")
-      .defaultDataset(DatasetId.of(PROJECT, DATASET))
-      .destinationTable(TABLE_ID_WITH_PROJECT)
-      .build();
-  private static final QueryJobInfo COMPLETE_QUERY_JOB = QueryJobInfo.builder("SQL")
-      .defaultDataset(DatasetId.of(PROJECT, DATASET)).destinationTable(TABLE_ID_WITH_PROJECT)
-      .jobId(JobId.of(PROJECT, JOB))
-      .build();
-  private static final ExtractJobInfo EXTRACT_JOB = ExtractJobInfo.of(TABLE_ID, "URI");
-  private static final ExtractJobInfo EXTRACT_JOB_WITH_PROJECT =
-      ExtractJobInfo.of(TABLE_ID_WITH_PROJECT, "URI");
-  private static final ExtractJobInfo COMPLETE_EXTRACT_JOB =
-      ExtractJobInfo.builder(TABLE_ID_WITH_PROJECT, "URI")
-          .jobId(JobId.of(PROJECT, JOB))
+  private static final QueryJobConfiguration QUERY_JOB_CONFIGURATION_WITH_PROJECT =
+      QueryJobConfiguration.builder("SQL")
+          .defaultDataset(DatasetId.of(PROJECT, DATASET))
+          .destinationTable(TABLE_ID_WITH_PROJECT)
           .build();
+  private static final JobInfo QUERY_JOB = JobInfo.of(QUERY_JOB_CONFIGURATION);
+  private static final JobInfo COMPLETE_QUERY_JOB =
+      JobInfo.of(JobId.of(PROJECT, JOB), QUERY_JOB_CONFIGURATION_WITH_PROJECT);
+  private static final ExtractJobConfiguration EXTRACT_JOB_CONFIGURATION =
+      ExtractJobConfiguration.of(TABLE_ID, "URI");
+  private static final ExtractJobConfiguration EXTRACT_JOB_CONFIGURATION_WITH_PROJECT =
+      ExtractJobConfiguration.of(TABLE_ID_WITH_PROJECT, "URI");
+  private static final JobInfo EXTRACT_JOB = JobInfo.of(EXTRACT_JOB_CONFIGURATION);
+  private static final JobInfo COMPLETE_EXTRACT_JOB =
+      JobInfo.of(JobId.of(PROJECT, JOB), EXTRACT_JOB_CONFIGURATION_WITH_PROJECT);
   private static final TableCell BOOLEAN_FIELD = new TableCell().setV("false");
   private static final TableCell INTEGER_FIELD = new TableCell().setV("1");
   private static final TableRow TABLE_ROW =
@@ -728,53 +728,57 @@ public void testListTableDataWithOptions() {
 
   @Test
   public void testCreateQueryJob() {
-    EasyMock.expect(bigqueryRpcMock.create(QUERY_JOB_WITH_PROJECT.toPb(), EMPTY_RPC_OPTIONS))
+    EasyMock.expect(bigqueryRpcMock.create(
+            JobInfo.of(QUERY_JOB_CONFIGURATION_WITH_PROJECT).toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(COMPLETE_QUERY_JOB.toPb());
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
-    QueryJobInfo job = bigquery.create(QUERY_JOB);
+    JobInfo job = bigquery.create(QUERY_JOB);
     assertEquals(COMPLETE_QUERY_JOB, job);
   }
 
   @Test
   public void testCreateLoadJob() {
-    EasyMock.expect(bigqueryRpcMock.create(LOAD_JOB_WITH_PROJECT.toPb(), EMPTY_RPC_OPTIONS))
+    EasyMock.expect(bigqueryRpcMock.create(
+            JobInfo.of(LOAD_JOB_CONFIGURATION_WITH_PROJECT).toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(COMPLETE_LOAD_JOB.toPb());
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
-    LoadJobInfo job = bigquery.create(LOAD_JOB);
+    JobInfo job = bigquery.create(LOAD_JOB);
     assertEquals(COMPLETE_LOAD_JOB, job);
   }
 
   @Test
   public void testCreateCopyJob() {
-    EasyMock.expect(bigqueryRpcMock.create(COPY_JOB_WITH_PROJECT.toPb(), EMPTY_RPC_OPTIONS))
+    EasyMock.expect(bigqueryRpcMock.create(
+            JobInfo.of(COPY_JOB_CONFIGURATION_WITH_PROJECT).toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(COMPLETE_COPY_JOB.toPb());
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
-    CopyJobInfo job = bigquery.create(COPY_JOB);
+    JobInfo job = bigquery.create(COPY_JOB);
     assertEquals(COMPLETE_COPY_JOB, job);
   }
 
   @Test
   public void testCreateExtractJob() {
-    EasyMock.expect(bigqueryRpcMock.create(EXTRACT_JOB_WITH_PROJECT.toPb(), EMPTY_RPC_OPTIONS))
+    EasyMock.expect(bigqueryRpcMock.create(
+            JobInfo.of(EXTRACT_JOB_CONFIGURATION_WITH_PROJECT).toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(COMPLETE_EXTRACT_JOB.toPb());
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
-    ExtractJobInfo job = bigquery.create(EXTRACT_JOB);
+    JobInfo job = bigquery.create(EXTRACT_JOB);
     assertEquals(COMPLETE_EXTRACT_JOB, job);
   }
 
   @Test
   public void testCreateJobWithSelectedFields() {
     Capture> capturedOptions = Capture.newInstance();
-    EasyMock.expect(
-        bigqueryRpcMock.create(eq(QUERY_JOB_WITH_PROJECT.toPb()), capture(capturedOptions)))
+    EasyMock.expect(bigqueryRpcMock.create(
+            eq(JobInfo.of(QUERY_JOB_CONFIGURATION_WITH_PROJECT).toPb()), capture(capturedOptions)))
         .andReturn(COMPLETE_QUERY_JOB.toPb());
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
-    QueryJobInfo job = bigquery.create(QUERY_JOB, JOB_OPTION_FIELDS);
+    JobInfo job = bigquery.create(QUERY_JOB, JOB_OPTION_FIELDS);
     assertEquals(COMPLETE_QUERY_JOB, job);
     String selector = (String) capturedOptions.getValue().get(JOB_OPTION_FIELDS.rpcOption());
     assertTrue(selector.contains("jobReference"));
@@ -789,7 +793,7 @@ public void testGetJob() {
         .andReturn(COMPLETE_COPY_JOB.toPb());
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
-    CopyJobInfo job = bigquery.getJob(JOB);
+    JobInfo job = bigquery.getJob(JOB);
     assertEquals(COMPLETE_COPY_JOB, job);
   }
 
@@ -799,15 +803,14 @@ public void testGetJobFromJobId() {
         .andReturn(COMPLETE_COPY_JOB.toPb());
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
-    CopyJobInfo job = bigquery.getJob(JobId.of(PROJECT, JOB));
+    JobInfo job = bigquery.getJob(JobId.of(PROJECT, JOB));
     assertEquals(COMPLETE_COPY_JOB, job);
   }
 
   @Test
   public void testListJobs() {
     String cursor = "cursor";
-    ImmutableList jobList =
-        ImmutableList.of(QUERY_JOB_WITH_PROJECT, LOAD_JOB_WITH_PROJECT);
+    ImmutableList jobList = ImmutableList.of(COMPLETE_QUERY_JOB, COMPLETE_LOAD_JOB);
     Tuple> result =
         Tuple.of(cursor, Iterables.transform(jobList, new Function() {
           @Override
@@ -826,8 +829,7 @@ public Job apply(JobInfo jobInfo) {
   @Test
   public void testListJobsWithOptions() {
     String cursor = "cursor";
-    ImmutableList jobList =
-        ImmutableList.of(QUERY_JOB_WITH_PROJECT, LOAD_JOB_WITH_PROJECT);
+    ImmutableList jobList = ImmutableList.of(COMPLETE_QUERY_JOB, COMPLETE_LOAD_JOB);
     Tuple> result =
         Tuple.of(cursor, Iterables.transform(jobList, new Function() {
           @Override
@@ -848,8 +850,7 @@ public Job apply(JobInfo jobInfo) {
   public void testListJobsWithSelectedFields() {
     String cursor = "cursor";
     Capture> capturedOptions = Capture.newInstance();
-    ImmutableList jobList =
-        ImmutableList.of(QUERY_JOB_WITH_PROJECT, LOAD_JOB_WITH_PROJECT);
+    ImmutableList jobList = ImmutableList.of(COMPLETE_QUERY_JOB, COMPLETE_LOAD_JOB);
     Tuple> result =
         Tuple.of(cursor, Iterables.transform(jobList, new Function() {
           @Override
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java
new file mode 100644
index 000000000000..0a94b4fbded2
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
+import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class CopyJobConfigurationTest {
+
+  private static final TableId SOURCE_TABLE = TableId.of("dataset", "sourceTable");
+  private static final List SOURCE_TABLES = ImmutableList.of(
+      TableId.of("dataset", "sourceTable1"),
+      TableId.of("dataset", "sourceTable2"));
+  private static final TableId DESTINATION_TABLE = TableId.of("dataset", "destinationTable");
+  private static final CreateDisposition CREATE_DISPOSITION = CreateDisposition.CREATE_IF_NEEDED;
+  private static final WriteDisposition WRITE_DISPOSITION = WriteDisposition.WRITE_APPEND;
+  private static final CopyJobConfiguration COPY_JOB_CONFIGURATION =
+      CopyJobConfiguration.builder(DESTINATION_TABLE, SOURCE_TABLE)
+          .createDisposition(CREATE_DISPOSITION)
+          .writeDisposition(WRITE_DISPOSITION)
+          .build();
+  private static final CopyJobConfiguration COPY_JOB_CONFIGURATION_MULTIPLE_TABLES =
+      CopyJobConfiguration.builder(DESTINATION_TABLE, SOURCE_TABLES)
+          .createDisposition(CREATE_DISPOSITION)
+          .writeDisposition(WRITE_DISPOSITION)
+          .build();
+
+  @Test
+  public void testToBuilder() {
+    compareCopyJobConfiguration(COPY_JOB_CONFIGURATION, COPY_JOB_CONFIGURATION.toBuilder().build());
+    compareCopyJobConfiguration(COPY_JOB_CONFIGURATION_MULTIPLE_TABLES,
+        COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.toBuilder().build());
+    CopyJobConfiguration jobConfiguration = COPY_JOB_CONFIGURATION.toBuilder()
+        .destinationTable(TableId.of("dataset", "newTable"))
+        .build();
+    assertEquals("newTable", jobConfiguration.destinationTable().table());
+    jobConfiguration = jobConfiguration.toBuilder().destinationTable(DESTINATION_TABLE).build();
+    compareCopyJobConfiguration(COPY_JOB_CONFIGURATION, jobConfiguration);
+  }
+
+  @Test
+  public void testOf() {
+    CopyJobConfiguration job = CopyJobConfiguration.of(DESTINATION_TABLE, SOURCE_TABLES);
+    assertEquals(DESTINATION_TABLE, job.destinationTable());
+    assertEquals(SOURCE_TABLES, job.sourceTables());
+    job = CopyJobConfiguration.of(DESTINATION_TABLE, SOURCE_TABLE);
+    assertEquals(DESTINATION_TABLE, job.destinationTable());
+    assertEquals(ImmutableList.of(SOURCE_TABLE), job.sourceTables());
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    CopyJobConfiguration jobConfiguration =
+        CopyJobConfiguration.of(DESTINATION_TABLE, SOURCE_TABLES);
+    compareCopyJobConfiguration(jobConfiguration, jobConfiguration.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(DESTINATION_TABLE, COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.destinationTable());
+    assertEquals(SOURCE_TABLES, COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.sourceTables());
+    assertEquals(CREATE_DISPOSITION, COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.createDisposition());
+    assertEquals(WRITE_DISPOSITION, COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.writeDisposition());
+    assertEquals(DESTINATION_TABLE, COPY_JOB_CONFIGURATION.destinationTable());
+    assertEquals(ImmutableList.of(SOURCE_TABLE), COPY_JOB_CONFIGURATION.sourceTables());
+    assertEquals(CREATE_DISPOSITION, COPY_JOB_CONFIGURATION.createDisposition());
+    assertEquals(WRITE_DISPOSITION, COPY_JOB_CONFIGURATION.writeDisposition());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    assertNotNull(COPY_JOB_CONFIGURATION.toPb().getCopy());
+    assertNull(COPY_JOB_CONFIGURATION.toPb().getExtract());
+    assertNull(COPY_JOB_CONFIGURATION.toPb().getLoad());
+    assertNull(COPY_JOB_CONFIGURATION.toPb().getQuery());
+    assertNull(COPY_JOB_CONFIGURATION.toPb().getCopy().getSourceTables());
+    assertNull(COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.toPb().getCopy().getSourceTable());
+    compareCopyJobConfiguration(COPY_JOB_CONFIGURATION,
+        CopyJobConfiguration.fromPb(COPY_JOB_CONFIGURATION.toPb()));
+    compareCopyJobConfiguration(COPY_JOB_CONFIGURATION_MULTIPLE_TABLES,
+        CopyJobConfiguration.fromPb(COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.toPb()));
+    CopyJobConfiguration jobConfiguration =
+        CopyJobConfiguration.of(DESTINATION_TABLE, SOURCE_TABLES);
+    compareCopyJobConfiguration(
+        jobConfiguration, CopyJobConfiguration.fromPb(jobConfiguration.toPb()));
+  }
+
+  private void compareCopyJobConfiguration(CopyJobConfiguration expected,
+      CopyJobConfiguration value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.destinationTable(), value.destinationTable());
+    assertEquals(expected.sourceTables(), value.sourceTables());
+    assertEquals(expected.createDisposition(), value.createDisposition());
+    assertEquals(expected.writeDisposition(), value.writeDisposition());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobInfoTest.java
deleted file mode 100644
index 81da59644cf0..000000000000
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobInfoTest.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import com.google.common.collect.ImmutableList;
-import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
-import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
-
-import org.junit.Test;
-
-import java.util.List;
-
-public class CopyJobInfoTest {
-
-  private static final String ETAG = "etag";
-  private static final String ID = "id";
-  private static final String SELF_LINK = "selfLink";
-  private static final String EMAIL = "email";
-  private static final TableId SOURCE_TABLE = TableId.of("dataset", "sourceTable");
-  private static final List SOURCE_TABLES = ImmutableList.of(
-      TableId.of("dataset", "sourceTable1"),
-      TableId.of("dataset", "sourceTable2")
-  );
-  private static final TableId DESTINATION_TABLE = TableId.of("dataset", "destinationTable");
-  private static final CreateDisposition CREATE_DISPOSITION = CreateDisposition.CREATE_IF_NEEDED;
-  private static final WriteDisposition WRITE_DISPOSITION = WriteDisposition.WRITE_APPEND;
-  private static final JobId JOB_ID = JobId.of("job");
-  private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
-  private static final JobStatistics JOB_STATISTICS = JobStatistics.builder()
-      .creationTime(1L)
-      .endTime(3L)
-      .startTime(2L)
-      .build();
-  private static final CopyJobInfo COPY_JOB =
-      CopyJobInfo.builder(DESTINATION_TABLE, SOURCE_TABLE)
-          .etag(ETAG)
-          .id(ID)
-          .selfLink(SELF_LINK)
-          .userEmail(EMAIL)
-          .jobId(JOB_ID)
-          .status(JOB_STATUS)
-          .createDisposition(CREATE_DISPOSITION)
-          .writeDisposition(WRITE_DISPOSITION)
-          .statistics(JOB_STATISTICS)
-          .build();
-  private static final CopyJobInfo COPY_JOB_INFO_MULTIPLE_TABLES =
-      CopyJobInfo.builder(DESTINATION_TABLE, SOURCE_TABLES)
-          .etag(ETAG)
-          .id(ID)
-          .selfLink(SELF_LINK)
-          .userEmail(EMAIL)
-          .jobId(JOB_ID)
-          .status(JOB_STATUS)
-          .createDisposition(CREATE_DISPOSITION)
-          .writeDisposition(WRITE_DISPOSITION)
-          .build();
-
-  @Test
-  public void testToBuilder() {
-    compareCopyJobInfo(COPY_JOB, COPY_JOB.toBuilder().build());
-    compareCopyJobInfo(COPY_JOB_INFO_MULTIPLE_TABLES,
-        COPY_JOB_INFO_MULTIPLE_TABLES.toBuilder().build());
-    CopyJobInfo job = COPY_JOB.toBuilder()
-        .destinationTable(TableId.of("dataset", "newTable"))
-        .build();
-    assertEquals("newTable", job.destinationTable().table());
-    job = job.toBuilder().destinationTable(DESTINATION_TABLE).build();
-    compareCopyJobInfo(COPY_JOB, job);
-  }
-
-  @Test
-  public void testOf() {
-    CopyJobInfo job = CopyJobInfo.of(DESTINATION_TABLE, SOURCE_TABLES);
-    assertEquals(DESTINATION_TABLE, job.destinationTable());
-    assertEquals(SOURCE_TABLES, job.sourceTables());
-    job = CopyJobInfo.of(DESTINATION_TABLE, SOURCE_TABLE);
-    assertEquals(DESTINATION_TABLE, job.destinationTable());
-    assertEquals(ImmutableList.of(SOURCE_TABLE), job.sourceTables());
-    job = CopyJobInfo.of(JOB_ID, DESTINATION_TABLE, SOURCE_TABLES);
-    assertEquals(JOB_ID, job.jobId());
-    assertEquals(DESTINATION_TABLE, job.destinationTable());
-    assertEquals(SOURCE_TABLES, job.sourceTables());
-    job = CopyJobInfo.of(JOB_ID, DESTINATION_TABLE, SOURCE_TABLE);
-    assertEquals(JOB_ID, job.jobId());
-    assertEquals(DESTINATION_TABLE, job.destinationTable());
-    assertEquals(ImmutableList.of(SOURCE_TABLE), job.sourceTables());
-  }
-
-  @Test
-  public void testToBuilderIncomplete() {
-    CopyJobInfo job = CopyJobInfo.of(DESTINATION_TABLE, SOURCE_TABLES);
-    compareCopyJobInfo(job, job.toBuilder().build());
-  }
-
-  @Test
-  public void testBuilder() {
-    assertEquals(ETAG, COPY_JOB_INFO_MULTIPLE_TABLES.etag());
-    assertEquals(ID, COPY_JOB_INFO_MULTIPLE_TABLES.id());
-    assertEquals(SELF_LINK, COPY_JOB_INFO_MULTIPLE_TABLES.selfLink());
-    assertEquals(EMAIL, COPY_JOB_INFO_MULTIPLE_TABLES.userEmail());
-    assertEquals(JOB_ID, COPY_JOB_INFO_MULTIPLE_TABLES.jobId());
-    assertEquals(JOB_STATUS, COPY_JOB_INFO_MULTIPLE_TABLES.status());
-    assertEquals(DESTINATION_TABLE, COPY_JOB_INFO_MULTIPLE_TABLES.destinationTable());
-    assertEquals(SOURCE_TABLES, COPY_JOB_INFO_MULTIPLE_TABLES.sourceTables());
-    assertEquals(CREATE_DISPOSITION, COPY_JOB_INFO_MULTIPLE_TABLES.createDisposition());
-    assertEquals(WRITE_DISPOSITION, COPY_JOB_INFO_MULTIPLE_TABLES.writeDisposition());
-    assertEquals(ETAG, COPY_JOB.etag());
-    assertEquals(ID, COPY_JOB.id());
-    assertEquals(SELF_LINK, COPY_JOB.selfLink());
-    assertEquals(EMAIL, COPY_JOB.userEmail());
-    assertEquals(JOB_ID, COPY_JOB.jobId());
-    assertEquals(JOB_STATUS, COPY_JOB.status());
-    assertEquals(DESTINATION_TABLE, COPY_JOB.destinationTable());
-    assertEquals(ImmutableList.of(SOURCE_TABLE), COPY_JOB.sourceTables());
-    assertEquals(CREATE_DISPOSITION, COPY_JOB.createDisposition());
-    assertEquals(WRITE_DISPOSITION, COPY_JOB.writeDisposition());
-    assertEquals(JOB_STATISTICS, COPY_JOB.statistics());
-  }
-
-  @Test
-  public void testToPbAndFromPb() {
-    assertNotNull(COPY_JOB.toPb().getConfiguration().getCopy());
-    assertNull(COPY_JOB.toPb().getConfiguration().getExtract());
-    assertNull(COPY_JOB.toPb().getConfiguration().getLoad());
-    assertNull(COPY_JOB.toPb().getConfiguration().getQuery());
-    assertNull(COPY_JOB.toPb().getConfiguration().getCopy().getSourceTables());
-    assertEquals(JOB_STATISTICS, JobStatistics.fromPb(COPY_JOB.statistics().toPb()));
-    assertNull(COPY_JOB_INFO_MULTIPLE_TABLES.toPb().getConfiguration().getCopy().getSourceTable());
-    compareCopyJobInfo(COPY_JOB, CopyJobInfo.fromPb(COPY_JOB.toPb()));
-    compareCopyJobInfo(COPY_JOB, (CopyJobInfo) JobInfo.fromPb(COPY_JOB.toPb()));
-    compareCopyJobInfo(COPY_JOB_INFO_MULTIPLE_TABLES,
-        CopyJobInfo.fromPb(COPY_JOB_INFO_MULTIPLE_TABLES.toPb()));
-    compareCopyJobInfo(COPY_JOB_INFO_MULTIPLE_TABLES,
-        (CopyJobInfo) JobInfo.fromPb(COPY_JOB_INFO_MULTIPLE_TABLES.toPb()));
-    CopyJobInfo job = CopyJobInfo.of(DESTINATION_TABLE, SOURCE_TABLES);
-    compareCopyJobInfo(job, CopyJobInfo.fromPb(job.toPb()));
-    compareCopyJobInfo(job, (CopyJobInfo) JobInfo.fromPb(job.toPb()));
-  }
-
-  private void compareCopyJobInfo(CopyJobInfo expected, CopyJobInfo value) {
-    assertEquals(expected, value);
-    assertEquals(expected.hashCode(), value.hashCode());
-    assertEquals(expected.toString(), value.toString());
-    assertEquals(expected.etag(), value.etag());
-    assertEquals(expected.id(), value.id());
-    assertEquals(expected.jobId(), value.jobId());
-    assertEquals(expected.selfLink(), value.selfLink());
-    assertEquals(expected.status(), value.status());
-    assertEquals(expected.statistics(), value.statistics());
-    assertEquals(expected.userEmail(), value.userEmail());
-    assertEquals(expected.destinationTable(), value.destinationTable());
-    assertEquals(expected.sourceTables(), value.sourceTables());
-    assertEquals(expected.createDisposition(), value.createDisposition());
-    assertEquals(expected.writeDisposition(), value.writeDisposition());
-  }
-}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java
new file mode 100644
index 000000000000..a81c912dbb58
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class ExtractJobConfigurationTest {
+
+  private static final List DESTINATION_URIS = ImmutableList.of("uri1", "uri2");
+  private static final String DESTINATION_URI = "uri1";
+  private static final TableId TABLE_ID = TableId.of("dataset", "table");
+  private static final String FIELD_DELIMITER = ",";
+  private static final String FORMAT = "CSV";
+  private static final String JSON_FORMAT = "NEWLINE_DELIMITED_JSON";
+  private static final Boolean PRINT_HEADER = true;
+  private static final String COMPRESSION = "GZIP";
+  private static final ExtractJobConfiguration EXTRACT_CONFIGURATION =
+      ExtractJobConfiguration.builder(TABLE_ID, DESTINATION_URIS)
+          .printHeader(PRINT_HEADER)
+          .fieldDelimiter(FIELD_DELIMITER)
+          .compression(COMPRESSION)
+          .format(FORMAT)
+          .build();
+  private static final ExtractJobConfiguration EXTRACT_CONFIGURATION_ONE_URI =
+      ExtractJobConfiguration.builder(TABLE_ID, DESTINATION_URI)
+          .printHeader(PRINT_HEADER)
+          .fieldDelimiter(FIELD_DELIMITER)
+          .compression(COMPRESSION)
+          .format(FORMAT)
+          .build();
+
+  @Test
+  public void testToBuilder() {
+    compareExtractJobConfiguration(
+        EXTRACT_CONFIGURATION, EXTRACT_CONFIGURATION.toBuilder().build());
+    ExtractJobConfiguration job = EXTRACT_CONFIGURATION.toBuilder()
+        .sourceTable(TableId.of("dataset", "newTable"))
+        .build();
+    assertEquals("newTable", job.sourceTable().table());
+    job = job.toBuilder().sourceTable(TABLE_ID).build();
+    compareExtractJobConfiguration(EXTRACT_CONFIGURATION, job);
+  }
+
+  @Test
+  public void testOf() {
+    ExtractJobConfiguration job = ExtractJobConfiguration.of(TABLE_ID, DESTINATION_URIS);
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(DESTINATION_URIS, job.destinationUris());
+    job = ExtractJobConfiguration.of(TABLE_ID, DESTINATION_URI);
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
+    job = ExtractJobConfiguration.of(TABLE_ID, DESTINATION_URIS, JSON_FORMAT);
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(DESTINATION_URIS, job.destinationUris());
+    assertEquals(JSON_FORMAT, job.format());
+    job = ExtractJobConfiguration.of(TABLE_ID, DESTINATION_URI, JSON_FORMAT);
+    assertEquals(TABLE_ID, job.sourceTable());
+    assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
+    assertEquals(JSON_FORMAT, job.format());
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    ExtractJobConfiguration job = ExtractJobConfiguration.of(TABLE_ID, DESTINATION_URIS);
+    compareExtractJobConfiguration(job, job.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(TABLE_ID, EXTRACT_CONFIGURATION.sourceTable());
+    assertEquals(DESTINATION_URIS, EXTRACT_CONFIGURATION.destinationUris());
+    assertEquals(FIELD_DELIMITER, EXTRACT_CONFIGURATION.fieldDelimiter());
+    assertEquals(COMPRESSION, EXTRACT_CONFIGURATION.compression());
+    assertEquals(PRINT_HEADER, EXTRACT_CONFIGURATION.printHeader());
+    assertEquals(FORMAT, EXTRACT_CONFIGURATION.format());
+    assertEquals(TABLE_ID, EXTRACT_CONFIGURATION_ONE_URI.sourceTable());
+    assertEquals(ImmutableList.of(DESTINATION_URI),
+        EXTRACT_CONFIGURATION_ONE_URI.destinationUris());
+    assertEquals(FIELD_DELIMITER, EXTRACT_CONFIGURATION_ONE_URI.fieldDelimiter());
+    assertEquals(COMPRESSION, EXTRACT_CONFIGURATION_ONE_URI.compression());
+    assertEquals(PRINT_HEADER, EXTRACT_CONFIGURATION_ONE_URI.printHeader());
+    assertEquals(FORMAT, EXTRACT_CONFIGURATION_ONE_URI.format());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    assertNotNull(EXTRACT_CONFIGURATION.toPb().getExtract());
+    assertNull(EXTRACT_CONFIGURATION.toPb().getCopy());
+    assertNull(EXTRACT_CONFIGURATION.toPb().getLoad());
+    assertNull(EXTRACT_CONFIGURATION.toPb().getQuery());
+    compareExtractJobConfiguration(EXTRACT_CONFIGURATION,
+        ExtractJobConfiguration.fromPb(EXTRACT_CONFIGURATION.toPb()));
+    compareExtractJobConfiguration(EXTRACT_CONFIGURATION_ONE_URI,
+        ExtractJobConfiguration.fromPb(EXTRACT_CONFIGURATION_ONE_URI.toPb()));
+    ExtractJobConfiguration job = ExtractJobConfiguration.of(TABLE_ID, DESTINATION_URIS);
+    compareExtractJobConfiguration(job, ExtractJobConfiguration.fromPb(job.toPb()));
+  }
+
+  private void compareExtractJobConfiguration(ExtractJobConfiguration expected,
+      ExtractJobConfiguration value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.sourceTable(), value.sourceTable());
+    assertEquals(expected.destinationUris(), value.destinationUris());
+    assertEquals(expected.compression(), value.compression());
+    assertEquals(expected.printHeader(), value.printHeader());
+    assertEquals(expected.fieldDelimiter(), value.fieldDelimiter());
+    assertEquals(expected.format(), value.format());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java
deleted file mode 100644
index bb47112b6410..000000000000
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobInfoTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import com.google.common.collect.ImmutableList;
-import com.google.gcloud.bigquery.JobStatistics.ExtractStatistics;
-
-import org.junit.Test;
-
-import java.util.List;
-
-public class ExtractJobInfoTest {
-
-  private static final String ETAG = "etag";
-  private static final String ID = "id";
-  private static final String SELF_LINK = "selfLink";
-  private static final String EMAIL = "email";
-  private static final List DESTINATION_URIS = ImmutableList.of("uri1", "uri2");
-  private static final String DESTINATION_URI = "uri1";
-  private static final TableId TABLE_ID = TableId.of("dataset", "table");
-  private static final String FIELD_DELIMITER = ",";
-  private static final String FORMAT = "CSV";
-  private static final String JSON_FORMAT = "NEWLINE_DELIMITED_JSON";
-  private static final Boolean PRINT_HEADER = true;
-  private static final String COMPRESSION = "GZIP";
-  private static final JobId JOB_ID = JobId.of("job");
-  private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
-  private static final ExtractStatistics JOB_STATISTICS = ExtractStatistics.builder()
-      .creationTime(1L)
-      .endTime(3L)
-      .startTime(2L)
-      .destinationUriFileCounts(ImmutableList.of(42L))
-      .build();
-  private static final ExtractJobInfo EXTRACT_JOB =
-      ExtractJobInfo.builder(TABLE_ID, DESTINATION_URIS)
-          .etag(ETAG)
-          .id(ID)
-          .selfLink(SELF_LINK)
-          .userEmail(EMAIL)
-          .jobId(JOB_ID)
-          .status(JOB_STATUS)
-          .printHeader(PRINT_HEADER)
-          .fieldDelimiter(FIELD_DELIMITER)
-          .compression(COMPRESSION)
-          .format(FORMAT)
-          .statistics(JOB_STATISTICS)
-          .build();
-  private static final ExtractJobInfo EXTRACT_JOB_ONE_URI =
-      ExtractJobInfo.builder(TABLE_ID, DESTINATION_URI)
-          .etag(ETAG)
-          .id(ID)
-          .selfLink(SELF_LINK)
-          .userEmail(EMAIL)
-          .jobId(JOB_ID)
-          .status(JOB_STATUS)
-          .printHeader(PRINT_HEADER)
-          .fieldDelimiter(FIELD_DELIMITER)
-          .compression(COMPRESSION)
-          .format(FORMAT)
-          .build();
-
-  @Test
-  public void testToBuilder() {
-    compareExtractJobInfo(EXTRACT_JOB, EXTRACT_JOB.toBuilder().build());
-    ExtractJobInfo job = EXTRACT_JOB.toBuilder()
-        .sourceTable(TableId.of("dataset", "newTable"))
-        .build();
-    assertEquals("newTable", job.sourceTable().table());
-    job = job.toBuilder().sourceTable(TABLE_ID).build();
-    compareExtractJobInfo(EXTRACT_JOB, job);
-  }
-
-  @Test
-  public void testOf() {
-    ExtractJobInfo job = ExtractJobInfo.of(TABLE_ID, DESTINATION_URIS);
-    assertEquals(TABLE_ID, job.sourceTable());
-    assertEquals(DESTINATION_URIS, job.destinationUris());
-    job = ExtractJobInfo.of(TABLE_ID, DESTINATION_URI);
-    assertEquals(TABLE_ID, job.sourceTable());
-    assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
-    job = ExtractJobInfo.of(TABLE_ID, JSON_FORMAT, DESTINATION_URIS);
-    assertEquals(TABLE_ID, job.sourceTable());
-    assertEquals(DESTINATION_URIS, job.destinationUris());
-    assertEquals(JSON_FORMAT, job.format());
-    job = ExtractJobInfo.of(TABLE_ID, JSON_FORMAT, DESTINATION_URI);
-    assertEquals(TABLE_ID, job.sourceTable());
-    assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
-    assertEquals(JSON_FORMAT, job.format());
-    job = ExtractJobInfo.of(JOB_ID, TABLE_ID, DESTINATION_URIS);
-    assertEquals(JOB_ID, job.jobId());
-    assertEquals(TABLE_ID, job.sourceTable());
-    assertEquals(DESTINATION_URIS, job.destinationUris());
-    job = ExtractJobInfo.of(JOB_ID, TABLE_ID, DESTINATION_URI);
-    assertEquals(JOB_ID, job.jobId());
-    assertEquals(TABLE_ID, job.sourceTable());
-    assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
-    job = ExtractJobInfo.of(JOB_ID, TABLE_ID, JSON_FORMAT, DESTINATION_URIS);
-    assertEquals(JOB_ID, job.jobId());
-    assertEquals(TABLE_ID, job.sourceTable());
-    assertEquals(DESTINATION_URIS, job.destinationUris());
-    assertEquals(JSON_FORMAT, job.format());
-    job = ExtractJobInfo.of(JOB_ID, TABLE_ID, JSON_FORMAT, DESTINATION_URI);
-    assertEquals(JOB_ID, job.jobId());
-    assertEquals(TABLE_ID, job.sourceTable());
-    assertEquals(ImmutableList.of(DESTINATION_URI), job.destinationUris());
-    assertEquals(JSON_FORMAT, job.format());
-  }
-
-  @Test
-  public void testToBuilderIncomplete() {
-    ExtractJobInfo job = ExtractJobInfo.of(TABLE_ID, DESTINATION_URIS);
-    compareExtractJobInfo(job, job.toBuilder().build());
-  }
-
-  @Test
-  public void testBuilder() {
-    assertEquals(ETAG, EXTRACT_JOB.etag());
-    assertEquals(ID, EXTRACT_JOB.id());
-    assertEquals(SELF_LINK, EXTRACT_JOB.selfLink());
-    assertEquals(EMAIL, EXTRACT_JOB.userEmail());
-    assertEquals(JOB_ID, EXTRACT_JOB.jobId());
-    assertEquals(JOB_STATUS, EXTRACT_JOB.status());
-    assertEquals(TABLE_ID, EXTRACT_JOB.sourceTable());
-    assertEquals(DESTINATION_URIS, EXTRACT_JOB.destinationUris());
-    assertEquals(FIELD_DELIMITER, EXTRACT_JOB.fieldDelimiter());
-    assertEquals(COMPRESSION, EXTRACT_JOB.compression());
-    assertEquals(PRINT_HEADER, EXTRACT_JOB.printHeader());
-    assertEquals(FORMAT, EXTRACT_JOB.format());
-    assertEquals(JOB_STATISTICS, EXTRACT_JOB.statistics());
-    assertEquals(ETAG, EXTRACT_JOB_ONE_URI.etag());
-    assertEquals(ID, EXTRACT_JOB_ONE_URI.id());
-    assertEquals(SELF_LINK, EXTRACT_JOB_ONE_URI.selfLink());
-    assertEquals(EMAIL, EXTRACT_JOB_ONE_URI.userEmail());
-    assertEquals(JOB_ID, EXTRACT_JOB_ONE_URI.jobId());
-    assertEquals(JOB_STATUS, EXTRACT_JOB_ONE_URI.status());
-    assertEquals(TABLE_ID, EXTRACT_JOB_ONE_URI.sourceTable());
-    assertEquals(ImmutableList.of(DESTINATION_URI),
-        EXTRACT_JOB_ONE_URI.destinationUris());
-    assertEquals(FIELD_DELIMITER, EXTRACT_JOB_ONE_URI.fieldDelimiter());
-    assertEquals(COMPRESSION, EXTRACT_JOB_ONE_URI.compression());
-    assertEquals(PRINT_HEADER, EXTRACT_JOB_ONE_URI.printHeader());
-    assertEquals(FORMAT, EXTRACT_JOB_ONE_URI.format());
-  }
-
-  @Test
-  public void testToPbAndFromPb() {
-    assertNotNull(EXTRACT_JOB.toPb().getConfiguration().getExtract());
-    assertNull(EXTRACT_JOB.toPb().getConfiguration().getCopy());
-    assertNull(EXTRACT_JOB.toPb().getConfiguration().getLoad());
-    assertNull(EXTRACT_JOB.toPb().getConfiguration().getQuery());
-    assertEquals(JOB_STATISTICS, JobStatistics.fromPb(EXTRACT_JOB.toPb().getStatistics()));
-    compareExtractJobInfo(EXTRACT_JOB,
-        ExtractJobInfo.fromPb(EXTRACT_JOB.toPb()));
-    compareExtractJobInfo(EXTRACT_JOB,
-        (ExtractJobInfo) JobInfo.fromPb(EXTRACT_JOB.toPb()));
-    compareExtractJobInfo(EXTRACT_JOB_ONE_URI,
-        ExtractJobInfo.fromPb(EXTRACT_JOB_ONE_URI.toPb()));
-    compareExtractJobInfo(EXTRACT_JOB_ONE_URI,
-        (ExtractJobInfo) JobInfo.fromPb(EXTRACT_JOB_ONE_URI.toPb()));
-    ExtractJobInfo job = ExtractJobInfo.of(TABLE_ID, DESTINATION_URIS);
-    compareExtractJobInfo(job, ExtractJobInfo.fromPb(job.toPb()));
-    compareExtractJobInfo(job, (ExtractJobInfo) JobInfo.fromPb(job.toPb()));
-  }
-
-  private void compareExtractJobInfo(ExtractJobInfo expected, ExtractJobInfo value) {
-    assertEquals(expected, value);
-    assertEquals(expected.hashCode(), value.hashCode());
-    assertEquals(expected.toString(), value.toString());
-    assertEquals(expected.etag(), value.etag());
-    assertEquals(expected.id(), value.id());
-    assertEquals(expected.jobId(), value.jobId());
-    assertEquals(expected.selfLink(), value.selfLink());
-    assertEquals(expected.status(), value.status());
-    assertEquals(expected.statistics(), value.statistics());
-    assertEquals(expected.userEmail(), value.userEmail());
-    assertEquals(expected.sourceTable(), value.sourceTable());
-    assertEquals(expected.destinationUris(), value.destinationUris());
-    assertEquals(expected.compression(), value.compression());
-    assertEquals(expected.printHeader(), value.printHeader());
-    assertEquals(expected.fieldDelimiter(), value.fieldDelimiter());
-    assertEquals(expected.format(), value.format());
-  }
-}
\ No newline at end of file
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index f672815bcb7a..be30b5eb5050 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -152,12 +152,12 @@ public static void beforeClass() throws IOException, InterruptedException {
         JSON_CONTENT.getBytes(StandardCharsets.UTF_8));
     DatasetInfo info = DatasetInfo.builder(DATASET).description(DESCRIPTION).build();
     bigquery.create(info);
-    LoadConfiguration configuration = LoadConfiguration.builder(TABLE_ID, FormatOptions.json())
+    LoadJobConfiguration configuration = LoadJobConfiguration.builder(
+            TABLE_ID, "gs://" + BUCKET + "/" + JSON_LOAD_FILE, FormatOptions.json())
         .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
         .schema(TABLE_SCHEMA)
         .build();
-    LoadJobInfo job = LoadJobInfo.of(configuration, "gs://" + BUCKET + "/" + JSON_LOAD_FILE);
-    job = bigquery.create(job);
+    JobInfo job = bigquery.create(JobInfo.of(configuration));
     while (job.status().state() != JobStatus.State.DONE) {
       Thread.sleep(1000);
       job = bigquery.getJob(job.jobId());
@@ -646,8 +646,9 @@ public void testQuery() throws InterruptedException {
       rowCount++;
     }
     assertEquals(2, rowCount);
-    QueryJobInfo queryJob = bigquery.getJob(response.jobId());
-    assertNotNull(queryJob.statistics().queryPlan());
+    JobInfo queryJob = bigquery.getJob(response.jobId());
+    JobStatistics.QueryStatistics statistics = queryJob.statistics();
+    assertNotNull(statistics.queryPlan());
   }
 
   @Test
@@ -685,14 +686,18 @@ public void testCreateAndGetJob() throws InterruptedException {
     assertEquals(DATASET, createdTableInfo.tableId().dataset());
     assertEquals(sourceTableName, createdTableInfo.tableId().table());
     TableId destinationTable = TableId.of(DATASET, destinationTableName);
-    CopyJobInfo job = CopyJobInfo.of(destinationTable, sourceTable);
-    CopyJobInfo createdJob = bigquery.create(job);
-    CopyJobInfo remoteJob = bigquery.getJob(createdJob.jobId());
+    CopyJobConfiguration copyJobConfiguration =
+        CopyJobConfiguration.of(destinationTable, sourceTable);
+    JobInfo job = JobInfo.of(copyJobConfiguration);
+    JobInfo createdJob = bigquery.create(job);
+    JobInfo remoteJob = bigquery.getJob(createdJob.jobId());
     assertEquals(createdJob.jobId(), remoteJob.jobId());
-    assertEquals(createdJob.sourceTables(), remoteJob.sourceTables());
-    assertEquals(createdJob.destinationTable(), remoteJob.destinationTable());
-    assertEquals(createdJob.createDisposition(), remoteJob.createDisposition());
-    assertEquals(createdJob.writeDisposition(), remoteJob.writeDisposition());
+    CopyJobConfiguration createdConfiguration = createdJob.configuration();
+    CopyJobConfiguration remoteConfiguration = remoteJob.configuration();
+    assertEquals(createdConfiguration.sourceTables(), remoteConfiguration.sourceTables());
+    assertEquals(createdConfiguration.destinationTable(), remoteConfiguration.destinationTable());
+    assertEquals(createdConfiguration.createDisposition(), remoteConfiguration.createDisposition());
+    assertEquals(createdConfiguration.writeDisposition(), remoteConfiguration.writeDisposition());
     assertNotNull(remoteJob.etag());
     assertNotNull(remoteJob.statistics());
     assertNotNull(remoteJob.status());
@@ -713,23 +718,25 @@ public void testCreateAndGetJobWithSelectedFields() throws InterruptedException
     assertEquals(DATASET, createdTableInfo.tableId().dataset());
     assertEquals(sourceTableName, createdTableInfo.tableId().table());
     TableId destinationTable = TableId.of(DATASET, destinationTableName);
-    CopyJobInfo job = CopyJobInfo.of(destinationTable, sourceTable);
-    CopyJobInfo createdJob = bigquery.create(job, JobOption.fields(JobField.ETAG));
+    CopyJobConfiguration configuration = CopyJobConfiguration.of(destinationTable, sourceTable);
+    JobInfo createdJob =
+        bigquery.create(JobInfo.of(configuration), JobOption.fields(JobField.ETAG));
+    CopyJobConfiguration createdConfiguration = createdJob.configuration();
     assertNotNull(createdJob.jobId());
-    assertNotNull(createdJob.sourceTables());
-    assertNotNull(createdJob.destinationTable());
+    assertNotNull(createdConfiguration.sourceTables());
+    assertNotNull(createdConfiguration.destinationTable());
     assertNotNull(createdJob.etag());
     assertNull(createdJob.statistics());
     assertNull(createdJob.status());
     assertNull(createdJob.selfLink());
     assertNull(createdJob.userEmail());
-    CopyJobInfo remoteJob = bigquery.getJob(createdJob.jobId(),
-        JobOption.fields(JobField.ETAG));
+    JobInfo remoteJob = bigquery.getJob(createdJob.jobId(), JobOption.fields(JobField.ETAG));
+    CopyJobConfiguration remoteConfiguration = remoteJob.configuration();
     assertEquals(createdJob.jobId(), remoteJob.jobId());
-    assertEquals(createdJob.sourceTables(), remoteJob.sourceTables());
-    assertEquals(createdJob.destinationTable(), remoteJob.destinationTable());
-    assertEquals(createdJob.createDisposition(), remoteJob.createDisposition());
-    assertEquals(createdJob.writeDisposition(), remoteJob.writeDisposition());
+    assertEquals(createdConfiguration.sourceTables(), remoteConfiguration.sourceTables());
+    assertEquals(createdConfiguration.destinationTable(), remoteConfiguration.destinationTable());
+    assertEquals(createdConfiguration.createDisposition(), remoteConfiguration.createDisposition());
+    assertEquals(createdConfiguration.writeDisposition(), remoteConfiguration.writeDisposition());
     assertNotNull(remoteJob.etag());
     assertNull(remoteJob.statistics());
     assertNull(remoteJob.status());
@@ -750,8 +757,8 @@ public void testCopyJob() throws InterruptedException {
     assertEquals(DATASET, createdTableInfo.tableId().dataset());
     assertEquals(sourceTableName, createdTableInfo.tableId().table());
     TableId destinationTable = TableId.of(DATASET, destinationTableName);
-    CopyJobInfo job = CopyJobInfo.of(destinationTable, sourceTable);
-    CopyJobInfo remoteJob = bigquery.create(job);
+    CopyJobConfiguration configuration = CopyJobConfiguration.of(destinationTable, sourceTable);
+    JobInfo remoteJob = bigquery.create(JobInfo.of(configuration));
     while (remoteJob.status().state() != JobStatus.State.DONE) {
       Thread.sleep(1000);
       remoteJob = bigquery.getJob(remoteJob.jobId());
@@ -774,11 +781,11 @@ public void testQueryJob() throws InterruptedException {
         .append(TABLE_ID.table())
         .toString();
     TableId destinationTable = TableId.of(DATASET, tableName);
-    QueryJobInfo job = QueryJobInfo.builder(query)
+    QueryJobConfiguration configuration = QueryJobConfiguration.builder(query)
         .defaultDataset(DatasetId.of(DATASET))
         .destinationTable(destinationTable)
         .build();
-    QueryJobInfo remoteJob = bigquery.create(job);
+    JobInfo remoteJob = bigquery.create(JobInfo.of(configuration));
     while (remoteJob.status().state() != JobStatus.State.DONE) {
       Thread.sleep(1000);
       remoteJob = bigquery.getJob(remoteJob.jobId());
@@ -807,30 +814,33 @@ public void testQueryJob() throws InterruptedException {
     }
     assertEquals(2, rowCount);
     assertTrue(bigquery.delete(DATASET, tableName));
-    QueryJobInfo queryJob = bigquery.getJob(remoteJob.jobId());
-    assertNotNull(queryJob.statistics().queryPlan());
+    JobInfo queryJob = bigquery.getJob(remoteJob.jobId());
+    JobStatistics.QueryStatistics statistics = queryJob.statistics();
+    assertNotNull(statistics.queryPlan());
   }
 
   @Test
   public void testExtractJob() throws InterruptedException {
     String tableName = "test_export_job_table";
     TableId destinationTable = TableId.of(DATASET, tableName);
-    LoadConfiguration configuration = LoadConfiguration.builder(destinationTable)
-        .schema(SIMPLE_SCHEMA)
-        .build();
-    LoadJobInfo remoteLoadJob =
-        bigquery.create(LoadJobInfo.of(configuration, "gs://" + BUCKET + "/" + LOAD_FILE));
+    LoadJobConfiguration configuration =
+        LoadJobConfiguration.builder(destinationTable, "gs://" + BUCKET + "/" + LOAD_FILE)
+            .schema(SIMPLE_SCHEMA)
+            .build();
+    JobInfo remoteLoadJob =
+        bigquery.create(JobInfo.of(configuration));
     while (remoteLoadJob.status().state() != JobStatus.State.DONE) {
       Thread.sleep(1000);
       remoteLoadJob = bigquery.getJob(remoteLoadJob.jobId());
     }
     assertNull(remoteLoadJob.status().error());
 
-    ExtractJobInfo extractJob =
-        ExtractJobInfo.builder(destinationTable, "gs://" + BUCKET + "/" + EXTRACT_FILE)
-          .printHeader(false)
-          .build();
-    ExtractJobInfo remoteExtractJob = bigquery.create(extractJob);
+    ExtractJobConfiguration extractConfiguration =
+        ExtractJobConfiguration.builder(destinationTable, "gs://" + BUCKET + "/" + EXTRACT_FILE)
+            .printHeader(false)
+            .build();
+    JobInfo extractJob = JobInfo.of(extractConfiguration);
+    JobInfo remoteExtractJob = bigquery.create(extractJob);
     while (remoteExtractJob.status().state() != JobStatus.State.DONE) {
       Thread.sleep(1000);
       remoteExtractJob = bigquery.getJob(remoteExtractJob.jobId());
@@ -846,11 +856,11 @@ public void testCancelJob() throws InterruptedException {
     String destinationTableName = "test_cancel_query_job_table";
     String query = "SELECT TimestampField, StringField, BooleanField FROM " + TABLE_ID.table();
     TableId destinationTable = TableId.of(DATASET, destinationTableName);
-    QueryJobInfo job = QueryJobInfo.builder(query)
+    QueryJobConfiguration configuration = QueryJobConfiguration.builder(query)
         .defaultDataset(DatasetId.of(DATASET))
         .destinationTable(destinationTable)
         .build();
-    JobInfo remoteJob = bigquery.create(job);
+    JobInfo remoteJob = bigquery.create(JobInfo.of(configuration));
     assertTrue(bigquery.cancel(remoteJob.jobId()));
     while (remoteJob.status().state() != JobStatus.State.DONE) {
       Thread.sleep(1000);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
new file mode 100644
index 000000000000..5c45215633c4
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
@@ -0,0 +1,354 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
+import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
+import com.google.gcloud.bigquery.JobStatistics.ExtractStatistics;
+import com.google.gcloud.bigquery.JobStatistics.LoadStatistics;
+import com.google.gcloud.bigquery.JobStatistics.QueryStatistics;
+
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+public class JobInfoTest {
+
+  private static final String ETAG = "etag";
+  private static final String ID = "id";
+  private static final String SELF_LINK = "selfLink";
+  private static final String EMAIL = "email";
+  private static final JobId JOB_ID = JobId.of("job");
+  private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
+  private static final JobStatistics COPY_JOB_STATISTICS = JobStatistics.builder()
+      .creationTime(1L)
+      .endTime(3L)
+      .startTime(2L)
+      .build();
+  private static final ExtractStatistics EXTRACT_JOB_STATISTICS =
+      ExtractStatistics.builder()
+          .creationTime(1L)
+          .endTime(3L)
+          .startTime(2L)
+          .destinationUriFileCounts(ImmutableList.of(42L))
+          .build();
+  private static final LoadStatistics LOAD_JOB_STATISTICS =
+      LoadStatistics.builder()
+          .creationTime(1L)
+          .endTime(3L)
+          .startTime(2L)
+          .inputFiles(42L)
+          .outputBytes(1024L)
+          .inputBytes(2048L)
+          .outputRows(24L)
+          .build();
+  private static final QueryStatistics QUERY_JOB_STATISTICS =
+      QueryStatistics.builder()
+          .creationTime(1L)
+          .endTime(3L)
+          .startTime(2L)
+          .totalBytesProcessed(2048L)
+          .totalBytesBilled(1024L)
+          .cacheHit(false)
+          .billingTier(42)
+          .build();
+  private static final TableId SOURCE_TABLE = TableId.of("dataset", "sourceTable");
+  private static final TableId DESTINATION_TABLE = TableId.of("dataset", "destinationTable");
+  private static final CreateDisposition CREATE_DISPOSITION = CreateDisposition.CREATE_IF_NEEDED;
+  private static final WriteDisposition WRITE_DISPOSITION = WriteDisposition.WRITE_APPEND;
+  private static final CopyJobConfiguration COPY_CONFIGURATION =
+      CopyJobConfiguration.builder(DESTINATION_TABLE, SOURCE_TABLE)
+          .createDisposition(CREATE_DISPOSITION)
+          .writeDisposition(WRITE_DISPOSITION)
+          .build();
+  private static final List DESTINATION_URIS = ImmutableList.of("uri1", "uri2");
+  private static final TableId TABLE_ID = TableId.of("dataset", "table");
+  private static final DatasetId DATASET_ID = DatasetId.of("project", "dataset");
+  private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
+  private static final Field FIELD_SCHEMA1 =
+      Field.builder("StringField", Field.Type.string())
+          .mode(Field.Mode.NULLABLE)
+          .description("FieldDescription1")
+          .build();
+  private static final Field FIELD_SCHEMA2 =
+      Field.builder("IntegerField", Field.Type.integer())
+          .mode(Field.Mode.REPEATED)
+          .description("FieldDescription2")
+          .build();
+  private static final Field FIELD_SCHEMA3 =
+      Field.builder("RecordField", Field.Type.record(FIELD_SCHEMA1, FIELD_SCHEMA2))
+          .mode(Field.Mode.REQUIRED)
+          .description("FieldDescription3")
+          .build();
+  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA1, FIELD_SCHEMA2, FIELD_SCHEMA3);
+  private static final String FIELD_DELIMITER = ",";
+  private static final String FORMAT = "CSV";
+  private static final Boolean PRINT_HEADER = true;
+  private static final String COMPRESSION = "GZIP";
+  private static final ExtractJobConfiguration EXTRACT_CONFIGURATION =
+      ExtractJobConfiguration.builder(TABLE_ID, DESTINATION_URIS)
+          .printHeader(PRINT_HEADER)
+          .fieldDelimiter(FIELD_DELIMITER)
+          .compression(COMPRESSION)
+          .format(FORMAT)
+          .build();
+  private static final List PROJECTION_FIELDS = ImmutableList.of("field1", "field2");
+  private static final Integer MAX_BAD_RECORDS = 42;
+  private static final Boolean IGNORE_UNKNOWN_VALUES = true;
+  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder().build();
+  private static final ExternalDataConfiguration TABLE_CONFIGURATION = ExternalDataConfiguration
+      .builder(SOURCE_URIS, TABLE_SCHEMA, CSV_OPTIONS)
+      .compression(COMPRESSION)
+      .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+      .maxBadRecords(MAX_BAD_RECORDS)
+      .build();
+  private static final LoadJobConfiguration LOAD_CONFIGURATION =
+      LoadJobConfiguration.builder(TABLE_ID, SOURCE_URIS)
+          .createDisposition(CREATE_DISPOSITION)
+          .writeDisposition(WRITE_DISPOSITION)
+          .formatOptions(CSV_OPTIONS)
+          .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+          .maxBadRecords(MAX_BAD_RECORDS)
+          .projectionFields(PROJECTION_FIELDS)
+          .schema(TABLE_SCHEMA)
+          .build();
+  private static final String QUERY = "BigQuery SQL";
+  private static final Map TABLE_DEFINITIONS =
+      ImmutableMap.of("tableName", TABLE_CONFIGURATION);
+  private static final QueryJobConfiguration.Priority PRIORITY =
+      QueryJobConfiguration.Priority.BATCH;
+  private static final boolean ALLOW_LARGE_RESULTS = true;
+  private static final boolean USE_QUERY_CACHE = false;
+  private static final boolean FLATTEN_RESULTS = true;
+  private static final List USER_DEFINED_FUNCTIONS = ImmutableList.of(
+      UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
+  private static final QueryJobConfiguration QUERY_CONFIGURATION =
+      QueryJobConfiguration.builder(QUERY)
+          .useQueryCache(USE_QUERY_CACHE)
+          .tableDefinitions(TABLE_DEFINITIONS)
+          .allowLargeResults(ALLOW_LARGE_RESULTS)
+          .createDisposition(CREATE_DISPOSITION)
+          .defaultDataset(DATASET_ID)
+          .destinationTable(TABLE_ID)
+          .writeDisposition(WRITE_DISPOSITION)
+          .priority(PRIORITY)
+          .flattenResults(FLATTEN_RESULTS)
+          .userDefinedFunctions(USER_DEFINED_FUNCTIONS)
+          .dryRun(true)
+          .build();
+  private static final JobInfo COPY_JOB = JobInfo.builder(COPY_CONFIGURATION)
+      .jobId(JOB_ID)
+      .statistics(COPY_JOB_STATISTICS)
+      .jobId(JOB_ID)
+      .etag(ETAG)
+      .id(ID)
+      .selfLink(SELF_LINK)
+      .userEmail(EMAIL)
+      .status(JOB_STATUS)
+      .build();
+  private static final JobInfo EXTRACT_JOB = JobInfo.builder(EXTRACT_CONFIGURATION)
+      .jobId(JOB_ID)
+      .statistics(EXTRACT_JOB_STATISTICS)
+      .jobId(JOB_ID)
+      .etag(ETAG)
+      .id(ID)
+      .selfLink(SELF_LINK)
+      .userEmail(EMAIL)
+      .status(JOB_STATUS)
+      .build();
+  private static final JobInfo LOAD_JOB = JobInfo.builder(LOAD_CONFIGURATION)
+      .jobId(JOB_ID)
+      .statistics(LOAD_JOB_STATISTICS)
+      .jobId(JOB_ID)
+      .etag(ETAG)
+      .id(ID)
+      .selfLink(SELF_LINK)
+      .userEmail(EMAIL)
+      .status(JOB_STATUS)
+      .build();
+  private static final JobInfo QUERY_JOB = JobInfo.builder(QUERY_CONFIGURATION)
+      .jobId(JOB_ID)
+      .statistics(QUERY_JOB_STATISTICS)
+      .jobId(JOB_ID)
+      .etag(ETAG)
+      .id(ID)
+      .selfLink(SELF_LINK)
+      .userEmail(EMAIL)
+      .status(JOB_STATUS)
+      .build();
+
+
+  @Test
+  public void testToBuilder() {
+    compareJobInfo(COPY_JOB, COPY_JOB.toBuilder().build());
+    compareJobInfo(EXTRACT_JOB, EXTRACT_JOB.toBuilder().build());
+    compareJobInfo(LOAD_JOB, LOAD_JOB.toBuilder().build());
+    compareJobInfo(QUERY_JOB, QUERY_JOB.toBuilder().build());
+    JobInfo job = COPY_JOB.toBuilder()
+        .userEmail("newEmail")
+        .build();
+    assertEquals("newEmail", job.userEmail());
+    job = job.toBuilder().userEmail(EMAIL).build();
+    compareJobInfo(COPY_JOB, job);
+    job = EXTRACT_JOB.toBuilder()
+        .userEmail("newEmail")
+        .build();
+    assertEquals("newEmail", job.userEmail());
+    job = job.toBuilder().userEmail(EMAIL).build();
+    compareJobInfo(EXTRACT_JOB, job);
+    job = LOAD_JOB.toBuilder()
+        .userEmail("newEmail")
+        .build();
+    assertEquals("newEmail", job.userEmail());
+    job = job.toBuilder().userEmail(EMAIL).build();
+    compareJobInfo(LOAD_JOB, job);
+    job = QUERY_JOB.toBuilder()
+        .userEmail("newEmail")
+        .build();
+    assertEquals("newEmail", job.userEmail());
+    job = job.toBuilder().userEmail(EMAIL).build();
+    compareJobInfo(QUERY_JOB, job);
+  }
+
+  @Test
+  public void testOf() {
+    JobInfo job = JobInfo.of(COPY_CONFIGURATION);
+    assertEquals(COPY_CONFIGURATION, job.configuration());
+    job = JobInfo.of(EXTRACT_CONFIGURATION);
+    assertEquals(EXTRACT_CONFIGURATION, job.configuration());
+    job = JobInfo.of(LOAD_CONFIGURATION);
+    assertEquals(LOAD_CONFIGURATION, job.configuration());
+    job = JobInfo.of(QUERY_CONFIGURATION);
+    assertEquals(QUERY_CONFIGURATION, job.configuration());
+    job = JobInfo.of(JOB_ID, COPY_CONFIGURATION);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(COPY_CONFIGURATION, job.configuration());
+    job = JobInfo.of(JOB_ID, EXTRACT_CONFIGURATION);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(EXTRACT_CONFIGURATION, job.configuration());
+    job = JobInfo.of(JOB_ID, LOAD_CONFIGURATION);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(LOAD_CONFIGURATION, job.configuration());
+    job = JobInfo.of(JOB_ID, QUERY_CONFIGURATION);
+    assertEquals(JOB_ID, job.jobId());
+    assertEquals(QUERY_CONFIGURATION, job.configuration());
+
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    JobInfo job = JobInfo.of(COPY_CONFIGURATION);
+    compareJobInfo(job, job.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(ETAG, COPY_JOB.etag());
+    assertEquals(ID, COPY_JOB.id());
+    assertEquals(SELF_LINK, COPY_JOB.selfLink());
+    assertEquals(EMAIL, COPY_JOB.userEmail());
+    assertEquals(JOB_ID, COPY_JOB.jobId());
+    assertEquals(JOB_STATUS, COPY_JOB.status());
+    assertEquals(COPY_CONFIGURATION, COPY_JOB.configuration());
+    assertEquals(COPY_JOB_STATISTICS, COPY_JOB.statistics());
+
+    assertEquals(ETAG, EXTRACT_JOB.etag());
+    assertEquals(ID, EXTRACT_JOB.id());
+    assertEquals(SELF_LINK, EXTRACT_JOB.selfLink());
+    assertEquals(EMAIL, EXTRACT_JOB.userEmail());
+    assertEquals(JOB_ID, EXTRACT_JOB.jobId());
+    assertEquals(JOB_STATUS, EXTRACT_JOB.status());
+    assertEquals(EXTRACT_CONFIGURATION, EXTRACT_JOB.configuration());
+    assertEquals(EXTRACT_JOB_STATISTICS, EXTRACT_JOB.statistics());
+
+    assertEquals(ETAG, LOAD_JOB.etag());
+    assertEquals(ID, LOAD_JOB.id());
+    assertEquals(SELF_LINK, LOAD_JOB.selfLink());
+    assertEquals(EMAIL, LOAD_JOB.userEmail());
+    assertEquals(JOB_ID, LOAD_JOB.jobId());
+    assertEquals(JOB_STATUS, LOAD_JOB.status());
+    assertEquals(LOAD_CONFIGURATION, LOAD_JOB.configuration());
+    assertEquals(LOAD_JOB_STATISTICS, LOAD_JOB.statistics());
+
+    assertEquals(ETAG, QUERY_JOB.etag());
+    assertEquals(ID, QUERY_JOB.id());
+    assertEquals(SELF_LINK, QUERY_JOB.selfLink());
+    assertEquals(EMAIL, QUERY_JOB.userEmail());
+    assertEquals(JOB_ID, QUERY_JOB.jobId());
+    assertEquals(JOB_STATUS, QUERY_JOB.status());
+    assertEquals(QUERY_CONFIGURATION, QUERY_JOB.configuration());
+    assertEquals(QUERY_JOB_STATISTICS, QUERY_JOB.statistics());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    assertNotNull(COPY_JOB.toPb().getConfiguration().getCopy());
+    assertNull(COPY_JOB.toPb().getConfiguration().getExtract());
+    assertNull(COPY_JOB.toPb().getConfiguration().getLoad());
+    assertNull(COPY_JOB.toPb().getConfiguration().getQuery());
+    assertEquals(COPY_JOB_STATISTICS, JobStatistics.fromPb(COPY_JOB.statistics().toPb()));
+    compareJobInfo(COPY_JOB, JobInfo.fromPb(COPY_JOB.toPb()));
+    assertTrue(JobInfo.fromPb(COPY_JOB.toPb()).configuration() instanceof CopyJobConfiguration);
+    assertNull(EXTRACT_JOB.toPb().getConfiguration().getCopy());
+    assertNotNull(EXTRACT_JOB.toPb().getConfiguration().getExtract());
+    assertNull(EXTRACT_JOB.toPb().getConfiguration().getLoad());
+    assertNull(EXTRACT_JOB.toPb().getConfiguration().getQuery());
+    assertEquals(EXTRACT_JOB_STATISTICS, JobStatistics.fromPb(EXTRACT_JOB.statistics().toPb()));
+    compareJobInfo(EXTRACT_JOB, JobInfo.fromPb(EXTRACT_JOB.toPb()));
+    assertTrue(
+        JobInfo.fromPb(EXTRACT_JOB.toPb()).configuration() instanceof ExtractJobConfiguration);
+    assertTrue(JobInfo.fromPb(EXTRACT_JOB.toPb()).statistics() instanceof ExtractStatistics);
+    assertNull(LOAD_JOB.toPb().getConfiguration().getCopy());
+    assertNull(LOAD_JOB.toPb().getConfiguration().getExtract());
+    assertNotNull(LOAD_JOB.toPb().getConfiguration().getLoad());
+    assertNull(LOAD_JOB.toPb().getConfiguration().getQuery());
+    assertEquals(LOAD_JOB_STATISTICS, JobStatistics.fromPb(LOAD_JOB.statistics().toPb()));
+    compareJobInfo(LOAD_JOB, JobInfo.fromPb(LOAD_JOB.toPb()));
+    assertTrue(JobInfo.fromPb(LOAD_JOB.toPb()).configuration() instanceof LoadJobConfiguration);
+    assertTrue(JobInfo.fromPb(LOAD_JOB.toPb()).statistics() instanceof LoadStatistics);
+    assertNull(QUERY_JOB.toPb().getConfiguration().getCopy());
+    assertNull(QUERY_JOB.toPb().getConfiguration().getExtract());
+    assertNull(QUERY_JOB.toPb().getConfiguration().getLoad());
+    assertNotNull(QUERY_JOB.toPb().getConfiguration().getQuery());
+    assertEquals(QUERY_JOB_STATISTICS, JobStatistics.fromPb(QUERY_JOB.statistics().toPb()));
+    compareJobInfo(QUERY_JOB, JobInfo.fromPb(QUERY_JOB.toPb()));
+    assertTrue(JobInfo.fromPb(QUERY_JOB.toPb()).configuration() instanceof QueryJobConfiguration);
+    assertTrue(JobInfo.fromPb(QUERY_JOB.toPb()).statistics() instanceof QueryStatistics);
+  }
+
+  private void compareJobInfo(JobInfo expected, JobInfo value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.etag(), value.etag());
+    assertEquals(expected.id(), value.id());
+    assertEquals(expected.jobId(), value.jobId());
+    assertEquals(expected.selfLink(), value.selfLink());
+    assertEquals(expected.status(), value.status());
+    assertEquals(expected.statistics(), value.statistics());
+    assertEquals(expected.userEmail(), value.userEmail());
+    assertEquals(expected.configuration(), value.configuration());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
index 6a5cef6508cc..90b602d978e0 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
@@ -36,7 +36,8 @@ public class JobTest {
   private static final JobId JOB_ID = JobId.of("dataset", "job");
   private static final TableId TABLE_ID1 = TableId.of("dataset", "table1");
   private static final TableId TABLE_ID2 = TableId.of("dataset", "table2");
-  private static final JobInfo JOB_INFO = CopyJobInfo.of(JOB_ID, TABLE_ID1, TABLE_ID2);
+  private static final JobInfo JOB_INFO =
+      JobInfo.of(JOB_ID, CopyJobConfiguration.of(TABLE_ID1, TABLE_ID2));
 
   private BigQuery bigquery;
   private Job job;
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java
index e72101829cdf..a245026c8854 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java
@@ -99,7 +99,7 @@ public void testBuilder() {
 
   @Test
   public void testToPbAndFromPb() {
-    assertNull(LOAD_CONFIGURATION.toPb().getSourceUris());
+    assertNull(LOAD_CONFIGURATION.toPb().getLoad().getSourceUris());
     compareLoadConfiguration(LOAD_CONFIGURATION,
         LoadConfiguration.fromPb(LOAD_CONFIGURATION.toPb()));
     LoadConfiguration configuration = LoadConfiguration.of(TABLE_ID);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java
new file mode 100644
index 000000000000..f58df04cfcad
--- /dev/null
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
+import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
+
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+public class LoadJobConfigurationTest {
+
+  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder()
+      .allowJaggedRows(true)
+      .allowQuotedNewLines(false)
+      .encoding(StandardCharsets.UTF_8)
+      .build();
+  private static final TableId TABLE_ID = TableId.of("dataset", "table");
+  private static final CreateDisposition CREATE_DISPOSITION = CreateDisposition.CREATE_IF_NEEDED;
+  private static final WriteDisposition WRITE_DISPOSITION = WriteDisposition.WRITE_APPEND;
+  private static final Integer MAX_BAD_RECORDS = 42;
+  private static final String FORMAT = "CSV";
+  private static final Boolean IGNORE_UNKNOWN_VALUES = true;
+  private static final List PROJECTION_FIELDS = ImmutableList.of("field1", "field2");
+  private static final Field FIELD_SCHEMA = Field.builder("IntegerField", Field.Type.integer())
+      .mode(Field.Mode.REQUIRED)
+      .description("FieldDescription")
+      .build();
+  private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
+  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA);
+  private static final LoadJobConfiguration LOAD_CONFIGURATION =
+      LoadJobConfiguration.builder(TABLE_ID, SOURCE_URIS)
+          .createDisposition(CREATE_DISPOSITION)
+          .writeDisposition(WRITE_DISPOSITION)
+          .formatOptions(CSV_OPTIONS)
+          .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
+          .maxBadRecords(MAX_BAD_RECORDS)
+          .projectionFields(PROJECTION_FIELDS)
+          .schema(TABLE_SCHEMA)
+          .build();
+
+  @Test
+  public void testToBuilder() {
+    compareLoadJobConfiguration(LOAD_CONFIGURATION, LOAD_CONFIGURATION.toBuilder().build());
+    LoadJobConfiguration configuration = LOAD_CONFIGURATION.toBuilder()
+        .destinationTable(TableId.of("dataset", "newTable"))
+        .build();
+    assertEquals("newTable", configuration.destinationTable().table());
+    configuration = configuration.toBuilder().destinationTable(TABLE_ID).build();
+    compareLoadJobConfiguration(LOAD_CONFIGURATION, configuration);
+  }
+
+  @Test
+  public void testOf() {
+    LoadJobConfiguration configuration = LoadJobConfiguration.of(TABLE_ID, SOURCE_URIS);
+    assertEquals(TABLE_ID, configuration.destinationTable());
+    assertEquals(SOURCE_URIS, configuration.sourceUris());
+    configuration = LoadJobConfiguration.of(TABLE_ID, SOURCE_URIS, CSV_OPTIONS);
+    assertEquals(TABLE_ID, configuration.destinationTable());
+    assertEquals(FORMAT, configuration.format());
+    assertEquals(CSV_OPTIONS, configuration.csvOptions());
+    assertEquals(SOURCE_URIS, configuration.sourceUris());
+    configuration = LoadJobConfiguration.of(TABLE_ID, "uri1");
+    assertEquals(TABLE_ID, configuration.destinationTable());
+    assertEquals(ImmutableList.of("uri1"), configuration.sourceUris());
+    configuration = LoadJobConfiguration.of(TABLE_ID, "uri1", CSV_OPTIONS);
+    assertEquals(TABLE_ID, configuration.destinationTable());
+    assertEquals(FORMAT, configuration.format());
+    assertEquals(CSV_OPTIONS, configuration.csvOptions());
+    assertEquals(ImmutableList.of("uri1"), configuration.sourceUris());
+  }
+
+  @Test
+  public void testToBuilderIncomplete() {
+    LoadJobConfiguration configuration = LoadJobConfiguration.of(TABLE_ID, SOURCE_URIS);
+    compareLoadJobConfiguration(configuration, configuration.toBuilder().build());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals(TABLE_ID, LOAD_CONFIGURATION.destinationTable());
+    assertEquals(CREATE_DISPOSITION, LOAD_CONFIGURATION.createDisposition());
+    assertEquals(WRITE_DISPOSITION, LOAD_CONFIGURATION.writeDisposition());
+    assertEquals(CSV_OPTIONS, LOAD_CONFIGURATION.csvOptions());
+    assertEquals(FORMAT, LOAD_CONFIGURATION.format());
+    assertEquals(IGNORE_UNKNOWN_VALUES, LOAD_CONFIGURATION.ignoreUnknownValues());
+    assertEquals(MAX_BAD_RECORDS, LOAD_CONFIGURATION.maxBadRecords());
+    assertEquals(PROJECTION_FIELDS, LOAD_CONFIGURATION.projectionFields());
+    assertEquals(TABLE_SCHEMA, LOAD_CONFIGURATION.schema());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    compareLoadJobConfiguration(LOAD_CONFIGURATION,
+        LoadJobConfiguration.fromPb(LOAD_CONFIGURATION.toPb()));
+    LoadJobConfiguration configuration = LoadJobConfiguration.of(TABLE_ID, SOURCE_URIS);
+    compareLoadJobConfiguration(configuration, LoadJobConfiguration.fromPb(configuration.toPb()));
+  }
+
+  private void compareLoadJobConfiguration(LoadJobConfiguration expected,
+      LoadJobConfiguration value) {
+    assertEquals(expected, value);
+    assertEquals(expected.hashCode(), value.hashCode());
+    assertEquals(expected.toString(), value.toString());
+    assertEquals(expected.destinationTable(), value.destinationTable());
+    assertEquals(expected.createDisposition(), value.createDisposition());
+    assertEquals(expected.writeDisposition(), value.writeDisposition());
+    assertEquals(expected.csvOptions(), value.csvOptions());
+    assertEquals(expected.format(), value.format());
+    assertEquals(expected.ignoreUnknownValues(), value.ignoreUnknownValues());
+    assertEquals(expected.maxBadRecords(), value.maxBadRecords());
+    assertEquals(expected.projectionFields(), value.projectionFields());
+    assertEquals(expected.schema(), value.schema());
+  }
+}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
deleted file mode 100644
index 499d0d939698..000000000000
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobInfoTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright 2015 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.
- */
-
-package com.google.gcloud.bigquery;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import com.google.common.collect.ImmutableList;
-import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
-import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
-import com.google.gcloud.bigquery.JobStatistics.LoadStatistics;
-
-import org.junit.Test;
-
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-public class LoadJobInfoTest {
-
-  private static final String ETAG = "etag";
-  private static final String ID = "id";
-  private static final String SELF_LINK = "selfLink";
-  private static final String EMAIL = "email";
-  private static final CsvOptions CSV_OPTIONS = CsvOptions.builder()
-      .allowJaggedRows(true)
-      .allowQuotedNewLines(false)
-      .encoding(StandardCharsets.UTF_8)
-      .build();
-  private static final String SOURCE_URI = "uri";
-  private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
-  private static final TableId TABLE_ID = TableId.of("dataset", "table");
-  private static final CreateDisposition CREATE_DISPOSITION = CreateDisposition.CREATE_IF_NEEDED;
-  private static final WriteDisposition WRITE_DISPOSITION = WriteDisposition.WRITE_APPEND;
-  private static final Integer MAX_BAD_RECORDS = 42;
-  private static final Boolean IGNORE_UNKNOWN_VALUES = true;
-  private static final List PROJECTION_FIELDS = ImmutableList.of("field1", "field2");
-  private static final JobId JOB_ID = JobId.of("job");
-  private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
-  private static final Field FIELD_SCHEMA = Field.builder("IntegerField", Field.Type.integer())
-      .mode(Field.Mode.REQUIRED)
-      .description("FieldDescription")
-      .build();
-  private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA);
-  private static final LoadStatistics JOB_STATISTICS = LoadStatistics.builder()
-      .creationTime(1L)
-      .endTime(3L)
-      .startTime(2L)
-      .inputFiles(42L)
-      .outputBytes(1024L)
-      .inputBytes(2048L)
-      .outputRows(24L)
-      .build();
-  private static final LoadConfiguration LOAD_CONFIGURATION = LoadConfiguration.builder(TABLE_ID)
-      .createDisposition(CREATE_DISPOSITION)
-      .writeDisposition(WRITE_DISPOSITION)
-      .formatOptions(CSV_OPTIONS)
-      .ignoreUnknownValues(IGNORE_UNKNOWN_VALUES)
-      .maxBadRecords(MAX_BAD_RECORDS)
-      .projectionFields(PROJECTION_FIELDS)
-      .schema(TABLE_SCHEMA)
-      .build();
-  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.builder(LOAD_CONFIGURATION, SOURCE_URIS)
-      .etag(ETAG)
-      .id(ID)
-      .selfLink(SELF_LINK)
-      .userEmail(EMAIL)
-      .jobId(JOB_ID)
-      .status(JOB_STATUS)
-      .statistics(JOB_STATISTICS)
-      .build();
-
-  @Test
-  public void testToBuilder() {
-    compareLoadJobInfo(LOAD_JOB, LOAD_JOB.toBuilder().build());
-    LoadJobInfo job = LOAD_JOB.toBuilder().etag("newEtag").build();
-    assertEquals("newEtag", job.etag());
-    job = job.toBuilder().etag(ETAG).build();
-    compareLoadJobInfo(LOAD_JOB, job);
-  }
-
-  @Test
-  public void testOf() {
-    LoadJobInfo job = LoadJobInfo.of(LOAD_CONFIGURATION, SOURCE_URIS);
-    assertEquals(LOAD_CONFIGURATION, job.configuration());
-    assertEquals(SOURCE_URIS, job.sourceUris());
-    job = LoadJobInfo.of(LOAD_CONFIGURATION, SOURCE_URI);
-    assertEquals(LOAD_CONFIGURATION, job.configuration());
-    assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
-    job = LoadJobInfo.of(JOB_ID, LOAD_CONFIGURATION, SOURCE_URIS);
-    assertEquals(JOB_ID, job.jobId());
-    assertEquals(LOAD_CONFIGURATION, job.configuration());
-    assertEquals(SOURCE_URIS, job.sourceUris());
-    job = LoadJobInfo.of(JOB_ID, LOAD_CONFIGURATION, SOURCE_URI);
-    assertEquals(JOB_ID, job.jobId());
-    assertEquals(LOAD_CONFIGURATION, job.configuration());
-    assertEquals(ImmutableList.of(SOURCE_URI), job.sourceUris());
-  }
-
-  @Test
-  public void testToBuilderIncomplete() {
-    LoadJobInfo job = LoadJobInfo.of(LOAD_CONFIGURATION, SOURCE_URIS);
-    compareLoadJobInfo(job, job.toBuilder().build());
-  }
-
-  @Test
-  public void testBuilder() {
-    assertEquals(ETAG, LOAD_JOB.etag());
-    assertEquals(ID, LOAD_JOB.id());
-    assertEquals(SELF_LINK, LOAD_JOB.selfLink());
-    assertEquals(EMAIL, LOAD_JOB.userEmail());
-    assertEquals(JOB_ID, LOAD_JOB.jobId());
-    assertEquals(JOB_STATUS, LOAD_JOB.status());
-    assertEquals(LOAD_CONFIGURATION, LOAD_JOB.configuration());
-    assertEquals(SOURCE_URIS, LOAD_JOB.sourceUris());
-    assertEquals(JOB_STATISTICS, LOAD_JOB.statistics());
-  }
-
-  @Test
-  public void testToPbAndFromPb() {
-    assertNotNull(LOAD_JOB.toPb().getConfiguration().getLoad());
-    assertNull(LOAD_JOB.toPb().getConfiguration().getExtract());
-    assertNull(LOAD_JOB.toPb().getConfiguration().getCopy());
-    assertNull(LOAD_JOB.toPb().getConfiguration().getQuery());
-    assertEquals(JOB_STATISTICS, JobStatistics.fromPb(LOAD_JOB.toPb().getStatistics()));
-    compareLoadJobInfo(LOAD_JOB, LoadJobInfo.fromPb(LOAD_JOB.toPb()));
-    compareLoadJobInfo(LOAD_JOB, (LoadJobInfo) JobInfo.fromPb(LOAD_JOB.toPb()));
-    LoadJobInfo job = LoadJobInfo.of(LOAD_CONFIGURATION, SOURCE_URIS);
-    compareLoadJobInfo(job, LoadJobInfo.fromPb(job.toPb()));
-    compareLoadJobInfo(job, (LoadJobInfo) JobInfo.fromPb(job.toPb()));
-  }
-
-  private void compareLoadJobInfo(LoadJobInfo expected, LoadJobInfo value) {
-    assertEquals(expected, value);
-    assertEquals(expected.hashCode(), value.hashCode());
-    assertEquals(expected.toString(), value.toString());
-    assertEquals(expected.etag(), value.etag());
-    assertEquals(expected.id(), value.id());
-    assertEquals(expected.jobId(), value.jobId());
-    assertEquals(expected.selfLink(), value.selfLink());
-    assertEquals(expected.status(), value.status());
-    assertEquals(expected.statistics(), value.statistics());
-    assertEquals(expected.userEmail(), value.userEmail());
-    assertEquals(expected.configuration(), value.configuration());
-    assertEquals(expected.sourceUris(), value.sourceUris());
-  }
-}
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java
similarity index 54%
rename from gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobInfoTest.java
rename to gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java
index f99bec19efd9..6febe38b73f3 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java
@@ -25,20 +25,15 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
 import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
-import com.google.gcloud.bigquery.JobStatistics.QueryStatistics;
-import com.google.gcloud.bigquery.QueryJobInfo.Priority;
+import com.google.gcloud.bigquery.QueryJobConfiguration.Priority;
 
 import org.junit.Test;
 
 import java.util.List;
 import java.util.Map;
 
-public class QueryJobInfoTest {
+public class QueryJobConfigurationTest {
 
-  private static final String ETAG = "etag";
-  private static final String ID = "id";
-  private static final String SELF_LINK = "selfLink";
-  private static final String EMAIL = "email";
   private static final String QUERY = "BigQuery SQL";
   private static final DatasetId DATASET_ID = DatasetId.of("project", "dataset");
   private static final TableId TABLE_ID = TableId.of("project", "dataset", "table");
@@ -79,114 +74,79 @@ public class QueryJobInfoTest {
   private static final boolean FLATTEN_RESULTS = true;
   private static final List USER_DEFINED_FUNCTIONS = ImmutableList.of(
       UserDefinedFunction.inline("Function"), UserDefinedFunction.fromUri("URI"));
-  private static final JobId JOB_ID = JobId.of("job");
-  private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
-  private static final QueryStatistics JOB_STATISTICS = QueryStatistics.builder()
-      .creationTime(1L)
-      .endTime(3L)
-      .startTime(2L)
-      .totalBytesProcessed(2048L)
-      .totalBytesBilled(1024L)
-      .cacheHit(false)
-      .billingTier(42)
-      .build();
-  private static final QueryJobInfo QUERY_JOB = QueryJobInfo.builder(QUERY)
-      .etag(ETAG)
-      .id(ID)
-      .selfLink(SELF_LINK)
-      .userEmail(EMAIL)
-      .jobId(JOB_ID)
-      .status(JOB_STATUS)
-      .useQueryCache(USE_QUERY_CACHE)
-      .tableDefinitions(TABLE_DEFINITIONS)
-      .allowLargeResults(ALLOW_LARGE_RESULTS)
-      .createDisposition(CREATE_DISPOSITION)
-      .defaultDataset(DATASET_ID)
-      .destinationTable(TABLE_ID)
-      .writeDisposition(WRITE_DISPOSITION)
-      .priority(PRIORITY)
-      .flattenResults(FLATTEN_RESULTS)
-      .userDefinedFunctions(USER_DEFINED_FUNCTIONS)
-      .dryRun(true)
-      .statistics(JOB_STATISTICS)
-      .build();
+  private static final QueryJobConfiguration QUERY_JOB_CONFIGURATION =
+      QueryJobConfiguration.builder(QUERY)
+          .useQueryCache(USE_QUERY_CACHE)
+          .tableDefinitions(TABLE_DEFINITIONS)
+          .allowLargeResults(ALLOW_LARGE_RESULTS)
+          .createDisposition(CREATE_DISPOSITION)
+          .defaultDataset(DATASET_ID)
+          .destinationTable(TABLE_ID)
+          .writeDisposition(WRITE_DISPOSITION)
+          .priority(PRIORITY)
+          .flattenResults(FLATTEN_RESULTS)
+          .userDefinedFunctions(USER_DEFINED_FUNCTIONS)
+          .dryRun(true)
+          .build();
 
   @Test
   public void testToBuilder() {
-    compareQueryJobInfo(QUERY_JOB, QUERY_JOB.toBuilder().build());
-    QueryJobInfo job = QUERY_JOB.toBuilder()
+    compareQueryJobConfiguration(QUERY_JOB_CONFIGURATION,
+        QUERY_JOB_CONFIGURATION.toBuilder().build());
+    QueryJobConfiguration job = QUERY_JOB_CONFIGURATION.toBuilder()
         .query("New BigQuery SQL")
         .build();
     assertEquals("New BigQuery SQL", job.query());
     job = job.toBuilder().query(QUERY).build();
-    compareQueryJobInfo(QUERY_JOB, job);
+    compareQueryJobConfiguration(QUERY_JOB_CONFIGURATION, job);
   }
 
   @Test
   public void testOf() {
-    QueryJobInfo job = QueryJobInfo.of(QUERY);
-    assertEquals(QUERY, job.query());
-    job = QueryJobInfo.of(JOB_ID, QUERY);
-    assertEquals(JOB_ID, job.jobId());
+    QueryJobConfiguration job = QueryJobConfiguration.of(QUERY);
     assertEquals(QUERY, job.query());
   }
 
   @Test
   public void testToBuilderIncomplete() {
-    QueryJobInfo job = QueryJobInfo.of(QUERY);
-    compareQueryJobInfo(job, job.toBuilder().build());
+    QueryJobConfiguration job = QueryJobConfiguration.of(QUERY);
+    compareQueryJobConfiguration(job, job.toBuilder().build());
   }
 
   @Test
   public void testBuilder() {
-    assertEquals(ETAG, QUERY_JOB.etag());
-    assertEquals(ID, QUERY_JOB.id());
-    assertEquals(SELF_LINK, QUERY_JOB.selfLink());
-    assertEquals(EMAIL, QUERY_JOB.userEmail());
-    assertEquals(JOB_ID, QUERY_JOB.jobId());
-    assertEquals(JOB_STATUS, QUERY_JOB.status());
-    assertEquals(ALLOW_LARGE_RESULTS, QUERY_JOB.allowLargeResults());
-    assertEquals(CREATE_DISPOSITION, QUERY_JOB.createDisposition());
-    assertEquals(DATASET_ID, QUERY_JOB.defaultDataset());
-    assertEquals(TABLE_ID, QUERY_JOB.destinationTable());
-    assertEquals(FLATTEN_RESULTS, QUERY_JOB.flattenResults());
-    assertEquals(PRIORITY, QUERY_JOB.priority());
-    assertEquals(QUERY, QUERY_JOB.query());
-    assertEquals(TABLE_DEFINITIONS, QUERY_JOB.tableDefinitions());
-    assertEquals(USE_QUERY_CACHE, QUERY_JOB.useQueryCache());
-    assertEquals(USER_DEFINED_FUNCTIONS, QUERY_JOB.userDefinedFunctions());
-    assertEquals(WRITE_DISPOSITION, QUERY_JOB.writeDisposition());
-    assertTrue(QUERY_JOB.dryRun());
-    assertEquals(JOB_STATISTICS, QUERY_JOB.statistics());
+    assertEquals(ALLOW_LARGE_RESULTS, QUERY_JOB_CONFIGURATION.allowLargeResults());
+    assertEquals(CREATE_DISPOSITION, QUERY_JOB_CONFIGURATION.createDisposition());
+    assertEquals(DATASET_ID, QUERY_JOB_CONFIGURATION.defaultDataset());
+    assertEquals(TABLE_ID, QUERY_JOB_CONFIGURATION.destinationTable());
+    assertEquals(FLATTEN_RESULTS, QUERY_JOB_CONFIGURATION.flattenResults());
+    assertEquals(PRIORITY, QUERY_JOB_CONFIGURATION.priority());
+    assertEquals(QUERY, QUERY_JOB_CONFIGURATION.query());
+    assertEquals(TABLE_DEFINITIONS, QUERY_JOB_CONFIGURATION.tableDefinitions());
+    assertEquals(USE_QUERY_CACHE, QUERY_JOB_CONFIGURATION.useQueryCache());
+    assertEquals(USER_DEFINED_FUNCTIONS, QUERY_JOB_CONFIGURATION.userDefinedFunctions());
+    assertEquals(WRITE_DISPOSITION, QUERY_JOB_CONFIGURATION.writeDisposition());
+    assertTrue(QUERY_JOB_CONFIGURATION.dryRun());
   }
 
   @Test
   public void testToPbAndFromPb() {
-    assertNotNull(QUERY_JOB.toPb().getConfiguration().getQuery());
-    assertNull(QUERY_JOB.toPb().getConfiguration().getExtract());
-    assertNull(QUERY_JOB.toPb().getConfiguration().getCopy());
-    assertNull(QUERY_JOB.toPb().getConfiguration().getLoad());
-    assertEquals(JOB_STATISTICS, JobStatistics.fromPb(QUERY_JOB.statistics().toPb()));
-    compareQueryJobInfo(QUERY_JOB, QueryJobInfo.fromPb(QUERY_JOB.toPb()));
-    compareQueryJobInfo(QUERY_JOB,
-        (QueryJobInfo) JobInfo.fromPb(QUERY_JOB.toPb()));
-    QueryJobInfo job = QueryJobInfo.of(QUERY);
-    compareQueryJobInfo(job, QueryJobInfo.fromPb(job.toPb()));
-    compareQueryJobInfo(job, (QueryJobInfo) JobInfo.fromPb(job.toPb()));
+    assertNotNull(QUERY_JOB_CONFIGURATION.toPb().getQuery());
+    assertNull(QUERY_JOB_CONFIGURATION.toPb().getExtract());
+    assertNull(QUERY_JOB_CONFIGURATION.toPb().getCopy());
+    assertNull(QUERY_JOB_CONFIGURATION.toPb().getLoad());
+    compareQueryJobConfiguration(QUERY_JOB_CONFIGURATION,
+        QueryJobConfiguration.fromPb(QUERY_JOB_CONFIGURATION.toPb()));
+    QueryJobConfiguration job = QueryJobConfiguration.of(QUERY);
+    compareQueryJobConfiguration(job, QueryJobConfiguration.fromPb(job.toPb()));
   }
 
-  private void compareQueryJobInfo(QueryJobInfo expected, QueryJobInfo value) {
+  private void compareQueryJobConfiguration(QueryJobConfiguration expected,
+      QueryJobConfiguration value) {
     assertEquals(expected, value);
     assertEquals(expected.hashCode(), value.hashCode());
     assertEquals(expected.toString(), value.toString());
-    assertEquals(expected.etag(), value.etag());
-    assertEquals(expected.id(), value.id());
-    assertEquals(expected.jobId(), value.jobId());
-    assertEquals(expected.selfLink(), value.selfLink());
-    assertEquals(expected.status(), value.status());
-    assertEquals(expected.statistics(), value.statistics());
     assertEquals(expected.dryRun(), value.dryRun());
-    assertEquals(expected.userEmail(), value.userEmail());
     assertEquals(expected.allowLargeResults(), value.allowLargeResults());
     assertEquals(expected.createDisposition(), value.createDisposition());
     assertEquals(expected.defaultDataset(), value.defaultDataset());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 1a20682aa447..1d0673a0183b 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -168,8 +168,10 @@ public class SerializationTest {
   private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE, BIGQUERY_ERROR,
       ImmutableList.of(BIGQUERY_ERROR));
   private static final JobId JOB_ID = JobId.of("project", "job");
-  private static final CopyJobInfo COPY_JOB = CopyJobInfo.of(TABLE_ID, TABLE_ID);
-  private static final ExtractJobInfo EXTRACT_JOB = ExtractJobInfo.of(TABLE_ID, SOURCE_URIS);
+  private static final CopyJobConfiguration COPY_JOB_CONFIGURATION =
+      CopyJobConfiguration.of(TABLE_ID, TABLE_ID);
+  private static final ExtractJobConfiguration EXTRACT_JOB_CONFIGURATION =
+      ExtractJobConfiguration.of(TABLE_ID, SOURCE_URIS);
   private static final LoadConfiguration LOAD_CONFIGURATION = LoadConfiguration.builder(TABLE_ID)
       .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
       .writeDisposition(JobInfo.WriteDisposition.WRITE_APPEND)
@@ -178,8 +180,11 @@ public class SerializationTest {
       .maxBadRecords(10)
       .schema(TABLE_SCHEMA)
       .build();
-  private static final LoadJobInfo LOAD_JOB = LoadJobInfo.of(LOAD_CONFIGURATION, SOURCE_URIS);
-  private static final QueryJobInfo QUERY_JOB = QueryJobInfo.of("query");
+  private static final LoadJobConfiguration LOAD_JOB_CONFIGURATION =
+      LoadJobConfiguration.of(TABLE_ID, SOURCE_URIS);
+  private static final QueryJobConfiguration QUERY_JOB_CONFIGURATION =
+      QueryJobConfiguration.of("query");
+  private static final JobInfo JOB_INFO = JobInfo.of(COPY_JOB_CONFIGURATION);
   private static final Map CONTENT1 =
       ImmutableMap.of("key", "val1");
   private static final Map CONTENT2 =
@@ -241,8 +246,9 @@ public void testModelAndRequests() throws Exception {
         DATASET_INFO, TABLE_ID, CSV_OPTIONS, STREAMING_BUFFER, EXTERNAL_DATA_CONFIGURATION,
         TABLE_SCHEMA, TABLE_INFO, VIEW_INFO, EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION,
         JOB_STATISTICS, EXTRACT_STATISTICS, LOAD_STATISTICS, QUERY_STATISTICS, BIGQUERY_ERROR,
-        JOB_STATUS, JOB_ID, COPY_JOB, EXTRACT_JOB, LOAD_CONFIGURATION, LOAD_JOB, QUERY_JOB,
-        INSERT_ALL_REQUEST, INSERT_ALL_RESPONSE, FIELD_VALUE, QUERY_REQUEST, QUERY_RESPONSE,
+        JOB_STATUS, JOB_ID, COPY_JOB_CONFIGURATION, EXTRACT_JOB_CONFIGURATION, LOAD_CONFIGURATION,
+        LOAD_JOB_CONFIGURATION, QUERY_JOB_CONFIGURATION, JOB_INFO, INSERT_ALL_REQUEST,
+        INSERT_ALL_RESPONSE, FIELD_VALUE, QUERY_REQUEST, QUERY_RESPONSE,
         BigQuery.DatasetOption.fields(), BigQuery.DatasetDeleteOption.deleteContents(),
         BigQuery.DatasetListOption.all(), BigQuery.TableOption.fields(),
         BigQuery.TableListOption.maxResults(42L), BigQuery.JobOption.fields(),
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
index c931d768def1..2d0b7e528750 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
@@ -47,15 +47,13 @@ public class TableTest {
 
   private static final TableId TABLE_ID1 = TableId.of("dataset", "table1");
   private static final TableId TABLE_ID2 = TableId.of("dataset", "table2");
-  private static final JobInfo COPY_JOB_INFO = CopyJobInfo.of(TABLE_ID2, TABLE_ID1);
-  private static final JobInfo LOAD_JOB_INFO = LoadJobInfo.builder(
-      LoadConfiguration.builder(TABLE_ID1).formatOptions(FormatOptions.json()).build(),
-      ImmutableList.of("URI"))
-          .build();
+  private static final CopyJobConfiguration COPY_JOB_CONFIGURATION =
+      CopyJobConfiguration.of(TABLE_ID2, TABLE_ID1);
+  private static final JobInfo COPY_JOB_INFO = JobInfo.of(COPY_JOB_CONFIGURATION);
+  private static final JobInfo LOAD_JOB_INFO =
+      JobInfo.of(LoadJobConfiguration.of(TABLE_ID1, ImmutableList.of("URI"), FormatOptions.json()));
   private static final JobInfo EXTRACT_JOB_INFO =
-      ExtractJobInfo.builder(TABLE_ID1, ImmutableList.of("URI"))
-          .format("CSV")
-          .build();
+      JobInfo.of(ExtractJobConfiguration.of(TABLE_ID1, ImmutableList.of("URI"), "CSV"));
   private static final Field FIELD = Field.of("FieldName", Field.Type.integer());
   private static final TableInfo TABLE_INFO = TableInfo.of(TABLE_ID1, Schema.of(FIELD));
   private static final List ROWS_TO_INSERT = ImmutableList.of(
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
index 895502e3d6d5..2143be188338 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
@@ -22,12 +22,12 @@
 import com.google.gcloud.bigquery.BigQuery;
 import com.google.gcloud.bigquery.BigQueryError;
 import com.google.gcloud.bigquery.BigQueryOptions;
-import com.google.gcloud.bigquery.CopyJobInfo;
+import com.google.gcloud.bigquery.CopyJobConfiguration;
 import com.google.gcloud.bigquery.DatasetId;
 import com.google.gcloud.bigquery.DatasetInfo;
 import com.google.gcloud.bigquery.ExternalDataConfiguration;
 import com.google.gcloud.bigquery.ExternalTableInfo;
-import com.google.gcloud.bigquery.ExtractJobInfo;
+import com.google.gcloud.bigquery.ExtractJobConfiguration;
 import com.google.gcloud.bigquery.Field;
 import com.google.gcloud.bigquery.FieldValue;
 import com.google.gcloud.bigquery.FormatOptions;
@@ -35,7 +35,7 @@
 import com.google.gcloud.bigquery.JobInfo;
 import com.google.gcloud.bigquery.JobStatus;
 import com.google.gcloud.bigquery.LoadConfiguration;
-import com.google.gcloud.bigquery.LoadJobInfo;
+import com.google.gcloud.bigquery.LoadJobConfiguration;
 import com.google.gcloud.bigquery.QueryRequest;
 import com.google.gcloud.bigquery.QueryResponse;
 import com.google.gcloud.bigquery.Schema;
@@ -544,15 +544,15 @@ void run(BigQuery bigquery, JobInfo job) throws Exception {
    */
   private static class LoadAction extends JobRunAction {
     @Override
-    LoadJobInfo parse(String... args) throws Exception {
+    JobInfo parse(String... args) throws Exception {
       if (args.length >= 4) {
         String dataset = args[0];
         String table = args[1];
         String format = args[2];
         TableId tableId = TableId.of(dataset, table);
-        LoadConfiguration configuration = LoadConfiguration.of(tableId, FormatOptions.of(format));
-        return LoadJobInfo.builder(configuration, Arrays.asList(args).subList(3, args.length))
-            .build();
+        LoadJobConfiguration configuration = LoadJobConfiguration.of(
+            tableId, Arrays.asList(args).subList(3, args.length), FormatOptions.of(format));
+        return JobInfo.of(configuration);
       }
       throw new IllegalArgumentException("Missing required arguments.");
     }
@@ -570,15 +570,15 @@ protected String params() {
    */
   private static class ExtractAction extends JobRunAction {
     @Override
-    ExtractJobInfo parse(String... args) throws Exception {
+    JobInfo parse(String... args) throws Exception {
       if (args.length >= 4) {
         String dataset = args[0];
         String table = args[1];
         String format = args[2];
         TableId tableId = TableId.of(dataset, table);
-        return ExtractJobInfo.builder(tableId, Arrays.asList(args).subList(3, args.length))
-            .format(format)
-            .build();
+        ExtractJobConfiguration configuration =
+            ExtractJobConfiguration.of(tableId, Arrays.asList(args).subList(3, args.length));
+        return JobInfo.of(configuration);
       }
       throw new IllegalArgumentException("Missing required arguments.");
     }
@@ -596,12 +596,12 @@ protected String params() {
    */
   private static class CopyAction extends JobRunAction {
     @Override
-    CopyJobInfo parse(String... args) throws Exception {
+    JobInfo parse(String... args) throws Exception {
       String message;
       if (args.length == 4) {
         TableId sourceTableId = TableId.of(args[0], args[1]);
         TableId destinationTableId = TableId.of(args[2], args[3]);
-        return CopyJobInfo.of(destinationTableId, sourceTableId);
+        return JobInfo.of(CopyJobConfiguration.of(destinationTableId, sourceTableId));
       } else if (args.length < 3) {
         message = "Missing required source or destination table.";
       } else {

From f10fa969474817d9863f7226ddc27b20972f0e3d Mon Sep 17 00:00:00 2001
From: JP Martin 
Date: Tue, 26 Jan 2016 13:59:06 -0800
Subject: [PATCH 307/322] adding gcloud-java-contrib module

---
 gcloud-java-contrib/README.md | 61 +++++++++++++++++++++++++++++++++++
 gcloud-java-contrib/pom.xml   | 37 +++++++++++++++++++++
 pom.xml                       |  1 +
 3 files changed, 99 insertions(+)
 create mode 100644 gcloud-java-contrib/README.md
 create mode 100644 gcloud-java-contrib/pom.xml

diff --git a/gcloud-java-contrib/README.md b/gcloud-java-contrib/README.md
new file mode 100644
index 000000000000..aaa828386533
--- /dev/null
+++ b/gcloud-java-contrib/README.md
@@ -0,0 +1,61 @@
+Google Cloud Java Contributions
+===============================
+
+Packages that provide higher-level abstraction/functionality for common gcloud-java use cases.
+
+[//]: # (commented out because there isn't any code yet, so this won't work)
+[//]: #
+[//]: # (Quickstart)
+[//]: # (----------)
+[//]: # (If you are using Maven, add this to your pom.xml file)
+[//]: # (```xml)
+[//]: # ()
+[//]: # (  com.google.gcloud)
+[//]: # (  gcloud-java-contrib)
+[//]: # (  0.1.2)
+[//]: # ()
+[//]: # (```)
+[//]: # (If you are using Gradle, add this to your dependencies)
+[//]: # (```Groovy)
+[//]: # (compile 'com.google.gcloud:gcloud-java-contrib:0.1.2')
+[//]: # (```)
+[//]: # (If you are using SBT, add this to your dependencies)
+[//]: # (```Scala)
+[//]: # (libraryDependencies += "com.google.gcloud" % "gcloud-java-contrib" % "0.1.2")
+[//]: # (```)
+
+
+Java Versions
+-------------
+
+Java 7 or above is required for using this client.
+
+Versioning
+----------
+
+This library follows [Semantic Versioning] (http://semver.org/).
+
+It is currently in major version zero (``0.y.z``), which means that anything
+may change at any time and the public API should not be considered
+stable.
+
+Contributing
+------------
+
+Contributions to this library are always welcome and highly encouraged.
+
+See `gcloud-java`'s [CONTRIBUTING] documentation and the `gcloud-*` [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
+
+License
+-------
+
+Apache 2.0 - See [LICENSE] for more information.
+
+
+[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
+[cloud-platform]: https://cloud.google.com/
+[developers-console]:https://console.developers.google.com/
diff --git a/gcloud-java-contrib/pom.xml b/gcloud-java-contrib/pom.xml
new file mode 100644
index 000000000000..80df11e20faa
--- /dev/null
+++ b/gcloud-java-contrib/pom.xml
@@ -0,0 +1,37 @@
+
+
+  4.0.0
+  com.google.gcloud
+  gcloud-java-contrib
+  jar
+  GCloud Java contributions
+  
+    Contains packages that provide higher-level abstraction/functionality for common gcloud-java use cases.
+  
+  
+    com.google.gcloud
+    gcloud-java-pom
+    0.1.3-SNAPSHOT
+  
+  
+    gcloud-java-contrib
+  
+  
+    
+      ${project.groupId}
+      gcloud-java
+      ${project.version}
+    
+  
+  
+    
+      
+        org.codehaus.mojo
+        exec-maven-plugin
+        
+          false
+        
+      
+    
+  
+
diff --git a/pom.xml b/pom.xml
index cd5c19720cd8..936a3ef6eaa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
   
     gcloud-java
     gcloud-java-bigquery
+    gcloud-java-contrib
     gcloud-java-core
     gcloud-java-datastore
     gcloud-java-examples

From 8ad323517877a976cf7f417ef2417445ffc20719 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 26 Jan 2016 15:57:21 -0800
Subject: [PATCH 308/322] fix toBuilder()

---
 .../google/gcloud/datastore/EntityQuery.java  |  67 ++++++
 .../com/google/gcloud/datastore/KeyQuery.java |  68 ++++++
 .../datastore/ProjectionEntityQuery.java      | 105 ++++++++++
 .../com/google/gcloud/datastore/Query.java    |  15 +-
 .../gcloud/datastore/StructuredQuery.java     | 194 ++++++------------
 .../gcloud/datastore/StructuredQueryTest.java | 182 ++++++++++++++++
 6 files changed, 487 insertions(+), 144 deletions(-)
 create mode 100644 gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java
 create mode 100644 gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java
 create mode 100644 gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java
 create mode 100644 gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/StructuredQueryTest.java

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java
new file mode 100644
index 000000000000..cc2b978603ed
--- /dev/null
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.datastore;
+
+import com.google.api.services.datastore.DatastoreV1;
+
+/**
+ * An implementation of a Google Cloud Datastore entity query that can be constructed by providing
+ * all the specific query elements.
+ *
+ * @see Datastore
+ *     queries
+ */
+public final class EntityQuery extends StructuredQuery {
+
+  private static final long serialVersionUID = 2990565454831019471L;
+
+  /**
+   * A {@code EntityQuery} builder for queries that return Entity results.
+   */
+  public static final class Builder extends StructuredQuery.BuilderImpl {
+
+    Builder(EntityQuery query) {
+      super(query);
+    }
+
+    Builder() {
+      super(ResultType.ENTITY);
+    }
+
+    @Override
+    Builder mergeFrom(DatastoreV1.Query queryPb) {
+      super.mergeFrom(queryPb);
+      clearProjection();
+      clearGroupBy();
+      return this;
+    }
+
+    @Override
+    public EntityQuery build() {
+      return new EntityQuery(this);
+    }
+  }
+
+  EntityQuery(Builder builder) {
+    super(builder);
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+}
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java
new file mode 100644
index 000000000000..73ee9a4481aa
--- /dev/null
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.datastore;
+
+import com.google.api.services.datastore.DatastoreV1;
+
+/**
+ * An implementation of a Google Cloud Datastore key-only query that can be constructed by providing
+ * all the specific query elements.
+ *
+ * @see Datastore
+ *     queries
+ */
+public final class KeyQuery extends StructuredQuery {
+
+  private static final long serialVersionUID = -746768461459070045L;
+
+  /**
+   * A {@code KeyQuery} builder for queries that return Key results.
+   */
+  public static final class Builder extends StructuredQuery.BuilderImpl {
+
+    Builder(KeyQuery query) {
+      super(query);
+    }
+
+    Builder() {
+      super(ResultType.KEY);
+      projection(Projection.property(KEY_PROPERTY_NAME));
+    }
+
+    @Override
+    Builder mergeFrom(DatastoreV1.Query queryPb) {
+      super.mergeFrom(queryPb);
+      projection(Projection.property(KEY_PROPERTY_NAME));
+      clearGroupBy();
+      return this;
+    }
+
+    @Override
+    public KeyQuery build() {
+      return new KeyQuery(this);
+    }
+  }
+
+  KeyQuery(Builder builder) {
+    super(builder);
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+}
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java
new file mode 100644
index 000000000000..c0f8617f9183
--- /dev/null
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.datastore;
+
+/**
+ * An implementation of a Google Cloud Datastore projection entity query that can be constructed by
+ * providing all the specific query elements.
+ *
+ * @see Datastore
+ *     queries
+ */
+public final class ProjectionEntityQuery extends StructuredQuery {
+
+  private static final long serialVersionUID = 5488451194542425391L;
+
+  /**
+   * A {@code ProjectionEntityQuery} builder for queries that return Key results.
+   */
+  public static final class Builder extends StructuredQuery.BuilderImpl {
+
+    Builder(ProjectionEntityQuery query) {
+      super(query);
+    }
+
+    Builder() {
+      super(ResultType.PROJECTION_ENTITY);
+    }
+
+    /**
+     * Clears the projection clause.
+     */
+    public Builder clearProjection() {
+      super.clearProjection();
+      return this;
+    }
+
+    /**
+     * Sets the query's projection clause (clearing any previously specified Projection settings).
+     */
+    public Builder projection(Projection projection, Projection... others) {
+      super.projection(projection, others);
+      return this;
+    }
+
+    /**
+     * Adds one or more projections to the existing projection clause.
+     */
+    public Builder addProjection(Projection projection, Projection... others) {
+      super.addProjection(projection, others);
+      return this;
+    }
+
+    /**
+     * Clears the group by clause.
+     */
+    public Builder clearGroupBy() {
+      super.clearGroupBy();
+      return this;
+    }
+
+    /**
+     * Sets the query's group by clause (clearing any previously specified GroupBy settings).
+     */
+    public Builder groupBy(String property, String... others) {
+      super.groupBy(property, others);
+      return this;
+    }
+
+    /**
+     * Adds one or more properties to the existing group by clause.
+     */
+    public Builder addGroupBy(String property, String... others) {
+      super.addGroupBy(property, others);
+      return this;
+    }
+
+    @Override
+    public ProjectionEntityQuery build() {
+      return new ProjectionEntityQuery(this);
+    }
+  }
+
+  ProjectionEntityQuery(Builder builder) {
+    super(builder);
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+}
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java
index 0dbd1633928e..50591a87a6a4 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java
@@ -22,9 +22,6 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.Maps;
-import com.google.gcloud.datastore.StructuredQuery.EntityQueryBuilder;
-import com.google.gcloud.datastore.StructuredQuery.KeyQueryBuilder;
-import com.google.gcloud.datastore.StructuredQuery.ProjectionEntityQueryBuilder;
 import com.google.protobuf.GeneratedMessage;
 import com.google.protobuf.InvalidProtocolBufferException;
 
@@ -217,21 +214,21 @@ public static  GqlQuery.Builder gqlQueryBuilder(ResultType resultType,
   /**
    * Returns a new {@link StructuredQuery} builder for full (complete entities) queries.
    */
-  public static EntityQueryBuilder entityQueryBuilder() {
-    return new EntityQueryBuilder();
+  public static EntityQuery.Builder entityQueryBuilder() {
+    return new EntityQuery.Builder();
   }
 
   /**
    * Returns a new {@link StructuredQuery} builder for key only queries.
    */
-  public static KeyQueryBuilder keyQueryBuilder() {
-    return new KeyQueryBuilder();
+  public static KeyQuery.Builder keyQueryBuilder() {
+    return new KeyQuery.Builder();
   }
 
   /**
    * Returns a new {@link StructuredQuery} builder for projection queries.
    */
-  public static ProjectionEntityQueryBuilder projectionEntityQueryBuilder() {
-    return new ProjectionEntityQueryBuilder();
+  public static ProjectionEntityQuery.Builder projectionEntityQueryBuilder() {
+    return new ProjectionEntityQuery.Builder();
   }
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
index b8d9dfe87902..15cca241e250 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -81,10 +81,10 @@
  * @see Datastore
  *     queries
  */
-public class StructuredQuery extends Query {
+public abstract class StructuredQuery extends Query {
 
   private static final long serialVersionUID = 546838955624019594L;
-  private static final String KEY_PROPERTY_NAME = "__key__";
+  static final String KEY_PROPERTY_NAME = "__key__";
 
   private final transient String kind;
   private final ImmutableList projection;
@@ -609,13 +609,48 @@ public static Projection first(String property) {
     }
   }
 
+  /**
+   * Interface for StructuredQuery builders.
+   *
+   * @param  the type of result the query returns.
+   */
+  public interface Builder {
+    Builder namespace(String namespace);
+
+    Builder kind(String kind);
+
+    Builder startCursor(Cursor startCursor);
+
+    Builder endCursor(Cursor endCursor);
+
+    Builder offset(int offset);
+
+    Builder limit(Integer limit);
+
+    Builder filter(Filter filter);
+
+    Builder clearOrderBy();
+
+    /**
+     * Sets the query's order by clause (clearing any previously specified OrderBy settings).
+     */
+    Builder orderBy(OrderBy orderBy, OrderBy... others);
+
+    /**
+     * Adds settings to the existing order by clause.
+     */
+    Builder addOrderBy(OrderBy orderBy, OrderBy... others);
+
+    StructuredQuery build();
+  }
+
   /**
    * Base class for StructuredQuery builders.
    *
    * @param  the type of result the query returns.
    * @param  the query builder.
    */
-  protected static class BaseBuilder> {
+  abstract static class BuilderImpl> implements Builder {
 
     private final ResultType resultType;
     private String namespace;
@@ -629,12 +664,12 @@ protected static class BaseBuilder> {
     private int offset;
     private Integer limit;
 
-    BaseBuilder(ResultType resultType) {
+    BuilderImpl(ResultType resultType) {
       this.resultType = resultType;
     }
 
-    BaseBuilder(StructuredQuery query) {
-      resultType = query.type();
+    BuilderImpl(StructuredQuery query) {
+      this(query.type());
       namespace = query.namespace();
       kind = query.kind;
       projection.addAll(query.projection);
@@ -652,60 +687,64 @@ B self() {
       return (B) this;
     }
 
+    @Override
     public B namespace(String namespace) {
       this.namespace = namespace;
       return self();
     }
 
+    @Override
     public B kind(String kind) {
       this.kind = kind;
       return self();
     }
 
+    @Override
     public B startCursor(Cursor startCursor) {
       this.startCursor = startCursor;
       return self();
     }
 
+    @Override
     public B endCursor(Cursor endCursor) {
       this.endCursor = endCursor;
       return self();
     }
 
+    @Override
     public B offset(int offset) {
       Preconditions.checkArgument(offset >= 0, "offset must not be negative");
       this.offset = offset;
       return self();
     }
 
+    @Override
     public B limit(Integer limit) {
       Preconditions.checkArgument(limit == null || limit > 0, "limit must be positive");
       this.limit = limit;
       return self();
     }
 
+    @Override
     public B filter(Filter filter) {
       this.filter = filter;
       return self();
     }
 
+    @Override
     public B clearOrderBy() {
       orderBy.clear();
       return self();
     }
 
-    /**
-     * Sets the query's order by clause (clearing any previously specified OrderBy settings).
-     */
+    @Override
     public B orderBy(OrderBy orderBy, OrderBy... others) {
       clearOrderBy();
       addOrderBy(orderBy, others);
       return self();
     }
 
-    /**
-     * Adds settings to the existing order by clause.
-     */
+    @Override
     public B addOrderBy(OrderBy orderBy, OrderBy... others) {
       this.orderBy.add(orderBy);
       Collections.addAll(this.orderBy, others);
@@ -776,121 +815,9 @@ B mergeFrom(DatastoreV1.Query queryPb) {
       }
       return self();
     }
-
-    public StructuredQuery build() {
-      return new StructuredQuery<>(this);
-    }
-  }
-
-  public static final class Builder extends BaseBuilder> {
-
-    Builder(ResultType resultType) {
-      super(resultType);
-    }
-
-    Builder(StructuredQuery query) {
-      super(query);
-    }
-  }
-
-  /**
-   * A StructuredQuery builder for queries that return Entity results.
-   */
-  public static final class EntityQueryBuilder extends BaseBuilder {
-
-    EntityQueryBuilder() {
-      super(ResultType.ENTITY);
-    }
-
-    @Override
-    public StructuredQuery build() {
-      return new StructuredQuery<>(this);
-    }
-  }
-
-  /**
-   * A StructuredQuery builder for queries that return Key results.
-   */
-  public static final class KeyQueryBuilder extends BaseBuilder {
-
-    KeyQueryBuilder() {
-      super(ResultType.KEY);
-      projection(Projection.property(KEY_PROPERTY_NAME));
-    }
-
-    @Override
-    KeyQueryBuilder mergeFrom(DatastoreV1.Query queryPb) {
-      super.mergeFrom(queryPb);
-      projection(Projection.property(KEY_PROPERTY_NAME));
-      clearGroupBy();
-      return this;
-    }
-
-    @Override
-    public StructuredQuery build() {
-      return new StructuredQuery<>(this);
-    }
-  }
-
-  /**
-   * A StructuredQuery builder for projection queries.
-   */
-  public static final class ProjectionEntityQueryBuilder
-      extends BaseBuilder {
-
-    ProjectionEntityQueryBuilder() {
-      super(ResultType.PROJECTION_ENTITY);
-    }
-
-    @Override
-    public StructuredQuery build() {
-      return new StructuredQuery<>(this);
-    }
-
-    @Override
-    public ProjectionEntityQueryBuilder clearProjection() {
-      return super.clearProjection();
-    }
-
-    /**
-     * Sets the query's projection clause (clearing any previously specified Projection settings).
-     */
-    @Override
-    public ProjectionEntityQueryBuilder projection(Projection projection, Projection... others) {
-      return super.projection(projection, others);
-    }
-
-    /**
-     * Adds one or more projections to the existing projection clause.
-     */
-    @Override
-    public ProjectionEntityQueryBuilder addProjection(Projection projection, Projection... others) {
-      return super.addProjection(projection, others);
-    }
-
-    @Override
-    public ProjectionEntityQueryBuilder clearGroupBy() {
-      return super.clearGroupBy();
-    }
-
-    /**
-     * Sets the query's group by clause (clearing any previously specified GroupBy settings).
-     */
-    @Override
-    public ProjectionEntityQueryBuilder groupBy(String property, String... others) {
-      return super.groupBy(property, others);
-    }
-
-    /**
-     * Adds one or more properties to the existing group by clause.
-     */
-    @Override
-    public ProjectionEntityQueryBuilder addGroupBy(String property, String... others) {
-      return super.addGroupBy(property, others);
-    }
   }
 
-  StructuredQuery(BaseBuilder builder) {
+  StructuredQuery(BuilderImpl builder) {
     super(builder.resultType, builder.namespace);
     kind = builder.kind;
     projection = ImmutableList.copyOf(builder.projection);
@@ -971,9 +898,7 @@ public Integer limit() {
     return limit;
   }
 
-  public Builder toBuilder() {
-    return new Builder<>(this);
-  }
+  public abstract Builder toBuilder();
 
   @Override
   void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb) {
@@ -982,8 +907,7 @@ void populatePb(DatastoreV1.RunQueryRequest.Builder requestPb) {
 
   @Override
   StructuredQuery nextQuery(DatastoreV1.QueryResultBatch responsePb) {
-    Builder builder = new Builder<>(type());
-    builder.mergeFrom(toPb());
+    Builder builder = toBuilder();
     builder.startCursor(new Cursor(responsePb.getEndCursor()));
     if (offset > 0 && responsePb.getSkippedResults() < offset) {
       builder.offset(offset - responsePb.getSkippedResults());
@@ -1035,15 +959,15 @@ Object fromPb(ResultType resultType, String namespace, byte[] bytesPb)
     return fromPb(resultType, namespace, DatastoreV1.Query.parseFrom(bytesPb));
   }
 
-  private static StructuredQuery fromPb(ResultType resultType, String namespace,
+  static StructuredQuery fromPb(ResultType resultType, String namespace,
       DatastoreV1.Query queryPb) {
-    BaseBuilder builder;
+    BuilderImpl builder;
     if (resultType.equals(ResultType.ENTITY)) {
-      builder = new EntityQueryBuilder();
+      builder = new EntityQuery.Builder();
     } else if (resultType.equals(ResultType.KEY)) {
-      builder = new KeyQueryBuilder();
+      builder = new KeyQuery.Builder();
     } else {
-      builder = new ProjectionEntityQueryBuilder();
+      builder = new ProjectionEntityQuery.Builder();
     }
     return builder.namespace(namespace).mergeFrom(queryPb).build();
   }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/StructuredQueryTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/StructuredQueryTest.java
new file mode 100644
index 000000000000..4c6150f630dd
--- /dev/null
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/StructuredQueryTest.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.google.gcloud.datastore;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.datastore.Query.ResultType;
+import com.google.gcloud.datastore.StructuredQuery.CompositeFilter;
+import com.google.gcloud.datastore.StructuredQuery.Filter;
+import com.google.gcloud.datastore.StructuredQuery.OrderBy;
+import com.google.gcloud.datastore.StructuredQuery.Projection;
+import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public class StructuredQueryTest {
+
+  private static final String NAMESPACE = "ns";
+  private static final String KIND = "k";
+  private static final Cursor START_CURSOR = Cursor.copyFrom(new byte[] {1, 2});
+  private static final Cursor END_CURSOR = Cursor.copyFrom(new byte[] {10});
+  private static final int OFFSET = 42;
+  private static final Integer LIMIT = 43;
+  private static final Filter FILTER = CompositeFilter.and(PropertyFilter.gt("p1", 10), PropertyFilter.eq("a", "v"));
+  private static final OrderBy ORDER_BY_1 = OrderBy.asc("p2");
+  private static final OrderBy ORDER_BY_2 = OrderBy.desc("p3");
+  private static final List ORDER_BY = ImmutableList.of(ORDER_BY_1, ORDER_BY_2);
+  private static final Projection PROJECTION1 = Projection.property("p4");
+  private static final Projection PROJECTION2 = Projection.property("p5");
+  private static final List PROJECTION = ImmutableList.of(PROJECTION1, PROJECTION2);
+  private static final String GROUP_BY1 = "p6";
+  private static final String GROUP_BY2 = "p7";
+  private static final List GROUP_BY = ImmutableList.of(GROUP_BY1, GROUP_BY2);
+  private static final EntityQuery ENTITY_QUERY = Query.entityQueryBuilder()
+      .namespace(NAMESPACE)
+      .kind(KIND)
+      .startCursor(START_CURSOR)
+      .endCursor(END_CURSOR)
+      .offset(OFFSET)
+      .limit(LIMIT)
+      .filter(FILTER)
+      .orderBy(ORDER_BY_1, ORDER_BY_2)
+      .build();
+  private static final KeyQuery KEY_QUERY = Query.keyQueryBuilder()
+      .namespace(NAMESPACE)
+      .kind(KIND)
+      .startCursor(START_CURSOR)
+      .endCursor(END_CURSOR)
+      .offset(OFFSET)
+      .limit(LIMIT)
+      .filter(FILTER)
+      .orderBy(ORDER_BY_1, ORDER_BY_2)
+      .build();
+  private static final ProjectionEntityQuery PROJECTION_QUERY =
+      Query.projectionEntityQueryBuilder()
+          .namespace(NAMESPACE)
+          .kind(KIND)
+          .startCursor(START_CURSOR)
+          .endCursor(END_CURSOR)
+          .offset(OFFSET)
+          .limit(LIMIT)
+          .filter(FILTER)
+          .orderBy(ORDER_BY_1, ORDER_BY_2)
+          .projection(PROJECTION1, PROJECTION2)
+          .groupBy(GROUP_BY1, GROUP_BY2)
+          .build();
+
+  @Test
+  public void testEntityQueryBuilder() {
+    compareBaseBuilderFields(ENTITY_QUERY);
+    assertTrue(ENTITY_QUERY.projection().isEmpty());
+    assertTrue(ENTITY_QUERY.groupBy().isEmpty());
+  }
+
+  @Test
+  public void testKeyQueryBuilder() {
+    compareBaseBuilderFields(KEY_QUERY);
+    assertEquals(
+        ImmutableList.of(Projection.property(StructuredQuery.KEY_PROPERTY_NAME)),
+        KEY_QUERY.projection());
+    assertTrue(KEY_QUERY.groupBy().isEmpty());
+  }
+
+  @Test
+  public void testProjectionEntityQueryBuilder() {
+    compareBaseBuilderFields(PROJECTION_QUERY);
+    assertEquals(PROJECTION, PROJECTION_QUERY.projection());
+    assertEquals(GROUP_BY, PROJECTION_QUERY.groupBy());
+  }
+
+  private void compareBaseBuilderFields(StructuredQuery query) {
+    assertEquals(NAMESPACE, query.namespace());
+    assertEquals(KIND, query.kind());
+    assertEquals(START_CURSOR, query.startCursor());
+    assertEquals(END_CURSOR, query.endCursor());
+    assertEquals(OFFSET, query.offset());
+    assertEquals(LIMIT, query.limit());
+    assertEquals(FILTER, query.filter());
+    assertEquals(ORDER_BY, query.orderBy());
+  }
+
+  @Test
+  public void mergeFrom() {
+    compareMergedQuery(
+        ENTITY_QUERY, new EntityQuery.Builder().mergeFrom(ENTITY_QUERY.toPb()).build());
+    compareMergedQuery(KEY_QUERY, new KeyQuery.Builder().mergeFrom(KEY_QUERY.toPb()).build());
+    compareMergedQuery(
+        PROJECTION_QUERY,
+        new ProjectionEntityQuery.Builder().mergeFrom(PROJECTION_QUERY.toPb()).build());
+  }
+
+  private void compareMergedQuery(StructuredQuery expected, StructuredQuery actual) {
+    assertEquals(expected.kind(), actual.kind());
+    assertEquals(expected.startCursor(), actual.startCursor());
+    assertEquals(expected.endCursor(), actual.endCursor());
+    assertEquals(expected.offset(), actual.offset());
+    assertEquals(expected.limit(), actual.limit());
+    assertEquals(expected.filter(), actual.filter());
+    assertEquals(expected.orderBy(), actual.orderBy());
+    assertEquals(expected.projection(), actual.projection());
+    assertEquals(expected.groupBy(), actual.groupBy());
+  }
+
+  @Test
+  public void testToAndFromPb() {
+    assertEquals(
+        ENTITY_QUERY,
+        StructuredQuery.fromPb(ResultType.ENTITY, ENTITY_QUERY.namespace(), ENTITY_QUERY.toPb()));
+    assertEquals(
+        KEY_QUERY, StructuredQuery.fromPb(ResultType.KEY, KEY_QUERY.namespace(), KEY_QUERY.toPb()));
+    assertEquals(
+        PROJECTION_QUERY,
+        StructuredQuery.fromPb(
+            ResultType.PROJECTION_ENTITY, PROJECTION_QUERY.namespace(), PROJECTION_QUERY.toPb()));
+  }
+
+  @Test
+  public void testToBuilder() {
+    StructuredQuery entityQuery =
+    Query.entityQueryBuilder().namespace("n1").kind("k1").build();
+    Query entityQueryResult = entityQuery.toBuilder().build();
+    StructuredQuery keyQuery = Query.keyQueryBuilder().namespace("n2").kind("k2").build();
+    Query keyQueryResult = keyQuery.toBuilder().build();
+    StructuredQuery projectionEntityQuery = Query.projectionEntityQueryBuilder()
+        .kind("k3")
+        .projection(Projection.property("p1"), Projection.property("p2"))
+        .build();
+    Query projectionEntityQueryResult = projectionEntityQuery.toBuilder().build();
+    assertEquals(entityQuery, entityQueryResult);
+    assertTrue(entityQueryResult instanceof EntityQuery);
+    assertEquals(keyQuery, keyQueryResult);
+    assertTrue(keyQueryResult instanceof KeyQuery);
+    assertEquals(projectionEntityQuery, projectionEntityQueryResult);
+    assertTrue(projectionEntityQueryResult instanceof ProjectionEntityQuery);
+  }
+
+  @Test
+  public void testKeyOnly() {
+    assertTrue(KEY_QUERY.keyOnly());
+    assertFalse(ENTITY_QUERY.keyOnly());
+    assertFalse(PROJECTION_QUERY.keyOnly());
+  }
+}

From f287462fd9edda07a34658be91f04421357f6519 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 26 Jan 2016 17:08:05 -0800
Subject: [PATCH 309/322] Minor refactoring and javadoc fixes

---
 .../google/gcloud/datastore/EntityQuery.java  |  2 +-
 .../com/google/gcloud/datastore/KeyQuery.java |  2 +-
 .../datastore/ProjectionEntityQuery.java      |  9 +++++++-
 .../gcloud/datastore/StructuredQueryTest.java | 21 +++++--------------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java
index cc2b978603ed..902168f20f48 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/EntityQuery.java
@@ -30,7 +30,7 @@ public final class EntityQuery extends StructuredQuery {
   private static final long serialVersionUID = 2990565454831019471L;
 
   /**
-   * A {@code EntityQuery} builder for queries that return Entity results.
+   * A {@code EntityQuery} builder for queries that return {@link Entity} results.
    */
   public static final class Builder extends StructuredQuery.BuilderImpl {
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java
index 73ee9a4481aa..7afa0f5099d6 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/KeyQuery.java
@@ -30,7 +30,7 @@ public final class KeyQuery extends StructuredQuery {
   private static final long serialVersionUID = -746768461459070045L;
 
   /**
-   * A {@code KeyQuery} builder for queries that return Key results.
+   * A {@code KeyQuery} builder for queries that return {@link Key} results.
    */
   public static final class Builder extends StructuredQuery.BuilderImpl {
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java
index c0f8617f9183..bad9fc5af2d0 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ProjectionEntityQuery.java
@@ -28,7 +28,8 @@ public final class ProjectionEntityQuery extends StructuredQuery {
 
@@ -43,6 +44,7 @@ public static final class Builder extends StructuredQuery.BuilderImpl entityQuery =
-    Query.entityQueryBuilder().namespace("n1").kind("k1").build();
-    Query entityQueryResult = entityQuery.toBuilder().build();
-    StructuredQuery keyQuery = Query.keyQueryBuilder().namespace("n2").kind("k2").build();
-    Query keyQueryResult = keyQuery.toBuilder().build();
-    StructuredQuery projectionEntityQuery = Query.projectionEntityQueryBuilder()
-        .kind("k3")
-        .projection(Projection.property("p1"), Projection.property("p2"))
-        .build();
-    Query projectionEntityQueryResult = projectionEntityQuery.toBuilder().build();
-    assertEquals(entityQuery, entityQueryResult);
-    assertTrue(entityQueryResult instanceof EntityQuery);
-    assertEquals(keyQuery, keyQueryResult);
-    assertTrue(keyQueryResult instanceof KeyQuery);
-    assertEquals(projectionEntityQuery, projectionEntityQueryResult);
-    assertTrue(projectionEntityQueryResult instanceof ProjectionEntityQuery);
+    List> queries =
+        ImmutableList.>of(ENTITY_QUERY, KEY_QUERY, PROJECTION_QUERY);
+    for (StructuredQuery query : queries) {
+      assertEquals(query, query.toBuilder().build());
+    }
   }
 
   @Test

From ced28faff4ac36271edc2d4f9c04471292081c65 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 26 Jan 2016 17:41:21 -0800
Subject: [PATCH 310/322] Release version 0.1.3

---
 gcloud-java-bigquery/pom.xml        | 2 +-
 gcloud-java-contrib/pom.xml         | 2 +-
 gcloud-java-core/pom.xml            | 2 +-
 gcloud-java-datastore/pom.xml       | 2 +-
 gcloud-java-examples/pom.xml        | 2 +-
 gcloud-java-resourcemanager/pom.xml | 2 +-
 gcloud-java-storage/pom.xml         | 2 +-
 gcloud-java/pom.xml                 | 2 +-
 pom.xml                             | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gcloud-java-bigquery/pom.xml b/gcloud-java-bigquery/pom.xml
index aba002b6dce4..d0258ddafc50 100644
--- a/gcloud-java-bigquery/pom.xml
+++ b/gcloud-java-bigquery/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3-SNAPSHOT
+    0.1.3
   
   
     gcloud-java-bigquery
diff --git a/gcloud-java-contrib/pom.xml b/gcloud-java-contrib/pom.xml
index 80df11e20faa..d08e100a47c0 100644
--- a/gcloud-java-contrib/pom.xml
+++ b/gcloud-java-contrib/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3-SNAPSHOT
+    0.1.3
   
   
     gcloud-java-contrib
diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index d87e0d7eae85..d1b3679bed17 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3-SNAPSHOT
+    0.1.3
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index 071dae4ad3f7..2d4aa5045660 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3-SNAPSHOT
+    0.1.3
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index a5f50b4fe89a..b914f9a271a4 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3-SNAPSHOT
+    0.1.3
   
   
     gcloud-java-examples
diff --git a/gcloud-java-resourcemanager/pom.xml b/gcloud-java-resourcemanager/pom.xml
index 5101a963cf42..10e462eb75fa 100644
--- a/gcloud-java-resourcemanager/pom.xml
+++ b/gcloud-java-resourcemanager/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3-SNAPSHOT
+    0.1.3
   
   
     gcloud-java-resourcemanager
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 0dc525db4e63..1d50518ccf49 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3-SNAPSHOT
+    0.1.3
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 68dcdd661b6d..550b774b998a 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3-SNAPSHOT
+    0.1.3
   
   
     
diff --git a/pom.xml b/pom.xml
index 936a3ef6eaa1..96881804a433 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.1.3-SNAPSHOT
+  0.1.3
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From 8571125c68021d45d4035d28de99b7806bf4f124 Mon Sep 17 00:00:00 2001
From: travis-ci 
Date: Wed, 27 Jan 2016 02:24:50 +0000
Subject: [PATCH 311/322] Updating version in README files. [ci skip]

---
 README.md                             | 6 +++---
 gcloud-java-bigquery/README.md        | 6 +++---
 gcloud-java-contrib/README.md         | 6 +++---
 gcloud-java-core/README.md            | 6 +++---
 gcloud-java-datastore/README.md       | 6 +++---
 gcloud-java-examples/README.md        | 6 +++---
 gcloud-java-resourcemanager/README.md | 6 +++---
 gcloud-java-storage/README.md         | 6 +++---
 gcloud-java/README.md                 | 6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 520bf8b62c55..6ed38912359d 100644
--- a/README.md
+++ b/README.md
@@ -27,16 +27,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.1.2
+  0.1.3
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:0.1.2'
+compile 'com.google.gcloud:gcloud-java:0.1.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.2"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.3"
 ```
 
 Example Applications
diff --git a/gcloud-java-bigquery/README.md b/gcloud-java-bigquery/README.md
index af68402fbf70..eb347dfa0063 100644
--- a/gcloud-java-bigquery/README.md
+++ b/gcloud-java-bigquery/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-bigquery
-  0.1.2
+  0.1.3
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-bigquery:0.1.2'
+compile 'com.google.gcloud:gcloud-java-bigquery:0.1.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-bigquery" % "0.1.2"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-bigquery" % "0.1.3"
 ```
 
 Example Application
diff --git a/gcloud-java-contrib/README.md b/gcloud-java-contrib/README.md
index aaa828386533..730e731a307c 100644
--- a/gcloud-java-contrib/README.md
+++ b/gcloud-java-contrib/README.md
@@ -12,16 +12,16 @@ Packages that provide higher-level abstraction/functionality for common gcloud-j
 [//]: # ()
 [//]: # (  com.google.gcloud)
 [//]: # (  gcloud-java-contrib)
-[//]: # (  0.1.2)
+[//]: # (  0.1.3)
 [//]: # ()
 [//]: # (```)
 [//]: # (If you are using Gradle, add this to your dependencies)
 [//]: # (```Groovy)
-[//]: # (compile 'com.google.gcloud:gcloud-java-contrib:0.1.2')
+[//]: # (compile 'com.google.gcloud:gcloud-java-contrib:0.1.3')
 [//]: # (```)
 [//]: # (If you are using SBT, add this to your dependencies)
 [//]: # (```Scala)
-[//]: # (libraryDependencies += "com.google.gcloud" % "gcloud-java-contrib" % "0.1.2")
+[//]: # (libraryDependencies += "com.google.gcloud" % "gcloud-java-contrib" % "0.1.3")
 [//]: # (```)
 
 
diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index f47d99779a05..9063bebebbef 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-core
-  0.1.2
+  0.1.3
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-core:0.1.2'
+compile 'com.google.gcloud:gcloud-java-core:0.1.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.1.2"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.1.3"
 ```
 
 Troubleshooting
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index 15c2b3961dc2..7eae00f2ad3f 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-datastore
-  0.1.2
+  0.1.3
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-datastore:0.1.2'
+compile 'com.google.gcloud:gcloud-java-datastore:0.1.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.1.2"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.1.3"
 ```
 
 Example Application
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index 3d9baadf0b6b..8030d14d09e7 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -17,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-examples
-  0.1.2
+  0.1.3
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-examples:0.1.2'
+compile 'com.google.gcloud:gcloud-java-examples:0.1.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.1.2"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.1.3"
 ```
 
 To run examples from your command line:
diff --git a/gcloud-java-resourcemanager/README.md b/gcloud-java-resourcemanager/README.md
index d0e58af85e4e..c2e2ff6eb8f1 100644
--- a/gcloud-java-resourcemanager/README.md
+++ b/gcloud-java-resourcemanager/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-resourcemanager
-  0.1.2
+  0.1.3
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-resourcemanager:0.1.2'
+compile 'com.google.gcloud:gcloud-java-resourcemanager:0.1.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-resourcemanager" % "0.1.2"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-resourcemanager" % "0.1.3"
 ```
 
 Example Application
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 7e08264433c8..7260ab5fe5c5 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java-storage
-  0.1.2
+  0.1.3
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java-storage:0.1.2'
+compile 'com.google.gcloud:gcloud-java-storage:0.1.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.1.2"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.1.3"
 ```
 
 Example Application
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index 1f56696c3643..a080d787d6ab 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.gcloud
   gcloud-java
-  0.1.2
+  0.1.3
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.gcloud:gcloud-java:0.1.2'
+compile 'com.google.gcloud:gcloud-java:0.1.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.2"
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.3"
 ```
 
 Troubleshooting

From 1cc4eaccc9e47cc5ec8f89bd1c9d00d022a2c491 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Tue, 26 Jan 2016 18:45:02 -0800
Subject: [PATCH 312/322] update version to 0.1.4-SNAPSHOT

---
 gcloud-java-bigquery/pom.xml        |  2 +-
 gcloud-java-contrib/README.md       | 39 +++++++++++++----------------
 gcloud-java-contrib/pom.xml         |  2 +-
 gcloud-java-core/pom.xml            |  2 +-
 gcloud-java-datastore/pom.xml       |  2 +-
 gcloud-java-examples/pom.xml        |  2 +-
 gcloud-java-resourcemanager/pom.xml |  2 +-
 gcloud-java-storage/pom.xml         |  2 +-
 gcloud-java/pom.xml                 |  2 +-
 pom.xml                             |  2 +-
 10 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/gcloud-java-bigquery/pom.xml b/gcloud-java-bigquery/pom.xml
index d0258ddafc50..a5d711abf610 100644
--- a/gcloud-java-bigquery/pom.xml
+++ b/gcloud-java-bigquery/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3
+    0.1.4-SNAPSHOT
   
   
     gcloud-java-bigquery
diff --git a/gcloud-java-contrib/README.md b/gcloud-java-contrib/README.md
index 730e731a307c..23713f7450a3 100644
--- a/gcloud-java-contrib/README.md
+++ b/gcloud-java-contrib/README.md
@@ -3,27 +3,24 @@ Google Cloud Java Contributions
 
 Packages that provide higher-level abstraction/functionality for common gcloud-java use cases.
 
-[//]: # (commented out because there isn't any code yet, so this won't work)
-[//]: #
-[//]: # (Quickstart)
-[//]: # (----------)
-[//]: # (If you are using Maven, add this to your pom.xml file)
-[//]: # (```xml)
-[//]: # ()
-[//]: # (  com.google.gcloud)
-[//]: # (  gcloud-java-contrib)
-[//]: # (  0.1.3)
-[//]: # ()
-[//]: # (```)
-[//]: # (If you are using Gradle, add this to your dependencies)
-[//]: # (```Groovy)
-[//]: # (compile 'com.google.gcloud:gcloud-java-contrib:0.1.3')
-[//]: # (```)
-[//]: # (If you are using SBT, add this to your dependencies)
-[//]: # (```Scala)
-[//]: # (libraryDependencies += "com.google.gcloud" % "gcloud-java-contrib" % "0.1.3")
-[//]: # (```)
-
+Quickstart
+----------
+If you are using Maven, add this to your pom.xml file
+```xml
+
+  com.google.gcloud
+  gcloud-java-contrib
+  0.1.3
+
+```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java-contrib:0.1.3'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-contrib" % "0.1.3"
+```
 
 Java Versions
 -------------
diff --git a/gcloud-java-contrib/pom.xml b/gcloud-java-contrib/pom.xml
index d08e100a47c0..5d5739781727 100644
--- a/gcloud-java-contrib/pom.xml
+++ b/gcloud-java-contrib/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3
+    0.1.4-SNAPSHOT
   
   
     gcloud-java-contrib
diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
index d1b3679bed17..7373b40abc75 100644
--- a/gcloud-java-core/pom.xml
+++ b/gcloud-java-core/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3
+    0.1.4-SNAPSHOT
   
   
     gcloud-java-core
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index 2d4aa5045660..2a5d8e52e640 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3
+    0.1.4-SNAPSHOT
   
   
     gcloud-java-datastore
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index b914f9a271a4..5597f1f44132 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3
+    0.1.4-SNAPSHOT
   
   
     gcloud-java-examples
diff --git a/gcloud-java-resourcemanager/pom.xml b/gcloud-java-resourcemanager/pom.xml
index 10e462eb75fa..8fc6dd723eef 100644
--- a/gcloud-java-resourcemanager/pom.xml
+++ b/gcloud-java-resourcemanager/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3
+    0.1.4-SNAPSHOT
   
   
     gcloud-java-resourcemanager
diff --git a/gcloud-java-storage/pom.xml b/gcloud-java-storage/pom.xml
index 1d50518ccf49..4e9d368a12bb 100644
--- a/gcloud-java-storage/pom.xml
+++ b/gcloud-java-storage/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3
+    0.1.4-SNAPSHOT
   
   
     gcloud-java-storage
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
index 550b774b998a..60e98fa63396 100644
--- a/gcloud-java/pom.xml
+++ b/gcloud-java/pom.xml
@@ -11,7 +11,7 @@
   
     com.google.gcloud
     gcloud-java-pom
-    0.1.3
+    0.1.4-SNAPSHOT
   
   
     
diff --git a/pom.xml b/pom.xml
index 96881804a433..2d1bfb1e0a74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   com.google.gcloud
   gcloud-java-pom
   pom
-  0.1.3
+  0.1.4-SNAPSHOT
   GCloud Java
   https://github.com/GoogleCloudPlatform/gcloud-java
   

From a2c8b39a513b90928dd6f266c6c96133d88b9de0 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Wed, 27 Jan 2016 13:05:49 +0100
Subject: [PATCH 313/322] Fix comments. Make JobConfiguration an abstract class

---
 .../com/google/gcloud/bigquery/BigQuery.java  |   4 +-
 .../google/gcloud/bigquery/BigQueryImpl.java  |  11 +-
 .../gcloud/bigquery/CopyJobConfiguration.java |  55 +--
 .../bigquery/ExtractJobConfiguration.java     |  40 +--
 .../gcloud/bigquery/JobConfiguration.java     | 109 +++++-
 .../com/google/gcloud/bigquery/JobInfo.java   |  32 +-
 .../gcloud/bigquery/LoadConfiguration.java    | 283 ++--------------
 .../gcloud/bigquery/LoadJobConfiguration.java | 238 +++++++++++--
 .../bigquery/QueryJobConfiguration.java       |  42 +--
 .../bigquery/TableDataWriteChannel.java       |  23 +-
 .../bigquery/WriteChannelConfiguration.java   | 316 ++++++++++++++++++
 .../google/gcloud/spi/DefaultBigQueryRpc.java |   2 -
 .../gcloud/bigquery/BigQueryImplTest.java     |   9 +-
 .../bigquery/CopyJobConfigurationTest.java    |   2 +-
 .../bigquery/ExtractJobConfigurationTest.java |   2 +-
 .../gcloud/bigquery/ITBigQueryTest.java       |   2 +-
 .../google/gcloud/bigquery/JobInfoTest.java   |   2 +-
 .../bigquery/LoadJobConfigurationTest.java    |   2 +-
 .../bigquery/QueryJobConfigurationTest.java   |   2 +-
 .../gcloud/bigquery/SerializationTest.java    |  17 +-
 .../bigquery/TableDataWriteChannelTest.java   |  15 +-
 ...ava => WriteChannelConfigurationTest.java} |  20 +-
 .../gcloud/examples/BigQueryExample.java      |  17 +-
 23 files changed, 808 insertions(+), 437 deletions(-)
 create mode 100644 gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
 rename gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/{LoadConfigurationTest.java => WriteChannelConfigurationTest.java} (84%)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
index f5009c83eb41..6bc6a2ebabb5 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
@@ -666,9 +666,9 @@ Page> listTableData(TableId tableId, TableDataListOption... opt
 
   /**
    * Returns a channel to write data to be inserted into a BigQuery table. Data format and other
-   * options can be configured using the {@link LoadConfiguration} parameter.
+   * options can be configured using the {@link WriteChannelConfiguration} parameter.
    *
    * @throws BigQueryException upon failure
    */
-  TableDataWriteChannel writer(LoadConfiguration loadConfiguration);
+  TableDataWriteChannel writer(WriteChannelConfiguration writeChannelConfiguration);
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
index a3f708bb4c96..3186a0ac196b 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -596,8 +596,8 @@ private static QueryResult.Builder transformQueryResults(JobId jobId, List
     
     optionMap(Option... options) {
@@ -681,7 +681,7 @@ public TableId apply(TableId tableId) {
         break;
       case LOAD:
         LoadJobConfiguration loadConfiguration = (LoadJobConfiguration) configuration;
-        jobBuilder.configuration((LoadJobConfiguration) setProjectId(loadConfiguration));
+        jobBuilder.configuration(setProjectId(loadConfiguration));
         break;
       default:
         // never reached
@@ -698,9 +698,10 @@ private QueryRequest setProjectId(QueryRequest request) {
     return builder.build();
   }
 
-  private LoadConfiguration setProjectId(LoadConfiguration configuration) {
+  @SuppressWarnings("unchecked")
+  private  T setProjectId(T configuration) {
     LoadConfiguration.Builder builder = configuration.toBuilder();
     builder.destinationTable(setProjectId(configuration.destinationTable()));
-    return builder.build();
+    return (T) builder.build();
   }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
index 88d420b38054..f9a46eb0eb37 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
@@ -1,21 +1,36 @@
+/*
+ * 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.
+ */
+
 package com.google.gcloud.bigquery;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.services.bigquery.model.JobConfigurationTableCopy;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 
 /**
- * Google BigQuery Copy Job configuration. A Copy Job copies an existing table to another new or
- * existing table.
+ * Google BigQuery copy job configuration. A copy job copies an existing table to another new or
+ * existing table. Copy job configurations have {@link JobConfiguration.Type#COPY} type.
  */
-public final class CopyJobConfiguration implements JobConfiguration, Serializable {
+public final class CopyJobConfiguration extends JobConfiguration {
 
   private static final long serialVersionUID = 1140509641399762967L;
 
@@ -24,16 +39,20 @@ public final class CopyJobConfiguration implements JobConfiguration, Serializabl
   private final JobInfo.CreateDisposition createDisposition;
   private final JobInfo.WriteDisposition writeDisposition;
 
-  public static final class Builder {
+  public static final class Builder
+      extends JobConfiguration.Builder {
 
     private List sourceTables;
     private TableId destinationTable;
     private JobInfo.CreateDisposition createDisposition;
     private JobInfo.WriteDisposition writeDisposition;
 
-    private Builder() {}
+    private Builder() {
+      super(Type.COPY);
+    }
 
     private Builder(CopyJobConfiguration jobConfiguration) {
+      super(Type.COPY);
       this.sourceTables = jobConfiguration.sourceTables;
       this.destinationTable = jobConfiguration.destinationTable;
       this.createDisposition = jobConfiguration.createDisposition;
@@ -41,6 +60,7 @@ private Builder(CopyJobConfiguration jobConfiguration) {
     }
 
     private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+      super(Type.COPY);
       JobConfigurationTableCopy copyConfigurationPb = configurationPb.getCopy();
       this.destinationTable = TableId.fromPb(copyConfigurationPb.getDestinationTable());
       if (copyConfigurationPb.getSourceTables() != null) {
@@ -103,17 +123,13 @@ public CopyJobConfiguration build() {
   }
 
   private CopyJobConfiguration(Builder builder) {
+    super(builder);
     this.sourceTables = checkNotNull(builder.sourceTables);
     this.destinationTable = checkNotNull(builder.destinationTable);
     this.createDisposition = builder.createDisposition;
     this.writeDisposition = builder.writeDisposition;
   }
 
-  @Override
-  public Type type() {
-    return Type.COPY;
-  }
-
   /**
    * Returns the source tables to copy.
    */
@@ -148,29 +164,29 @@ public JobInfo.WriteDisposition writeDisposition() {
     return writeDisposition;
   }
 
+  @Override
   public Builder toBuilder() {
     return new Builder(this);
   }
 
   @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this)
+  protected ToStringHelper toStringHelper() {
+    return super.toStringHelper()
         .add("sourceTables", sourceTables)
         .add("destinationTable", destinationTable)
         .add("createDisposition", createDisposition)
-        .add("writeDisposition", writeDisposition)
-        .toString();
+        .add("writeDisposition", writeDisposition);
   }
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof CopyJobConfiguration
-        && Objects.equals(toPb(), ((CopyJobConfiguration) obj).toPb());
+    return obj instanceof CopyJobConfiguration && baseEquals((CopyJobConfiguration) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(sourceTables, destinationTable, createDisposition, writeDisposition);
+    return Objects.hash(baseHashCode(), sourceTables, destinationTable, createDisposition,
+        writeDisposition);
   }
 
   com.google.api.services.bigquery.model.JobConfiguration toPb() {
@@ -218,6 +234,7 @@ public static CopyJobConfiguration of(TableId destinationTable, List so
     return builder(destinationTable, sourceTables).build();
   }
 
+  @SuppressWarnings("unchecked")
   static CopyJobConfiguration fromPb(
       com.google.api.services.bigquery.model.JobConfiguration jobPb) {
     return new Builder(jobPb).build();
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
index 04f493d4af20..17a1308eb99e 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * 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.
@@ -19,19 +19,18 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.services.bigquery.model.JobConfigurationExtract;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.ImmutableList;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 
 /**
- * Google BigQuery Extract Job configuration. An Extract Job exports a BigQuery table to Google
+ * Google BigQuery extract job configuration. An extract job exports a BigQuery table to Google
  * Cloud Storage. The extract destination provided as URIs that point to objects in Google Cloud
- * Storage.
+ * Storage. Extract job configurations have {@link JobConfiguration.Type#EXTRACT} type.
  */
-public final class ExtractJobConfiguration  implements JobConfiguration, Serializable {
+public final class ExtractJobConfiguration extends JobConfiguration {
 
   private static final long serialVersionUID = 4147749733166593761L;
 
@@ -42,7 +41,8 @@ public final class ExtractJobConfiguration  implements JobConfiguration, Seriali
   private final String format;
   private final String compression;
 
-  public static final class Builder {
+  public static final class Builder
+      extends JobConfiguration.Builder {
 
     private TableId sourceTable;
     private List destinationUris;
@@ -51,9 +51,12 @@ public static final class Builder {
     private String format;
     private String compression;
 
-    private Builder() {}
+    private Builder() {
+      super(Type.EXTRACT);
+    }
 
     private Builder(ExtractJobConfiguration jobInfo) {
+      super(Type.EXTRACT);
       this.sourceTable = jobInfo.sourceTable;
       this.destinationUris = jobInfo.destinationUris;
       this.printHeader = jobInfo.printHeader;
@@ -63,6 +66,7 @@ private Builder(ExtractJobConfiguration jobInfo) {
     }
 
     private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+      super(Type.EXTRACT);
       JobConfigurationExtract extractConfigurationPb = configurationPb.getExtract();
       this.sourceTable = TableId.fromPb(extractConfigurationPb.getSourceTable());
       this.destinationUris = extractConfigurationPb.getDestinationUris();
@@ -134,6 +138,7 @@ public ExtractJobConfiguration build() {
   }
 
   private ExtractJobConfiguration(Builder builder) {
+    super(builder);
     this.sourceTable = checkNotNull(builder.sourceTable);
     this.destinationUris = checkNotNull(builder.destinationUris);
     this.printHeader = builder.printHeader;
@@ -142,11 +147,6 @@ private ExtractJobConfiguration(Builder builder) {
     this.compression = builder.compression;
   }
 
-  @Override
-  public Type type() {
-    return Type.EXTRACT;
-  }
-
   /**
    * Returns the table to export.
    */
@@ -193,31 +193,30 @@ public String compression() {
     return compression;
   }
 
+  @Override
   public Builder toBuilder() {
     return new Builder(this);
   }
 
   @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this)
+  protected ToStringHelper toStringHelper() {
+    return super.toStringHelper()
         .add("sourceTable", sourceTable)
         .add("destinationUris", destinationUris)
         .add("format", format)
         .add("printHeader", printHeader)
         .add("fieldDelimiter", fieldDelimiter)
-        .add("compression", compression)
-        .toString();
+        .add("compression", compression);
   }
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ExtractJobConfiguration
-        && Objects.equals(toPb(), ((ExtractJobConfiguration) obj).toPb());
+    return obj instanceof ExtractJobConfiguration && baseEquals((ExtractJobConfiguration) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(sourceTable, destinationUris, printHeader, fieldDelimiter,
+    return Objects.hash(baseHashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,
         format, compression);
   }
 
@@ -281,6 +280,7 @@ public static ExtractJobConfiguration of(TableId sourceTable, List desti
     return builder(sourceTable, destinationUris).format(format).build();
   }
 
+  @SuppressWarnings("unchecked")
   static ExtractJobConfiguration fromPb(
       com.google.api.services.bigquery.model.JobConfiguration confPb) {
     return new Builder(confPb).build();
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
index ea19a6d9cb67..625875448209 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * 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.
@@ -16,35 +16,128 @@
 
 package com.google.gcloud.bigquery;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
+
+import java.io.Serializable;
+import java.util.Objects;
+
 /**
- * Common interface for a BigQuery Job configuration.
+ * Base class for a BigQuery job configuration.
  */
-public interface JobConfiguration {
+public abstract class JobConfiguration implements Serializable {
+
+  private static final long serialVersionUID = -548132177415406526L;
+
+  private final Type type;
 
   /**
    * Type of a BigQuery Job.
    */
   enum Type {
     /**
-     * A Copy Job copies an existing table to another new or existing table.
+     * A Copy Job copies an existing table to another new or existing table. Instances of
+     * {@code JobConfiguration} for this type are implemented by {@link CopyJobConfiguration}.
      */
     COPY,
     /**
-     * An Extract Job exports a BigQuery table to Google Cloud Storage.
+     * An Extract Job exports a BigQuery table to Google Cloud Storage. Instances of
+     * {@code JobConfiguration} for this type are implemented by {@link ExtractJobConfiguration}.
      */
     EXTRACT,
     /**
-     * A Load Job loads data from one of several formats into a table.
+     * A Load Job loads data from one of several formats into a table.  Instances of
+     * {@code JobConfiguration} for this type are implemented by {@link LoadJobConfiguration}.
      */
     LOAD,
     /**
-     * A Query Job runs a query against BigQuery data.
+     * A Query Job runs a query against BigQuery data.  Instances of
+     * {@code JobConfiguration} for this type are implemented by {@link QueryJobConfiguration}.
      */
     QUERY
   }
 
+  /**
+   * Base builder for job configurations.
+   *
+   * @param  the job configuration type
+   * @param  the job configuration builder
+   */
+  public abstract static class Builder> {
+
+    private Type type;
+
+    protected Builder(Type type) {
+      this.type = checkNotNull(type);
+    }
+
+    @SuppressWarnings("unchecked")
+    protected B self() {
+      return (B) this;
+    }
+
+    B type(Type type) {
+      this.type = checkNotNull(type);
+      return self();
+    }
+
+    /**
+     * Creates an object.
+     */
+    public abstract T build();
+  }
+
+  protected JobConfiguration(Builder builder) {
+    this.type = builder.type;
+  }
+
   /**
    * Returns the type of the job configuration.
    */
-  Type type();
+  public Type type() {
+    return type;
+  }
+
+  /**
+   * Returns a builder for the object.
+   */
+  public abstract Builder toBuilder();
+
+  protected ToStringHelper toStringHelper() {
+    return MoreObjects.toStringHelper(this).add("type", type);
+  }
+
+  @Override
+  public String toString() {
+    return toStringHelper().toString();
+  }
+
+  protected final int baseHashCode() {
+    return Objects.hash(type);
+  }
+
+  protected final boolean baseEquals(JobConfiguration jobConfiguration) {
+    return Objects.equals(toPb(), jobConfiguration.toPb());
+  }
+
+  abstract com.google.api.services.bigquery.model.JobConfiguration toPb();
+
+  @SuppressWarnings("unchecked")
+  static  T fromPb(
+      com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+    if (configurationPb.getCopy() != null) {
+      return (T) CopyJobConfiguration.fromPb(configurationPb);
+    } else if (configurationPb.getExtract() != null) {
+      return (T) ExtractJobConfiguration.fromPb(configurationPb);
+    } else if (configurationPb.getLoad() != null) {
+      return (T) LoadJobConfiguration.fromPb(configurationPb);
+    } else if (configurationPb.getQuery() != null) {
+      return (T) QueryJobConfiguration.fromPb(configurationPb);
+    } else {
+      // never reached
+      throw new IllegalArgumentException("Job configuration is not supported");
+    }
+  }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
index 519f3bf6163b..355f0c52fb25 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -125,19 +125,7 @@ protected Builder(Job jobPb) {
         this.statistics = JobStatistics.fromPb(jobPb.getStatistics());
       }
       this.userEmail = jobPb.getUserEmail();
-      com.google.api.services.bigquery.model.JobConfiguration confPb = jobPb.getConfiguration();
-      if (confPb.getCopy() != null) {
-        this.configuration = CopyJobConfiguration.fromPb(confPb);
-      } else if (confPb.getExtract() != null) {
-        this.configuration = ExtractJobConfiguration.fromPb(confPb);
-      } else if (confPb.getLoad() != null) {
-        this.configuration = LoadJobConfiguration.fromPb(confPb);
-      } else if (confPb.getQuery() != null) {
-        this.configuration = QueryJobConfiguration.fromPb(confPb);
-      } else {
-        // never reached
-        throw new IllegalArgumentException("Job configuration is not supported");
-      }
+      this.configuration = JobConfiguration.fromPb(jobPb.getConfiguration());
     }
 
     Builder etag(String etag) {
@@ -305,23 +293,7 @@ Job toPb() {
     if (statistics != null) {
       jobPb.setStatistics(statistics.toPb());
     }
-    switch (configuration.type()) {
-      case COPY:
-        jobPb.setConfiguration(this.configuration().toPb());
-        break;
-      case EXTRACT:
-        jobPb.setConfiguration(this.configuration().toPb());
-        break;
-      case LOAD:
-        jobPb.setConfiguration(this.configuration().toPb());
-        break;
-      case QUERY:
-        jobPb.setConfiguration(this.configuration().toPb());
-        break;
-      default:
-        // never reached
-        throw new IllegalArgumentException("Job configuration is not supported");
-    }
+    jobPb.setConfiguration(configuration.toPb());
     return jobPb;
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java
index 115701a5932f..223a25a478e0 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadConfiguration.java
@@ -16,108 +16,26 @@
 
 package com.google.gcloud.bigquery;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.api.services.bigquery.model.JobConfigurationLoad;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
 import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
 import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
 
-import java.io.Serializable;
 import java.util.List;
-import java.util.Objects;
 
 /**
- * Google BigQuery Configuration for a load operation. A load configuration can be used to load data
- * into a table with a {@link com.google.gcloud.WriteChannel}
- * ({@link BigQuery#writer(LoadConfiguration)}).
+ * Common interface for a load configuration. A load configuration
+ * ({@link WriteChannelConfiguration}) can be used to load data into a table with a
+ * {@link com.google.gcloud.WriteChannel} ({@link BigQuery#writer(WriteChannelConfiguration)}).
+ * A load configuration ({@link LoadJobConfiguration}) can also be used to create a load job
+ * ({@link JobInfo#of(JobConfiguration)}).
  */
-public class LoadConfiguration implements Serializable {
-
-  private static final long serialVersionUID = 470267591917413578L;
-
-  protected final TableId destinationTable;
-  protected final CreateDisposition createDisposition;
-  protected final WriteDisposition writeDisposition;
-  protected final FormatOptions formatOptions;
-  protected final Integer maxBadRecords;
-  protected final Schema schema;
-  protected final Boolean ignoreUnknownValues;
-  protected final List projectionFields;
-
-  public static class Builder {
-
-    private TableId destinationTable;
-    private CreateDisposition createDisposition;
-    private WriteDisposition writeDisposition;
-    private FormatOptions formatOptions;
-    private Integer maxBadRecords;
-    private Schema schema;
-    private Boolean ignoreUnknownValues;
-    private List projectionFields;
-
-    protected Builder() {}
+public interface LoadConfiguration {
 
-    protected Builder(LoadConfiguration loadConfiguration) {
-      this.destinationTable = loadConfiguration.destinationTable;
-      this.createDisposition = loadConfiguration.createDisposition;
-      this.writeDisposition = loadConfiguration.writeDisposition;
-      this.formatOptions = loadConfiguration.formatOptions;
-      this.maxBadRecords = loadConfiguration.maxBadRecords;
-      this.schema = loadConfiguration.schema;
-      this.ignoreUnknownValues = loadConfiguration.ignoreUnknownValues;
-      this.projectionFields = loadConfiguration.projectionFields;
-    }
-
-    protected Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
-      JobConfigurationLoad loadConfigurationPb = configurationPb.getLoad();
-      this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
-      if (loadConfigurationPb.getCreateDisposition() != null) {
-        this.createDisposition =
-            CreateDisposition.valueOf(loadConfigurationPb.getCreateDisposition());
-      }
-      if (loadConfigurationPb.getWriteDisposition() != null) {
-        this.writeDisposition = WriteDisposition.valueOf(loadConfigurationPb.getWriteDisposition());
-      }
-      if (loadConfigurationPb.getSourceFormat() != null) {
-        this.formatOptions = FormatOptions.of(loadConfigurationPb.getSourceFormat());
-      }
-      if (loadConfigurationPb.getAllowJaggedRows() != null
-          || loadConfigurationPb.getAllowQuotedNewlines() != null
-          || loadConfigurationPb.getEncoding() != null
-          || loadConfigurationPb.getFieldDelimiter() != null
-          || loadConfigurationPb.getQuote() != null
-          || loadConfigurationPb.getSkipLeadingRows() != null) {
-        CsvOptions.Builder builder = CsvOptions.builder()
-            .allowJaggedRows(loadConfigurationPb.getAllowJaggedRows())
-            .allowQuotedNewLines(loadConfigurationPb.getAllowQuotedNewlines())
-            .encoding(loadConfigurationPb.getEncoding())
-            .fieldDelimiter(loadConfigurationPb.getFieldDelimiter())
-            .quote(loadConfigurationPb.getQuote())
-            .skipLeadingRows(loadConfigurationPb.getSkipLeadingRows());
-        this.formatOptions = builder.build();
-      }
-      this.maxBadRecords = loadConfigurationPb.getMaxBadRecords();
-      if (loadConfigurationPb.getSchema() != null) {
-        this.schema = Schema.fromPb(loadConfigurationPb.getSchema());
-      }
-      this.ignoreUnknownValues = loadConfigurationPb.getIgnoreUnknownValues();
-      this.projectionFields = loadConfigurationPb.getProjectionFields();
-    }
-
-    @SuppressWarnings("unchecked")
-    B self() {
-      return (B) this;
-    }
+  interface Builder {
 
     /**
      * Sets the destination table to load the data into.
      */
-    public B destinationTable(TableId destinationTable) {
-      this.destinationTable = destinationTable;
-      return self();
-    }
+    Builder destinationTable(TableId destinationTable);
 
     /**
      * Sets whether the job is allowed to create new tables.
@@ -125,10 +43,7 @@ public B destinationTable(TableId destinationTable) {
      * @see 
      *     Create Disposition
      */
-    public B createDisposition(CreateDisposition createDisposition) {
-      this.createDisposition = createDisposition;
-      return self();
-    }
+    Builder createDisposition(CreateDisposition createDisposition);
 
     /**
      * Sets the action that should occur if the destination table already exists.
@@ -136,10 +51,7 @@ public B createDisposition(CreateDisposition createDisposition) {
      * @see 
      *     Write Disposition
      */
-    public B writeDisposition(WriteDisposition writeDisposition) {
-      this.writeDisposition = writeDisposition;
-      return self();
-    }
+    Builder writeDisposition(WriteDisposition writeDisposition);
 
     /**
      * Sets the source format, and possibly some parsing options, of the external data. Supported
@@ -149,30 +61,21 @@ public B writeDisposition(WriteDisposition writeDisposition) {
      * 
      *     Source Format
      */
-    public B formatOptions(FormatOptions formatOptions) {
-      this.formatOptions = formatOptions;
-      return self();
-    }
+    Builder formatOptions(FormatOptions formatOptions);
 
     /**
      * Sets the maximum number of bad records that BigQuery can ignore when running the job. If the
      * number of bad records exceeds this value, an invalid error is returned in the job result.
      * By default no bad record is ignored.
      */
-    public B maxBadRecords(Integer maxBadRecords) {
-      this.maxBadRecords = maxBadRecords;
-      return self();
-    }
+    Builder maxBadRecords(Integer maxBadRecords);
 
     /**
      * Sets the schema for the destination table. The schema can be omitted if the destination table
      * already exists, or if you're loading data from a Google Cloud Datastore backup (i.e.
      * {@code DATASTORE_BACKUP} format option).
      */
-    public B schema(Schema schema) {
-      this.schema = schema;
-      return self();
-    }
+    Builder schema(Schema schema);
 
     /**
      * Sets whether BigQuery should allow extra values that are not represented in the table schema.
@@ -180,10 +83,7 @@ public B schema(Schema schema) {
      * are treated as bad records, and if there are too many bad records, an invalid error is
      * returned in the job result. By default unknown values are not allowed.
      */
-    public B ignoreUnknownValues(Boolean ignoreUnknownValues) {
-      this.ignoreUnknownValues = ignoreUnknownValues;
-      return self();
-    }
+    Builder ignoreUnknownValues(Boolean ignoreUnknownValues);
 
     /**
      * Sets which entity properties to load into BigQuery from a Cloud Datastore backup. This field
@@ -192,36 +92,15 @@ public B ignoreUnknownValues(Boolean ignoreUnknownValues) {
      * all properties. If any named property isn't found in the Cloud Datastore backup, an invalid
      * error is returned in the job result.
      */
-    public B projectionFields(List projectionFields) {
-      this.projectionFields =
-          projectionFields != null ? ImmutableList.copyOf(projectionFields) : null;
-      return self();
-    }
-
-    @SuppressWarnings("unchecked")
-    public T build() {
-      return (T) new LoadConfiguration(this);
-    }
-  }
+    Builder projectionFields(List projectionFields);
 
-  @SuppressWarnings("unchecked")
-  protected LoadConfiguration(Builder builder) {
-    this.destinationTable = checkNotNull(builder.destinationTable);
-    this.createDisposition = builder.createDisposition;
-    this.writeDisposition = builder.writeDisposition;
-    this.formatOptions = builder.formatOptions;
-    this.maxBadRecords = builder.maxBadRecords;
-    this.schema = builder.schema;
-    this.ignoreUnknownValues = builder.ignoreUnknownValues;
-    this.projectionFields = (List) builder.projectionFields;
+    LoadConfiguration build();
   }
 
   /**
    * Returns the destination table to load the data into.
    */
-  public TableId destinationTable() {
-    return destinationTable;
-  }
+  TableId destinationTable();
 
   /**
    * Returns whether the job is allowed to create new tables.
@@ -229,9 +108,7 @@ public TableId destinationTable() {
    * @see 
    *     Create Disposition
    */
-  public CreateDisposition createDisposition() {
-    return this.createDisposition;
-  }
+  CreateDisposition createDisposition();
 
   /**
    * Returns the action that should occur if the destination table already exists.
@@ -239,40 +116,30 @@ public CreateDisposition createDisposition() {
    * @see 
    *     Write Disposition
    */
-  public WriteDisposition writeDisposition() {
-    return writeDisposition;
-  }
+  WriteDisposition writeDisposition();
 
   /**
    * Returns additional properties used to parse CSV data (used when {@link #format()} is set
    * to CSV). Returns {@code null} if not set.
    */
-  public CsvOptions csvOptions() {
-    return formatOptions instanceof CsvOptions ? (CsvOptions) formatOptions : null;
-  }
+  CsvOptions csvOptions();
 
   /**
    * Returns the maximum number of bad records that BigQuery can ignore when running the job. If the
    * number of bad records exceeds this value, an invalid error is returned in the job result.
    * By default no bad record is ignored.
    */
-  public Integer maxBadRecords() {
-    return maxBadRecords;
-  }
+  Integer maxBadRecords();
 
   /**
    * Returns the schema for the destination table, if set. Returns {@code null} otherwise.
    */
-  public Schema schema() {
-    return schema;
-  }
+  Schema schema();
 
   /**
    * Returns the format of the data files.
    */
-  public String format() {
-    return formatOptions != null ? formatOptions.type() : null;
-  }
+  String format();
 
   /**
    * Returns whether BigQuery should allow extra values that are not represented in the table
@@ -280,9 +147,7 @@ public String format() {
    * columns are treated as bad records, and if there are too many bad records, an invalid error is
    * returned in the job result. By default unknown values are not allowed.
    */
-  public Boolean ignoreUnknownValues() {
-    return ignoreUnknownValues;
-  }
+  Boolean ignoreUnknownValues();
 
   /**
    * Returns which entity properties to load into BigQuery from a Cloud Datastore backup. This field
@@ -291,104 +156,10 @@ public Boolean ignoreUnknownValues() {
    * all properties. If any named property isn't found in the Cloud Datastore backup, an invalid
    * error is returned in the job result.
    */
-  public List projectionFields() {
-    return projectionFields;
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  MoreObjects.ToStringHelper toStringHelper() {
-    return MoreObjects.toStringHelper(this)
-        .add("destinationTable", destinationTable)
-        .add("createDisposition", createDisposition)
-        .add("writeDisposition", writeDisposition)
-        .add("formatOptions", formatOptions)
-        .add("maxBadRecords", maxBadRecords)
-        .add("schema", schema)
-        .add("ignoreUnknownValue", ignoreUnknownValues)
-        .add("projectionFields", projectionFields);
-  }
-
-  @Override
-  public String toString() {
-    return toStringHelper().toString();
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof LoadConfiguration
-        && Objects.equals(toPb(), ((LoadConfiguration) obj).toPb());
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(destinationTable, createDisposition, writeDisposition, formatOptions,
-        maxBadRecords, schema, ignoreUnknownValues, projectionFields);
-  }
-
-  com.google.api.services.bigquery.model.JobConfiguration toPb() {
-    JobConfigurationLoad loadConfigurationPb = new JobConfigurationLoad();
-    loadConfigurationPb.setDestinationTable(destinationTable.toPb());
-    if (createDisposition != null) {
-      loadConfigurationPb.setCreateDisposition(createDisposition.toString());
-    }
-    if (writeDisposition != null) {
-      loadConfigurationPb.setWriteDisposition(writeDisposition.toString());
-    }
-    if (csvOptions() != null) {
-      CsvOptions csvOptions = csvOptions();
-      loadConfigurationPb.setFieldDelimiter(csvOptions.fieldDelimiter())
-          .setAllowJaggedRows(csvOptions.allowJaggedRows())
-          .setAllowQuotedNewlines(csvOptions.allowQuotedNewLines())
-          .setEncoding(csvOptions.encoding())
-          .setQuote(csvOptions.quote())
-          .setSkipLeadingRows(csvOptions.skipLeadingRows());
-    }
-    if (schema != null) {
-      loadConfigurationPb.setSchema(schema.toPb());
-    }
-    if (formatOptions != null) {
-      loadConfigurationPb.setSourceFormat(formatOptions.type());
-    }
-    loadConfigurationPb.setMaxBadRecords(maxBadRecords);
-    loadConfigurationPb.setIgnoreUnknownValues(ignoreUnknownValues);
-    loadConfigurationPb.setProjectionFields(projectionFields);
-    return new com.google.api.services.bigquery.model.JobConfiguration()
-        .setLoad(loadConfigurationPb);
-  }
-
-  static LoadConfiguration fromPb(
-      com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
-    return new Builder<>(configurationPb).build();
-  }
-
-  /**
-   * Creates a builder for a BigQuery Load Configuration given the destination table.
-   */
-  public static Builder builder(TableId destinationTable) {
-    return new Builder<>().destinationTable(destinationTable);
-  }
-
-  /**
-   * Creates a builder for a BigQuery Load Configuration given the destination table and format.
-   */
-  public static Builder builder(TableId destinationTable, FormatOptions format) {
-    return new Builder<>().destinationTable(destinationTable).formatOptions(format);
-  }
+  List projectionFields();
 
   /**
-   * Returns a BigQuery Load Configuration for the given destination table.
+   * Returns a builder for the load configuration object.
    */
-  public static LoadConfiguration of(TableId destinationTable) {
-    return builder(destinationTable).build();
-  }
-
-  /**
-   * Returns a BigQuery Load Configuration for the given destination table and format.
-   */
-  public static LoadConfiguration of(TableId destinationTable, FormatOptions format) {
-    return builder(destinationTable).formatOptions(format).build();
-  }
+  Builder toBuilder();
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
index 93ac10d4385b..796d5ddcb058 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * 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.
@@ -16,52 +16,162 @@
 
 package com.google.gcloud.bigquery;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.JobConfigurationLoad;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.ImmutableList;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 
 /**
- * Google BigQuery Load Job configuration. A Load Job loads data from one of several formats into a
- * table. Data is provided as URIs that point to objects in Google Cloud Storage.
+ * Google BigQuery load job configuration. A load job loads data from one of several formats into a
+ * table. Data is provided as URIs that point to objects in Google Cloud Storage. Load job
+ * configurations have {@link JobConfiguration.Type#LOAD} type.
  */
-public class LoadJobConfiguration extends LoadConfiguration
-    implements JobConfiguration, Serializable {
+public class LoadJobConfiguration extends JobConfiguration implements LoadConfiguration {
 
   private static final long serialVersionUID = -2673554846792429829L;
 
   private final List sourceUris;
+  protected final TableId destinationTable;
+  protected final JobInfo.CreateDisposition createDisposition;
+  protected final JobInfo.WriteDisposition writeDisposition;
+  protected final FormatOptions formatOptions;
+  protected final Integer maxBadRecords;
+  protected final Schema schema;
+  protected final Boolean ignoreUnknownValues;
+  protected final List projectionFields;
 
   public static final class Builder
-      extends LoadConfiguration.Builder {
+      extends JobConfiguration.Builder
+      implements LoadConfiguration.Builder {
 
     private List sourceUris;
+    private TableId destinationTable;
+    private JobInfo.CreateDisposition createDisposition;
+    private JobInfo.WriteDisposition writeDisposition;
+    private FormatOptions formatOptions;
+    private Integer maxBadRecords;
+    private Schema schema;
+    private Boolean ignoreUnknownValues;
+    private List projectionFields;
 
     private Builder() {
-      super();
+      super(Type.LOAD);
     }
 
     private Builder(LoadJobConfiguration loadConfiguration) {
-      super(loadConfiguration);
+      super(Type.LOAD);
+      this.destinationTable = loadConfiguration.destinationTable;
+      this.createDisposition = loadConfiguration.createDisposition;
+      this.writeDisposition = loadConfiguration.writeDisposition;
+      this.formatOptions = loadConfiguration.formatOptions;
+      this.maxBadRecords = loadConfiguration.maxBadRecords;
+      this.schema = loadConfiguration.schema;
+      this.ignoreUnknownValues = loadConfiguration.ignoreUnknownValues;
+      this.projectionFields = loadConfiguration.projectionFields;
       this.sourceUris = loadConfiguration.sourceUris;
     }
 
     private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
-      super(configurationPb);
-      if (configurationPb.getLoad().getSourceUris() != null) {
+      super(Type.LOAD);
+      JobConfigurationLoad loadConfigurationPb = configurationPb.getLoad();
+      this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
+      if (loadConfigurationPb.getCreateDisposition() != null) {
+        this.createDisposition =
+            JobInfo.CreateDisposition.valueOf(loadConfigurationPb.getCreateDisposition());
+      }
+      if (loadConfigurationPb.getWriteDisposition() != null) {
+        this.writeDisposition =
+            JobInfo.WriteDisposition.valueOf(loadConfigurationPb.getWriteDisposition());
+      }
+      if (loadConfigurationPb.getSourceFormat() != null) {
+        this.formatOptions = FormatOptions.of(loadConfigurationPb.getSourceFormat());
+      }
+      if (loadConfigurationPb.getAllowJaggedRows() != null
+          || loadConfigurationPb.getAllowQuotedNewlines() != null
+          || loadConfigurationPb.getEncoding() != null
+          || loadConfigurationPb.getFieldDelimiter() != null
+          || loadConfigurationPb.getQuote() != null
+          || loadConfigurationPb.getSkipLeadingRows() != null) {
+        CsvOptions.Builder builder = CsvOptions.builder()
+            .allowJaggedRows(loadConfigurationPb.getAllowJaggedRows())
+            .allowQuotedNewLines(loadConfigurationPb.getAllowQuotedNewlines())
+            .encoding(loadConfigurationPb.getEncoding())
+            .fieldDelimiter(loadConfigurationPb.getFieldDelimiter())
+            .quote(loadConfigurationPb.getQuote())
+            .skipLeadingRows(loadConfigurationPb.getSkipLeadingRows());
+        this.formatOptions = builder.build();
+      }
+      this.maxBadRecords = loadConfigurationPb.getMaxBadRecords();
+      if (loadConfigurationPb.getSchema() != null) {
+        this.schema = Schema.fromPb(loadConfigurationPb.getSchema());
+      }
+      this.ignoreUnknownValues = loadConfigurationPb.getIgnoreUnknownValues();
+      this.projectionFields = loadConfigurationPb.getProjectionFields();
+      if (loadConfigurationPb.getSourceUris() != null) {
         this.sourceUris = ImmutableList.copyOf(configurationPb.getLoad().getSourceUris());
       }
     }
 
+    @Override
+    public Builder destinationTable(TableId destinationTable) {
+      this.destinationTable = destinationTable;
+      return this;
+    }
+
+    @Override
+    public Builder createDisposition(JobInfo.CreateDisposition createDisposition) {
+      this.createDisposition = createDisposition;
+      return this;
+    }
+
+    @Override
+    public Builder writeDisposition(JobInfo.WriteDisposition writeDisposition) {
+      this.writeDisposition = writeDisposition;
+      return this;
+    }
+
+   @Override
+    public Builder formatOptions(FormatOptions formatOptions) {
+      this.formatOptions = formatOptions;
+      return this;
+    }
+
+    @Override
+    public Builder maxBadRecords(Integer maxBadRecords) {
+      this.maxBadRecords = maxBadRecords;
+      return this;
+    }
+
+    @Override
+    public Builder schema(Schema schema) {
+      this.schema = schema;
+      return this;
+    }
+
+    @Override
+    public Builder ignoreUnknownValues(Boolean ignoreUnknownValues) {
+      this.ignoreUnknownValues = ignoreUnknownValues;
+      return this;
+    }
+
+    @Override
+    public Builder projectionFields(List projectionFields) {
+      this.projectionFields =
+          projectionFields != null ? ImmutableList.copyOf(projectionFields) : null;
+      return this;
+    }
+
     /**
      * Sets the fully-qualified URIs that point to source data in Google Cloud Storage (e.g.
      * gs://bucket/path). Each URI can contain one '*' wildcard character and it must come after the
      * 'bucket' name.
      */
     public Builder sourceUris(List sourceUris) {
-      this.sourceUris = sourceUris != null ? ImmutableList.copyOf(sourceUris) : null;
+      this.sourceUris = ImmutableList.copyOf(checkNotNull(sourceUris));
       return this;
     }
 
@@ -74,11 +184,59 @@ public LoadJobConfiguration build() {
   private LoadJobConfiguration(Builder builder) {
     super(builder);
     this.sourceUris = builder.sourceUris;
+    this.destinationTable = builder.destinationTable;
+    this.createDisposition = builder.createDisposition;
+    this.writeDisposition = builder.writeDisposition;
+    this.formatOptions = builder.formatOptions;
+    this.maxBadRecords = builder.maxBadRecords;
+    this.schema = builder.schema;
+    this.ignoreUnknownValues = builder.ignoreUnknownValues;
+    this.projectionFields = builder.projectionFields;
+  }
+
+  @Override
+  public TableId destinationTable() {
+    return destinationTable;
+  }
+
+  @Override
+  public JobInfo.CreateDisposition createDisposition() {
+    return this.createDisposition;
   }
 
   @Override
-  public Type type() {
-    return Type.LOAD;
+  public JobInfo.WriteDisposition writeDisposition() {
+    return writeDisposition;
+  }
+
+  @Override
+  public CsvOptions csvOptions() {
+    return formatOptions instanceof CsvOptions ? (CsvOptions) formatOptions : null;
+  }
+
+  @Override
+  public Integer maxBadRecords() {
+    return maxBadRecords;
+  }
+
+  @Override
+  public Schema schema() {
+    return schema;
+  }
+
+  @Override
+  public String format() {
+    return formatOptions != null ? formatOptions.type() : null;
+  }
+
+  @Override
+  public Boolean ignoreUnknownValues() {
+    return ignoreUnknownValues;
+  }
+
+  @Override
+  public List projectionFields() {
+    return projectionFields;
   }
 
   /**
@@ -90,32 +248,67 @@ public List sourceUris() {
     return sourceUris;
   }
 
+  @Override
   public Builder toBuilder() {
     return new Builder(this);
   }
 
   @Override
-  ToStringHelper toStringHelper() {
-    return super.toStringHelper().add("sourceUris", sourceUris);
+  protected ToStringHelper toStringHelper() {
+    return super.toStringHelper()
+        .add("destinationTable", destinationTable)
+        .add("createDisposition", createDisposition)
+        .add("writeDisposition", writeDisposition)
+        .add("formatOptions", formatOptions)
+        .add("maxBadRecords", maxBadRecords)
+        .add("schema", schema)
+        .add("ignoreUnknownValue", ignoreUnknownValues)
+        .add("projectionFields", projectionFields)
+        .add("sourceUris", sourceUris);
   }
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof LoadJobConfiguration
-        && Objects.equals(toPb(), ((LoadJobConfiguration) obj).toPb());
+    return obj instanceof LoadJobConfiguration && baseEquals((LoadJobConfiguration) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), sourceUris);
+    return Objects.hash(baseHashCode(), sourceUris);
   }
 
   com.google.api.services.bigquery.model.JobConfiguration toPb() {
-    com.google.api.services.bigquery.model.JobConfiguration configurationPb = super.toPb();
+    JobConfigurationLoad loadConfigurationPb = new JobConfigurationLoad();
+    loadConfigurationPb.setDestinationTable(destinationTable.toPb());
+    if (createDisposition != null) {
+      loadConfigurationPb.setCreateDisposition(createDisposition.toString());
+    }
+    if (writeDisposition != null) {
+      loadConfigurationPb.setWriteDisposition(writeDisposition.toString());
+    }
+    if (csvOptions() != null) {
+      CsvOptions csvOptions = csvOptions();
+      loadConfigurationPb.setFieldDelimiter(csvOptions.fieldDelimiter())
+          .setAllowJaggedRows(csvOptions.allowJaggedRows())
+          .setAllowQuotedNewlines(csvOptions.allowQuotedNewLines())
+          .setEncoding(csvOptions.encoding())
+          .setQuote(csvOptions.quote())
+          .setSkipLeadingRows(csvOptions.skipLeadingRows());
+    }
+    if (schema != null) {
+      loadConfigurationPb.setSchema(schema.toPb());
+    }
+    if (formatOptions != null) {
+      loadConfigurationPb.setSourceFormat(formatOptions.type());
+    }
+    loadConfigurationPb.setMaxBadRecords(maxBadRecords);
+    loadConfigurationPb.setIgnoreUnknownValues(ignoreUnknownValues);
+    loadConfigurationPb.setProjectionFields(projectionFields);
     if (sourceUris != null) {
-      configurationPb.getLoad().setSourceUris(ImmutableList.copyOf(sourceUris));
+      loadConfigurationPb.setSourceUris(ImmutableList.copyOf(sourceUris));
     }
-    return configurationPb;
+    return new com.google.api.services.bigquery.model.JobConfiguration()
+        .setLoad(loadConfigurationPb);
   }
 
   /**
@@ -183,6 +376,7 @@ public static LoadJobConfiguration of(TableId destinationTable, String sourceUri
     return of(destinationTable, ImmutableList.of(sourceUri), format);
   }
 
+  @SuppressWarnings("unchecked")
   static LoadJobConfiguration fromPb(
       com.google.api.services.bigquery.model.JobConfiguration confPb) {
     return new Builder(confPb).build();
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
index 0cf12f546258..2ffee5be71ab 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * 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.
@@ -19,7 +19,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.services.bigquery.model.JobConfigurationQuery;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -27,15 +27,15 @@
 import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
 import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 /**
- * Google BigQuery Query Job configuration. A Query Job runs a query against BigQuery data.
+ * Google BigQuery Query Job configuration. A Query Job runs a query against BigQuery data. Query
+ * job configurations have {@link JobConfiguration.Type#QUERY} type.
  */
-public final class QueryJobConfiguration implements JobConfiguration, Serializable {
+public final class QueryJobConfiguration extends JobConfiguration {
 
   private static final long serialVersionUID = -1108948249081804890L;
 
@@ -72,7 +72,7 @@ public enum Priority {
   private final Boolean flattenResults;
   private final Boolean dryRun;
 
-  public static final class Builder {
+  public static final class Builder extends JobConfiguration.Builder {
 
     private String query;
     private TableId destinationTable;
@@ -87,9 +87,12 @@ public static final class Builder {
     private Boolean flattenResults;
     private Boolean dryRun;
 
-    private Builder() {}
+    private Builder() {
+      super(Type.QUERY);
+    }
 
     private Builder(QueryJobConfiguration jobConfiguration) {
+      super(Type.QUERY);
       this.query = jobConfiguration.query;
       this.destinationTable = jobConfiguration.destinationTable;
       this.tableDefinitions = jobConfiguration.tableDefinitions;
@@ -105,6 +108,7 @@ private Builder(QueryJobConfiguration jobConfiguration) {
     }
 
     private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+      super(Type.QUERY);
       JobConfigurationQuery queryConfigurationPb = configurationPb.getQuery();
       this.query = queryConfigurationPb.getQuery();
       allowLargeResults = queryConfigurationPb.getAllowLargeResults();
@@ -294,6 +298,7 @@ public QueryJobConfiguration build() {
   }
 
   private QueryJobConfiguration(Builder builder) {
+    super(builder);
     this.query = checkNotNull(builder.query);
     this.allowLargeResults = builder.allowLargeResults;
     this.createDisposition = builder.createDisposition;
@@ -309,11 +314,6 @@ private QueryJobConfiguration(Builder builder) {
     this.dryRun = builder.dryRun;
   }
 
-  @Override
-  public Type type() {
-    return Type.QUERY;
-  }
-
   /**
    * Returns whether the job is enabled to create arbitrarily large results. If {@code true}
    * the query is allowed to create large results at a slight cost in performance.
@@ -425,13 +425,14 @@ public Boolean dryRun() {
     return dryRun;
   }
 
+  @Override
   public Builder toBuilder() {
     return new Builder(this);
   }
 
   @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this)
+  protected ToStringHelper toStringHelper() {
+    return super.toStringHelper()
         .add("query", query)
         .add("destinationTable", destinationTable)
         .add("defaultDataset", defaultDataset)
@@ -443,21 +444,19 @@ public String toString() {
         .add("userDefinedFunctions", userDefinedFunctions)
         .add("createDisposition", createDisposition)
         .add("writeDisposition", writeDisposition)
-        .add("dryRun", dryRun)
-        .toString();
+        .add("dryRun", dryRun);
   }
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof QueryJobConfiguration
-        && Objects.equals(toPb(), ((QueryJobConfiguration) obj).toPb());
+    return obj instanceof QueryJobConfiguration && baseEquals((QueryJobConfiguration) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(allowLargeResults, createDisposition, destinationTable, defaultDataset,
-        flattenResults, priority, query, tableDefinitions, useQueryCache, userDefinedFunctions,
-        writeDisposition, dryRun);
+    return Objects.hash(baseHashCode(), allowLargeResults, createDisposition, destinationTable,
+        defaultDataset, flattenResults, priority, query, tableDefinitions, useQueryCache,
+        userDefinedFunctions, writeDisposition, dryRun);
   }
 
   com.google.api.services.bigquery.model.JobConfiguration toPb() {
@@ -516,6 +515,7 @@ public static QueryJobConfiguration of(String query) {
     return builder(query).build();
   }
 
+  @SuppressWarnings("unchecked")
   static QueryJobConfiguration fromPb(
       com.google.api.services.bigquery.model.JobConfiguration jobPb) {
     return new Builder(jobPb).build();
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableDataWriteChannel.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableDataWriteChannel.java
index c4cee5a9a303..bee0340a29a8 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableDataWriteChannel.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableDataWriteChannel.java
@@ -24,18 +24,18 @@
 import com.google.gcloud.RetryHelper;
 import com.google.gcloud.WriteChannel;
 
-import java.util.Arrays;
-
 /**
  * WriteChannel implementation to stream data into a BigQuery table.
  */
-class TableDataWriteChannel extends BaseWriteChannel {
+class TableDataWriteChannel extends BaseWriteChannel {
 
-  TableDataWriteChannel(BigQueryOptions options, LoadConfiguration loadConfiguration) {
-    this(options, loadConfiguration, options.rpc().open(loadConfiguration.toPb()));
+  TableDataWriteChannel(BigQueryOptions options,
+      WriteChannelConfiguration writeChannelConfiguration) {
+    this(options, writeChannelConfiguration, options.rpc().open(writeChannelConfiguration.toPb()));
   }
 
-  TableDataWriteChannel(BigQueryOptions options, LoadConfiguration config, String uploadId) {
+  TableDataWriteChannel(BigQueryOptions options, WriteChannelConfiguration config,
+      String uploadId) {
     super(options, config, uploadId);
   }
 
@@ -57,7 +57,8 @@ protected StateImpl.Builder stateBuilder() {
     return StateImpl.builder(options(), entity(), uploadId());
   }
 
-  static class StateImpl extends BaseWriteChannel.BaseState {
+  static class StateImpl
+      extends BaseWriteChannel.BaseState {
 
     private static final long serialVersionUID = -787362105981823738L;
 
@@ -66,9 +67,10 @@ static class StateImpl extends BaseWriteChannel.BaseState {
+        extends BaseWriteChannel.BaseState.Builder {
 
-      private Builder(BigQueryOptions options, LoadConfiguration configuration, String uploadId) {
+      private Builder(BigQueryOptions options, WriteChannelConfiguration configuration,
+          String uploadId) {
         super(options, configuration, uploadId);
       }
 
@@ -77,7 +79,8 @@ public RestorableState build() {
       }
     }
 
-    static Builder builder(BigQueryOptions options, LoadConfiguration config, String uploadId) {
+    static Builder builder(BigQueryOptions options, WriteChannelConfiguration config,
+        String uploadId) {
       return new Builder(options, config, uploadId);
     }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
new file mode 100644
index 000000000000..7c026c100929
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
@@ -0,0 +1,316 @@
+/*
+ * 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.
+ */
+
+package com.google.gcloud.bigquery;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.api.services.bigquery.model.JobConfigurationLoad;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
+import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Google BigQuery Configuration for a load operation. A load configuration can be used to load data
+ * into a table with a {@link com.google.gcloud.WriteChannel}
+ * ({@link BigQuery#writer(WriteChannelConfiguration)}).
+ */
+public class WriteChannelConfiguration implements LoadConfiguration, Serializable {
+
+  private static final long serialVersionUID = 470267591917413578L;
+
+  protected final TableId destinationTable;
+  protected final CreateDisposition createDisposition;
+  protected final WriteDisposition writeDisposition;
+  protected final FormatOptions formatOptions;
+  protected final Integer maxBadRecords;
+  protected final Schema schema;
+  protected final Boolean ignoreUnknownValues;
+  protected final List projectionFields;
+
+  public static final class Builder implements LoadConfiguration.Builder {
+
+    private TableId destinationTable;
+    private CreateDisposition createDisposition;
+    private WriteDisposition writeDisposition;
+    private FormatOptions formatOptions;
+    private Integer maxBadRecords;
+    private Schema schema;
+    private Boolean ignoreUnknownValues;
+    private List projectionFields;
+
+    protected Builder() {}
+
+    protected Builder(WriteChannelConfiguration writeChannelConfiguration) {
+      this.destinationTable = writeChannelConfiguration.destinationTable;
+      this.createDisposition = writeChannelConfiguration.createDisposition;
+      this.writeDisposition = writeChannelConfiguration.writeDisposition;
+      this.formatOptions = writeChannelConfiguration.formatOptions;
+      this.maxBadRecords = writeChannelConfiguration.maxBadRecords;
+      this.schema = writeChannelConfiguration.schema;
+      this.ignoreUnknownValues = writeChannelConfiguration.ignoreUnknownValues;
+      this.projectionFields = writeChannelConfiguration.projectionFields;
+    }
+
+    protected Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+      JobConfigurationLoad loadConfigurationPb = configurationPb.getLoad();
+      this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
+      if (loadConfigurationPb.getCreateDisposition() != null) {
+        this.createDisposition =
+            CreateDisposition.valueOf(loadConfigurationPb.getCreateDisposition());
+      }
+      if (loadConfigurationPb.getWriteDisposition() != null) {
+        this.writeDisposition = WriteDisposition.valueOf(loadConfigurationPb.getWriteDisposition());
+      }
+      if (loadConfigurationPb.getSourceFormat() != null) {
+        this.formatOptions = FormatOptions.of(loadConfigurationPb.getSourceFormat());
+      }
+      if (loadConfigurationPb.getAllowJaggedRows() != null
+          || loadConfigurationPb.getAllowQuotedNewlines() != null
+          || loadConfigurationPb.getEncoding() != null
+          || loadConfigurationPb.getFieldDelimiter() != null
+          || loadConfigurationPb.getQuote() != null
+          || loadConfigurationPb.getSkipLeadingRows() != null) {
+        CsvOptions.Builder builder = CsvOptions.builder()
+            .allowJaggedRows(loadConfigurationPb.getAllowJaggedRows())
+            .allowQuotedNewLines(loadConfigurationPb.getAllowQuotedNewlines())
+            .encoding(loadConfigurationPb.getEncoding())
+            .fieldDelimiter(loadConfigurationPb.getFieldDelimiter())
+            .quote(loadConfigurationPb.getQuote())
+            .skipLeadingRows(loadConfigurationPb.getSkipLeadingRows());
+        this.formatOptions = builder.build();
+      }
+      this.maxBadRecords = loadConfigurationPb.getMaxBadRecords();
+      if (loadConfigurationPb.getSchema() != null) {
+        this.schema = Schema.fromPb(loadConfigurationPb.getSchema());
+      }
+      this.ignoreUnknownValues = loadConfigurationPb.getIgnoreUnknownValues();
+      this.projectionFields = loadConfigurationPb.getProjectionFields();
+    }
+
+    @Override
+    public Builder destinationTable(TableId destinationTable) {
+      this.destinationTable = destinationTable;
+      return this;
+    }
+
+    @Override
+    public Builder createDisposition(CreateDisposition createDisposition) {
+      this.createDisposition = createDisposition;
+      return this;
+    }
+
+    @Override
+    public Builder writeDisposition(WriteDisposition writeDisposition) {
+      this.writeDisposition = writeDisposition;
+      return this;
+    }
+
+    @Override
+    public Builder formatOptions(FormatOptions formatOptions) {
+      this.formatOptions = formatOptions;
+      return this;
+    }
+
+    @Override
+    public Builder maxBadRecords(Integer maxBadRecords) {
+      this.maxBadRecords = maxBadRecords;
+      return this;
+    }
+
+    @Override
+    public Builder schema(Schema schema) {
+      this.schema = schema;
+      return this;
+    }
+
+    @Override
+    public Builder ignoreUnknownValues(Boolean ignoreUnknownValues) {
+      this.ignoreUnknownValues = ignoreUnknownValues;
+      return this;
+    }
+
+    @Override
+    public Builder projectionFields(List projectionFields) {
+      this.projectionFields =
+          projectionFields != null ? ImmutableList.copyOf(projectionFields) : null;
+      return this;
+    }
+
+    public WriteChannelConfiguration build() {
+      return new WriteChannelConfiguration(this);
+    }
+  }
+
+  protected WriteChannelConfiguration(Builder builder) {
+    this.destinationTable = checkNotNull(builder.destinationTable);
+    this.createDisposition = builder.createDisposition;
+    this.writeDisposition = builder.writeDisposition;
+    this.formatOptions = builder.formatOptions;
+    this.maxBadRecords = builder.maxBadRecords;
+    this.schema = builder.schema;
+    this.ignoreUnknownValues = builder.ignoreUnknownValues;
+    this.projectionFields = builder.projectionFields;
+  }
+
+  @Override
+  public TableId destinationTable() {
+    return destinationTable;
+  }
+
+  @Override
+  public CreateDisposition createDisposition() {
+    return this.createDisposition;
+  }
+
+  @Override
+  public WriteDisposition writeDisposition() {
+    return writeDisposition;
+  }
+
+  @Override
+  public CsvOptions csvOptions() {
+    return formatOptions instanceof CsvOptions ? (CsvOptions) formatOptions : null;
+  }
+
+  @Override
+  public Integer maxBadRecords() {
+    return maxBadRecords;
+  }
+
+  @Override
+  public Schema schema() {
+    return schema;
+  }
+
+  @Override
+  public String format() {
+    return formatOptions != null ? formatOptions.type() : null;
+  }
+
+  @Override
+  public Boolean ignoreUnknownValues() {
+    return ignoreUnknownValues;
+  }
+
+  @Override
+  public List projectionFields() {
+    return projectionFields;
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  MoreObjects.ToStringHelper toStringHelper() {
+    return MoreObjects.toStringHelper(this)
+        .add("destinationTable", destinationTable)
+        .add("createDisposition", createDisposition)
+        .add("writeDisposition", writeDisposition)
+        .add("formatOptions", formatOptions)
+        .add("maxBadRecords", maxBadRecords)
+        .add("schema", schema)
+        .add("ignoreUnknownValue", ignoreUnknownValues)
+        .add("projectionFields", projectionFields);
+  }
+
+  @Override
+  public String toString() {
+    return toStringHelper().toString();
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof WriteChannelConfiguration
+        && Objects.equals(toPb(), ((WriteChannelConfiguration) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(destinationTable, createDisposition, writeDisposition, formatOptions,
+        maxBadRecords, schema, ignoreUnknownValues, projectionFields);
+  }
+
+  com.google.api.services.bigquery.model.JobConfiguration toPb() {
+    JobConfigurationLoad loadConfigurationPb = new JobConfigurationLoad();
+    loadConfigurationPb.setDestinationTable(destinationTable.toPb());
+    if (createDisposition != null) {
+      loadConfigurationPb.setCreateDisposition(createDisposition.toString());
+    }
+    if (writeDisposition != null) {
+      loadConfigurationPb.setWriteDisposition(writeDisposition.toString());
+    }
+    if (csvOptions() != null) {
+      CsvOptions csvOptions = csvOptions();
+      loadConfigurationPb.setFieldDelimiter(csvOptions.fieldDelimiter())
+          .setAllowJaggedRows(csvOptions.allowJaggedRows())
+          .setAllowQuotedNewlines(csvOptions.allowQuotedNewLines())
+          .setEncoding(csvOptions.encoding())
+          .setQuote(csvOptions.quote())
+          .setSkipLeadingRows(csvOptions.skipLeadingRows());
+    }
+    if (schema != null) {
+      loadConfigurationPb.setSchema(schema.toPb());
+    }
+    if (formatOptions != null) {
+      loadConfigurationPb.setSourceFormat(formatOptions.type());
+    }
+    loadConfigurationPb.setMaxBadRecords(maxBadRecords);
+    loadConfigurationPb.setIgnoreUnknownValues(ignoreUnknownValues);
+    loadConfigurationPb.setProjectionFields(projectionFields);
+    return new com.google.api.services.bigquery.model.JobConfiguration()
+        .setLoad(loadConfigurationPb);
+  }
+
+  static WriteChannelConfiguration fromPb(
+      com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+    return new Builder(configurationPb).build();
+  }
+
+  /**
+   * Creates a builder for a BigQuery Load Configuration given the destination table.
+   */
+  public static Builder builder(TableId destinationTable) {
+    return new Builder().destinationTable(destinationTable);
+  }
+
+  /**
+   * Creates a builder for a BigQuery Load Configuration given the destination table and format.
+   */
+  public static Builder builder(TableId destinationTable, FormatOptions format) {
+    return builder(destinationTable).formatOptions(format);
+  }
+
+  /**
+   * Returns a BigQuery Load Configuration for the given destination table.
+   */
+  public static WriteChannelConfiguration of(TableId destinationTable) {
+    return builder(destinationTable).build();
+  }
+
+  /**
+   * Returns a BigQuery Load Configuration for the given destination table and format.
+   */
+  public static WriteChannelConfiguration of(TableId destinationTable, FormatOptions format) {
+    return builder(destinationTable).formatOptions(format).build();
+  }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
index 592ae1b93d6d..b57f1dc8a128 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/DefaultBigQueryRpc.java
@@ -24,7 +24,6 @@
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 import static java.net.HttpURLConnection.HTTP_OK;
 
-import com.google.api.client.googleapis.json.GoogleJsonError;
 import com.google.api.client.http.ByteArrayContent;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpRequest;
@@ -43,7 +42,6 @@
 import com.google.api.services.bigquery.model.GetQueryResultsResponse;
 import com.google.api.services.bigquery.model.Job;
 import com.google.api.services.bigquery.model.JobConfiguration;
-import com.google.api.services.bigquery.model.JobConfigurationLoad;
 import com.google.api.services.bigquery.model.JobList;
 import com.google.api.services.bigquery.model.JobStatus;
 import com.google.api.services.bigquery.model.QueryRequest;
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
index 862dd5b930fa..8af8c700cd8c 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -1010,12 +1010,13 @@ public void testGetQueryResultsWithOptions() {
 
   @Test
   public void testWriter() {
-    LoadConfiguration loadConfiguration = LoadConfiguration.of(TABLE_ID);
-    EasyMock.expect(bigqueryRpcMock.open(LoadConfiguration.of(TABLE_ID_WITH_PROJECT).toPb()))
-        .andReturn("upload-id");
+    WriteChannelConfiguration writeChannelConfiguration = WriteChannelConfiguration.of(TABLE_ID);
+    EasyMock.expect(
+        bigqueryRpcMock.open(WriteChannelConfiguration.of(TABLE_ID_WITH_PROJECT).toPb()))
+            .andReturn("upload-id");
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.service();
-    WriteChannel channel = bigquery.writer(loadConfiguration);
+    WriteChannel channel = bigquery.writer(writeChannelConfiguration);
     assertNotNull(channel);
     assertTrue(channel.isOpen());
   }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java
index 0a94b4fbded2..ff038cf0a37d 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * 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.
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java
index a81c912dbb58..d4d7a50f47f2 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * 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.
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
index be30b5eb5050..e083d3682d8c 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -878,7 +878,7 @@ public void testCancelNonExistingJob() throws InterruptedException {
   public void testInsertFromFile() throws InterruptedException, FileNotFoundException {
     String destinationTableName = "test_insert_from_file_table";
     TableId tableId = TableId.of(DATASET, destinationTableName);
-    LoadConfiguration configuration = LoadConfiguration.builder(tableId)
+    WriteChannelConfiguration configuration = WriteChannelConfiguration.builder(tableId)
         .formatOptions(FormatOptions.json())
         .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
         .schema(TABLE_SCHEMA)
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
index 5c45215633c4..5bc3643c288d 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * 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.
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java
index f58df04cfcad..495b5e4d64f6 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * 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.
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java
index 6febe38b73f3..c59deff5020f 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * 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.
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 1d0673a0183b..19b281f073b3 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -172,14 +172,15 @@ public class SerializationTest {
       CopyJobConfiguration.of(TABLE_ID, TABLE_ID);
   private static final ExtractJobConfiguration EXTRACT_JOB_CONFIGURATION =
       ExtractJobConfiguration.of(TABLE_ID, SOURCE_URIS);
-  private static final LoadConfiguration LOAD_CONFIGURATION = LoadConfiguration.builder(TABLE_ID)
-      .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
-      .writeDisposition(JobInfo.WriteDisposition.WRITE_APPEND)
-      .formatOptions(CSV_OPTIONS)
-      .ignoreUnknownValues(true)
-      .maxBadRecords(10)
-      .schema(TABLE_SCHEMA)
-      .build();
+  private static final WriteChannelConfiguration LOAD_CONFIGURATION =
+      WriteChannelConfiguration.builder(TABLE_ID)
+          .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
+          .writeDisposition(JobInfo.WriteDisposition.WRITE_APPEND)
+          .formatOptions(CSV_OPTIONS)
+          .ignoreUnknownValues(true)
+          .maxBadRecords(10)
+          .schema(TABLE_SCHEMA)
+          .build();
   private static final LoadJobConfiguration LOAD_JOB_CONFIGURATION =
       LoadJobConfiguration.of(TABLE_ID, SOURCE_URIS);
   private static final QueryJobConfiguration QUERY_JOB_CONFIGURATION =
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableDataWriteChannelTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableDataWriteChannelTest.java
index 67933407e377..6b7edcd76db1 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableDataWriteChannelTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableDataWriteChannelTest.java
@@ -50,13 +50,14 @@ public class TableDataWriteChannelTest {
 
   private static final String UPLOAD_ID = "uploadid";
   private static final TableId TABLE_ID = TableId.of("dataset", "table");
-  private static final LoadConfiguration LOAD_CONFIGURATION = LoadConfiguration.builder(TABLE_ID)
-      .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
-      .writeDisposition(JobInfo.WriteDisposition.WRITE_APPEND)
-      .formatOptions(FormatOptions.json())
-      .ignoreUnknownValues(true)
-      .maxBadRecords(10)
-      .build();
+  private static final WriteChannelConfiguration LOAD_CONFIGURATION =
+      WriteChannelConfiguration.builder(TABLE_ID)
+          .createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
+          .writeDisposition(JobInfo.WriteDisposition.WRITE_APPEND)
+          .formatOptions(FormatOptions.json())
+          .ignoreUnknownValues(true)
+          .maxBadRecords(10)
+          .build();
   private static final int MIN_CHUNK_SIZE = 256 * 1024;
   private static final int DEFAULT_CHUNK_SIZE = 8 * MIN_CHUNK_SIZE;
   private static final int CUSTOM_CHUNK_SIZE = 4 * MIN_CHUNK_SIZE;
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/WriteChannelConfigurationTest.java
similarity index 84%
rename from gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java
rename to gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/WriteChannelConfigurationTest.java
index a245026c8854..17fa8446d097 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/WriteChannelConfigurationTest.java
@@ -28,7 +28,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-public class LoadConfigurationTest {
+public class WriteChannelConfigurationTest {
 
   private static final CsvOptions CSV_OPTIONS = CsvOptions.builder()
       .allowJaggedRows(true)
@@ -47,7 +47,7 @@ public class LoadConfigurationTest {
       .description("FieldDescription")
       .build();
   private static final Schema TABLE_SCHEMA = Schema.of(FIELD_SCHEMA);
-  private static final LoadConfiguration LOAD_CONFIGURATION = LoadConfiguration.builder(TABLE_ID)
+  private static final WriteChannelConfiguration LOAD_CONFIGURATION = WriteChannelConfiguration.builder(TABLE_ID)
       .createDisposition(CREATE_DISPOSITION)
       .writeDisposition(WRITE_DISPOSITION)
       .formatOptions(CSV_OPTIONS)
@@ -60,7 +60,7 @@ public class LoadConfigurationTest {
   @Test
   public void testToBuilder() {
     compareLoadConfiguration(LOAD_CONFIGURATION, LOAD_CONFIGURATION.toBuilder().build());
-    LoadConfiguration configuration = LOAD_CONFIGURATION.toBuilder()
+    WriteChannelConfiguration configuration = LOAD_CONFIGURATION.toBuilder()
         .destinationTable(TableId.of("dataset", "newTable"))
         .build();
     assertEquals("newTable", configuration.destinationTable().table());
@@ -70,9 +70,9 @@ public void testToBuilder() {
 
   @Test
   public void testOf() {
-    LoadConfiguration configuration = LoadConfiguration.of(TABLE_ID);
+    WriteChannelConfiguration configuration = WriteChannelConfiguration.of(TABLE_ID);
     assertEquals(TABLE_ID, configuration.destinationTable());
-    configuration = LoadConfiguration.of(TABLE_ID, CSV_OPTIONS);
+    configuration = WriteChannelConfiguration.of(TABLE_ID, CSV_OPTIONS);
     assertEquals(TABLE_ID, configuration.destinationTable());
     assertEquals(FORMAT, configuration.format());
     assertEquals(CSV_OPTIONS, configuration.csvOptions());
@@ -80,7 +80,7 @@ public void testOf() {
 
   @Test
   public void testToBuilderIncomplete() {
-    LoadConfiguration configuration = LoadConfiguration.of(TABLE_ID);
+    WriteChannelConfiguration configuration = WriteChannelConfiguration.of(TABLE_ID);
     compareLoadConfiguration(configuration, configuration.toBuilder().build());
   }
 
@@ -101,12 +101,12 @@ public void testBuilder() {
   public void testToPbAndFromPb() {
     assertNull(LOAD_CONFIGURATION.toPb().getLoad().getSourceUris());
     compareLoadConfiguration(LOAD_CONFIGURATION,
-        LoadConfiguration.fromPb(LOAD_CONFIGURATION.toPb()));
-    LoadConfiguration configuration = LoadConfiguration.of(TABLE_ID);
-    compareLoadConfiguration(configuration, LoadConfiguration.fromPb(configuration.toPb()));
+        WriteChannelConfiguration.fromPb(LOAD_CONFIGURATION.toPb()));
+    WriteChannelConfiguration configuration = WriteChannelConfiguration.of(TABLE_ID);
+    compareLoadConfiguration(configuration, WriteChannelConfiguration.fromPb(configuration.toPb()));
   }
 
-  private void compareLoadConfiguration(LoadConfiguration expected, LoadConfiguration value) {
+  private void compareLoadConfiguration(WriteChannelConfiguration expected, WriteChannelConfiguration value) {
     assertEquals(expected, value);
     assertEquals(expected.hashCode(), value.hashCode());
     assertEquals(expected.toString(), value.toString());
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
index 2143be188338..8fe78cbd50ad 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/BigQueryExample.java
@@ -34,7 +34,7 @@
 import com.google.gcloud.bigquery.JobId;
 import com.google.gcloud.bigquery.JobInfo;
 import com.google.gcloud.bigquery.JobStatus;
-import com.google.gcloud.bigquery.LoadConfiguration;
+import com.google.gcloud.bigquery.WriteChannelConfiguration;
 import com.google.gcloud.bigquery.LoadJobConfiguration;
 import com.google.gcloud.bigquery.QueryRequest;
 import com.google.gcloud.bigquery.QueryResponse;
@@ -576,8 +576,8 @@ JobInfo parse(String... args) throws Exception {
         String table = args[1];
         String format = args[2];
         TableId tableId = TableId.of(dataset, table);
-        ExtractJobConfiguration configuration =
-            ExtractJobConfiguration.of(tableId, Arrays.asList(args).subList(3, args.length));
+        ExtractJobConfiguration configuration = ExtractJobConfiguration.of(
+            tableId, Arrays.asList(args).subList(3, args.length), format);
         return JobInfo.of(configuration);
       }
       throw new IllegalArgumentException("Missing required arguments.");
@@ -671,9 +671,11 @@ protected String params() {
    * @see Resumable
    *     Upload
    */
-  private static class LoadFileAction extends BigQueryAction> {
+  private static class LoadFileAction
+      extends BigQueryAction> {
     @Override
-    void run(BigQuery bigquery, Tuple configuration) throws Exception {
+    void run(BigQuery bigquery, Tuple configuration)
+        throws Exception {
       System.out.println("Running insert");
       try (FileChannel fileChannel = FileChannel.open(Paths.get(configuration.y()))) {
         WriteChannel writeChannel = bigquery.writer(configuration.x());
@@ -688,13 +690,14 @@ void run(BigQuery bigquery, Tuple configuration) thro
     }
 
     @Override
-    Tuple parse(String... args) throws Exception {
+    Tuple parse(String... args) throws Exception {
       if (args.length == 4) {
         String dataset = args[0];
         String table = args[1];
         String format = args[2];
         TableId tableId = TableId.of(dataset, table);
-        LoadConfiguration configuration = LoadConfiguration.of(tableId, FormatOptions.of(format));
+        WriteChannelConfiguration configuration =
+            WriteChannelConfiguration.of(tableId, FormatOptions.of(format));
         return Tuple.of(configuration, args[3]);
       }
       throw new IllegalArgumentException("Missing required arguments.");

From f09410d37edfb18b033e3ce1633abdc83da52bae Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Wed, 27 Jan 2016 15:16:29 -0800
Subject: [PATCH 314/322] Document that input stream is closed in
 storage.create(BlobInfo, InputStream)

---
 .../src/main/java/com/google/gcloud/storage/Storage.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
index 272c5fdef223..b550015d0516 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -1236,7 +1236,8 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    * Create a new blob. Direct upload is used to upload {@code content}. For large content,
    * {@link #writer} is recommended as it uses resumable upload. By default any md5 and crc32c
    * values in the given {@code blobInfo} are ignored unless requested via the
-   * {@code BlobWriteOption.md5Match} and {@code BlobWriteOption.crc32cMatch} options.
+   * {@code BlobWriteOption.md5Match} and {@code BlobWriteOption.crc32cMatch} options. The given
+   * input stream is closed upon success.
    *
    * @return a complete blob information
    * @throws StorageException upon failure

From 70ee77cae5cca69c1a4c6e274d242b5c09818e7b Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 28 Jan 2016 13:13:24 +0100
Subject: [PATCH 315/322] Move setProjectId from BigQueryImpl to entity objects

---
 .../google/gcloud/bigquery/BaseTableInfo.java |   4 +
 .../google/gcloud/bigquery/BigQueryImpl.java  | 112 ++----------------
 .../gcloud/bigquery/CopyJobConfiguration.java |  15 +++
 .../com/google/gcloud/bigquery/DatasetId.java |   4 +
 .../google/gcloud/bigquery/DatasetInfo.java   |  23 ++++
 .../bigquery/ExtractJobConfiguration.java     |   5 +
 .../gcloud/bigquery/JobConfiguration.java     |   2 +
 .../com/google/gcloud/bigquery/JobInfo.java   |   4 +
 .../gcloud/bigquery/LoadJobConfiguration.java |   5 +
 .../bigquery/QueryJobConfiguration.java       |  12 ++
 .../google/gcloud/bigquery/QueryRequest.java  |   8 ++
 .../com/google/gcloud/bigquery/TableId.java   |   4 +
 .../bigquery/WriteChannelConfiguration.java   |   4 +
 .../bigquery/CopyJobConfigurationTest.java    |   9 ++
 .../google/gcloud/bigquery/DatasetIdTest.java |   5 +
 .../gcloud/bigquery/DatasetInfoTest.java      |  13 +-
 .../bigquery/ExtractJobConfigurationTest.java |   6 +
 .../google/gcloud/bigquery/JobInfoTest.java   |  18 ++-
 .../bigquery/LoadJobConfigurationTest.java    |   6 +
 .../bigquery/QueryJobConfigurationTest.java   |  11 +-
 .../gcloud/bigquery/QueryRequestTest.java     |   7 +-
 .../google/gcloud/bigquery/TableIdTest.java   |   5 +
 .../google/gcloud/bigquery/TableInfoTest.java |   7 ++
 23 files changed, 179 insertions(+), 110 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
index 977da0981d2a..8bb30f025c06 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
@@ -394,6 +394,10 @@ protected final boolean baseEquals(BaseTableInfo tableInfo) {
     return Objects.equals(toPb(), tableInfo.toPb());
   }
 
+  BaseTableInfo setProjectId(String projectId) {
+    return toBuilder().tableId(tableId().setProjectId(projectId)).build();
+  }
+
   Table toPb() {
     Table tablePb = new Table();
     tablePb.setTableReference(tableId.toPb());
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
index 3186a0ac196b..e521228d73bb 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryImpl.java
@@ -25,7 +25,6 @@
 import com.google.api.services.bigquery.model.Table;
 import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
 import com.google.api.services.bigquery.model.TableDataInsertAllRequest.Rows;
-import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.TableRow;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
@@ -159,7 +158,7 @@ public QueryResult nextPage() {
   @Override
   public DatasetInfo create(DatasetInfo dataset, DatasetOption... options)
       throws BigQueryException {
-    final Dataset datasetPb = setProjectId(dataset).toPb();
+    final Dataset datasetPb = dataset.setProjectId(options().projectId()).toPb();
     final Map optionsMap = optionMap(options);
     try {
       return DatasetInfo.fromPb(runWithRetries(new Callable() {
@@ -176,7 +175,7 @@ public Dataset call() {
   @Override
   public  T create(T table, TableOption... options)
       throws BigQueryException {
-    final Table tablePb = setProjectId(table).toPb();
+    final Table tablePb = table.setProjectId(options().projectId()).toPb();
     final Map optionsMap = optionMap(options);
     try {
       return BaseTableInfo.fromPb(runWithRetries(new Callable
    () {
@@ -192,7 +191,7 @@ public Table call() {
 
   @Override
   public JobInfo create(JobInfo job, JobOption... options) throws BigQueryException {
-    final Job jobPb = setProjectId(job).toPb();
+    final Job jobPb = job.setProjectId(options().projectId()).toPb();
     final Map optionsMap = optionMap(options);
     try {
       return JobInfo.fromPb(runWithRetries(new Callable() {
@@ -295,7 +294,7 @@ public Boolean call() {
   @Override
   public DatasetInfo update(DatasetInfo dataset, DatasetOption... options)
       throws BigQueryException {
-    final Dataset datasetPb = setProjectId(dataset).toPb();
+    final Dataset datasetPb = dataset.setProjectId(options().projectId()).toPb();
     final Map optionsMap = optionMap(options);
     try {
       return DatasetInfo.fromPb(runWithRetries(new Callable() {
@@ -312,7 +311,7 @@ public Dataset call() {
   @Override
   public  T update(T table, TableOption... options)
       throws BigQueryException {
-    final Table tablePb = setProjectId(table).toPb();
+    final Table tablePb = table.setProjectId(options().projectId()).toPb();
     final Map optionsMap = optionMap(options);
     try {
       return BaseTableInfo.fromPb(runWithRetries(new Callable
    () {
@@ -508,7 +507,7 @@ public QueryResponse query(final QueryRequest request) throws BigQueryException
           runWithRetries(new Callable() {
             @Override
             public com.google.api.services.bigquery.model.QueryResponse call() {
-              return bigQueryRpc.query(setProjectId(request).toPb());
+              return bigQueryRpc.query(request.setProjectId(options().projectId()).toPb());
             }
           }, options().retryParams(), EXCEPTION_HANDLER);
       QueryResponse.Builder builder = QueryResponse.builder();
@@ -597,7 +596,8 @@ private static QueryResult.Builder transformQueryResults(JobId jobId, List
     optionMap(Option... options) {
@@ -608,100 +608,4 @@ public TableDataWriteChannel writer(WriteChannelConfiguration writeChannelConfig
     }
     return optionMap;
   }
-
-  private DatasetInfo setProjectId(DatasetInfo dataset) {
-    DatasetInfo.Builder datasetBuilder = dataset.toBuilder();
-    datasetBuilder.datasetId(setProjectId(dataset.datasetId()));
-    if (dataset.acl() != null) {
-      List acls = Lists.newArrayListWithCapacity(dataset.acl().size());
-      for (Acl acl : dataset.acl()) {
-        if (acl.entity().type() == Acl.Entity.Type.VIEW) {
-          Dataset.Access accessPb = acl.toPb();
-          TableReference viewReferencePb = accessPb.getView();
-          if (viewReferencePb.getProjectId() == null) {
-            viewReferencePb.setProjectId(options().projectId());
-          }
-          acls.add(Acl.of(new Acl.View(TableId.fromPb(viewReferencePb))));
-        } else {
-          acls.add(acl);
-        }
-      }
-      datasetBuilder.acl(acls);
-    }
-    return datasetBuilder.build();
-  }
-
-  private DatasetId setProjectId(DatasetId dataset) {
-    return dataset.project() != null ? dataset
-        : DatasetId.of(options().projectId(), dataset.dataset());
-  }
-
-  private BaseTableInfo setProjectId(BaseTableInfo table) {
-    return table.toBuilder().tableId(setProjectId(table.tableId())).build();
-  }
-
-  private TableId setProjectId(TableId table) {
-    return table.project() != null ? table
-        : TableId.of(options().projectId(), table.dataset(), table.table());
-  }
-
-  private JobInfo setProjectId(JobInfo job) {
-    JobConfiguration configuration = job.configuration();
-    JobInfo.Builder jobBuilder = job.toBuilder();
-    switch (configuration.type()) {
-      case COPY:
-        CopyJobConfiguration copyConfiguration = (CopyJobConfiguration) configuration;
-        CopyJobConfiguration.Builder copyBuilder = copyConfiguration.toBuilder();
-        copyBuilder.sourceTables(
-            Lists.transform(copyConfiguration.sourceTables(), new Function() {
-              @Override
-              public TableId apply(TableId tableId) {
-                return setProjectId(tableId);
-              }
-            }));
-        copyBuilder.destinationTable(setProjectId(copyConfiguration.destinationTable()));
-        jobBuilder.configuration(copyBuilder.build());
-        break;
-      case QUERY:
-        QueryJobConfiguration queryConfiguration = (QueryJobConfiguration) configuration;
-        QueryJobConfiguration.Builder queryBuilder = queryConfiguration.toBuilder();
-        if (queryConfiguration.destinationTable() != null) {
-          queryBuilder.destinationTable(setProjectId(queryConfiguration.destinationTable()));
-        }
-        if (queryConfiguration.defaultDataset() != null) {
-          queryBuilder.defaultDataset(setProjectId(queryConfiguration.defaultDataset()));
-        }
-        jobBuilder.configuration(queryBuilder.build());
-        break;
-      case EXTRACT:
-        ExtractJobConfiguration extractConfiguration = (ExtractJobConfiguration) configuration;
-        ExtractJobConfiguration.Builder extractBuilder = extractConfiguration.toBuilder();
-        extractBuilder.sourceTable(setProjectId(extractConfiguration.sourceTable()));
-        jobBuilder.configuration(extractBuilder.build());
-        break;
-      case LOAD:
-        LoadJobConfiguration loadConfiguration = (LoadJobConfiguration) configuration;
-        jobBuilder.configuration(setProjectId(loadConfiguration));
-        break;
-      default:
-        // never reached
-        throw new IllegalArgumentException("Job configuration is not supported");
-    }
-    return jobBuilder.build();
-  }
-
-  private QueryRequest setProjectId(QueryRequest request) {
-    QueryRequest.Builder builder = request.toBuilder();
-    if (request.defaultDataset() != null) {
-      builder.defaultDataset(setProjectId(request.defaultDataset()));
-    }
-    return builder.build();
-  }
-
-  @SuppressWarnings("unchecked")
-  private  T setProjectId(T configuration) {
-    LoadConfiguration.Builder builder = configuration.toBuilder();
-    builder.destinationTable(setProjectId(configuration.destinationTable()));
-    return (T) builder.build();
-  }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
index f9a46eb0eb37..16ca019ce694 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
@@ -19,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.services.bigquery.model.JobConfigurationTableCopy;
+import com.google.common.base.Function;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -189,6 +190,20 @@ public int hashCode() {
         writeDisposition);
   }
 
+  @Override
+  CopyJobConfiguration setProjectId(final String projectId) {
+    Builder builder = toBuilder();
+    builder.sourceTables(
+        Lists.transform(sourceTables(), new Function() {
+          @Override
+          public TableId apply(TableId tableId) {
+            return tableId.setProjectId(projectId);
+          }
+        }));
+    builder.destinationTable(destinationTable().setProjectId(projectId));
+    return builder.build();
+  }
+
   com.google.api.services.bigquery.model.JobConfiguration toPb() {
     JobConfigurationTableCopy configurationPb = new JobConfigurationTableCopy();
     configurationPb.setDestinationTable(destinationTable.toPb());
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
index 942322ea51d3..006c089f8d63 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
@@ -81,6 +81,10 @@ public String toString() {
     return toPb().toString();
   }
 
+  DatasetId setProjectId(String projectId) {
+    return project() != null ? this : DatasetId.of(projectId, dataset());
+  }
+
   DatasetReference toPb() {
     return new DatasetReference().setProjectId(project).setDatasetId(dataset);
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
index 95897ba3a801..c6330308c8ce 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
@@ -21,6 +21,7 @@
 
 import com.google.api.client.util.Data;
 import com.google.api.services.bigquery.model.Dataset;
+import com.google.api.services.bigquery.model.TableReference;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
@@ -333,6 +334,28 @@ public boolean equals(Object obj) {
     return obj instanceof DatasetInfo && Objects.equals(toPb(), ((DatasetInfo) obj).toPb());
   }
 
+  DatasetInfo setProjectId(String projectId) {
+    Builder builder = toBuilder();
+    builder.datasetId(datasetId().setProjectId(projectId));
+    if (acl() != null) {
+      List acls = Lists.newArrayListWithCapacity(acl().size());
+      for (Acl acl : acl()) {
+        if (acl.entity().type() == Acl.Entity.Type.VIEW) {
+          Dataset.Access accessPb = acl.toPb();
+          TableReference viewReferencePb = accessPb.getView();
+          if (viewReferencePb.getProjectId() == null) {
+            viewReferencePb.setProjectId(projectId);
+          }
+          acls.add(Acl.of(new Acl.View(TableId.fromPb(viewReferencePb))));
+        } else {
+          acls.add(acl);
+        }
+      }
+      builder.acl(acls);
+    }
+    return builder.build();
+  }
+
   Dataset toPb() {
     Dataset datasetPb = new Dataset();
     datasetPb.setDatasetReference(datasetId.toPb());
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
index 17a1308eb99e..bfa47da0373b 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
@@ -220,6 +220,11 @@ public int hashCode() {
         format, compression);
   }
 
+  @Override
+  ExtractJobConfiguration setProjectId(String projectId) {
+    return toBuilder().sourceTable(sourceTable().setProjectId(projectId)).build();
+  }
+
   com.google.api.services.bigquery.model.JobConfiguration toPb() {
     JobConfigurationExtract extractConfigurationPb = new JobConfigurationExtract();
     extractConfigurationPb.setDestinationUris(destinationUris);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
index 625875448209..2d78a3041459 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
@@ -122,6 +122,8 @@ protected final boolean baseEquals(JobConfiguration jobConfiguration) {
     return Objects.equals(toPb(), jobConfiguration.toPb());
   }
 
+  abstract JobConfiguration setProjectId(String projectId);
+
   abstract com.google.api.services.bigquery.model.JobConfiguration toPb();
 
   @SuppressWarnings("unchecked")
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
index 355f0c52fb25..25d7686e6595 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -278,6 +278,10 @@ public boolean equals(Object obj) {
     return obj instanceof JobInfo && Objects.equals(toPb(), ((JobInfo) obj).toPb());
   }
 
+  JobInfo setProjectId(String projectId) {
+    return toBuilder().configuration(this.configuration().setProjectId(projectId)).build();
+  }
+
   Job toPb() {
     Job jobPb = new Job();
     jobPb.setEtag(etag);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
index 796d5ddcb058..8d690b34a158 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
@@ -277,6 +277,11 @@ public int hashCode() {
     return Objects.hash(baseHashCode(), sourceUris);
   }
 
+  @Override
+  LoadJobConfiguration setProjectId(String projectId) {
+    return toBuilder().destinationTable(destinationTable().setProjectId(projectId)).build();
+  }
+
   com.google.api.services.bigquery.model.JobConfiguration toPb() {
     JobConfigurationLoad loadConfigurationPb = new JobConfigurationLoad();
     loadConfigurationPb.setDestinationTable(destinationTable.toPb());
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
index 2ffee5be71ab..b611a1714873 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
@@ -459,6 +459,18 @@ public int hashCode() {
         userDefinedFunctions, writeDisposition, dryRun);
   }
 
+  @Override
+  QueryJobConfiguration setProjectId(String projectId) {
+    Builder builder = toBuilder();
+    if (destinationTable() != null) {
+      builder.destinationTable(destinationTable().setProjectId(projectId));
+    }
+    if (defaultDataset() != null) {
+      builder.defaultDataset(defaultDataset().setProjectId(projectId));
+    }
+    return builder.build();
+  }
+
   com.google.api.services.bigquery.model.JobConfiguration toPb() {
     com.google.api.services.bigquery.model.JobConfiguration configurationPb =
         new com.google.api.services.bigquery.model.JobConfiguration();
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
index 3655c2aba453..0bcfb3d4a9ae 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
@@ -253,6 +253,14 @@ public boolean equals(Object obj) {
     return obj instanceof QueryRequest && Objects.equals(toPb(), ((QueryRequest) obj).toPb());
   }
 
+  QueryRequest setProjectId(String projectId) {
+    Builder builder = toBuilder();
+    if (defaultDataset() != null) {
+      builder.defaultDataset(defaultDataset().setProjectId(projectId));
+    }
+    return builder.build();
+  }
+
   com.google.api.services.bigquery.model.QueryRequest toPb() {
     com.google.api.services.bigquery.model.QueryRequest queryRequestPb =
         new com.google.api.services.bigquery.model.QueryRequest().setQuery(query);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
index 7a4e0bbb38b4..20ed53cc1a5d 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
@@ -105,6 +105,10 @@ public String toString() {
     return toPb().toString();
   }
 
+  TableId setProjectId(String projectId) {
+    return project() != null ? this : TableId.of(projectId, dataset(), table());
+  }
+
   TableReference toPb() {
     return new TableReference().setProjectId(project).setDatasetId(dataset).setTableId(table);
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
index 7c026c100929..18c3f1561056 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
@@ -250,6 +250,10 @@ public int hashCode() {
         maxBadRecords, schema, ignoreUnknownValues, projectionFields);
   }
 
+  WriteChannelConfiguration setProjectId(String projectId) {
+    return toBuilder().destinationTable(destinationTable().setProjectId(projectId)).build();
+  }
+
   com.google.api.services.bigquery.model.JobConfiguration toPb() {
     JobConfigurationLoad loadConfigurationPb = new JobConfigurationLoad();
     loadConfigurationPb.setDestinationTable(destinationTable.toPb());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java
index ff038cf0a37d..3f3f6f0fd15c 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/CopyJobConfigurationTest.java
@@ -108,6 +108,15 @@ public void testToPbAndFromPb() {
         jobConfiguration, CopyJobConfiguration.fromPb(jobConfiguration.toPb()));
   }
 
+  @Test
+  public void testSetProjectId() {
+    CopyJobConfiguration configuration = COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.setProjectId("p");
+    assertEquals("p", configuration.destinationTable().project());
+    for (TableId sourceTable : configuration.sourceTables()) {
+      assertEquals("p", sourceTable.project());
+    }
+  }
+
   private void compareCopyJobConfiguration(CopyJobConfiguration expected,
       CopyJobConfiguration value) {
     assertEquals(expected, value);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetIdTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetIdTest.java
index 0af665895d71..ec645d71c96f 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetIdTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetIdTest.java
@@ -45,6 +45,11 @@ public void testToPbAndFromPb() {
     compareDatasetIds(DATASET_COMPLETE, DatasetId.fromPb(DATASET_COMPLETE.toPb()));
   }
 
+  @Test
+  public void testSetProjectId() {
+    assertEquals(DATASET_COMPLETE, DATASET.setProjectId("project"));
+  }
+
   private void compareDatasetIds(DatasetId expected, DatasetId value) {
     assertEquals(expected, value);
     assertEquals(expected.project(), value.project());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
index 733253a2d790..20875c0fc853 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetInfoTest.java
@@ -29,7 +29,10 @@ public class DatasetInfoTest {
 
   private static final List ACCESS_RULES = ImmutableList.of(
       Acl.of(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
-      Acl.of(new Acl.View(TableId.of("project", "dataset", "table")), Acl.Role.WRITER));
+      Acl.of(new Acl.View(TableId.of("dataset", "table"))));
+  private static final List ACCESS_RULES_COMPLETE = ImmutableList.of(
+      Acl.of(Acl.Group.ofAllAuthenticatedUsers(), Acl.Role.READER),
+      Acl.of(new Acl.View(TableId.of("project", "dataset", "table"))));
   private static final Long CREATION_TIME = System.currentTimeMillis();
   private static final Long DEFAULT_TABLE_EXPIRATION = CREATION_TIME + 100;
   private static final String DESCRIPTION = "description";
@@ -55,6 +58,7 @@ public class DatasetInfoTest {
       .build();
   private static final DatasetInfo DATASET_INFO_COMPLETE = DATASET_INFO.toBuilder()
       .datasetId(DATASET_ID_COMPLETE)
+      .acl(ACCESS_RULES_COMPLETE)
       .build();
 
   @Test
@@ -91,7 +95,7 @@ public void testBuilder() {
     assertEquals(LOCATION, DATASET_INFO.location());
     assertEquals(SELF_LINK, DATASET_INFO.selfLink());
     assertEquals(DATASET_ID_COMPLETE, DATASET_INFO_COMPLETE.datasetId());
-    assertEquals(ACCESS_RULES, DATASET_INFO_COMPLETE.acl());
+    assertEquals(ACCESS_RULES_COMPLETE, DATASET_INFO_COMPLETE.acl());
     assertEquals(CREATION_TIME, DATASET_INFO_COMPLETE.creationTime());
     assertEquals(DEFAULT_TABLE_EXPIRATION, DATASET_INFO_COMPLETE.defaultTableLifetime());
     assertEquals(DESCRIPTION, DATASET_INFO_COMPLETE.description());
@@ -110,6 +114,11 @@ public void testToPbAndFromPb() {
     compareDatasets(datasetInfo, DatasetInfo.fromPb(datasetInfo.toPb()));
   }
 
+  @Test
+  public void testSetProjectId() {
+    assertEquals(DATASET_INFO_COMPLETE, DATASET_INFO.setProjectId("project"));
+  }
+
   private void compareDatasets(DatasetInfo expected, DatasetInfo value) {
     assertEquals(expected, value);
     assertEquals(expected.datasetId(), value.datasetId());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java
index d4d7a50f47f2..7ac67f41b1f8 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ExtractJobConfigurationTest.java
@@ -118,6 +118,12 @@ public void testToPbAndFromPb() {
     compareExtractJobConfiguration(job, ExtractJobConfiguration.fromPb(job.toPb()));
   }
 
+  @Test
+  public void testSetProjectId() {
+    ExtractJobConfiguration configuration = EXTRACT_CONFIGURATION.setProjectId("p");
+    assertEquals("p", configuration.sourceTable().project());
+  }
+
   private void compareExtractJobConfiguration(ExtractJobConfiguration expected,
       ExtractJobConfiguration value) {
     assertEquals(expected, value);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
index 5bc3643c288d..e65a128bbe96 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
@@ -85,7 +85,7 @@ public class JobInfoTest {
           .build();
   private static final List DESTINATION_URIS = ImmutableList.of("uri1", "uri2");
   private static final TableId TABLE_ID = TableId.of("dataset", "table");
-  private static final DatasetId DATASET_ID = DatasetId.of("project", "dataset");
+  private static final DatasetId DATASET_ID = DatasetId.of("dataset");
   private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
   private static final Field FIELD_SCHEMA1 =
       Field.builder("StringField", Field.Type.string())
@@ -338,6 +338,22 @@ public void testToPbAndFromPb() {
     assertTrue(JobInfo.fromPb(QUERY_JOB.toPb()).statistics() instanceof QueryStatistics);
   }
 
+  @Test
+  public void testSetProjectId() {
+    CopyJobConfiguration copyConfiguration = COPY_JOB.setProjectId("p").configuration();
+    assertEquals("p", copyConfiguration.destinationTable().project());
+    for (TableId sourceTable : copyConfiguration.sourceTables()) {
+      assertEquals("p", sourceTable.project());
+    }
+    ExtractJobConfiguration extractConfiguration = EXTRACT_JOB.setProjectId("p").configuration();
+    assertEquals("p", extractConfiguration.sourceTable().project());
+    LoadConfiguration loadConfiguration = LOAD_JOB.setProjectId("p").configuration();
+    assertEquals("p", loadConfiguration.destinationTable().project());
+    QueryJobConfiguration queryConfiguration = QUERY_JOB.setProjectId("p").configuration();
+    assertEquals("p", queryConfiguration.defaultDataset().project());
+    assertEquals("p", queryConfiguration.destinationTable().project());
+  }
+
   private void compareJobInfo(JobInfo expected, JobInfo value) {
     assertEquals(expected, value);
     assertEquals(expected.hashCode(), value.hashCode());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java
index 495b5e4d64f6..88ae6a4fc1b8 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/LoadJobConfigurationTest.java
@@ -116,6 +116,12 @@ public void testToPbAndFromPb() {
     compareLoadJobConfiguration(configuration, LoadJobConfiguration.fromPb(configuration.toPb()));
   }
 
+  @Test
+  public void testSetProjectId() {
+    LoadConfiguration configuration = LOAD_CONFIGURATION.setProjectId("p");
+    assertEquals("p", configuration.destinationTable().project());
+  }
+
   private void compareLoadJobConfiguration(LoadJobConfiguration expected,
       LoadJobConfiguration value) {
     assertEquals(expected, value);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java
index c59deff5020f..69b2f992fe22 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryJobConfigurationTest.java
@@ -35,8 +35,8 @@
 public class QueryJobConfigurationTest {
 
   private static final String QUERY = "BigQuery SQL";
-  private static final DatasetId DATASET_ID = DatasetId.of("project", "dataset");
-  private static final TableId TABLE_ID = TableId.of("project", "dataset", "table");
+  private static final DatasetId DATASET_ID = DatasetId.of("dataset");
+  private static final TableId TABLE_ID = TableId.of("dataset", "table");
   private static final List SOURCE_URIS = ImmutableList.of("uri1", "uri2");
   private static final Field FIELD_SCHEMA1 =
       Field.builder("StringField", Field.Type.string())
@@ -141,6 +141,13 @@ public void testToPbAndFromPb() {
     compareQueryJobConfiguration(job, QueryJobConfiguration.fromPb(job.toPb()));
   }
 
+  @Test
+  public void testSetProjectId() {
+    QueryJobConfiguration configuration = QUERY_JOB_CONFIGURATION.setProjectId("p");
+    assertEquals("p", configuration.defaultDataset().project());
+    assertEquals("p", configuration.destinationTable().project());
+  }
+
   private void compareQueryJobConfiguration(QueryJobConfiguration expected,
       QueryJobConfiguration value) {
     assertEquals(expected, value);
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java
index 276e4f6792b3..370b4d614cbf 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/QueryRequestTest.java
@@ -26,7 +26,7 @@
 public class QueryRequestTest {
 
   private static final String QUERY = "BigQuery SQL";
-  private static final DatasetId DATASET_ID = DatasetId.of("project", "dataset");
+  private static final DatasetId DATASET_ID = DatasetId.of("dataset");
   private static final Boolean USE_QUERY_CACHE = true;
   private static final Boolean DRY_RUN = false;
   private static final Long MAX_RESULTS = 42L;
@@ -91,6 +91,11 @@ public void testToPbAndFromPb() {
     compareQueryRequest(queryRequest, QueryRequest.fromPb(queryRequest.toPb()));
   }
 
+  @Test
+  public void testSetProjectId() {
+    assertEquals("p", QUERY_REQUEST.setProjectId("p").defaultDataset().project());
+  }
+
   private void compareQueryRequest(QueryRequest expected, QueryRequest value) {
     assertEquals(expected, value);
     assertEquals(expected.query(), value.query());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableIdTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableIdTest.java
index 9da050bf5951..bc013bfa5c31 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableIdTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableIdTest.java
@@ -47,6 +47,11 @@ public void testToPbAndFromPb() {
     compareTableIds(TABLE_COMPLETE, TableId.fromPb(TABLE_COMPLETE.toPb()));
   }
 
+  @Test
+  public void testSetProjectId() {
+    assertEquals(TABLE_COMPLETE, TABLE.setProjectId("project"));
+  }
+
   private void compareTableIds(TableId expected, TableId value) {
     assertEquals(expected, value);
     assertEquals(expected.project(), value.project());
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
index c636a31ad1ff..7326f6c51b95 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableInfoTest.java
@@ -196,6 +196,13 @@ public void testToAndFromPb() {
         BaseTableInfo.fromPb(EXTERNAL_TABLE_INFO.toPb()));
   }
 
+  @Test
+  public void testSetProjectId() {
+    assertEquals("project", TABLE_INFO.setProjectId("project").tableId().project());
+    assertEquals("project", EXTERNAL_TABLE_INFO.setProjectId("project").tableId().project());
+    assertEquals("project", VIEW_INFO.setProjectId("project").tableId().project());
+  }
+
   private void compareBaseTableInfo(BaseTableInfo expected, BaseTableInfo value) {
     assertEquals(expected, value);
     assertEquals(expected.tableId(), value.tableId());

From 05d6c57f0f05921af6ea55e8d20d2c5d8c2a5952 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 28 Jan 2016 14:29:33 +0100
Subject: [PATCH 316/322] Update README and package-info to use
 JobConfiguration

---
 README.md                                                    | 5 +++--
 .../main/java/com/google/gcloud/bigquery/package-info.java   | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 520bf8b62c55..a544653e90da 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,7 @@ import com.google.gcloud.bigquery.BigQuery;
 import com.google.gcloud.bigquery.BigQueryOptions;
 import com.google.gcloud.bigquery.Field;
 import com.google.gcloud.bigquery.JobStatus;
-import com.google.gcloud.bigquery.LoadJobInfo;
+import com.google.gcloud.bigquery.JobInfo;
 import com.google.gcloud.bigquery.Schema;
 import com.google.gcloud.bigquery.TableId;
 import com.google.gcloud.bigquery.TableInfo;
@@ -144,7 +144,8 @@ if (info == null) {
   bigquery.create(TableInfo.of(tableId, Schema.of(integerField)));
 } else {
   System.out.println("Loading data into table " + tableId);
-  LoadJobInfo loadJob = LoadJobInfo.of(tableId, "gs://bucket/path");
+  LoadJobConfiguration configuration = LoadJobConfiguration.of(tableId, "gs://bucket/path");
+  JobInfo loadJob = JobInfo.of(configuration);
   loadJob = bigquery.create(loadJob);
   while (loadJob.status().state() != JobStatus.State.DONE) {
     Thread.sleep(1000L);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
index 8553de221fdc..dd57da2b606a 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
@@ -28,7 +28,8 @@
  *   bigquery.create(TableInfo.of(tableId, Schema.of(integerField)));
  * } else {
  *   System.out.println("Loading data into table " + tableId);
- *   LoadJobInfo loadJob = LoadJobInfo.of(tableId, "gs://bucket/path");
+ *   LoadJobConfiguration configuration = LoadJobConfiguration.of(tableId, "gs://bucket/path");
+ *   JobInfo loadJob = JobInfo.of(configuration);
  *   loadJob = bigquery.create(loadJob);
  *   while (loadJob.status().state() != JobStatus.State.DONE) {
  *     Thread.sleep(1000L);

From 68eed9e1e36eb2dcede8236bff7caaae40e0f42f Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Thu, 28 Jan 2016 17:57:25 +0100
Subject: [PATCH 317/322] Minor style fixes

---
 .../java/com/google/gcloud/bigquery/LoadJobConfiguration.java  | 2 +-
 .../java/com/google/gcloud/bigquery/QueryJobConfiguration.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
index 8d690b34a158..a47644c65e20 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
@@ -134,7 +134,7 @@ public Builder writeDisposition(JobInfo.WriteDisposition writeDisposition) {
       return this;
     }
 
-   @Override
+    @Override
     public Builder formatOptions(FormatOptions formatOptions) {
       this.formatOptions = formatOptions;
       return this;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
index b611a1714873..054e364f9684 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
@@ -72,7 +72,8 @@ public enum Priority {
   private final Boolean flattenResults;
   private final Boolean dryRun;
 
-  public static final class Builder extends JobConfiguration.Builder {
+  public static final class Builder
+      extends JobConfiguration.Builder {
 
     private String query;
     private TableId destinationTable;

From 71d91aa5b6f603e02285207662e5faae5b1c8a7f Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Thu, 28 Jan 2016 18:22:03 -0800
Subject: [PATCH 318/322] Fixed missed merge conflict

---
 .../java/com/google/gcloud/datastore/QueryResults.java     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
index cd851f690ca5..a6e5971936dd 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResults.java
@@ -36,7 +36,6 @@ public interface QueryResults extends Iterator {
   Class resultClass();
 
   /**
-<<<<<<< HEAD
    * Returns the Cursor for the point after the value returned in the last {@link #next} call. This
    * cursor can be used to issue subsequent queries (with the same constraints) that may return
    * additional results.
@@ -51,11 +50,7 @@ public interface QueryResults extends Iterator {
    * // Consume some results (using results.next()) and do any other actions as necessary.
    * query = query.toBuilder().startCursor(results.cursorAfter()).build();
    * results = datastore.run(query); // now we will iterate over all entities not yet consumed
-   * 
-=======
-   * Returns the Cursor for the point after the value returned in the last {@link #next} call.
-   * Currently, {@code cursorAfter} returns null in all cases but the last result.
->>>>>>> upstream/master
+   * }
    */
   Cursor cursorAfter();
 }

From 73250ea0a38353c8dd912f15631ea565d1a01825 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi 
Date: Fri, 29 Jan 2016 07:42:35 +0100
Subject: [PATCH 319/322] Fix access-related issues

---
 .../gcloud/bigquery/BigQueryException.java    |  2 --
 .../gcloud/bigquery/CopyJobConfiguration.java |  6 ++---
 .../bigquery/ExtractJobConfiguration.java     |  6 ++---
 .../gcloud/bigquery/JobConfiguration.java     | 12 +++++-----
 .../com/google/gcloud/bigquery/JobInfo.java   |  2 +-
 .../gcloud/bigquery/LoadJobConfiguration.java | 24 +++++++++----------
 .../bigquery/QueryJobConfiguration.java       |  6 ++---
 .../bigquery/WriteChannelConfiguration.java   | 22 ++++++++---------
 .../google/gcloud/bigquery/JobInfoTest.java   |  2 +-
 9 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
index c42bbd96db66..a157afd25db2 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
@@ -16,8 +16,6 @@
 
 package com.google.gcloud.bigquery;
 
-import com.google.api.client.googleapis.json.GoogleJsonError;
-import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.BaseServiceException;
 import com.google.gcloud.RetryHelper.RetryHelperException;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
index 16ca019ce694..1da4fdbe3cdd 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
@@ -53,7 +53,7 @@ private Builder() {
     }
 
     private Builder(CopyJobConfiguration jobConfiguration) {
-      super(Type.COPY);
+      this();
       this.sourceTables = jobConfiguration.sourceTables;
       this.destinationTable = jobConfiguration.destinationTable;
       this.createDisposition = jobConfiguration.createDisposition;
@@ -61,7 +61,7 @@ private Builder(CopyJobConfiguration jobConfiguration) {
     }
 
     private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
-      super(Type.COPY);
+      this();
       JobConfigurationTableCopy copyConfigurationPb = configurationPb.getCopy();
       this.destinationTable = TableId.fromPb(copyConfigurationPb.getDestinationTable());
       if (copyConfigurationPb.getSourceTables() != null) {
@@ -171,7 +171,7 @@ public Builder toBuilder() {
   }
 
   @Override
-  protected ToStringHelper toStringHelper() {
+  ToStringHelper toStringHelper() {
     return super.toStringHelper()
         .add("sourceTables", sourceTables)
         .add("destinationTable", destinationTable)
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
index bfa47da0373b..d8e57bd17254 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
@@ -56,7 +56,7 @@ private Builder() {
     }
 
     private Builder(ExtractJobConfiguration jobInfo) {
-      super(Type.EXTRACT);
+      this();
       this.sourceTable = jobInfo.sourceTable;
       this.destinationUris = jobInfo.destinationUris;
       this.printHeader = jobInfo.printHeader;
@@ -66,7 +66,7 @@ private Builder(ExtractJobConfiguration jobInfo) {
     }
 
     private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
-      super(Type.EXTRACT);
+      this();
       JobConfigurationExtract extractConfigurationPb = configurationPb.getExtract();
       this.sourceTable = TableId.fromPb(extractConfigurationPb.getSourceTable());
       this.destinationUris = extractConfigurationPb.getDestinationUris();
@@ -199,7 +199,7 @@ public Builder toBuilder() {
   }
 
   @Override
-  protected ToStringHelper toStringHelper() {
+  ToStringHelper toStringHelper() {
     return super.toStringHelper()
         .add("sourceTable", sourceTable)
         .add("destinationUris", destinationUris)
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
index 2d78a3041459..2244969567ef 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobConfiguration.java
@@ -69,12 +69,12 @@ public abstract static class Builder sourceUris;
-  protected final TableId destinationTable;
-  protected final JobInfo.CreateDisposition createDisposition;
-  protected final JobInfo.WriteDisposition writeDisposition;
-  protected final FormatOptions formatOptions;
-  protected final Integer maxBadRecords;
-  protected final Schema schema;
-  protected final Boolean ignoreUnknownValues;
-  protected final List projectionFields;
+  private final TableId destinationTable;
+  private final JobInfo.CreateDisposition createDisposition;
+  private final JobInfo.WriteDisposition writeDisposition;
+  private final FormatOptions formatOptions;
+  private final Integer maxBadRecords;
+  private final Schema schema;
+  private final Boolean ignoreUnknownValues;
+  private final List projectionFields;
 
   public static final class Builder
       extends JobConfiguration.Builder
@@ -63,7 +63,7 @@ private Builder() {
     }
 
     private Builder(LoadJobConfiguration loadConfiguration) {
-      super(Type.LOAD);
+      this();
       this.destinationTable = loadConfiguration.destinationTable;
       this.createDisposition = loadConfiguration.createDisposition;
       this.writeDisposition = loadConfiguration.writeDisposition;
@@ -76,7 +76,7 @@ private Builder(LoadJobConfiguration loadConfiguration) {
     }
 
     private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
-      super(Type.LOAD);
+      this();
       JobConfigurationLoad loadConfigurationPb = configurationPb.getLoad();
       this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
       if (loadConfigurationPb.getCreateDisposition() != null) {
@@ -254,7 +254,7 @@ public Builder toBuilder() {
   }
 
   @Override
-  protected ToStringHelper toStringHelper() {
+  ToStringHelper toStringHelper() {
     return super.toStringHelper()
         .add("destinationTable", destinationTable)
         .add("createDisposition", createDisposition)
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
index 054e364f9684..630a3d5b9088 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
@@ -93,7 +93,7 @@ private Builder() {
     }
 
     private Builder(QueryJobConfiguration jobConfiguration) {
-      super(Type.QUERY);
+      this();
       this.query = jobConfiguration.query;
       this.destinationTable = jobConfiguration.destinationTable;
       this.tableDefinitions = jobConfiguration.tableDefinitions;
@@ -109,7 +109,7 @@ private Builder(QueryJobConfiguration jobConfiguration) {
     }
 
     private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
-      super(Type.QUERY);
+      this();
       JobConfigurationQuery queryConfigurationPb = configurationPb.getQuery();
       this.query = queryConfigurationPb.getQuery();
       allowLargeResults = queryConfigurationPb.getAllowLargeResults();
@@ -432,7 +432,7 @@ public Builder toBuilder() {
   }
 
   @Override
-  protected ToStringHelper toStringHelper() {
+  ToStringHelper toStringHelper() {
     return super.toStringHelper()
         .add("query", query)
         .add("destinationTable", destinationTable)
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
index 18c3f1561056..18342bac1bff 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
@@ -37,14 +37,14 @@ public class WriteChannelConfiguration implements LoadConfiguration, Serializabl
 
   private static final long serialVersionUID = 470267591917413578L;
 
-  protected final TableId destinationTable;
-  protected final CreateDisposition createDisposition;
-  protected final WriteDisposition writeDisposition;
-  protected final FormatOptions formatOptions;
-  protected final Integer maxBadRecords;
-  protected final Schema schema;
-  protected final Boolean ignoreUnknownValues;
-  protected final List projectionFields;
+  private final TableId destinationTable;
+  private final CreateDisposition createDisposition;
+  private final WriteDisposition writeDisposition;
+  private final FormatOptions formatOptions;
+  private final Integer maxBadRecords;
+  private final Schema schema;
+  private final Boolean ignoreUnknownValues;
+  private final List projectionFields;
 
   public static final class Builder implements LoadConfiguration.Builder {
 
@@ -57,9 +57,9 @@ public static final class Builder implements LoadConfiguration.Builder {
     private Boolean ignoreUnknownValues;
     private List projectionFields;
 
-    protected Builder() {}
+    private Builder() {}
 
-    protected Builder(WriteChannelConfiguration writeChannelConfiguration) {
+    private Builder(WriteChannelConfiguration writeChannelConfiguration) {
       this.destinationTable = writeChannelConfiguration.destinationTable;
       this.createDisposition = writeChannelConfiguration.createDisposition;
       this.writeDisposition = writeChannelConfiguration.writeDisposition;
@@ -70,7 +70,7 @@ protected Builder(WriteChannelConfiguration writeChannelConfiguration) {
       this.projectionFields = writeChannelConfiguration.projectionFields;
     }
 
-    protected Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
+    private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
       JobConfigurationLoad loadConfigurationPb = configurationPb.getLoad();
       this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
       if (loadConfigurationPb.getCreateDisposition() != null) {
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
index e65a128bbe96..96bf8d1838c4 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
@@ -347,7 +347,7 @@ public void testSetProjectId() {
     }
     ExtractJobConfiguration extractConfiguration = EXTRACT_JOB.setProjectId("p").configuration();
     assertEquals("p", extractConfiguration.sourceTable().project());
-    LoadConfiguration loadConfiguration = LOAD_JOB.setProjectId("p").configuration();
+    LoadJobConfiguration loadConfiguration = LOAD_JOB.setProjectId("p").configuration();
     assertEquals("p", loadConfiguration.destinationTable().project());
     QueryJobConfiguration queryConfiguration = QUERY_JOB.setProjectId("p").configuration();
     assertEquals("p", queryConfiguration.defaultDataset().project());

From c4bf7ad9fe6ecc3c16fb87fbde923630c13d301e Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 29 Jan 2016 14:20:42 -0800
Subject: [PATCH 320/322] Add note to update java-docs-samples and public
 documentation for releases

---
 RELEASING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASING.md b/RELEASING.md
index 586ebeb9b53b..5e2d6202062e 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -26,6 +26,8 @@ As mentioned before, there is an optional version argument.  By default, the scr
 
 6. Create and merge in another PR to reflect the updated project version.  For an example of what this PR should look like, see [#227](https://github.com/GoogleCloudPlatform/gcloud-java/pull/227).
 
+7. Be sure to update App Engine documentation and [java-docs-samples](https://github.com/GoogleCloudPlatform/java-docs-samples) code as necessary.  See directions [here](https://docs.google.com/a/google.com/document/d/1SS3xNn2v0qW7EadGUPBUAPIQAH5VY6WSFmT17ZjjUVE/edit?usp=sharing).
+
 ### To push a snapshot version
 
 Pushing a snapshot is completely automated.  If "-SNAPSHOT" is included in the version denoted by the base directory's pom.xml, then an updated artifact will be pushed to the snapshot repository when Travis CI successfully completes a non-PR build.

From a76e6c40e3a77dc991d404a80287d5240ce8a0d9 Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Fri, 22 Jan 2016 11:03:01 -0800
Subject: [PATCH 321/322] Make Project a subclass of ProjectInfo

---
 README.md                                     |  16 +-
 .../examples/ResourceManagerExample.java      |   3 +-
 gcloud-java-resourcemanager/README.md         |  34 ++--
 .../gcloud/resourcemanager/Project.java       | 160 +++++++++++++++---
 .../gcloud/resourcemanager/ProjectInfo.java   | 120 ++++++++-----
 .../resourcemanager/ResourceManager.java      |  14 +-
 .../resourcemanager/ResourceManagerImpl.java  |  31 ++--
 .../gcloud/resourcemanager/package-info.java  |  10 +-
 .../gcloud/resourcemanager/ProjectTest.java   | 125 ++++++++++----
 .../ResourceManagerImplTest.java              |  38 +++--
 .../resourcemanager/SerializationTest.java    |  10 +-
 11 files changed, 398 insertions(+), 163 deletions(-)

diff --git a/README.md b/README.md
index 520bf8b62c55..f4bad65a7bc5 100644
--- a/README.md
+++ b/README.md
@@ -209,20 +209,22 @@ Google Cloud Resource Manager (Alpha)
 Here is a code snippet showing a simple usage example. Note that you must supply Google SDK credentials for this service, not other forms of authentication listed in the [Authentication section](#authentication).
 
 ```java
-import com.google.gcloud.resourcemanager.ProjectInfo;
+import com.google.gcloud.resourcemanager.Project;
 import com.google.gcloud.resourcemanager.ResourceManager;
 import com.google.gcloud.resourcemanager.ResourceManagerOptions;
 
 import java.util.Iterator;
 
 ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().service();
-ProjectInfo myProject = resourceManager.get("some-project-id"); // Use an existing project's ID
-ProjectInfo newProjectInfo = resourceManager.replace(myProject.toBuilder()
-    .addLabel("launch-status", "in-development").build());
-System.out.println("Updated the labels of project " + newProjectInfo.projectId()
-    + " to be " + newProjectInfo.labels());
+Project myProject = resourceManager.get("some-project-id"); // Use an existing project's ID
+Project newProject = myProject.toBuilder()
+    .addLabel("launch-status", "in-development")
+    .build()
+    .replace();
+System.out.println("Updated the labels of project " + newProject.projectId()
+    + " to be " + newProject.labels());
 // List all the projects you have permission to view.
-Iterator projectIterator = resourceManager.list().iterateAll();
+Iterator projectIterator = resourceManager.list().iterateAll();
 System.out.println("Projects I can view:");
 while (projectIterator.hasNext()) {
   System.out.println(projectIterator.next().projectId());
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java
index c1ba4e06cf7d..46ff82bfaf12 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java
@@ -17,6 +17,7 @@
 package com.google.gcloud.examples;
 
 import com.google.common.base.Joiner;
+import com.google.gcloud.resourcemanager.Project;
 import com.google.gcloud.resourcemanager.ProjectInfo;
 import com.google.gcloud.resourcemanager.ResourceManager;
 import com.google.gcloud.resourcemanager.ResourceManagerOptions;
@@ -64,7 +65,7 @@ public void run(ResourceManager resourceManager, String... args) {
           labels.put(args[i], "");
         }
       }
-      ProjectInfo project =
+      Project project =
           resourceManager.create(ProjectInfo.builder(projectId).labels(labels).build());
       System.out.printf(
           "Successfully created project '%s': %s.%n", projectId, projectDetails(project));
diff --git a/gcloud-java-resourcemanager/README.md b/gcloud-java-resourcemanager/README.md
index d0e58af85e4e..63f2a9c80efb 100644
--- a/gcloud-java-resourcemanager/README.md
+++ b/gcloud-java-resourcemanager/README.md
@@ -83,6 +83,7 @@ ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().servi
 All you need to create a project is a globally unique project ID.  You can also optionally attach a non-unique name and labels to your project. Read more about naming guidelines for project IDs, names, and labels [here](https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects). To create a project, add the following import at the top of your file:
 
 ```java
+import com.google.gcloud.resourcemanager.Project;
 import com.google.gcloud.resourcemanager.ProjectInfo;
 ```
 
@@ -90,26 +91,28 @@ Then add the following code to create a project (be sure to change `myProjectId`
 
 ```java
 String myProjectId = "my-globally-unique-project-id"; // Change to a unique project ID.
-ProjectInfo myProject = resourceManager.create(ProjectInfo.builder(myProjectId).build());
+Project myProject = resourceManager.create(ProjectInfo.builder(myProjectId).build());
 ```
 
-Note that the return value from `create` is a `ProjectInfo` that includes additional read-only information, like creation time, project number, and lifecycle state. Read more about these fields on the [Projects page](https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects).
+Note that the return value from `create` is a `Project` that includes additional read-only information, like creation time, project number, and lifecycle state. Read more about these fields on the [Projects page](https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects). `Project`, a subclass of `ProjectInfo`, adds a layer of service-related functionality over `ProjectInfo`.
 
 #### Getting a specific project
 You can load a project if you know it's project ID and have read permissions to the project. For example, to get the project we just created we can do the following:
 
 ```java
-ProjectInfo projectFromServer = resourceManager.get(myProjectId);
+Project projectFromServer = resourceManager.get(myProjectId);
 ```
 
 #### Editing a project
-To edit a project, create a new `ProjectInfo` object and pass it in to the `ResourceManager.replace` method.
+To edit a project, create a new `ProjectInfo` object and pass it in to the `Project.replace` method.
 
 For example, to add a label for the newly created project to denote that it's launch status is "in development", add the following code:
 
 ```java
-ProjectInfo newProjectInfo = resourceManager.replace(projectFromServer.toBuilder()
-    .addLabel("launch-status", "in-development").build());
+Project newProject = myProject.toBuilder()
+    .addLabel("launch-status", "in-development")
+    .build()
+    .replace();
 ```
 
 Note that the values of the project you pass in to `replace` overwrite the server's values for non-read-only fields, namely `projectName` and `labels`. For example, if you create a project with `projectName` "some-project-name" and subsequently call replace using a `ProjectInfo` object that didn't set the `projectName`, then the server will unset the project's name. The server ignores any attempted changes to the read-only fields `projectNumber`, `lifecycleState`, and `createTime`. The `projectId` cannot change.
@@ -124,7 +127,7 @@ import java.util.Iterator;
 Then add the following code to print a list of projects you can view:
 
 ```java
-Iterator projectIterator = resourceManager.list().iterateAll();
+Iterator projectIterator = resourceManager.list().iterateAll();
 System.out.println("Projects I can view:");
 while (projectIterator.hasNext()) {
   System.out.println(projectIterator.next().projectId());
@@ -136,6 +139,7 @@ while (projectIterator.hasNext()) {
 Here we put together all the code shown above into one program.  This program assumes that you are running from your own desktop and used the Google Cloud SDK to authenticate yourself.
 
 ```java
+import com.google.gcloud.resourcemanager.Project;
 import com.google.gcloud.resourcemanager.ProjectInfo;
 import com.google.gcloud.resourcemanager.ResourceManager;
 import com.google.gcloud.resourcemanager.ResourceManagerOptions;
@@ -151,20 +155,22 @@ public class GcloudJavaResourceManagerExample {
 
     // Create a project.
     String myProjectId = "my-globally-unique-project-id"; // Change to a unique project ID.
-    ProjectInfo myProject = resourceManager.create(ProjectInfo.builder(myProjectId).build());
+    Project myProject = resourceManager.create(ProjectInfo.builder(myProjectId).build());
 
     // Get a project from the server.
-    ProjectInfo projectFromServer = resourceManager.get(myProjectId);
+    Project projectFromServer = resourceManager.get(myProjectId);
     System.out.println("Got project " + projectFromServer.projectId() + " from the server.");
 
     // Update a project
-    ProjectInfo newProjectInfo = resourceManager.replace(myProject.toBuilder()
-        .addLabel("launch-status", "in-development").build());
-    System.out.println("Updated the labels of project " + newProjectInfo.projectId()
-        + " to be " + newProjectInfo.labels());
+    Project newProject = myProject.toBuilder()
+        .addLabel("launch-status", "in-development")
+        .build()
+        .replace();
+    System.out.println("Updated the labels of project " + newProject.projectId()
+        + " to be " + newProject.labels());
 
     // List all the projects you have permission to view.
-    Iterator projectIterator = resourceManager.list().iterateAll();
+    Iterator projectIterator = resourceManager.list().iterateAll();
     System.out.println("Projects I can view:");
     while (projectIterator.hasNext()) {
       System.out.println(projectIterator.next().projectId());
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
index e329e1aa3714..f12a7ea50676 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -18,25 +18,110 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * A Google Cloud Resource Manager project object.
  *
  * 
    A Project is a high-level Google Cloud Platform entity. It is a container for ACLs, APIs,
  * AppEngine Apps, VMs, and other Google Cloud Platform resources. This class' member variables are
- * immutable.  Methods that change or update the underlying Project information return a new Project
- * instance.
+ * immutable. Methods that change or update the underlying Project information return a new Project
+ * instance. {@code Project} adds a layer of service-related functionality over {@link ProjectInfo}.
  */
-public class Project {
+public class Project extends ProjectInfo {
 
-  private final ResourceManager resourceManager;
-  private final ProjectInfo info;
+  private static final long serialVersionUID = 6767630161335155133L;
 
-  /**
-   * Constructs a Project object that contains the ProjectInfo given.
-   */
-  public Project(ResourceManager resourceManager, ProjectInfo projectInfo) {
+  private final ResourceManagerOptions options;
+  private transient ResourceManager resourceManager;
+
+  public static class Builder extends ProjectInfo.Builder {
+    private final ResourceManager resourceManager;
+    private ProjectInfo.BuilderImpl infoBuilder;
+
+    Builder(ResourceManager resourceManager) {
+      this.resourceManager = resourceManager;
+      this.infoBuilder = new ProjectInfo.BuilderImpl();
+    }
+
+    Builder(Project project) {
+      this.resourceManager = project.resourceManager;
+      this.infoBuilder = new ProjectInfo.BuilderImpl(project);
+    }
+
+    @Override
+    public Builder name(String name) {
+      infoBuilder.name(name);
+      return this;
+    }
+
+    @Override
+    public Builder projectId(String projectId) {
+      infoBuilder.projectId(projectId);
+      return this;
+    }
+
+    @Override
+    public Builder addLabel(String key, String value) {
+      infoBuilder.addLabel(key, value);
+      return this;
+    }
+
+    @Override
+    public Builder removeLabel(String key) {
+      infoBuilder.removeLabel(key);
+      return this;
+    }
+
+    @Override
+    public Builder clearLabels() {
+      infoBuilder.clearLabels();
+      return this;
+    }
+
+    @Override
+    public Builder labels(Map labels) {
+      infoBuilder.labels(labels);
+      return this;
+    }
+
+    @Override
+    Builder projectNumber(Long projectNumber) {
+      infoBuilder.projectNumber(projectNumber);
+      return this;
+    }
+
+    @Override
+    Builder state(State state) {
+      infoBuilder.state(state);
+      return this;
+    }
+
+    @Override
+    Builder createTimeMillis(Long createTimeMillis) {
+      infoBuilder.createTimeMillis(createTimeMillis);
+      return this;
+    }
+
+    @Override
+    Builder parent(ResourceId parent) {
+      infoBuilder.parent(parent);
+      return this;
+    }
+
+    @Override
+    public Project build() {
+      return new Project(resourceManager, infoBuilder);
+    }
+  }
+
+  Project(ResourceManager resourceManager, ProjectInfo.BuilderImpl infoBuilder) {
+    super(infoBuilder);
     this.resourceManager = checkNotNull(resourceManager);
-    this.info = checkNotNull(projectInfo);
+    this.options = resourceManager.options();
   }
 
   /**
@@ -46,15 +131,7 @@ public Project(ResourceManager resourceManager, ProjectInfo projectInfo) {
    * @throws ResourceManagerException upon failure
    */
   public static Project get(ResourceManager resourceManager, String projectId) {
-    ProjectInfo projectInfo = resourceManager.get(projectId);
-    return projectInfo != null ? new Project(resourceManager, projectInfo) : null;
-  }
-
-  /**
-   * Returns the {@link ProjectInfo} object associated with this Project.
-   */
-  public ProjectInfo info() {
-    return info;
+    return resourceManager.get(projectId);
   }
 
   /**
@@ -72,7 +149,7 @@ public ResourceManager resourceManager() {
    * @throws ResourceManagerException upon failure
    */
   public Project reload() {
-    return Project.get(resourceManager, info.projectId());
+    return Project.get(resourceManager, projectId());
   }
 
   /**
@@ -98,7 +175,7 @@ public Project reload() {
    * @throws ResourceManagerException upon failure
    */
   public void delete() {
-    resourceManager.delete(info.projectId());
+    resourceManager.delete(projectId());
   }
 
   /**
@@ -115,21 +192,52 @@ public void delete() {
    * @throws ResourceManagerException upon failure (including when the project can't be restored)
    */
   public void undelete() {
-    resourceManager.undelete(info.projectId());
+    resourceManager.undelete(projectId());
   }
 
   /**
-   * Replaces the attributes of the project.
+   * Replaces the attributes of the project with the attributes of this project.
    *
    * 
    The caller must have modify permissions for this project.
    *
    * @see Cloud
    * Resource Manager update
-   * @return the ProjectInfo representing the new project metadata
+   * @return the Project representing the new project metadata
    * @throws ResourceManagerException upon failure
    */
-  public Project replace(ProjectInfo projectInfo) {
-    return new Project(resourceManager, resourceManager.replace(checkNotNull(projectInfo)));
+  public Project replace() {
+    return resourceManager.replace(this);
+  }
+
+  static Builder builder(ResourceManager resourceManager, String projectId) {
+    return new Builder(resourceManager).projectId(projectId);
+  }
+
+  @Override
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof Project && Objects.equals(toPb(), ((Project) obj).toPb())
+        && Objects.equals(options, ((Project) obj).options);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), options);
+  }
+
+  private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    in.defaultReadObject();
+    this.resourceManager = options.service();
+  }
+
+  static Project fromPb(ResourceManager resourceManager,
+      com.google.api.services.cloudresourcemanager.model.Project answer) {
+    ProjectInfo info = ProjectInfo.fromPb(answer);
+    return new Project(resourceManager, new ProjectInfo.BuilderImpl(info));
   }
 }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
index 2cb8a2d93ad2..7553a207cd29 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
@@ -115,7 +115,66 @@ static ResourceId fromPb(
     }
   }
 
-  public static class Builder {
+  public static abstract class Builder {
+
+    /**
+     * Set the user-assigned name of the project.
+     *
+     * 
    This field is optional and can remain unset. Allowed characters are: lowercase and
+     * uppercase letters, numbers, hyphen, single-quote, double-quote, space, and exclamation point.
+     * This field can be changed after project creation.
+     */
+    public abstract Builder name(String name);
+
+    /**
+     * Set the unique, user-assigned ID of the project.
+     *
+     * 
    The ID must be 6 to 30 lowercase letters, digits, or hyphens. It must start with a letter.
+     * Trailing hyphens are prohibited. This field cannot be changed after the server creates the
+     * project.
+     */
+    public abstract Builder projectId(String projectId);
+
+    /**
+     * Add a label associated with this project.
+     *
+     * 
    See {@link #labels} for label restrictions.
+     */
+    public abstract Builder addLabel(String key, String value);
+
+    /**
+     * Remove a label associated with this project.
+     */
+    public abstract Builder removeLabel(String key);
+
+    /**
+     * Clear the labels associated with this project.
+     */
+    public abstract Builder clearLabels();
+
+    /**
+     * Set the labels associated with this project.
+     *
+     * 
    Label keys must be between 1 and 63 characters long and must conform to the following
+     * regular expression: [a-z]([-a-z0-9]*[a-z0-9])?. Label values must be between 0 and 63
+     * characters long and must conform to the regular expression ([a-z]([-a-z0-9]*[a-z0-9])?)?. No
+     * more than 256 labels can be associated with a given resource. This field can be changed after
+     * project creation.
+     */
+    public abstract Builder labels(Map labels);
+
+    abstract Builder projectNumber(Long projectNumber);
+
+    abstract Builder state(State state);
+
+    abstract Builder createTimeMillis(Long createTimeMillis);
+
+    abstract Builder parent(ResourceId parent);
+
+    public abstract ProjectInfo build();
+  }
+
+  static class BuilderImpl extends Builder {
 
     private String name;
     private String projectId;
@@ -125,10 +184,9 @@ public static class Builder {
     private Long createTimeMillis;
     private ResourceId parent;
 
-    private Builder() {
-    }
+    BuilderImpl() {}
 
-    Builder(ProjectInfo info) {
+    BuilderImpl(ProjectInfo info) {
       this.name = info.name;
       this.projectId = info.projectId;
       this.labels.putAll(info.labels);
@@ -138,96 +196,73 @@ private Builder() {
       this.parent = info.parent;
     }
 
-    /**
-     * Set the user-assigned name of the project.
-     *
-     * 
    This field is optional and can remain unset. Allowed characters are: lowercase and
-     * uppercase letters, numbers, hyphen, single-quote, double-quote, space, and exclamation point.
-     * This field can be changed after project creation.
-     */
+    @Override
     public Builder name(String name) {
       this.name = firstNonNull(name, Data.nullOf(String.class));
       return this;
     }
 
-    /**
-     * Set the unique, user-assigned ID of the project.
-     *
-     * 
    The ID must be 6 to 30 lowercase letters, digits, or hyphens. It must start with a letter.
-     * Trailing hyphens are prohibited. This field cannot be changed after the server creates the
-     * project.
-     */
+    @Override
     public Builder projectId(String projectId) {
       this.projectId = checkNotNull(projectId);
       return this;
     }
 
-    /**
-     * Add a label associated with this project.
-     *
-     * 
    See {@link #labels} for label restrictions.
-     */
+    @Override
     public Builder addLabel(String key, String value) {
       this.labels.put(key, value);
       return this;
     }
 
-    /**
-     * Remove a label associated with this project.
-     */
+    @Override
     public Builder removeLabel(String key) {
       this.labels.remove(key);
       return this;
     }
 
-    /**
-     * Clear the labels associated with this project.
-     */
+    @Override
     public Builder clearLabels() {
       this.labels.clear();
       return this;
     }
 
-    /**
-     * Set the labels associated with this project.
-     *
-     * 
    Label keys must be between 1 and 63 characters long and must conform to the following
-     * regular expression: [a-z]([-a-z0-9]*[a-z0-9])?. Label values must be between 0 and 63
-     * characters long and must conform to the regular expression ([a-z]([-a-z0-9]*[a-z0-9])?)?. No
-     * more than 256 labels can be associated with a given resource. This field can be changed after
-     * project creation.
-     */
+    @Override
     public Builder labels(Map labels) {
       this.labels = Maps.newHashMap(checkNotNull(labels));
       return this;
     }
 
+    @Override
     Builder projectNumber(Long projectNumber) {
       this.projectNumber = projectNumber;
       return this;
     }
 
+    @Override
     Builder state(State state) {
       this.state = state;
       return this;
     }
 
+    @Override
     Builder createTimeMillis(Long createTimeMillis) {
       this.createTimeMillis = createTimeMillis;
       return this;
     }
 
+    @Override
     Builder parent(ResourceId parent) {
       this.parent = parent;
       return this;
     }
 
+    @Override
     public ProjectInfo build() {
       return new ProjectInfo(this);
     }
   }
 
-  ProjectInfo(Builder builder) {
+  ProjectInfo(BuilderImpl builder) {
     this.name = builder.name;
     this.projectId = builder.projectId;
     this.labels = ImmutableMap.copyOf(builder.labels);
@@ -296,7 +331,8 @@ public Long createTimeMillis() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ProjectInfo && Objects.equals(toPb(), ((ProjectInfo) obj).toPb());
+    return obj.getClass().equals(ProjectInfo.class)
+        && Objects.equals(toPb(), ((ProjectInfo) obj).toPb());
   }
 
   @Override
@@ -305,11 +341,11 @@ public int hashCode() {
   }
 
   public static Builder builder(String id) {
-    return new Builder().projectId(id);
+    return new BuilderImpl().projectId(id);
   }
 
   public Builder toBuilder() {
-    return new Builder(this);
+    return new BuilderImpl(this);
   }
 
   com.google.api.services.cloudresourcemanager.model.Project toPb() {
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
index 3d658d18d28a..af772dce6b60 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
@@ -179,12 +179,12 @@ public static ProjectListOption fields(ProjectField... fields) {
    * @see Cloud
    * Resource Manager create
-   * @return ProjectInfo object representing the new project's metadata. The returned object will
+   * @return Project object representing the new project's metadata. The returned object will
    *     include the following read-only fields supplied by the server: project number, lifecycle
    *     state, and creation time.
    * @throws ResourceManagerException upon failure
    */
-  ProjectInfo create(ProjectInfo project);
+  Project create(ProjectInfo project);
 
   /**
    * Marks the project identified by the specified project ID for deletion.
@@ -221,7 +221,7 @@ public static ProjectListOption fields(ProjectField... fields) {
    * Resource Manager get
    * @throws ResourceManagerException upon failure
    */
-  ProjectInfo get(String projectId, ProjectGetOption... options);
+  Project get(String projectId, ProjectGetOption... options);
 
   /**
    * Lists the projects visible to the current user.
@@ -234,10 +234,10 @@ public static ProjectListOption fields(ProjectField... fields) {
    * @see Cloud
    * Resource Manager list
-   * @return {@code Page}, a page of projects
+   * @return {@code Page}, a page of projects
    * @throws ResourceManagerException upon failure
    */
-  Page list(ProjectListOption... options);
+  Page list(ProjectListOption... options);
 
   /**
    * Replaces the attributes of the project.
@@ -247,10 +247,10 @@ public static ProjectListOption fields(ProjectField... fields) {
    * @see Cloud
    * Resource Manager update
-   * @return the ProjectInfo representing the new project metadata
+   * @return the Project representing the new project metadata
    * @throws ResourceManagerException upon failure
    */
-  ProjectInfo replace(ProjectInfo newProject);
+  Project replace(ProjectInfo newProject);
 
   /**
    * Restores the project identified by the specified project ID.
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
index 22f2b350d2f3..e087caab5966 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
@@ -46,9 +46,9 @@ final class ResourceManagerImpl
   }
 
   @Override
-  public ProjectInfo create(final ProjectInfo project) {
+  public Project create(final ProjectInfo project) {
     try {
-      return ProjectInfo.fromPb(runWithRetries(
+      return Project.fromPb(this, runWithRetries(
           new Callable() {
             @Override
             public com.google.api.services.cloudresourcemanager.model.Project call() {
@@ -76,7 +76,7 @@ public Void call() {
   }
 
   @Override
-  public ProjectInfo get(final String projectId, ProjectGetOption... options) {
+  public Project get(final String projectId, ProjectGetOption... options) {
     final Map optionsMap = optionMap(options);
     try {
       com.google.api.services.cloudresourcemanager.model.Project answer = runWithRetries(
@@ -86,13 +86,13 @@ public com.google.api.services.cloudresourcemanager.model.Project call() {
               return resourceManagerRpc.get(projectId, optionsMap);
             }
           }, options().retryParams(), EXCEPTION_HANDLER);
-      return answer == null ? null : ProjectInfo.fromPb(answer);
+      return answer == null ? null : Project.fromPb(this, answer);
     } catch (RetryHelperException e) {
       throw ResourceManagerException.translateAndThrow(e);
     }
   }
 
-  private static class ProjectPageFetcher implements NextPageFetcher {
+  private static class ProjectPageFetcher implements NextPageFetcher {
 
     private static final long serialVersionUID = 2158209410430566961L;
     private final Map requestOptions;
@@ -106,17 +106,17 @@ private static class ProjectPageFetcher implements NextPageFetcher
     }
 
     @Override
-    public Page nextPage() {
+    public Page nextPage() {
       return listProjects(serviceOptions, requestOptions);
     }
   }
 
   @Override
-  public Page list(ProjectListOption... options) {
+  public Page list(ProjectListOption... options) {
     return listProjects(options(), optionMap(options));
   }
 
-  private static Page listProjects(final ResourceManagerOptions serviceOptions,
+  private static Page listProjects(final ResourceManagerOptions serviceOptions,
       final Map optionsMap) {
     try {
       Tuple> result =
@@ -130,16 +130,17 @@ Iterable> call() {
               },
               serviceOptions.retryParams(), EXCEPTION_HANDLER);
       String cursor = result.x();
-      Iterable projects =
+      Iterable projects =
           result.y() == null
-              ? ImmutableList.of() : Iterables.transform(
+              ? ImmutableList.of() : Iterables.transform(
                   result.y(),
                   new Function() {
+                      Project>() {
                     @Override
-                    public ProjectInfo apply(
+                    public Project apply(
                         com.google.api.services.cloudresourcemanager.model.Project projectPb) {
-                      return ProjectInfo.fromPb(projectPb);
+                      return new Project(
+                          serviceOptions.service(), new ProjectInfo.BuilderImpl(ProjectInfo.fromPb(projectPb)));
                     }
                   });
       return new PageImpl<>(
@@ -150,9 +151,9 @@ public ProjectInfo apply(
   }
 
   @Override
-  public ProjectInfo replace(final ProjectInfo newProject) {
+  public Project replace(final ProjectInfo newProject) {
     try {
-      return ProjectInfo.fromPb(runWithRetries(
+      return Project.fromPb(this, runWithRetries(
           new Callable() {
             @Override
             public com.google.api.services.cloudresourcemanager.model.Project call() {
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java
index b8687fbf1314..22a81499eb7a 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/package-info.java
@@ -21,10 +21,12 @@
  * 
     {@code
  * ResourceManager resourceManager = ResourceManagerOptions.defaultInstance().service();
  * String myProjectId = "my-globally-unique-project-id"; // Change to a unique project ID.
- * ProjectInfo myProject = resourceManager.create(ProjectInfo.builder(myProjectId).build());
- * ProjectInfo newProjectInfo = resourceManager.replace(myProject.toBuilder()
- *     .addLabel("launch-status", "in-development").build());
- * Iterator projectIterator = resourceManager.list().iterateAll();
+ * Project myProject = resourceManager.create(ProjectInfo.builder(myProjectId).build());
+ * Project newProject = myProject.toBuilder()
+ *     .addLabel("launch-status", "in-development")
+ *     .build()
+ *     .replace();
+ * Iterator projectIterator = resourceManager.list().iterateAll();
  * System.out.println("Projects I can view:");
  * while (projectIterator.hasNext()) {
  *   System.out.println(projectIterator.next().projectId());
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
index 077818bf2bb9..a741963913c6 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
@@ -16,19 +16,19 @@
 
 package com.google.gcloud.resourcemanager;
 
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.createStrictMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 import com.google.common.collect.ImmutableMap;
 
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Map;
@@ -48,89 +48,152 @@ public class ProjectTest {
       .state(STATE)
       .build();
 
+  private ResourceManager serviceMockReturnsOptions = createStrictMock(ResourceManager.class);
+  private ResourceManagerOptions mockOptions = createMock(ResourceManagerOptions.class);
   private ResourceManager resourceManager;
+  private Project expectedProject;
   private Project project;
 
-  @Before
-  public void setUp() throws Exception {
-    resourceManager = createStrictMock(ResourceManager.class);
-    project = new Project(resourceManager, PROJECT_INFO);
-  }
-
   @After
   public void tearDown() throws Exception {
     verify(resourceManager);
   }
 
+  private void initializeExpectedProject(int optionsCalls) {
+    expect(serviceMockReturnsOptions.options()).andReturn(mockOptions).times(optionsCalls);
+    replay(serviceMockReturnsOptions);
+    resourceManager = createStrictMock(ResourceManager.class);
+    expectedProject =
+        new Project(serviceMockReturnsOptions, new ProjectInfo.BuilderImpl(PROJECT_INFO));
+  }
+
+  private void initializeProject() {
+    project = new Project(resourceManager, new ProjectInfo.BuilderImpl(PROJECT_INFO));
+  }
+
+  @Test
+  public void testBuilder() {
+    initializeExpectedProject(2);
+    replay(resourceManager);
+    Project builtProject = Project.builder(serviceMockReturnsOptions, PROJECT_ID)
+        .name(NAME)
+        .labels(LABELS)
+        .projectNumber(PROJECT_NUMBER)
+        .createTimeMillis(CREATE_TIME_MILLIS)
+        .state(STATE)
+        .build();
+    assertEquals(PROJECT_ID, builtProject.projectId());
+    assertEquals(NAME, builtProject.name());
+    assertEquals(LABELS, builtProject.labels());
+    assertEquals(PROJECT_NUMBER, builtProject.projectNumber());
+    assertEquals(CREATE_TIME_MILLIS, builtProject.createTimeMillis());
+    assertEquals(STATE, builtProject.state());
+    assertSame(serviceMockReturnsOptions, builtProject.resourceManager());
+  }
+
+  @Test
+  public void testToBuilder() {
+    initializeExpectedProject(4);
+    replay(resourceManager);
+    compareProjects(expectedProject, expectedProject.toBuilder().build());
+  }
+
   @Test
-  public void testLoad() {
-    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(PROJECT_INFO);
+  public void testGet() {
+    initializeExpectedProject(1);
+    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(expectedProject);
     replay(resourceManager);
     Project loadedProject = Project.get(resourceManager, PROJECT_INFO.projectId());
-    assertEquals(PROJECT_INFO, loadedProject.info());
+    assertEquals(expectedProject, loadedProject);
   }
 
   @Test
   public void testReload() {
+    initializeExpectedProject(2);
     ProjectInfo newInfo = PROJECT_INFO.toBuilder().addLabel("k3", "v3").build();
-    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(newInfo);
+    Project expectedProject =
+        new Project(serviceMockReturnsOptions, new ProjectInfo.BuilderImpl(newInfo));
+    expect(resourceManager.options()).andReturn(mockOptions);
+    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(expectedProject);
     replay(resourceManager);
+    initializeProject();
     Project newProject = project.reload();
-    assertSame(resourceManager, newProject.resourceManager());
-    assertEquals(newInfo, newProject.info());
+    assertEquals(expectedProject, newProject);
   }
 
   @Test
   public void testLoadNull() {
+    initializeExpectedProject(1);
     expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
     replay(resourceManager);
     assertNull(Project.get(resourceManager, PROJECT_INFO.projectId()));
   }
 
   @Test
-  public void testReloadDeletedProject() {
-    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(PROJECT_INFO);
+  public void testReloadNull() {
+    initializeExpectedProject(1);
+    expect(resourceManager.options()).andReturn(mockOptions);
     expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
     replay(resourceManager);
-    Project loadedProject = Project.get(resourceManager, PROJECT_INFO.projectId());
-    assertNotNull(loadedProject);
-    Project reloadedProject = loadedProject.reload();
+    Project reloadedProject =
+        new Project(resourceManager, new ProjectInfo.BuilderImpl(PROJECT_INFO)).reload();
     assertNull(reloadedProject);
   }
 
-  @Test
-  public void testInfo() {
-    replay(resourceManager);
-    assertEquals(PROJECT_INFO, project.info());
-  }
-
   @Test
   public void testResourceManager() {
+    initializeExpectedProject(1);
     replay(resourceManager);
-    assertEquals(resourceManager, project.resourceManager());
+    assertEquals(serviceMockReturnsOptions, expectedProject.resourceManager());
   }
 
   @Test
   public void testDelete() {
+    initializeExpectedProject(1);
+    expect(resourceManager.options()).andReturn(mockOptions);
     resourceManager.delete(PROJECT_INFO.projectId());
     replay(resourceManager);
+    initializeProject();
     project.delete();
   }
 
   @Test
   public void testUndelete() {
+    initializeExpectedProject(1);
+    expect(resourceManager.options()).andReturn(mockOptions);
     resourceManager.undelete(PROJECT_INFO.projectId());
     replay(resourceManager);
+    initializeProject();
     project.undelete();
   }
 
   @Test
   public void testReplace() {
-    ProjectInfo newInfo = PROJECT_INFO.toBuilder().addLabel("k3", "v3").build();
-    expect(resourceManager.replace(newInfo)).andReturn(newInfo);
+    initializeExpectedProject(2);
+    Project expectedReplacedProject = expectedProject.toBuilder().addLabel("k3", "v3").build();
+    expect(resourceManager.options()).andReturn(mockOptions).times(2);
+    expect(resourceManager.replace(anyObject(Project.class))).andReturn(expectedReplacedProject);
     replay(resourceManager);
-    Project newProject = project.replace(newInfo);
-    assertSame(resourceManager, newProject.resourceManager());
-    assertEquals(newInfo, newProject.info());
+    initializeProject();
+    Project newProject =
+        new Project(resourceManager, new ProjectInfo.BuilderImpl(expectedReplacedProject));
+    Project actualReplacedProject = newProject.replace();
+    compareProjectInfos(expectedReplacedProject, actualReplacedProject);
+  }
+
+  private void compareProjects(Project expected, Project value) {
+    assertEquals(expected, value);
+    compareProjectInfos(expected, value);
+    assertEquals(expected.resourceManager().options(), value.resourceManager().options());
+  }
+
+  private void compareProjectInfos(ProjectInfo expected, ProjectInfo value) {
+    assertEquals(expected.projectId(), value.projectId());
+    assertEquals(expected.name(), value.name());
+    assertEquals(expected.labels(), value.labels());
+    assertEquals(expected.projectNumber(), value.projectNumber());
+    assertEquals(expected.createTimeMillis(), value.createTimeMillis());
+    assertEquals(expected.state(), value.state());
+    assertEquals(expected.parent(), value.parent());
   }
 }
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
index 7d1e00496463..37c54718fb4a 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -78,7 +79,7 @@ public void setUp() {
   }
 
   private void clearProjects() {
-    for (ProjectInfo project : RESOURCE_MANAGER.list().values()) {
+    for (Project project : RESOURCE_MANAGER.list().values()) {
       RESOURCE_MANAGER_HELPER.removeProject(project.projectId());
     }
   }
@@ -97,13 +98,14 @@ private void compareReadWriteFields(ProjectInfo expected, ProjectInfo actual) {
 
   @Test
   public void testCreate() {
-    ProjectInfo returnedProject = RESOURCE_MANAGER.create(PARTIAL_PROJECT);
+    Project returnedProject = RESOURCE_MANAGER.create(PARTIAL_PROJECT);
     compareReadWriteFields(PARTIAL_PROJECT, returnedProject);
     assertEquals(ProjectInfo.State.ACTIVE, returnedProject.state());
     assertNull(returnedProject.name());
     assertNull(returnedProject.parent());
     assertNotNull(returnedProject.projectNumber());
     assertNotNull(returnedProject.createTimeMillis());
+    assertSame(RESOURCE_MANAGER, returnedProject.resourceManager());
     try {
       RESOURCE_MANAGER.create(PARTIAL_PROJECT);
       fail("Should fail, project already exists.");
@@ -117,6 +119,7 @@ public void testCreate() {
     assertEquals(ProjectInfo.State.ACTIVE, returnedProject.state());
     assertNotNull(returnedProject.projectNumber());
     assertNotNull(returnedProject.createTimeMillis());
+    assertSame(RESOURCE_MANAGER, returnedProject.resourceManager());
   }
 
   @Test
@@ -137,16 +140,17 @@ public void testDelete() {
   @Test
   public void testGet() {
     RESOURCE_MANAGER.create(COMPLETE_PROJECT);
-    ProjectInfo returnedProject = RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId());
+    Project returnedProject = RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId());
     compareReadWriteFields(COMPLETE_PROJECT, returnedProject);
+    assertEquals(RESOURCE_MANAGER, returnedProject.resourceManager());
     RESOURCE_MANAGER_HELPER.removeProject(COMPLETE_PROJECT.projectId());
     assertNull(RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId()));
   }
 
   @Test
   public void testGetWithOptions() {
-    ProjectInfo originalProject = RESOURCE_MANAGER.create(COMPLETE_PROJECT);
-    ProjectInfo returnedProject = RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId(), GET_FIELDS);
+    Project originalProject = RESOURCE_MANAGER.create(COMPLETE_PROJECT);
+    Project returnedProject = RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId(), GET_FIELDS);
     assertFalse(COMPLETE_PROJECT.equals(returnedProject));
     assertEquals(COMPLETE_PROJECT.projectId(), returnedProject.projectId());
     assertEquals(COMPLETE_PROJECT.name(), returnedProject.name());
@@ -155,15 +159,17 @@ public void testGetWithOptions() {
     assertNull(returnedProject.projectNumber());
     assertNull(returnedProject.state());
     assertTrue(returnedProject.labels().isEmpty());
+    assertEquals(RESOURCE_MANAGER, originalProject.resourceManager());
+    assertEquals(RESOURCE_MANAGER, returnedProject.resourceManager());
   }
 
   @Test
   public void testList() {
-    Page projects = RESOURCE_MANAGER.list();
+    Page projects = RESOURCE_MANAGER.list();
     assertFalse(projects.values().iterator().hasNext()); // TODO: change this when #421 is resolved
     RESOURCE_MANAGER.create(PARTIAL_PROJECT);
     RESOURCE_MANAGER.create(COMPLETE_PROJECT);
-    for (ProjectInfo p : RESOURCE_MANAGER.list().values()) {
+    for (Project p : RESOURCE_MANAGER.list().values()) {
       if (p.projectId().equals(PARTIAL_PROJECT.projectId())) {
         compareReadWriteFields(PARTIAL_PROJECT, p);
       } else if (p.projectId().equals(COMPLETE_PROJECT.projectId())) {
@@ -171,14 +177,15 @@ public void testList() {
       } else {
         fail("Some unexpected project returned by list.");
       }
+      assertSame(RESOURCE_MANAGER, p.resourceManager());
     }
   }
 
   @Test
   public void testListFieldOptions() {
     RESOURCE_MANAGER.create(COMPLETE_PROJECT);
-    Page projects = RESOURCE_MANAGER.list(LIST_FIELDS);
-    ProjectInfo returnedProject = projects.iterateAll().next();
+    Page projects = RESOURCE_MANAGER.list(LIST_FIELDS);
+    Project returnedProject = projects.iterateAll().next();
     assertEquals(COMPLETE_PROJECT.projectId(), returnedProject.projectId());
     assertEquals(COMPLETE_PROJECT.name(), returnedProject.name());
     assertEquals(COMPLETE_PROJECT.labels(), returnedProject.labels());
@@ -186,6 +193,7 @@ public void testListFieldOptions() {
     assertNull(returnedProject.projectNumber());
     assertNull(returnedProject.state());
     assertNull(returnedProject.createTimeMillis());
+    assertSame(RESOURCE_MANAGER, returnedProject.resourceManager());
   }
 
   @Test
@@ -207,10 +215,11 @@ public void testListFilterOptions() {
     RESOURCE_MANAGER.create(nonMatchingProject1);
     RESOURCE_MANAGER.create(nonMatchingProject2);
     RESOURCE_MANAGER.create(nonMatchingProject3);
-    for (ProjectInfo p : RESOURCE_MANAGER.list(LIST_FILTER).values()) {
+    for (Project p : RESOURCE_MANAGER.list(LIST_FILTER).values()) {
       assertFalse(p.equals(nonMatchingProject1));
       assertFalse(p.equals(nonMatchingProject2));
       compareReadWriteFields(matchingProject, p);
+      assertSame(RESOURCE_MANAGER, p.resourceManager());
     }
   }
 
@@ -225,11 +234,12 @@ public void testReplace() {
         .state(ProjectInfo.State.DELETE_REQUESTED)
         .parent(createdProject.parent())
         .build();
-    ProjectInfo returnedProject = RESOURCE_MANAGER.replace(anotherCompleteProject);
+    Project returnedProject = RESOURCE_MANAGER.replace(anotherCompleteProject);
     compareReadWriteFields(anotherCompleteProject, returnedProject);
     assertEquals(createdProject.projectNumber(), returnedProject.projectNumber());
     assertEquals(createdProject.createTimeMillis(), returnedProject.createTimeMillis());
     assertEquals(createdProject.state(), returnedProject.state());
+    assertEquals(RESOURCE_MANAGER, returnedProject.resourceManager());
     ProjectInfo nonexistantProject =
         ProjectInfo.builder("some-project-id-that-does-not-exist").build();
     try {
@@ -276,8 +286,10 @@ public void testRetryableException() {
         .andThrow(new ResourceManagerException(500, "Internal Error"))
         .andReturn(PARTIAL_PROJECT.toPb());
     EasyMock.replay(resourceManagerRpcMock);
-    ProjectInfo returnedProject = resourceManagerMock.get(PARTIAL_PROJECT.projectId());
-    assertEquals(PARTIAL_PROJECT, returnedProject);
+    Project returnedProject = resourceManagerMock.get(PARTIAL_PROJECT.projectId());
+    assertEquals(
+        new Project(resourceManagerMock, new ProjectInfo.BuilderImpl(PARTIAL_PROJECT)),
+        returnedProject);
   }
 
   @Test
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
index 64e09449149b..497de880254a 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
@@ -35,6 +35,8 @@
 
 public class SerializationTest {
 
+private static final ResourceManager RESOURCE_MANAGER =
+      ResourceManagerOptions.defaultInstance().service();
   private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.builder("id1").build();
   private static final ProjectInfo FULL_PROJECT_INFO = ProjectInfo.builder("id")
       .name("name")
@@ -43,8 +45,10 @@ public class SerializationTest {
       .state(ProjectInfo.State.ACTIVE)
       .createTimeMillis(1234L)
       .build();
-  private static final PageImpl PAGE_RESULT =
-      new PageImpl<>(null, "c", Collections.singletonList(PARTIAL_PROJECT_INFO));
+  private static final Project PROJECT =
+      new Project(RESOURCE_MANAGER, new ProjectInfo.BuilderImpl(FULL_PROJECT_INFO));
+  private static final PageImpl PAGE_RESULT =
+      new PageImpl<>(null, "c", Collections.singletonList(PROJECT));
   private static final ResourceManager.ProjectGetOption PROJECT_GET_OPTION =
       ResourceManager.ProjectGetOption.fields(ResourceManager.ProjectField.NAME);
   private static final ResourceManager.ProjectListOption PROJECT_LIST_OPTION =
@@ -65,7 +69,7 @@ public void testServiceOptions() throws Exception {
 
   @Test
   public void testModelAndRequests() throws Exception {
-    Serializable[] objects = {PARTIAL_PROJECT_INFO, FULL_PROJECT_INFO, PAGE_RESULT,
+    Serializable[] objects = {PARTIAL_PROJECT_INFO, FULL_PROJECT_INFO, PROJECT, PAGE_RESULT,
         PROJECT_GET_OPTION, PROJECT_LIST_OPTION};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);

From d27d567606f198822c5ec2b4a5e8c592e263abec Mon Sep 17 00:00:00 2001
From: Ajay Kannan 
Date: Mon, 1 Feb 2016 17:35:06 -0800
Subject: [PATCH 322/322] Fix ServiceOptions merge bug, remove unnecessary
 protected modifier from DateTime, set cursorAfter to endCursor where
 appropriate, and fix error codes for retries.

---
 .../com/google/gcloud/ServiceOptions.java     |  4 +---
 .../gcloud/datastore/DatastoreException.java  |  4 +---
 .../com/google/gcloud/datastore/DateTime.java |  4 ++--
 .../gcloud/datastore/QueryResultsImpl.java    |  1 +
 .../datastore/DatastoreExceptionTest.java     | 20 +++++++++----------
 .../gcloud/datastore/DatastoreTest.java       |  2 +-
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 34280dbf92e5..31e543809464 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.client.extensions.appengine.http.UrlFetchTransport;
@@ -229,8 +228,7 @@ public B clock(Clock clock) {
      * @return the builder
      */
     public B projectId(String projectId) {
-      this.projectId =
-          checkNotNull(projectId, "Project ID cannot be set to null. Leave unset for default.");
+      this.projectId = projectId;
       return self();
     }
 
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
index ecad69ac635b..a940fe573f93 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
@@ -34,9 +34,7 @@ public class DatastoreException extends BaseServiceException {
 
   // see https://cloud.google.com/datastore/docs/concepts/errors#Error_Codes"
   private static final Set RETRYABLE_ERRORS = ImmutableSet.of(
-      new Error(409, "ABORTED"),
-      new Error(403, "DEADLINE_EXCEEDED"),
-      new Error(503, "UNAVAILABLE"));
+      new Error(10, "ABORTED"), new Error(4, "DEADLINE_EXCEEDED"), new Error(14, "UNAVAILABLE"));
   private static final long serialVersionUID = 2663750991205874435L;
 
   public DatastoreException(int code, String message, String reason, Throwable cause) {
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DateTime.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DateTime.java
index 45347ed41dcb..5e8664395802 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DateTime.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DateTime.java
@@ -106,11 +106,11 @@ Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
         com.google.protobuf.Timestamp.parseFrom(bytesPb)));
   }
 
-  protected static long timestampPbToMicroseconds(com.google.protobuf.Timestamp timestampPb) {
+  static long timestampPbToMicroseconds(com.google.protobuf.Timestamp timestampPb) {
     return timestampPb.getSeconds() * 1000000 + timestampPb.getNanos() / 1000;
   }
 
-  protected static com.google.protobuf.Timestamp microsecondsToTimestampPb(long microseconds) {
+  static com.google.protobuf.Timestamp microsecondsToTimestampPb(long microseconds) {
     long seconds = microseconds / 1000000;
     int nanos = (int) (microseconds % 1000000) * 1000;
     return com.google.protobuf.Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
index 25dde18a1a1b..ec3a652c6131 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
@@ -93,6 +93,7 @@ protected T computeNext() {
       sendRequest();
     }
     if (!entityResultPbIter.hasNext()) {
+      cursor = runQueryResponsePb.getBatch().getEndCursor();
       return endOfData();
     }
     com.google.datastore.v1beta3.EntityResult entityResultPb = entityResultPbIter.next();
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
index 4d62224172f9..301a863476b6 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
@@ -38,29 +38,29 @@ public class DatastoreExceptionTest {
 
   @Test
   public void testDatastoreException() throws Exception {
-    DatastoreException exception = new DatastoreException(409, "message", "ABORTED");
-    assertEquals(409, exception.code());
+    DatastoreException exception = new DatastoreException(10, "message", "ABORTED");
+    assertEquals(10, exception.code());
     assertEquals("ABORTED", exception.reason());
     assertEquals("message", exception.getMessage());
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
 
-    exception = new DatastoreException(403, "message", "DEADLINE_EXCEEDED");
-    assertEquals(403, exception.code());
+    exception = new DatastoreException(4, "message", "DEADLINE_EXCEEDED");
+    assertEquals(4, exception.code());
     assertEquals("DEADLINE_EXCEEDED", exception.reason());
     assertEquals("message", exception.getMessage());
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
 
-    exception = new DatastoreException(503, "message", "UNAVAILABLE");
-    assertEquals(503, exception.code());
+    exception = new DatastoreException(14, "message", "UNAVAILABLE");
+    assertEquals(14, exception.code());
     assertEquals("UNAVAILABLE", exception.reason());
     assertEquals("message", exception.getMessage());
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
 
-    exception = new DatastoreException(500, "message", "INTERNAL");
-    assertEquals(500, exception.code());
+    exception = new DatastoreException(2, "message", "INTERNAL");
+    assertEquals(2, exception.code());
     assertEquals("INTERNAL", exception.reason());
     assertEquals("message", exception.getMessage());
     assertFalse(exception.retryable());
@@ -77,14 +77,14 @@ public void testDatastoreException() throws Exception {
 
   @Test
   public void testTranslateAndThrow() throws Exception {
-    DatastoreException cause = new DatastoreException(503, "message", "UNAVAILABLE");
+    DatastoreException cause = new DatastoreException(14, "message", "UNAVAILABLE");
     RetryHelper.RetryHelperException exceptionMock = createMock(RetryHelper.RetryHelperException.class);
     expect(exceptionMock.getCause()).andReturn(cause).times(2);
     replay(exceptionMock);
     try {
       DatastoreException.translateAndThrow(exceptionMock);
     } catch (BaseServiceException ex) {
-      assertEquals(503, ex.code());
+      assertEquals(14, ex.code());
       assertEquals("message", ex.getMessage());
       assertTrue(ex.retryable());
       assertTrue(ex.idempotent());
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index a39952c448eb..002e5f6df04f 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -986,7 +986,7 @@ public void testRetryableException() throws Exception {
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class)))
         .andReturn(rpcMock);
     EasyMock.expect(rpcMock.lookup(requestPb))
-        .andThrow(new DatastoreException(503, "UNAVAILABLE", "UNAVAILABLE", null))
+        .andThrow(new DatastoreException(14, "UNAVAILABLE", "UNAVAILABLE", null))
         .andReturn(responsePb);
     EasyMock.replay(rpcFactoryMock, rpcMock);
     DatastoreOptions options = this.options.toBuilder()