bean converter: support java.util.Collection while provisioning parameter #2069

Author: jknack

jooby/src/main/java/io/jooby/internal/converter/ReflectiveBeanConverter.java

@@ -14,6 +14,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Parameter;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -161,21 +162,21 @@ private static Object value(Parameter parameter, ValueNode node, ValueNode value
     try {
       if (isFileUpload(node, parameter)) {
         Multipart multipart = (Multipart) node;
-        if (List.class.isAssignableFrom(parameter.getType())) {
-          return multipart.files(value.name());
-        } else if (Set.class.isAssignableFrom(parameter.getType())) {
+        if (Set.class.isAssignableFrom(parameter.getType())) {
           return new HashSet<>(multipart.files(value.name()));
+        } else if (Collection.class.isAssignableFrom(parameter.getType())) {
+          return multipart.files(value.name());
         } else if (Optional.class.isAssignableFrom(parameter.getType())) {
           List<FileUpload> files = multipart.files(value.name());
           return files.isEmpty() ? Optional.empty() : Optional.of(files.get(0));
         } else {
           return multipart.file(value.name());
         }
       } else {
-        if (List.class.isAssignableFrom(parameter.getType())) {
-          return value.toList($Types.parameterizedType0(parameter.getParameterizedType()));
-        } else if (Set.class.isAssignableFrom(parameter.getType())) {
+        if (Set.class.isAssignableFrom(parameter.getType())) {
           return value.toSet($Types.parameterizedType0(parameter.getParameterizedType()));
+        } else if (Collection.class.isAssignableFrom(parameter.getType())) {
+          return value.toList($Types.parameterizedType0(parameter.getParameterizedType()));
         } else if (Optional.class.isAssignableFrom(parameter.getType())) {
           return value.toOptional($Types.parameterizedType0(parameter.getParameterizedType()));
         } else {

tests/src/test/java/io/jooby/i2068/Issue2068.java

@@ -8,7 +8,7 @@
 public class Issue2068 {
 
   @ServerTest
-  public void shouldFailIfContextAsServiceWasNotCalled(ServerTestRunner runner) {
+  public void shouldFavorEmptyConstructor(ServerTestRunner runner) {
     runner.define(app -> {
       app.get("/i2068", ctx -> {
         Bean2068 bean = ctx.query(Bean2068.class);

tests/src/test/java/io/jooby/i2069/Bean2069.java

@@ -0,0 +1,16 @@
+package io.jooby.i2069;
+
+import java.util.Collection;
+
+public class Bean2069 {
+
+  private Collection<String> id;
+
+  public Collection<String> getId() {
+    return id;
+  }
+
+  public void setId(Collection<String> id) {
+    this.id = id;
+  }
+}

tests/src/test/java/io/jooby/i2069/Issue2069.java

@@ -0,0 +1,25 @@
+package io.jooby.i2069;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.jooby.i2068.Bean2068;
+import io.jooby.junit.ServerTest;
+import io.jooby.junit.ServerTestRunner;
+
+public class Issue2069 {
+
+  @ServerTest
+  public void shouldSupportCollectionAsQueryParameter(ServerTestRunner runner) {
+    runner.define(app -> {
+      app.get("/i2069", ctx -> {
+        Bean2069 bean = ctx.query(Bean2069.class);
+        return bean.getId();
+      });
+    }).ready(http -> {
+      http.get("/i2069?id=foo.id", rsp -> {
+        assertEquals("[foo.id]", rsp.body().string());
+      });
+    });
+  }
+
+}