---

mziccard · mziccard · commit 389c554f7e21 · 2016-09-12T10:53:34.000+02:00
yaml --- r: 7567 b: refs/heads/tswast-patch-1 c: 5376eff h: refs/heads/master i: 7565: 2066553 7563: eac368c 7559: 9810622 7551: 7ef2d77
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: b0046d0810b955e99f7fbee5e4f84c95ac3854bc
+refs/heads/tswast-patch-1: 5376eff36a01a0707b3741c54497927d7a0929d3
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-storage/src/main/java/com/google/cloud/storage/Acl.java b/branches/tswast-patch-1/google-cloud-storage/src/main/java/com/google/cloud/storage/Acl.java
@@ -34,8 +34,7 @@
  */
 public final class Acl implements Serializable {
 
-  private static final long serialVersionUID = 6435575339887912222L;
-
+  private static final long serialVersionUID = 7516713233557576082L;
   static final Function<ObjectAccessControl, Acl> FROM_OBJECT_PB_FUNCTION =
       new Function<ObjectAccessControl, Acl>() {
         @Override
@@ -51,10 +50,10 @@ public Acl apply(BucketAccessControl aclPb) {
         }
       };
 
-  private final String id;
-  private final String etag;
   private final Entity entity;
   private final Role role;
+  private final String id;
+  private final String etag;
 
   public enum Role {
     OWNER, READER, WRITER
@@ -359,33 +358,33 @@ private Acl(Builder builder) {
   }
 
   /**
-   * Returns the ID of the ACL entry.
+   * Returns the entity for this ACL object.
    */
-  public String id() {
-    return id;
+  public Entity entity() {
+    return entity;
   }
 
   /**
-   * Returns HTTP 1.1 Entity tag for the ACL entry.
-   *
-   * @see <a href="http://tools.ietf.org/html/rfc2616#section-3.11">Entity Tags</a>
+   * Returns the role associated to the entity in this ACL object.
    */
-  public String etag() {
-    return etag;
+  public Role role() {
+    return role;
   }
 
   /**
-   * Returns the entity for this ACL object.
+   * Returns the ID of the ACL entry.
    */
-  public Entity entity() {
-    return entity;
+  public String id() {
+    return id;
   }
 
   /**
-   * Returns the role associated to the entity in this ACL object.
+   * Returns HTTP 1.1 Entity tag for the ACL entry.
+   *
+   * @see <a href="http://tools.ietf.org/html/rfc2616#section-3.11">Entity Tags</a>
    */
-  public Role role() {
-    return role;
+  public String etag() {
+    return etag;
   }
 
   /**
@@ -447,17 +446,17 @@ public boolean equals(Object obj) {
 
   BucketAccessControl toBucketPb() {
     BucketAccessControl bucketPb = new BucketAccessControl();
-    bucketPb.setRole(role().toString());
     bucketPb.setEntity(entity().toString());
+    bucketPb.setRole(role().toString());
     bucketPb.setId(id());
     bucketPb.setEtag(etag());
     return bucketPb;
   }
 
   ObjectAccessControl toObjectPb() {
     ObjectAccessControl objectPb = new ObjectAccessControl();
-    objectPb.setRole(role().name());
     objectPb.setEntity(entity().toPb());
+    objectPb.setRole(role().name());
     objectPb.setId(id());
     objectPb.setEtag(etag());
     return objectPb;
