---

pongad · web-flow · commit bd90d0ba706f · 2018-02-16T13:44:52.000+11:00
yaml --- r: 9011 b: refs/heads/lesv-patch-1 c: 924301d h: refs/heads/master i: 9009: ab3f219 9007: c73f3d8
diff --git a/[refs] b/[refs]
@@ -66,7 +66,7 @@ refs/tags/v0.22.0: 18b298fe4bfe8ec2f20b0e0bf7ffdcce5cc3c5fe
 refs/heads/vam-google-patch-1: d0c8fee3a4074d0bf7360ce8c4f7f7223d0ee7b9
 refs/heads/vam-google-patch-CODEOWNERS: 2ac1616e25229e51d08a984708ef1918f91a35ee
 refs/heads/danoscarmike-patch-1: 7342a9916bce4ed00002c7202e2a16c5d46afaea
-refs/heads/lesv-patch-1: b6125eb3d111445ee4ba7a379cd4c366ba6ad875
+refs/heads/lesv-patch-1: 924301dc7381ad983ddcdae533f3bd027b55756e
 refs/heads/ml-update-branch: 079dd6610017f5c51b9d1938c12d6d55b61513cf
 refs/heads/vkedia-patch-2: 7d8241388a9769a5c069334761b06c7012c878e7
 refs/heads/vkedia-patch-3: 4d128043acaa7db9160faf439d2ca6104e8a88cb
diff --git a/branches/lesv-patch-1/google-cloud-core/src/main/java/com/google/cloud/Role.java b/branches/lesv-patch-1/google-cloud-core/src/main/java/com/google/cloud/Role.java
@@ -82,15 +82,22 @@ public static Role owner() {
   /**
    * Returns a new role given its string value.
    *
-   * @param value the string value for the role, for example, {@code "roles/viewer"},
-   *     {@code "roles/editor"}, or {@code "roles/owner"}. If this value does not start with the
-   *     role prefix {@code roles/}, the prefix is prepended.
+   * <p>If the value contains no slash character ({@code '/'}), the prefix {@code "roles/""} is
+   * prepended. This slightly simplifies usage for <a
+   * href="https://cloud.google.com/iam/docs/understanding-roles>"predefined roles</a>. For <a
+   * href="https://cloud.google.com/iam/docs/creating-custom-roles">custom roles</a>, call this
+   * method with the fully-qualified name, eg {@code "projects/XXX/roles/YYY"}.
+   *
+   * @param value the string value for the role
    * @see <a href="https://cloud.google.com/iam/docs/viewing-grantable-roles">Viewing the Grantable
    *     Roles on Resources</a>
    */
   public static Role of(String value) {
     checkNotNull(value);
-    return new Role(value.startsWith(ROLE_PREFIX) ? value : ROLE_PREFIX + value);
+    if (!value.contains("/")) {
+      value = ROLE_PREFIX + value;
+    }
+    return new Role(value);
   }
 
   @Override
diff --git a/branches/lesv-patch-1/google-cloud-core/src/test/java/com/google/cloud/RoleTest.java b/branches/lesv-patch-1/google-cloud-core/src/test/java/com/google/cloud/RoleTest.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud;
 
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
 
 import org.junit.Test;
 
@@ -28,28 +28,31 @@ public class RoleTest {
 
   @Test
   public void testOf() {
-    assertEquals("roles/viewer", VIEWER.getValue());
-    assertEquals("roles/editor", EDITOR.getValue());
-    assertEquals("roles/owner", OWNER.getValue());
+    assertThat(VIEWER.getValue()).isEqualTo("roles/viewer");
+    assertThat(EDITOR.getValue()).isEqualTo("roles/editor");
+    assertThat(OWNER.getValue()).isEqualTo("roles/owner");
     compareRoles(VIEWER, Role.of("roles/viewer"));
     compareRoles(EDITOR, Role.of("roles/editor"));
     compareRoles(OWNER, Role.of("roles/owner"));
+
+    String customRole = "projects/foo/roles/bar";
+    assertThat(Role.of(customRole).getValue()).isEqualTo(customRole);
   }
 
 
   @Test
   public void testViewer() {
-    assertEquals("roles/viewer", Role.viewer().getValue());
+    assertThat(Role.viewer().getValue()).isEqualTo("roles/viewer");
   }
 
   @Test
   public void testEditor() {
-    assertEquals("roles/editor", Role.editor().getValue());
+    assertThat(Role.editor().getValue()).isEqualTo("roles/editor");
   }
 
   @Test
   public void testOwner() {
-    assertEquals("roles/owner", Role.owner().getValue());
+    assertThat(Role.owner().getValue()).isEqualTo("roles/owner");
   }
 
   @Test(expected = NullPointerException.class)
@@ -58,9 +61,9 @@ public void testOfNullValue() {
   }
 
   private void compareRoles(Role expected, Role actual) {
-    assertEquals(expected, actual);
-    assertEquals(expected.getValue(), actual.getValue());
-    assertEquals(expected.hashCode(), actual.hashCode());
-    assertEquals(expected.toString(), actual.toString());
+    assertThat(actual).isEqualTo(expected);
+    assertThat(actual.getValue()).isEqualTo(expected.getValue());
+    assertThat(actual.hashCode()).isEqualTo(expected.hashCode());
+    assertThat(actual.toString()).isEqualTo(expected.toString());
   }
 }
