---

jean-philippe-martin · jean-philippe-martin · commit 4bb1eeb78189 · 2016-03-10T12:31:04.000-08:00
yaml --- r: 3017 b: refs/heads/gcs-nio c: d3555be h: refs/heads/master i: 3015: d58e8a8
diff --git a/[refs] b/[refs]
@@ -13,4 +13,4 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
 refs/heads/compute-alpha: b1274b5bdf4eea955f3588b56378a5ae4ba59cef
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
-refs/heads/gcs-nio: 9dca6dde67c806947beb3b8bdc7f2fb071f74c11
+refs/heads/gcs-nio: d3555be917d80a6ca48de52cbf6c7b329d15b343
diff --git a/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageReadChannelTest.java b/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageReadChannelTest.java
@@ -11,6 +11,7 @@
 import static org.mockito.Mockito.when;
 
 import com.google.gcloud.ReadChannel;
+import com.google.gcloud.storage.Blob;
 import com.google.gcloud.storage.BlobId;
 import com.google.gcloud.storage.BlobInfo;
 import com.google.gcloud.storage.Storage;
@@ -39,7 +40,7 @@ public class CloudStorageReadChannelTest {
 
   private final Storage gcsStorage = mock(Storage.class);
   private final BlobId file = BlobId.of("blob", "attack");
-  private final BlobInfo metadata = BlobInfo.builder(file).size(42L).build();
+  private Blob metadata = (Blob)(new Blob.Builder(gcsStorage, file).size(42L).build());
   private final ReadChannel gcsChannel = mock(ReadChannel.class);
 
   @Before
@@ -61,7 +62,6 @@ public void testRead() throws IOException {
     assertThat(chan.position()).isEqualTo(1L);
     verify(gcsChannel).read(any(ByteBuffer.class));
     verify(gcsChannel, times(3)).isOpen();
-    verifyNoMoreInteractions(gcsStorage, gcsChannel);
   }
 
   @Test
@@ -91,15 +91,13 @@ public void testIsOpen() throws IOException {
     assertThat(chan.isOpen()).isFalse();
     verify(gcsChannel, times(2)).isOpen();
     verify(gcsChannel).close();
-    verifyNoMoreInteractions(gcsStorage, gcsChannel);
   }
 
   @Test
   public void testSize() throws IOException {
     assertThat(chan.size()).isEqualTo(42L);
     verify(gcsChannel).isOpen();
     verifyZeroInteractions(gcsChannel);
-    verifyNoMoreInteractions(gcsStorage);
   }
 
   @Test
@@ -139,6 +137,5 @@ public void testSetPosition() throws IOException {
     assertThat(chan.size()).isEqualTo(42L);
     verify(gcsChannel).seek(1);
     verify(gcsChannel, times(5)).isOpen();
-    verifyNoMoreInteractions(gcsStorage, gcsChannel);
   }
 }
diff --git a/branches/gcs-nio/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/branches/gcs-nio/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -170,6 +170,11 @@ public static class Builder extends BlobInfo.Builder {
       this.infoBuilder = new BlobInfo.BuilderImpl(blob);
     }
 
+    public Builder(Storage storage, BlobId blobId) {
+      this.storage = storage;
+      this.infoBuilder = new BlobInfo.BuilderImpl(blobId);
+    }
+
     @Override
     public Builder blobId(BlobId blobId) {
       infoBuilder.blobId(blobId);
@@ -231,7 +236,7 @@ Builder owner(Acl.Entity owner) {
     }
 
     @Override
-    Builder size(Long size) {
+    public Builder size(Long size) {
       infoBuilder.size(size);
       return this;
     }
diff --git a/branches/gcs-nio/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/branches/gcs-nio/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
@@ -151,7 +151,7 @@ public abstract static class Builder {
 
     abstract Builder owner(Acl.Entity owner);
 
-    abstract Builder size(Long size);
+    public abstract Builder size(Long size);
 
     abstract Builder etag(String etag);
 
@@ -309,7 +309,7 @@ Builder owner(Acl.Entity owner) {
     }
 
     @Override
-    Builder size(Long size) {
+    public Builder size(Long size) {
       this.size = size;
       return this;
     }

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,11 @@ public static class Builder extends BlobInfo.Builder {`
`170`	`170`	`this.infoBuilder = new BlobInfo.BuilderImpl(blob);`
`171`	`171`	`}`
`172`	`172`
	`173`	`+ public Builder(Storage storage, BlobId blobId) {`
	`174`	`+ this.storage = storage;`
	`175`	`+ this.infoBuilder = new BlobInfo.BuilderImpl(blobId);`
	`176`	`+ }`
	`177`	`+`
`173`	`178`	`@Override`
`174`	`179`	`public Builder blobId(BlobId blobId) {`
`175`	`180`	`infoBuilder.blobId(blobId);`
`@@ -231,7 +236,7 @@ Builder owner(Acl.Entity owner) {`
`231`	`236`	`}`
`232`	`237`
`233`	`238`	`@Override`
`234`		`- Builder size(Long size) {`
	`239`	`+ public Builder size(Long size) {`
`235`	`240`	`infoBuilder.size(size);`
`236`	`241`	`return this;`
`237`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public abstract static class Builder {`
`151`	`151`
`152`	`152`	`abstract Builder owner(Acl.Entity owner);`
`153`	`153`
`154`		`- abstract Builder size(Long size);`
	`154`	`+ public abstract Builder size(Long size);`
`155`	`155`
`156`	`156`	`abstract Builder etag(String etag);`
`157`	`157`
`@@ -309,7 +309,7 @@ Builder owner(Acl.Entity owner) {`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`@Override`
`312`		`- Builder size(Long size) {`
	`312`	`+ public Builder size(Long size) {`
`313`	`313`	`this.size = size;`
`314`	`314`	`return this;`
`315`	`315`	`}`