---

mziccard · mziccard · commit 69ee68ee115b · 2016-02-25T23:09:18.000+01:00
yaml --- r: 4547 b: refs/heads/logging-alpha c: a62c69d h: refs/heads/master i: 4545: 54fff2a 4543: 6f46d92
diff --git a/[refs] b/[refs]
@@ -12,7 +12,7 @@ refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
 refs/heads/gcs-nio: 283aeaf15efdcf3621eb6859f05e55ad7764375d
-refs/heads/logging-alpha: 5fea7ce3b1796f8dea70286a6fbfd2ed7ed0eed9
+refs/heads/logging-alpha: a62c69dec52fcb1248c173fa3f2e104af9473048
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
 refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f
diff --git a/branches/logging-alpha/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java b/branches/logging-alpha/gcloud-java-resourcemanager/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/branches/logging-alpha/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java b/branches/logging-alpha/gcloud-java-resourcemanager/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<>();
