Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Allow colons in Identity values #5029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chingor13 merged 6 commits into from
May 22, 2019
Merged

Allow colons in Identity values #5029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a44af8
Allow colons in Identity values
JesseLovelace Apr 26, 2019
51e9a41
Merge branch 'master' of github.com:googleapis/google-cloud-java
JesseLovelace Apr 29, 2019
b7bfb54
Merge branch 'master' of github.com:googleapis/google-cloud-java
JesseLovelace Apr 30, 2019
ae8c8f5
Merge branch 'master' of github.com:googleapis/google-cloud-java
JesseLovelace Apr 30, 2019
e012739
Merge branch 'master' of github.com:googleapis/google-cloud-java into…
JesseLovelace May 7, 2019
4b3e158
Merge branch 'allowcolonsinids' of github.com:googleapis/google-cloud…
JesseLovelace May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Identity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 7 additions & 5 deletions google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down