---

aozarov · aozarov · commit 819125831879 · 2015-04-11T12:42:21.000-07:00
yaml --- r: 5939 b: refs/heads/tswast-patch-1 c: 3b8f4e3 h: refs/heads/master i: 5937: f007542 5935: fc0a976
diff --git a/[refs] b/[refs]
@@ -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: 9dbd7c957205b26c6b601be8f812898e33745ec4
+refs/heads/tswast-patch-1: 3b8f4e36c1aae0293f4277d26fb62f36e7c45b39
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/ObjectInfo.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/ObjectInfo.java
@@ -34,13 +34,14 @@ public class ObjectInfo implements Serializable {
   private static final long serialVersionUID = 2228487739943277159L;
 
   private final String bucket;
+  private final String id;
   private final String name;
-  private final String contentType;
+  private final String selfLink;
   private final String cacheControl;
   private final ImmutableList<Acl> acl;
-  private final String owner;
+  private final Acl.Entity owner;
   private final long size;
-  private final String contentEncoding;
+  private final String etag;
   private final String md5;
   private final String crc32c;
   private final String mediaLink;
@@ -49,17 +50,28 @@ public class ObjectInfo implements Serializable {
   private final long metageneration;
   private final long deleteTime;
   private final long updateTime;
+  private final String contentType;
+  private final String contentEncoding;
+  private final String contentDisposition;
+  private final String contentLanguage;
+  private final int componentCount;
 
   public static final class Builder {
 
     private String bucket;
+    private String id;
     private String name;
     private String contentType;
+    private String contentEncoding;
+    private String contentDisposition;
+    private  String contentLanguage;
+    private int componentCount;
     private String cacheControl;
     private ImmutableList<Acl> acl;
-    private String owner;
+    private Acl.Entity owner;
     private long size;
-    private String contentEncoding;
+    private String etag;
+    private String selfLink;
     private String md5;
     private String crc32c;
     private String mediaLink;
@@ -77,6 +89,11 @@ public Builder bucket(String bucket) {
       return this;
     }
 
+    Builder id(String id) {
+      this.id = id;
+      return this;
+    }
+
     public Builder name(String name) {
       this.name = name;
       return this;
@@ -87,6 +104,26 @@ public Builder contentType(String contentType) {
       return this;
     }
 
+    Builder contentDisposition(String contentDisposition) {
+      this.contentDisposition = contentDisposition;
+      return this;
+    }
+
+    Builder contentLanguage(String contentLanguage) {
+      this.contentLanguage = contentLanguage;
+      return this;
+    }
+
+    public Builder contentEncoding(String contentEncoding) {
+      this.contentEncoding = contentEncoding;
+      return this;
+    }
+
+    Builder componentCount(int componentCount) {
+      this.componentCount = componentCount;
+      return this;
+    }
+
     public Builder cacheControl(String cacheControl) {
       this.cacheControl = cacheControl;
       return this;
@@ -97,7 +134,7 @@ public Builder acl(List<Acl> acl) {
       return this;
     }
 
-    public Builder owner(String owner) {
+    public Builder owner(Acl.Entity owner) {
       this.owner = owner;
       return this;
     }
@@ -107,8 +144,13 @@ public Builder size(long size) {
       return this;
     }
 
-    public Builder contentEncoding(String contentEncoding) {
-      this.contentEncoding = contentEncoding;
+    Builder etag(String etag) {
+      this.etag = etag;
+      return this;
+    }
+
+    Builder selfLink(String selfLink) {
+      this.selfLink = selfLink;
       return this;
     }
 
@@ -159,13 +201,19 @@ public ObjectInfo build() {
 
   private ObjectInfo(Builder builder) {
     bucket = builder.bucket;
+    id = builder.id;
     name = builder.name;
-    contentType = builder.contentType;
     cacheControl = builder.cacheControl;
+    contentEncoding = builder.contentEncoding;
+    contentType = builder.contentType;
+    contentDisposition = builder.contentDisposition;
+    contentLanguage = builder.contentLanguage;
+    componentCount = builder.componentCount;
     acl = builder.acl;
     owner = builder.owner;
     size = builder.size;
-    contentEncoding = builder.contentEncoding;
+    etag = builder.etag;
+    selfLink = builder.selfLink;
     md5 = builder.md5;
     crc32c = builder.crc32c;
     mediaLink = builder.mediaLink;
@@ -180,12 +228,12 @@ public String bucket() {
     return bucket;
   }
 
-  public String name() {
-    return name;
+  public String id() {
+    return id;
   }
 
-  public String contentType() {
-    return contentType;
+  public String name() {
+    return name;
   }
 
   public String cacheControl() {
@@ -196,18 +244,42 @@ public List<Acl> acl() {
     return acl;
   }
 
-  public String owner() {
+  public Acl.Entity owner() {
     return owner;
   }
 
   public long size() {
     return size;
   }
 
+  public String contentType() {
+    return contentType;
+  }
+
   public String contentEncoding() {
     return contentEncoding;
   }
 
+  public String contentDisposition() {
+    return contentDisposition;
+  }
+
+  public String contentLanguage() {
+    return contentEncoding;
+  }
+
+  public int componentCount() {
+    return componentCount;
+  }
+
+  public String etag() {
+    return etag;
+  }
+
+  public String selfLink() {
+    return selfLink;
+  }
+
   public String md5() {
     return md5;
   }
@@ -257,8 +329,13 @@ public Builder toBuilder() {
         .name(name)
         .owner(owner)
         .updateTime(updateTime)
-        .size(size);
-
+        .size(size)
+        .contentDisposition(contentDisposition)
+        .componentCount(componentCount)
+        .contentLanguage(contentLanguage)
+        .etag(etag)
+        .id(id)
+        .selfLink(selfLink);
   }
 
   public static Builder builder() {
@@ -286,16 +363,15 @@ public ObjectAccessControl apply(Acl acl) {
     storageObject.setMetadata(metadata);
     storageObject.setMetageneration(metageneration);
     storageObject.setName(name);
-    storageObject.setOwner(owner);
+    storageObject.setOwner(new StorageObject.Owner().setEntity(owner.toPb()));
     storageObject.setUpdated(new DateTime(updateTime));
     storageObject.setSize(BigInteger.valueOf(size));
-    storageObject.setContentDisposition();
-    storageObject.setComponentCount();
-    storageObject.setContentLanguage();
-    storageObject.setEtag();
-    storageObject.setId();
-    storageObject.setSelfLink();
-    storageObject.setStorageClass();
+    storageObject.setContentDisposition(contentDisposition);
+    storageObject.setComponentCount(componentCount);
+    storageObject.setContentLanguage(contentLanguage);
+    storageObject.setEtag(etag);
+    storageObject.setId(id);
+    storageObject.setSelfLink(selfLink);
     return storageObject;
   }
 
@@ -319,16 +395,15 @@ static ObjectInfo fromPb(StorageObject storageObject) {
         .metadata(storageObject.getMetadata())
         .metageneration(storageObject.getMetageneration())
         .name(storageObject.getName())
-        .owner(storageObject.getName())
+        .owner(Acl.Entity.fromPb(storageObject.getOwner().getEntity()))
         .updateTime(storageObject.getUpdated().getValue())
         .size(storageObject.getSize().longValue())
+        .contentDisposition(storageObject.getContentDisposition())
+        .componentCount(storageObject.getComponentCount())
+        .contentLanguage(storageObject.getContentLanguage())
+        .etag(storageObject.getEtag())
+        .id(storageObject.getId())
+        .selfLink(storageObject.getSelfLink())
         .build();
-    storageObject.setContentDisposition();
-    storageObject.setComponentCount();
-    storageObject.setContentLanguage();
-    storageObject.setEtag();
-    storageObject.setId();
-    storageObject.setSelfLink();
-    storageObject.setStorageClass();
   }
 }
