googleapis
diff --git a/‎[refs]‎
Lines changed: 1 addition & 1 deletion b/‎[refs]‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/Bucket.java‎
Lines changed: 0 additions & 24 deletions b/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/Bucket.java‎
Lines changed: 0 additions & 24 deletions
diff --git a/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/BucketImpl.java‎
Lines changed: 0 additions & 1 deletion b/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/BucketImpl.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/BucketInfo.java‎
Lines changed: 75 additions & 21 deletions b/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/BucketInfo.java‎
Lines changed: 75 additions & 21 deletions
diff --git a/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/StorageServiceImpl.java‎
Lines changed: 3 additions & 2 deletions b/‎branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/StorageServiceImpl.java‎
Lines changed: 3 additions & 2 deletions
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: f22030bfd7ca7329ad86775067c09a0b91b74132
+refs/heads/tswast-patch-1: 7e1817e705e400f57cfac34e12af28d8fa46888f
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
@@ -16,50 +16,89 @@
 
 package com.google.gcloud.storage;
 
+import com.google.api.services.storage.model.Bucket;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+
 public final class BucketInfo {
 
   private final String id;
   private final String name;
+  private final String etag;
   private final long createTime;
   private final long metageneration;
   private final Cors cors;
-  private final Acl acl;
-  private final Acl defaultAcl;
+  private final ImmutableList<Acl> acl;
+  private final ImmutableList<Acl> defaultAcl;
+  private final Location location;
+  private final StorageClass storageClass;
 
   public enum StorageClass {
     DURABLE_REDUCED_AVAILABILITY,
     STANDARD
   }
 
+  public enum Location {
+    US, EU, ASIA
+  }
+
   public final static class Builder {
 
     private final String id;
     private final String name;
-    private final long createTime;
-    private final long metageneration;
+    private StorageClass storageClass;
+    private Location location;
+    private String etag;
+    private Long createTime;
+    private Long metageneration;
     private Cors cors;
-    private Acl acl;
-    private Acl defaultAcl;
+    private Iterable<Acl> acl;
+    private Iterable<Acl> defaultAcl;
 
-    Builder(String id, String name, long createTime, long metageneration) {
+    Builder(String id, String name) {
       this.id = id;
       this.name = name;
+    }
+
+    public Builder storageClass(StorageClass storageClass) {
+      this.storageClass = storageClass;
+      return this;
+    }
+
+    public Builder location(Location location) {
+      this.location = location;
+      return this;
+    }
+
+    Builder etag(String etag) {
+      this.etag = etag;
+      return this;
+    }
+
+    Builder createTime(Long createTime) {
       this.createTime = createTime;
+      return this;
+    }
+
+    Builder metageneration(Long metageneration) {
       this.metageneration = metageneration;
+      return this;
     }
 
-    public Builder cors(Cors cors) {
+    Builder cors(Cors cors) {
       this.cors = cors;
       return this;
     }
 
-    public Builder acl(Acl acl) {
-      this.acl = acl;
+    public Builder acl(Iterable<Acl> acl) {
+      this.acl = ImmutableList.copyOf(acl);
       return this;
     }
 
-    public Builder defaultAcl(Acl defaultAcl) {
-      this.defaultAcl = defaultAcl;
+    public Builder defaultAcl(Iterable<Acl> acl) {
+      this.defaultAcl = ImmutableList.copyOf(acl);
       return this;
     }
 
@@ -71,11 +110,14 @@ public BucketInfo build() {
   private BucketInfo(Builder builder) {
     id = builder.id;
     name = builder.name;
-    createTime = builder.createTime;
-    metageneration = builder.metageneration;
+    etag = builder.etag;
+    createTime = MoreObjects.firstNonNull(builder.createTime, 0L);
+    metageneration = MoreObjects.firstNonNull(builder.metageneration, 0L);
+    location = builder.location;
+    storageClass = builder.storageClass;
     cors = builder.cors;
-    acl = builder.acl;
-    defaultAcl = builder.defaultAcl;
+    acl = ImmutableList.copyOf(builder.acl);
+    defaultAcl = ImmutableList.copyOf(builder.defaultAcl);
   }
 
   public String id() {
@@ -90,19 +132,31 @@ public Cors cors() {
     return cors;
   }
 
-  public Acl acl() {
+  public List<Acl> acl() {
     return acl;
   }
 
-  public Acl defaultObjectAcl() {
+  public List<Acl> defaultObjectAcl() {
     return defaultAcl;
   }
 
   public Builder toBuilder() {
-    return builder(id, name, createTime, metageneration).cors(cors).acl(acl).defaultAcl(defaultAcl);
+    return new Builder(id, name)
+        .createTime(createTime)
+        .etag(etag)
+        .metageneration(metageneration)
+        .cors(cors)
+        .acl(acl)
+        .defaultAcl(defaultAcl)
+        .location(location)
+        .storageClass(storageClass);
+  }
+
+  void fromPb(Bucket bucket) {
+
   }
 
-  public static Builder builder(String id, String name, long createTime, long metageneration) {
-    return new Builder(id, name, createTime, metageneration);
+  Bucket toPb() {
+    return n
   }
 }
@@ -16,6 +16,7 @@
 
 package com.google.gcloud.storage;
 
+import com.google.api.services.storage.model.Bucket;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.gcloud.BaseService;
@@ -33,7 +34,7 @@ final class StorageServiceImpl extends BaseService<StorageServiceOptions> implem
   }
 
   @Override
-  public Iterable<Bucket> listBuckets() {
+  public Iterable<BucketInfo> listBuckets() {
     try {
       return Iterables.transform(storageRpc.buckets(),
           new Function<com.google.api.services.storage.model.Bucket, Bucket>() {
@@ -47,7 +48,7 @@ public Iterable<Bucket> listBuckets() {
   }
 
   @Override
-  public Bucket getBucket(String bucket) {
+  public BucketInfo getBucket(String bucket) {
     try {
       return new BucketImpl(this, storageRpc.bucket(bucket));
     } catch (IOException ex) {