Consistently order fields in Acl, update serialVersionUID

mziccard · mziccard · commit 5376eff36a01 · 2016-09-12T10:53:34.000+02:00
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Acl.java b/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;
