Skip to content

Commit 1d8adec

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 6613 b: refs/heads/tswast-patch-1 c: 3687cb1 h: refs/heads/master i: 6611: 8810cb8
1 parent 2b013e5 commit 1d8adec

4 files changed

Lines changed: 37 additions & 5 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 4899c2711fc266d41c9f4f7535b6919cb5afc5a4
60+
refs/heads/tswast-patch-1: 3687cb16aec0347bad882da69bc961740b118ea3
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

branches/tswast-patch-1/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,41 @@ public Y y() {
4646
}
4747
}
4848

49+
public class ListOptions {
50+
private List<String> filters;
51+
private String pageToken;
52+
53+
private static final ListOptions DEFAULT_INSTANCE = new ListOptions(null, null);
54+
55+
ListOptions(List<String> filters, String pageToken) {
56+
this.filters = filters;
57+
this.pageToken = pageToken;
58+
}
59+
60+
public static ListOptions getDefaultInstance() {
61+
return DEFAULT_INSTANCE;
62+
}
63+
64+
public static ListOptions createListOption(List<String> filters, String pageToken) {
65+
return new ListOptions(filters, pageToken);
66+
}
67+
68+
public String pageToken() {
69+
return pageToken;
70+
}
71+
72+
public List<String> filters() {
73+
return filters;
74+
}
75+
}
76+
4977
Project create(Project project) throws ResourceManagerException;
5078

5179
void delete(String projectId) throws ResourceManagerException;
5280

5381
Project get(String projectId) throws ResourceManagerException;
5482

55-
Tuple<String, Iterable<Project>> list() throws ResourceManagerException;
56-
57-
Tuple<String, Iterable<Project>> list(String filter) throws ResourceManagerException;
83+
Tuple<String, Iterable<Project>> list(ListOptions listOptions) throws ResourceManagerException;
5884

5985
void undelete(String projectId) throws ResourceManagerException;
6086

@@ -64,6 +90,6 @@ public Y y() {
6490

6591
void setIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
6692

67-
List<String> testIamPermissions(String projectId, List<String> permissions)
93+
boolean hasPermissions(String projectId, List<String> permissions)
6894
throws ResourceManagerException;
6995
}

branches/tswast-patch-1/gcloud-java/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
<artifactId>gcloud-java-datastore</artifactId>
2525
<version>${project.version}</version>
2626
</dependency>
27+
<dependency>
28+
<groupId>${project.groupId}</groupId>
29+
<artifactId>gcloud-java-resourcemanager</artifactId>
30+
<version>${project.version}</version>
31+
</dependency>
2732
<dependency>
2833
<groupId>${project.groupId}</groupId>
2934
<artifactId>gcloud-java-storage</artifactId>

branches/tswast-patch-1/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<modules>
6969
<module>gcloud-java-core</module>
7070
<module>gcloud-java-datastore</module>
71+
<module>gcloud-java-resourcemanager</module>
7172
<module>gcloud-java-storage</module>
7273
<module>gcloud-java</module>
7374
<module>gcloud-java-examples</module>

0 commit comments

Comments
 (0)