---

mziccard · mziccard · commit dec9296dbb20 · 2015-11-04T21:12:13.000+01:00
yaml --- r: 2359 b: refs/heads/update-datastore c: ba4bfa6 h: refs/heads/master i: 2357: 2aaa4e7 2355: 5a4bc6c 2351: 4129e6d
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: f11c05a4846d598984fee5c132493d962fdf92e0
+refs/heads/update-datastore: ba4bfa6017b39800abfda831ee071664802e6186
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/branches/update-datastore/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/branches/update-datastore/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/branches/update-datastore/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());
   }
