Merge pull request #256 from mziccard/blob-exists-options

aozarov · aozarov · commit 7115734b09c4 · 2015-10-14T09:41:59.000-07:00
Add options parameter to Blob.exists
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
@@ -150,11 +150,12 @@ public BlobId id() {
   /**
    * Checks if this blob exists.
    *
+   * @param options blob read options
    * @return true if this blob exists, false otherwise
    * @throws StorageException upon failure
    */
-  public boolean exists() {
-    return storage.get(info.blobId()) != null;
+  public boolean exists(BlobSourceOption... options) {
+    return storage.get(info.blobId(), convert(info, options)) != null;
   }
 
   /**
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,14 +70,14 @@ public void testInfo() throws Exception {
 
   @Test
   public void testExists_True() throws Exception {
-    expect(storage.get(BLOB_INFO.blobId())).andReturn(BLOB_INFO);
+    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobSourceOption[0])).andReturn(BLOB_INFO);
     replay(storage);
     assertTrue(blob.exists());
   }
 
   @Test
   public void testExists_False() throws Exception {
-    expect(storage.get(BLOB_INFO.blobId())).andReturn(null);
+    expect(storage.get(BLOB_INFO.blobId(), new Storage.BlobSourceOption[0])).andReturn(null);
     replay(storage);
     assertFalse(blob.exists());
   }

Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,12 @@ public BlobId id() {`
`150`	`150`	`/**`
`151`	`151`	`* Checks if this blob exists.`
`152`	`152`	`*`
	`153`	`+ * @param options blob read options`
`153`	`154`	`* @return true if this blob exists, false otherwise`
`154`	`155`	`* @throws StorageException upon failure`
`155`	`156`	`*/`
`156`		`- public boolean exists() {`
`157`		`- return storage.get(info.blobId()) != null;`
	`157`	`+ public boolean exists(BlobSourceOption... options) {`
	`158`	`+ return storage.get(info.blobId(), convert(info, options)) != null;`
`158`	`159`	`}`
`159`	`160`
`160`	`161`	`/**`