Update Query Builder to handle collections

Previously the QueryBuilder would only work with arguments that were scalar
values.  This change updates the implementation to notice collections and
render them as comma delimited strings.

Author: nebhale

cloudfoundry-client-spring/src/main/java/org/cloudfoundry/reactor/client/QueryBuilder.java

@@ -23,6 +23,8 @@
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * A builder for Cloud Foundry queries
@@ -52,7 +54,14 @@ public static void augment(UriComponentsBuilder builder, Object instance) {
             Object value = ReflectionUtils.invokeMethod(method, instance);
 
             if (value != null) {
-                builder.queryParam(queryParameter.value(), value);
+
+                if (value instanceof Collection) {
+                    builder.queryParam(queryParameter.value(), ((Collection<?>) value).stream()
+                        .map(Object::toString)
+                        .collect(Collectors.joining(",")));
+                } else {
+                    builder.queryParam(queryParameter.value(), value);
+                }
             }
         }
     }

cloudfoundry-client-spring/src/test/java/org/cloudfoundry/reactor/uaa/tokens/ReactorTokensTest.java

@@ -97,7 +97,8 @@ protected CheckTokenResponse getResponse() {
         protected CheckTokenRequest getValidRequest() {
             return CheckTokenRequest.builder()
                 .token("f9f2f98d88e04ff7bb1f69041d3c0346")
-                .scopes("password.write,scim.userids")
+                .scope("password.write")
+                .scope("scim.userids")
                 .build();
         }
 

cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/tokens/AbstractCheckTokenRequest.java

@@ -20,6 +20,8 @@
 import org.cloudfoundry.QueryParameter;
 import org.immutables.value.Value;
 
+import java.util.List;
+
 /**
  * The request payload for the check token operation
  */
@@ -31,7 +33,7 @@ abstract class AbstractCheckTokenRequest {
      */
     @QueryParameter("scopes")
     @Nullable
-    abstract String getScopes();
+    abstract List<String> getScopes();
 
     /**
      * The token