Merge pull request #15576 from jmartisk/master-issue-15571

Fix GraphQL queries returning Collection.class in native mode
quarkusio · Mar 9, 2021 · 1a00681 · 1a00681
2 parents 75dc8df + 9397de4
commit 1a00681
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/...oyment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/...oyment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
@@ -268,6 +268,7 @@ private Class[] getGraphQLJavaClasses() {
         classes.add(graphql.schema.GraphQLSchema.class);
         classes.add(graphql.schema.GraphQLTypeReference.class);
         classes.add(List.class);
+        classes.add(Collection.class);
         return classes.toArray(new Class[] {});
     }
 

diff --git a/...tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java b/...tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java
@@ -2,6 +2,7 @@
 
 import java.time.LocalTime;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -36,6 +37,13 @@ public Greetings load(Greetings greetings) {
     public List<Greeting> buildInOptions(@Source Greeting greeting) {
         List<Greeting> options = new ArrayList<>();
         options.add(new Hello());
+        return options;
+    }
+
+    @Name("options2")
+    // make sure that returning Collection.class does not break native mode
+    public Collection<Greeting> buildInOptionsCollection(@Source Greeting greeting) {
+        List<Greeting> options = new ArrayList<>();
         options.add(new Morning());
         return options;
     }

diff --git a/...s/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.java b/...s/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.java
@@ -22,6 +22,9 @@ void testEndpoint() {
                 "    options{\n" +
                 "       message\n" +
                 "    }\n" +
+                "    options2{\n" +
+                "       message\n" +
+                "    }\n" +
                 "  }\n" +
                 "  farewell:farewell{\n" +
                 "    type\n" +