Skip to content

Commit 02c6813

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 2039 b: refs/heads/pubsub-alpha c: 249fae8 h: refs/heads/master i: 2037: ddf9e66 2035: 0eb235e 2031: 2e44f85
1 parent 9035098 commit 02c6813

2 files changed

Lines changed: 8 additions & 24 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
6-
refs/heads/pubsub-alpha: c69af1acb3ee4cb24876f1444540c5b543e40c0c
6+
refs/heads/pubsub-alpha: 249fae8f180a61e7a4ef619169c62d45a90b8076
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
88
refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

branches/pubsub-alpha/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)