Handle no project fields are selected on list

googleapis · Feb 25, 2016 · 926241a · 926241a
1 parent 5fea7ce
commit 926241a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/...r/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java b/...r/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
@@ -60,6 +60,7 @@ public class LocalResourceManagerHelper {
       ImmutableSet.of("gzip", "x-gzip");
   private static final Pattern LIST_FIELDS_PATTERN =
       Pattern.compile("(.*?)projects\\((.*?)\\)(.*?)");
+  private static final String[] NO_FIELDS = {};
 
   static {
     try {
@@ -245,6 +246,9 @@ private static Map<String, Object> parseListOptions(String query) throws IOExcep
             if (matcher.matches()) {
               options.put("projectFields", matcher.group(2).split(","));
               options.put("listFields", (matcher.group(1) + matcher.group(3)).split(","));
+            } else {
+              options.put("projectFields", NO_FIELDS);
+              options.put("listFields", argEntry[1].split(","));
             }
             break;
           case "filter":
@@ -393,14 +397,23 @@ Response list(Map<String, Object> options) {
         }
       }
     }
-    StringBuilder responseBody = new StringBuilder();
-    responseBody.append("{\"projects\": [");
-    Joiner.on(",").appendTo(responseBody, projectsSerialized);
-    responseBody.append(']');
     String[] listFields = (String[]) options.get("listFields");
+    StringBuilder responseBody = new StringBuilder();
+    responseBody.append('{');
+    boolean commaNeeded = false;
+    // If fields parameter is set but no project field is selected we must return no projects.
+    if (!(projectFields != null && projectFields.length == 0)) {
+      responseBody.append("\"projects\": [");
+      Joiner.on(",").appendTo(responseBody, projectsSerialized);
+      responseBody.append(']');
+      commaNeeded = true;
+    }
     if (nextPageToken != null && (listFields == null
         || ImmutableSet.copyOf(listFields).contains("nextPageToken"))) {
-      responseBody.append(", \"nextPageToken\": \"");
+      if (commaNeeded) {
+        responseBody.append(",");
+      }
+      responseBody.append("\"nextPageToken\": \"");
       responseBody.append(nextPageToken);
       responseBody.append('"');
     }

diff --git a/...nager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java b/...nager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java
@@ -408,6 +408,23 @@ public void testListNoPageTokenFieldOptions() {
     assertFalse(iterator.hasNext());
   }
 
+  @Test
+  public void testListPageTokenNoFieldsOptions() {
+    Map<ResourceManagerRpc.Option, Object> rpcOptions = new HashMap<>();
+    rpcOptions.put(ResourceManagerRpc.Option.PAGE_SIZE, 1);
+    rpcOptions.put(ResourceManagerRpc.Option.FIELDS, "nextPageToken");
+    rpc.create(PARTIAL_PROJECT);
+    rpc.create(COMPLETE_PROJECT);
+    Tuple<String, Iterable<com.google.api.services.cloudresourcemanager.model.Project>> projects =
+        rpc.list(rpcOptions);
+    assertNotNull(projects.x());
+    assertNull(projects.y());
+    rpcOptions.put(ResourceManagerRpc.Option.PAGE_TOKEN, projects.x());
+    projects = rpc.list(rpcOptions);
+    assertNull(projects.x());
+    assertNull(projects.y());
+  }
+
   @Test
   public void testListFilterOptions() {
     Map<ResourceManagerRpc.Option, Object> rpcFilterOptions = new HashMap<>();