Use blobId in Blob whenever possible

mziccard · mziccard · commit 8b89ba37f3fe · 2015-10-14T09:12:00.000+02:00
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
@@ -154,7 +154,7 @@ public BlobId id() {
    * @throws StorageException upon failure
    */
   public boolean exists() {
-    return storage.get(info.bucket(), info.name()) != null;
+    return storage.get(info.blobId()) != null;
   }
 
   /**
@@ -164,7 +164,7 @@ public boolean exists() {
    * @throws StorageException upon failure
    */
   public byte[] content(Storage.BlobSourceOption... options) {
-    return storage.readAllBytes(info.bucket(), info.name(), options);
+    return storage.readAllBytes(info.blobId(), options);
   }
 
   /**
@@ -175,7 +175,7 @@ public byte[] content(Storage.BlobSourceOption... options) {
    * @throws StorageException upon failure
    */
   public Blob reload(BlobSourceOption... options) {
-    return new Blob(storage, storage.get(info.bucket(), info.name(), convert(info, options)));
+    return new Blob(storage, storage.get(info.blobId(), convert(info, options)));
   }
 
   /**
@@ -205,7 +205,7 @@ public Blob update(BlobInfo blobInfo, BlobTargetOption... options) {
    * @throws StorageException upon failure
    */
   public boolean delete(BlobSourceOption... options) {
-    return storage.delete(info.bucket(), info.name(), convert(info, options));
+    return storage.delete(info.blobId(), convert(info, options));
   }
 
   /**
@@ -246,7 +246,7 @@ public Blob copyTo(String targetBucket, String targetBlob, BlobSourceOption... o
    * @throws StorageException upon failure
    */
   public BlobReadChannel reader(BlobSourceOption... options) {
-    return storage.reader(info.bucket(), info.name(), convert(info, options));
+    return storage.reader(info.blobId(), convert(info, options));
   }
 
   /**
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
@@ -70,30 +70,30 @@ public void testInfo() throws Exception {
 
   @Test
   public void testExists_True() throws Exception {
-    expect(storage.get(BLOB_INFO.bucket(), BLOB_INFO.name())).andReturn(BLOB_INFO);
+    expect(storage.get(BLOB_INFO.blobId())).andReturn(BLOB_INFO);
     replay(storage);
     assertTrue(blob.exists());
   }
 
   @Test
   public void testExists_False() throws Exception {
-    expect(storage.get(BLOB_INFO.bucket(), BLOB_INFO.name())).andReturn(null);
+    expect(storage.get(BLOB_INFO.blobId())).andReturn(null);
     replay(storage);
     assertFalse(blob.exists());
   }
 
   @Test
   public void testContent() throws Exception {
     byte[] content = {1, 2};
-    expect(storage.readAllBytes(BLOB_INFO.bucket(), BLOB_INFO.name())).andReturn(content);
+    expect(storage.readAllBytes(BLOB_INFO.blobId())).andReturn(content);
     replay(storage);
     assertArrayEquals(content, blob.content());
   }
 
   @Test
   public void testReload() throws Exception {
     BlobInfo updatedInfo = BLOB_INFO.toBuilder().cacheControl("c").build();
-    expect(storage.get(BLOB_INFO.bucket(), BLOB_INFO.name())).andReturn(updatedInfo);
+    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobSourceOption[0])).andReturn(updatedInfo);
     replay(storage);
     Blob updatedBlob = blob.reload();
     assertSame(storage, blob.storage());
@@ -112,7 +112,7 @@ public void testUpdate() throws Exception {
 
   @Test
   public void testDelete() throws Exception {
-    expect(storage.delete(BLOB_INFO.bucket(), BLOB_INFO.name())).andReturn(true);
+    expect(storage.delete(BLOB_INFO.blobId(), new Storage.BlobSourceOption[0])).andReturn(true);
     replay(storage);
     assertTrue(blob.delete());
   }
@@ -146,7 +146,7 @@ public void testCopyTo() throws Exception {
   @Test
   public void testReader() throws Exception {
     BlobReadChannel channel = createMock(BlobReadChannel.class);
-    expect(storage.reader(BLOB_INFO.bucket(), BLOB_INFO.name())).andReturn(channel);
+    expect(storage.reader(BLOB_INFO.blobId())).andReturn(channel);
     replay(storage);
     assertSame(channel, blob.reader());
   }
