Skip to content

Commit 249fae8

Browse files
author
Ajay Kannan
committed
Remove spi result enums, change 'update/set' terminology to 'replace'
1 parent c69af1a commit 249fae8

1 file changed

Lines changed: 7 additions & 23 deletions

File tree

gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,9 @@ public enum Permission {
3333
DELETE,
3434
GET,
3535
LIST,
36-
UPDATE,
36+
REPLACE,
3737
GET_IAM_POLICY,
38-
SET_IAM_POLICY
39-
}
40-
41-
public enum DeleteResult {
42-
SUCCESS,
43-
ALREADY_DELETED
44-
}
45-
46-
public enum UndeleteResult {
47-
SUCCESS,
48-
DELETE_IN_PROGRESS,
49-
GONE
50-
}
51-
52-
public enum SetIamPolicyResult {
53-
SUCCESS,
54-
ETAG_NOT_MATCH
38+
REPLACE_IAM_POLICY
5539
}
5640

5741
class Tuple<X, Y> {
@@ -114,22 +98,22 @@ public int pageSize() {
11498

11599
Project create(Project project) throws ResourceManagerException;
116100

117-
DeleteResult delete(String projectId) throws ResourceManagerException;
101+
void delete(String projectId) throws ResourceManagerException;
118102

119103
Project get(String projectId) throws ResourceManagerException;
120104

121105
Tuple<String, Iterable<Project>> list(ListOptions listOptions) throws ResourceManagerException;
122106

123-
UndeleteResult undelete(String projectId) throws ResourceManagerException;
107+
void undelete(String projectId) throws ResourceManagerException;
124108

125-
Project update(Project project) throws ResourceManagerException;
109+
Project replace(Project project) throws ResourceManagerException;
126110

127111
Policy getIamPolicy(String projectId) throws ResourceManagerException;
128112

129-
SetIamPolicyResult setIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
113+
boolean replaceIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
130114

131115
List<Boolean> hasPermissions(String projectId, List<Permission> permissions)
132116
throws ResourceManagerException;
133117

134-
// TODO(ajaykannan): implement "Organization" functionality when available
118+
// TODO(ajaykannan): implement "Organization" functionality when available (issue #319)
135119
}

0 commit comments

Comments
 (0)