Merge pull request #245 from graphql-java-kickstart/bugfix/239-support-arrays

Bugfix/239 support arrays

Author: oliemansm

README.md

@@ -54,11 +54,11 @@ A few libraries exist to ease the boilerplate pain, including [GraphQL-Java's bu
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-java-tools</artifactId>
-    <version>5.4.1</version>
+    <version>5.5.0</version>
 </dependency>
 ```
 ```groovy
-compile 'com.graphql-java-kickstart:graphql-java-tools:5.4.1'
+compile 'com.graphql-java-kickstart:graphql-java-tools:5.5.0'
 ```
 
 New releases will be available faster in the JCenter repository than in Maven Central. Add the following to use for Maven

example/pom.xml

@@ -22,8 +22,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <graphql-spring-boot-starter.version>5.2</graphql-spring-boot-starter.version>
-        <graphql-java-tools.version>5.4.0</graphql-java-tools.version>
+        <graphql-spring-boot-starter.version>5.5.0</graphql-spring-boot-starter.version>
+        <graphql-java-tools.version>5.5.0</graphql-java-tools.version>
         <kotlin.version>1.3.10</kotlin.version>
     </properties>
 

src/main/kotlin/com/coxautodev/graphql/tools/TypeClassMatcher.kt

@@ -78,6 +78,8 @@ internal class TypeClassMatcher(private val definitionsByName: Map<String, TypeD
             is ListType -> {
                 if (realType is ParameterizedType && isListType(realType, potentialMatch)) {
                     match(potentialMatch, graphQLType.type, realType.actualTypeArguments.first())
+                } else if ((realType as Class<*>).isArray) {
+                    match(potentialMatch, graphQLType.type, realType.componentType)
                 } else {
                     throw error(potentialMatch, "Java class is not a List or generic type information was lost: $realType")
                 }

src/test/groovy/com/coxautodev/graphql/tools/EndToEndSpec.groovy

@@ -634,4 +634,20 @@ class EndToEndSpec extends Specification {
             subscriber.requestNextElement().data.get("onItemCreatedCoroutineChannelAndSuspendFunction").id == 1
             subscriber.expectCompletion()
     }
+
+    def "generated schema supports arrays"() {
+        when:
+            def data = Utils.assertNoGraphQlErrors(gql) {
+                '''
+                {
+                    arrayItems {
+                        name
+                    }
+                }
+                '''
+            }
+
+        then:
+            data.arrayItems.collect { it.name } == ['item1', 'item2']
+    }
 }

src/test/java/com/coxautodev/graphql/tools/ReactiveTest.java

@@ -4,26 +4,26 @@
 import graphql.execution.AsyncExecutionStrategy;
 import graphql.schema.GraphQLSchema;
 import groovy.lang.Closure;
-import io.reactivex.Single;
-import io.reactivex.internal.operators.single.SingleJust;
+//import io.reactivex.Single;
+//import io.reactivex.internal.operators.single.SingleJust;
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 
-import static io.reactivex.Maybe.just;
+//import static io.reactivex.Maybe.just;
 
 public class ReactiveTest {
 
     @Test
     public void futureSucceeds() {
         SchemaParserOptions options = SchemaParserOptions.newOptions()
-                .genericWrappers(
-                        new SchemaParserOptions.GenericWrapper(Single.class, 0),
-                        new SchemaParserOptions.GenericWrapper(SingleJust.class, 0)
-                )
+//                .genericWrappers(
+//                        new SchemaParserOptions.GenericWrapper(Single.class, 0),
+//                        new SchemaParserOptions.GenericWrapper(SingleJust.class, 0)
+//                )
                 .build();
         GraphQLSchema schema = SchemaParser.newParser().file("Reactive.graphqls")
                 .resolvers(new Query())

src/test/kotlin/com/coxautodev/graphql/tools/EndToEndSpec.kt

@@ -79,6 +79,8 @@ type Query {
     dataFetcherResult: Item!
 
     coroutineItems: [Item!]!
+
+    arrayItems: [Item!]!
 }
 
 type ExtendedType {
@@ -288,6 +290,8 @@ class Query: GraphQLQueryResolver, ListListResolver<String>() {
     }
 
     suspend fun coroutineItems(): List<Item> = CompletableDeferred(items).await()
+
+    fun arrayItems() = items.toTypedArray()
 }
 
 class UnusedRootResolver: GraphQLQueryResolver

travis-build.sh

@@ -24,6 +24,8 @@ saveMavenSettings() {
 EOL
 }
 
+mvn -B verify
+
 if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then
     saveMavenSettings
     git checkout -f ${TRAVIS_BRANCH}