Skip to content

Commit a313201

Browse files
garrettjonesgooglegarrettjonesgoogle
authored
---
yaml --- r: 5591 b: refs/heads/master c: 67af4bf h: refs/heads/master i: 5589: 0417596 5587: 9cf06c4 5583: c349185
1 parent 4df94df commit a313201

9 files changed

Lines changed: 236 additions & 64 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 101e56ed736e60fa0cf05b411f570b81eddf0680
2+
refs/heads/master: 67af4bfc9be500ef97969fe3a7367a1e5309346f
33
refs/heads/travis: dae77e558b884bc1b165155482d76c8e40b0fca4
44
refs/heads/gh-pages: 049a9668af6afce3b5840dee8be005b0e6b43506
55
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

‎trunk/google-cloud-core/src/main/java/com/google/cloud/Identity.java‎

Lines changed: 64 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21+
import com.google.api.core.ApiFunction;
2122
import com.google.common.base.CaseFormat;
2223

2324
import java.io.Serializable;
@@ -48,52 +49,91 @@ public final class Identity implements Serializable {
4849
/**
4950
* The types of IAM identities.
5051
*/
51-
public enum Type {
52+
public static final class Type extends StringEnumValue {
53+
private static final long serialVersionUID = 3809891273596003916L;
54+
55+
private Type(String constant) {
56+
super(constant);
57+
}
58+
59+
private static final ApiFunction<String, Type> CONSTRUCTOR =
60+
new ApiFunction<String, Type>() {
61+
@Override
62+
public Type apply(String constant) {
63+
return new Type(constant);
64+
}
65+
};
66+
67+
private static final StringEnumType<Type> type = new StringEnumType(
68+
Type.class,
69+
CONSTRUCTOR);
5270

5371
/**
5472
* Represents anyone who is on the internet; with or without a Google account.
5573
*/
56-
ALL_USERS,
74+
public static final Type ALL_USERS = type.createAndRegister("ALL_USERS");
5775

5876
/**
5977
* Represents anyone who is authenticated with a Google account or a service account.
6078
*/
61-
ALL_AUTHENTICATED_USERS,
79+
public static final Type ALL_AUTHENTICATED_USERS = type.createAndRegister("ALL_AUTHENTICATED_USERS");
6280

6381
/**
6482
* Represents a specific Google account.
6583
*/
66-
USER,
84+
public static final Type USER = type.createAndRegister("USER");
6785

6886
/**
6987
* Represents a service account.
7088
*/
71-
SERVICE_ACCOUNT,
89+
public static final Type SERVICE_ACCOUNT = type.createAndRegister("SERVICE_ACCOUNT");
7290

7391
/**
7492
* Represents a Google group.
7593
*/
76-
GROUP,
94+
public static final Type GROUP = type.createAndRegister("GROUP");
7795

7896
/**
7997
* Represents all the users of a Google Apps domain name.
8098
*/
81-
DOMAIN,
82-
99+
public static final Type DOMAIN = type.createAndRegister("DOMAIN");
100+
83101
/**
84102
* Represents owners of a Google Cloud Platform project.
85103
*/
86-
PROJECT_OWNER,
87-
104+
public static final Type PROJECT_OWNER = type.createAndRegister("PROJECT_OWNER");
105+
88106
/**
89107
* Represents editors of a Google Cloud Platform project.
90108
*/
91-
PROJECT_EDITOR,
92-
109+
public static final Type PROJECT_EDITOR = type.createAndRegister("PROJECT_EDITOR");
110+
93111
/**
94112
* Represents viewers of a Google Cloud Platform project.
95113
*/
96-
PROJECT_VIEWER
114+
public static final Type PROJECT_VIEWER = type.createAndRegister("PROJECT_VIEWER");
115+
116+
/**
117+
* Get the Type for the given String constant, and throw an exception if the constant is
118+
* not recognized.
119+
*/
120+
public static Type valueOfStrict(String constant) {
121+
return type.valueOfStrict(constant);
122+
}
123+
124+
/**
125+
* Get the Type for the given String constant, and allow unrecognized values.
126+
*/
127+
public static Type valueOf(String constant) {
128+
return type.valueOf(constant);
129+
}
130+
131+
/**
132+
* Return the known values for Type.
133+
*/
134+
public static Type[] values() {
135+
return type.values();
136+
}
97137
}
98138

99139
private Identity(Type type, String value) {
@@ -225,27 +265,11 @@ public boolean equals(Object obj) {
225265
* {@code Identity} objects to strings for protobuf-generated policies.
226266
*/
227267
public String strValue() {
228-
switch (type) {
229-
case ALL_USERS:
230-
return "allUsers";
231-
case ALL_AUTHENTICATED_USERS:
232-
return "allAuthenticatedUsers";
233-
case USER:
234-
return "user:" + value;
235-
case SERVICE_ACCOUNT:
236-
return "serviceAccount:" + value;
237-
case GROUP:
238-
return "group:" + value;
239-
case DOMAIN:
240-
return "domain:" + value;
241-
case PROJECT_OWNER:
242-
return "projectOwner:" + value;
243-
case PROJECT_EDITOR:
244-
return "projectEditor:" + value;
245-
case PROJECT_VIEWER:
246-
return "projectViewer:" + value;
247-
default:
248-
throw new IllegalStateException("Unexpected identity type: " + type);
268+
String protobufString = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, type.toString());
269+
if (value == null) {
270+
return protobufString;
271+
} else {
272+
return protobufString + ":" + value;
249273
}
250274
}
251275

@@ -256,27 +280,12 @@ public String strValue() {
256280
public static Identity valueOf(String identityStr) {
257281
String[] info = identityStr.split(":");
258282
Type type = Type.valueOf(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, info[0]));
259-
switch (type) {
260-
case ALL_USERS:
261-
return Identity.allUsers();
262-
case ALL_AUTHENTICATED_USERS:
263-
return Identity.allAuthenticatedUsers();
264-
case USER:
265-
return Identity.user(info[1]);
266-
case SERVICE_ACCOUNT:
267-
return Identity.serviceAccount(info[1]);
268-
case GROUP:
269-
return Identity.group(info[1]);
270-
case DOMAIN:
271-
return Identity.domain(info[1]);
272-
case PROJECT_OWNER:
273-
return Identity.projectOwner(info[1]);
274-
case PROJECT_EDITOR:
275-
return Identity.projectEditor(info[1]);
276-
case PROJECT_VIEWER:
277-
return Identity.projectViewer(info[1]);
278-
default:
279-
throw new IllegalStateException("Unexpected identity type " + type);
283+
if (info.length == 1) {
284+
return new Identity(type, null);
285+
} else if (info.length == 2){
286+
return new Identity(type, info[1]);
287+
} else {
288+
throw new IllegalArgumentException("Illegal identity string: \"" + identityStr + "\"");
280289
}
281290
}
282291
}

‎trunk/google-cloud-core/src/main/java/com/google/cloud/StringEnumType.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public EnumT valueOfStrict(String constant) {
6666
* Get the enum object for the given String constant, and allow unrecognized values.
6767
*/
6868
public EnumT valueOf(String constant) {
69+
if (constant == null || constant.isEmpty()) {
70+
throw new IllegalArgumentException("Empty enum constants not allowed.");
71+
}
6972
EnumT value = knownValues.get(constant);
7073
if (value != null) {
7174
return value;

‎trunk/google-cloud-core/src/main/java/com/google/cloud/StringEnumValue.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717

1818
import com.google.api.core.InternalApi;
1919
import com.google.common.base.Preconditions;
20+
import java.io.Serializable;
2021

2122
/**
2223
* This represents a specific instance of a concept having a known set of acceptable String values,
2324
* which can expand later due to new API features. Standard Java enums can't be used in such
2425
* a context.
2526
*/
26-
public abstract class StringEnumValue {
27+
public abstract class StringEnumValue implements Serializable {
28+
private static final long serialVersionUID = 1501809419544297884L;
2729
private final String constant;
2830

2931
/**
@@ -34,6 +36,10 @@ protected StringEnumValue(String constant) {
3436
this.constant = Preconditions.checkNotNull(constant);
3537
}
3638

39+
public String name() {
40+
return constant;
41+
}
42+
3743
@Override
3844
public String toString() {
3945
return constant;

‎trunk/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,21 @@ public void testIdentityToAndFromPb() {
142142
compareIdentities(PROJECT_VIEWER, Identity.valueOf(PROJECT_VIEWER.strValue()));
143143
}
144144

145+
@Test(expected = IllegalArgumentException.class)
146+
public void testValueOfEmpty() {
147+
Identity.valueOf("");
148+
}
149+
150+
@Test(expected = IllegalArgumentException.class)
151+
public void testValueOfThreePart() {
152+
Identity.valueOf("a:b:c");
153+
}
154+
155+
@Test
156+
public void testUnrecognizedToString() {
157+
assertEquals("a:b", Identity.valueOf("a:b").strValue());
158+
}
159+
145160
private void compareIdentities(Identity expected, Identity actual) {
146161
assertEquals(expected, actual);
147162
assertEquals(expected.getType(), actual.getType());

‎trunk/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ public class StringEnumTest {
3030
public ExpectedException expectedException = ExpectedException.none();
3131

3232
public static class Letter extends StringEnumValue {
33+
private static final long serialVersionUID = -1717976087182628526L;
34+
3335
private Letter(String constant) {
3436
super(constant);
3537
}

‎trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/Acl.java‎

Lines changed: 91 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21+
import com.google.api.core.ApiFunction;
2122
import com.google.api.services.storage.model.BucketAccessControl;
2223
import com.google.api.services.storage.model.ObjectAccessControl;
24+
import com.google.cloud.StringEnumType;
25+
import com.google.cloud.StringEnumValue;
2326
import com.google.common.base.Function;
2427
import com.google.common.base.MoreObjects;
2528

@@ -55,8 +58,50 @@ public Acl apply(BucketAccessControl aclPb) {
5558
private final String id;
5659
private final String etag;
5760

58-
public enum Role {
59-
OWNER, READER, WRITER
61+
public static final class Role extends StringEnumValue {
62+
private static final long serialVersionUID = 123037132067643600L;
63+
64+
private Role(String constant) {
65+
super(constant);
66+
}
67+
68+
private static final ApiFunction<String, Role> CONSTRUCTOR =
69+
new ApiFunction<String, Role>() {
70+
@Override
71+
public Role apply(String constant) {
72+
return new Role(constant);
73+
}
74+
};
75+
76+
private static final StringEnumType<Role> type = new StringEnumType(
77+
Role.class,
78+
CONSTRUCTOR);
79+
80+
public static final Role OWNER = type.createAndRegister("OWNER");
81+
public static final Role READER = type.createAndRegister("READER");
82+
public static final Role WRITER = type.createAndRegister("WRITER");
83+
84+
/**
85+
* Get the Role for the given String constant, and throw an exception if the constant is
86+
* not recognized.
87+
*/
88+
public static Role valueOfStrict(String constant) {
89+
return type.valueOfStrict(constant);
90+
}
91+
92+
/**
93+
* Get the Role for the given String constant, and allow unrecognized values.
94+
*/
95+
public static Role valueOf(String constant) {
96+
return type.valueOf(constant);
97+
}
98+
99+
/**
100+
* Return the known values for Role.
101+
*/
102+
public static Role[] values() {
103+
return type.values();
104+
}
60105
}
61106

62107
/**
@@ -305,8 +350,50 @@ public static final class Project extends Entity {
305350
private final ProjectRole projectRole;
306351
private final String projectId;
307352

308-
public enum ProjectRole {
309-
OWNERS, EDITORS, VIEWERS
353+
public static final class ProjectRole extends StringEnumValue {
354+
private static final long serialVersionUID = -8360324311187914382L;
355+
356+
private ProjectRole(String constant) {
357+
super(constant);
358+
}
359+
360+
private static final ApiFunction<String, ProjectRole> CONSTRUCTOR =
361+
new ApiFunction<String, ProjectRole>() {
362+
@Override
363+
public ProjectRole apply(String constant) {
364+
return new ProjectRole(constant);
365+
}
366+
};
367+
368+
private static final StringEnumType<ProjectRole> type = new StringEnumType(
369+
ProjectRole.class,
370+
CONSTRUCTOR);
371+
372+
public static final ProjectRole OWNERS = type.createAndRegister("OWNERS");
373+
public static final ProjectRole EDITORS = type.createAndRegister("EDITORS");
374+
public static final ProjectRole VIEWERS = type.createAndRegister("VIEWERS");
375+
376+
/**
377+
* Get the ProjectRole for the given String constant, and throw an exception if the constant is
378+
* not recognized.
379+
*/
380+
public static ProjectRole valueOfStrict(String constant) {
381+
return type.valueOfStrict(constant);
382+
}
383+
384+
/**
385+
* Get the ProjectRole for the given String constant, and allow unrecognized values.
386+
*/
387+
public static ProjectRole valueOf(String constant) {
388+
return type.valueOf(constant);
389+
}
390+
391+
/**
392+
* Return the known values for ProjectRole.
393+
*/
394+
public static ProjectRole[] values() {
395+
return type.values();
396+
}
310397
}
311398

312399
/**

0 commit comments

Comments
 (0)