Merge branch 'master' into KammererTob_master

# Conflicts:
#	src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy

Author: Oryan M

pom.xml

@@ -14,10 +14,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <kotlin.version>1.3.72</kotlin.version>
-        <kotlin-coroutines.version>1.3.9</kotlin-coroutines.version>
+        <kotlin.version>1.4.21</kotlin.version>
+        <kotlin-coroutines.version>1.4.2</kotlin-coroutines.version>
         <jackson.version>2.10.3</jackson.version>
-        <graphql-java.version>16.1</graphql-java.version>
+        <graphql-java.version>16.2</graphql-java.version>
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
@@ -155,9 +155,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-            <version>1.0-groovy-2.4</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -209,7 +209,6 @@
                         <configuration>
                             <sources>
                                 <source>src/test/kotlin</source>
-                                <source>src/test/groovy</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -240,23 +239,6 @@
             </plugin>
 
 
-            <!-- Compile Groovy tests -->
-            <plugin>
-                <groupId>org.codehaus.gmavenplus</groupId>
-                <artifactId>gmavenplus-plugin</artifactId>
-                <version>1.5</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generateStubs</goal>
-                            <goal>testGenerateStubs</goal>
-                            <goal>addTestSources</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -279,7 +261,6 @@
                 </dependencies>
                 <configuration>
                     <includes>
-                        <include>**/*Spec.*</include>
                         <include>**/*Test.*</include>
                     </includes>
                 </configuration>

src/main/kotlin/graphql/kickstart/tools/SchemaClassScanner.kt

@@ -333,26 +333,29 @@ internal class SchemaClassScanner(
             }
 
             is InputObjectTypeDefinition -> {
-                graphQLType.inputValueDefinitions.forEach { inputValueDefinition ->
-                    val inputGraphQLType = inputValueDefinition.type.unwrap()
-                    if (inputGraphQLType is TypeName && !ScalarInfo.GRAPHQL_SPECIFICATION_SCALARS_DEFINITIONS.containsKey(inputGraphQLType.name)) {
-                        val inputValueJavaType = findInputValueType(inputValueDefinition.name, inputGraphQLType, javaType.unwrap())
-                        if (inputValueJavaType != null) {
-                            handleFoundType(typeClassMatcher.match(TypeClassMatcher.PotentialMatch.parameterType(
-                                inputValueDefinition.type,
-                                inputValueJavaType,
-                                GenericType(javaType, options).relativeToType(inputValueJavaType),
-                                InputObjectReference(inputValueDefinition)
-                            )))
-                        } else {
-                            var mappingAdvice = "Try adding it manually to the dictionary"
-                            if (javaType.unwrap().name.contains("Map")) {
-                                mappingAdvice = " or add a class to represent your input type instead of a Map."
+                val inputObjectTypes = listOf(graphQLType) + inputExtensionDefinitions.filter { it.name == graphQLType.name }
+                inputObjectTypes
+                    .flatMap { it.inputValueDefinitions }
+                    .forEach { inputValueDefinition ->
+                        val inputGraphQLType = inputValueDefinition.type.unwrap()
+                        if (inputGraphQLType is TypeName && !ScalarInfo.GRAPHQL_SPECIFICATION_SCALARS_DEFINITIONS.containsKey(inputGraphQLType.name)) {
+                            val inputValueJavaType = findInputValueType(inputValueDefinition.name, inputGraphQLType, javaType.unwrap())
+                            if (inputValueJavaType != null) {
+                                handleFoundType(typeClassMatcher.match(TypeClassMatcher.PotentialMatch.parameterType(
+                                    inputValueDefinition.type,
+                                    inputValueJavaType,
+                                    GenericType(javaType, options).relativeToType(inputValueJavaType),
+                                    InputObjectReference(inputValueDefinition)
+                                )))
+                            } else {
+                                var mappingAdvice = "Try adding it manually to the dictionary"
+                                if (javaType.unwrap().name.contains("Map")) {
+                                    mappingAdvice = " or add a class to represent your input type instead of a Map."
+                                }
+                                log.warn("Cannot find definition for field '${inputValueDefinition.name}: ${inputGraphQLType.name}' on input type '${graphQLType.name}' -> ${javaType.unwrap().name}. $mappingAdvice")
                             }
-                            log.warn("Cannot find definition for field '${inputValueDefinition.name}: ${inputGraphQLType.name}' on input type '${graphQLType.name}' -> ${javaType.unwrap().name}. $mappingAdvice")
                         }
                     }
-                }
             }
         }
     }

src/main/kotlin/graphql/kickstart/tools/relay/RelayConnectionFactory.kt

@@ -6,12 +6,18 @@ import graphql.language.*
 class RelayConnectionFactory : TypeDefinitionFactory {
 
     override fun create(existing: MutableList<Definition<*>>): List<Definition<*>> {
+        val connectionDirectives = findConnectionDirectives(existing)
+        if (connectionDirectives.isEmpty()) {
+            // do not add Relay definitions unless needed
+            return emptyList()
+        }
+
         val definitions = mutableListOf<Definition<*>>()
         val definitionsByName = existing.filterIsInstance<TypeDefinition<*>>()
             .associateBy { it.name }
             .toMutableMap()
 
-        findConnectionDirectives(existing)
+        connectionDirectives
             .flatMap { createDefinitions(it) }
             .forEach {
                 if (!definitionsByName.containsKey(it.name)) {