Minor fixes

Author: Ajay Kannan

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java

@@ -73,7 +73,7 @@ public enum Type {
        * <li>Set up billing (for a project).
        * </ul>
        */
-      OWNER;
+      OWNER
     }
 
     private static final long serialVersionUID = 2421978909244287488L;
@@ -134,12 +134,16 @@ static Role fromStr(String roleStr) {
 
     @Override
     public final int hashCode() {
-      return Objects.hash(value);
+      return Objects.hash(value, type);
     }
 
     @Override
     public final boolean equals(Object obj) {
-      return obj instanceof Role && Objects.equals(value, ((Role) obj).value());
+      if (!(obj instanceof Role)) {
+        return false;
+      }
+      Role other = (Role) obj;
+      return Objects.equals(value, other.value()) && Objects.equals(type, other.type());
     }
   }
 

gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java

@@ -17,6 +17,7 @@
 package com.google.gcloud.resourcemanager;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNull;
 
 import com.google.common.collect.ImmutableSet;
@@ -63,4 +64,16 @@ public void testRoleType() {
     assertEquals(Type.VIEWER, Role.viewer().type());
     assertNull(Role.rawRole("raw-role").type());
   }
+
+  @Test
+  public void testEquals() {
+    Policy copy = Policy.builder()
+        .addBinding(Role.owner(), ImmutableSet.of(USER))
+        .addBinding(Role.viewer(), ImmutableSet.of(ALL_USERS))
+        .addBinding(Role.editor(), ImmutableSet.of(ALL_AUTH_USERS, DOMAIN))
+        .addBinding(Role.rawRole("some-role"), ImmutableSet.of(SERVICE_ACCOUNT, GROUP))
+        .build();
+    assertEquals(SIMPLE_POLICY, copy);
+    assertNotEquals(SIMPLE_POLICY, FULL_POLICY);
+  }
 }