Fixes to the ResourceManagerRpc layer, and also add resource manager to pom files

Ajay Kannan · Ajay Kannan · commit 3687cb16aec0 · 2015-12-21T09:15:57.000-08:00
spi api fixes
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
@@ -46,15 +46,41 @@ public Y y() {
     }
   }
 
+  public class ListOptions {
+    private List<String> filters;
+    private String pageToken;
+
+    private static final ListOptions DEFAULT_INSTANCE = new ListOptions(null, null);
+
+    ListOptions(List<String> filters, String pageToken) {
+      this.filters = filters;
+      this.pageToken = pageToken;
+    }
+
+    public static ListOptions getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    public static ListOptions createListOption(List<String> filters, String pageToken) {
+      return new ListOptions(filters, pageToken);
+    }
+
+    public String pageToken() {
+      return pageToken;
+    }
+
+    public List<String> filters() {
+      return filters;
+    }
+  }
+
   Project create(Project project) throws ResourceManagerException;
 
   void delete(String projectId) throws ResourceManagerException;
 
   Project get(String projectId) throws ResourceManagerException;
 
-  Tuple<String, Iterable<Project>> list() throws ResourceManagerException;
-
-  Tuple<String, Iterable<Project>> list(String filter) throws ResourceManagerException;
+  Tuple<String, Iterable<Project>> list(ListOptions listOptions) throws ResourceManagerException;
 
   void undelete(String projectId) throws ResourceManagerException;
 
@@ -64,6 +90,6 @@ public Y y() {
 
   void setIamPolicy(String projectId, Policy policy) throws ResourceManagerException;
 
-  List<String> testIamPermissions(String projectId, List<String> permissions)
+  boolean hasPermissions(String projectId, List<String> permissions)
       throws ResourceManagerException;
 }
diff --git a/gcloud-java/pom.xml b/gcloud-java/pom.xml
@@ -24,6 +24,11 @@
       <artifactId>gcloud-java-datastore</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>gcloud-java-resourcemanager</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>gcloud-java-storage</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -68,6 +68,7 @@
   <modules>
     <module>gcloud-java-core</module>
     <module>gcloud-java-datastore</module>
+    <module>gcloud-java-resourcemanager</module>
     <module>gcloud-java-storage</module>
     <module>gcloud-java</module>
     <module>gcloud-java-examples</module>
