---

JesseLovelace · chingor13 · commit 497578ec5dd0 · 2019-05-22T13:51:31.000-07:00
yaml --- r: 35345 b: refs/heads/pubsub-ordering-keys c: fff25ba h: refs/heads/master i: 35343: b12b50d
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 720d90171cd515c21a21f9f8f17d638ff67ec09c
+refs/heads/pubsub-ordering-keys: fff25ba885353dd4c9499d9084e4463291c72c9a
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Identity.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Identity.java
@@ -255,7 +255,7 @@ public String strValue() {
    * policy identities to {@code Identity} objects.
    */
   public static Identity valueOf(String identityStr) {
-    String[] info = identityStr.split(":");
+    String[] info = identityStr.split(":", 2);
     Type type = Type.valueOf(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, info[0]));
     if (info.length == 1) {
       return new Identity(type, null);
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java
@@ -141,16 +141,18 @@ public void testValueOfEmpty() {
     Identity.valueOf("");
   }
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testValueOfThreePart() {
-    Identity.valueOf("a:b:c");
-  }
-
   @Test
   public void testUnrecognizedToString() {
     assertEquals("a:b", Identity.valueOf("a:b").strValue());
   }
 
+  @Test
+  public void testValueOfThreePart() {
+    Identity identity = Identity.valueOf("a:b:c");
+    assertEquals("A", identity.getType().name());
+    assertEquals("b:c", identity.getValue());
+  }
+
   private void compareIdentities(Identity expected, Identity actual) {
     assertEquals(expected, actual);
     assertEquals(expected.getType(), actual.getType());
