Update to GraphQL Java 11 (#93)

Resolves #92

Author: dariuszkuc

example/pom.xml

@@ -63,7 +63,7 @@
         <kotlin.version>1.3.11</kotlin.version>
         <junit.version>4.12</junit.version>
         <graphiql.version>5.0.2</graphiql.version>
-        <graphql-kotlin.version>0.0.25</graphql-kotlin.version>
+        <graphql-kotlin.version>0.0.26-SNAPSHOT</graphql-kotlin.version>
         <graphql-servlet.version>6.1.2</graphql-servlet.version>
     </properties>
 

example/src/main/kotlin/com.expedia.graphql.sample/dataFetchers/SpringDataFetcherFactory.kt

@@ -1,9 +1,11 @@
 package com.expedia.graphql.sample.dataFetchers
 
-import com.expedia.graphql.schema.extensions.deepName
 import graphql.schema.DataFetcher
 import graphql.schema.DataFetcherFactory
 import graphql.schema.DataFetcherFactoryEnvironment
+import graphql.schema.GraphQLList
+import graphql.schema.GraphQLNonNull
+import graphql.schema.GraphQLType
 import org.springframework.beans.factory.BeanFactory
 import org.springframework.beans.factory.BeanFactoryAware
 import org.springframework.stereotype.Component
@@ -22,5 +24,12 @@ class SpringDataFetcherFactory: DataFetcherFactory<Any>, BeanFactoryAware {
         val targetedTypeName = environment?.fieldDefinition?.type?.deepName?.removeSuffix("!")?.removeSuffix("Input")
         return beanFactory.getBean("${targetedTypeName}DataFetcher") as DataFetcher<Any>
     }
+}
 
-}
+// keeping it internal
+internal val GraphQLType.deepName: String
+    get() = when {
+        this is GraphQLNonNull -> "${this.wrappedType.deepName}!"
+        this is GraphQLList -> "[${this.wrappedType.deepName}]"
+        else -> name
+    }

example/src/main/kotlin/com.expedia.graphql.sample/query/NestedQueries.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component
 
 @Component
 class NestedQueries : Query {
-    fun findAnimal(context: String): NestedAnimal = NestedAnimal(1, "cat")
+    fun findAnimal(): NestedAnimal = NestedAnimal(1, "cat")
 }
 
 data class NestedAnimal(

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.expedia.www</groupId>
     <artifactId>graphql-kotlin</artifactId>
-    <version>0.0.25-SNAPSHOT</version>
+    <version>0.0.26-SNAPSHOT</version>
     <name>graphql-kotlin</name>
     <description>Code-only GraphQL schema generation for Kotlin</description>
     <url>https://github.com/ExpediaDotCom/graphql-kotlin</url>
@@ -73,7 +73,7 @@
         <!-- Project Versions -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <graphql-java.version>10.0</graphql-java.version>
+        <graphql-java.version>11.0</graphql-java.version>
 
         <!-- kotlin -->
         <kotlin.version>1.3.11</kotlin.version>

src/main/kotlin/com/expedia/graphql/schema/generator/directive/DirectiveWiringHelper.kt

@@ -23,7 +23,7 @@ import graphql.schema.idl.WiringFactory
  * Based on
  * https://github.com/graphql-java/graphql-java/blob/master/src/main/java/graphql/schema/idl/SchemaGeneratorDirectiveHelper.java
  */
-internal class DirectiveWiringHelper(private val wiringFactory: WiringFactory, private val manualWiring: Map<String, SchemaDirectiveWiring> = mutableMapOf()) {
+class DirectiveWiringHelper(private val wiringFactory: WiringFactory, private val manualWiring: Map<String, SchemaDirectiveWiring> = mutableMapOf()) {
 
     /**
      * Wire up the directive based on the GraphQL type

src/test/kotlin/com/expedia/graphql/schema/extensions/GraphQLTypeExtensionsTest.kt

@@ -3,13 +3,18 @@ package com.expedia.graphql.schema.extensions
 import graphql.schema.GraphQLList
 import graphql.schema.GraphQLNonNull
 import graphql.schema.GraphQLType
+import graphql.schema.GraphQLTypeVisitor
+import graphql.util.TraversalControl
+import graphql.util.TraverserContext
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 internal class GraphQLTypeExtensionsTest {
 
     private class BasicType : GraphQLType {
         override fun getName() = "BasicType"
+
+        override fun accept(context: TraverserContext<GraphQLType>, visitor: GraphQLTypeVisitor): TraversalControl = context.thisNode().accept(context, visitor)
     }
 
     private val basicType = BasicType()

src/test/kotlin/com/expedia/graphql/schema/generator/TypesCacheTest.kt

@@ -2,6 +2,9 @@ package com.expedia.graphql.schema.generator
 
 import com.expedia.graphql.schema.generator.models.KGraphQLType
 import graphql.schema.GraphQLType
+import graphql.schema.GraphQLTypeVisitor
+import graphql.util.TraversalControl
+import graphql.util.TraverserContext
 import org.junit.jupiter.api.Test
 import kotlin.reflect.full.starProjectedType
 import kotlin.test.assertEquals
@@ -14,8 +17,17 @@ class TypesCacheTest {
 
     internal data class MyType(val id: Int = 0)
 
-    private val graphQLType: GraphQLType = GraphQLType { "MyType" }
-    private val secondGraphQLType: GraphQLType = GraphQLType { "MySecondType" }
+    private val graphQLType: GraphQLType = object : GraphQLType {
+        override fun getName(): String = "MyType"
+
+        override fun accept(context: TraverserContext<GraphQLType>, visitor: GraphQLTypeVisitor): TraversalControl = context.thisNode().accept(context, visitor)
+    }
+
+    private val secondGraphQLType: GraphQLType = object : GraphQLType {
+        override fun getName(): String = "MySecondType"
+
+        override fun accept(context: TraverserContext<GraphQLType>, visitor: GraphQLTypeVisitor): TraversalControl = context.thisNode().accept(context, visitor)
+    }
 
     @Test
     fun `basic get and put with non input type`() {

src/test/kotlin/com/expedia/graphql/schema/generator/directive/DirectiveWiringHelperTest.kt

@@ -1,6 +1,7 @@
 package com.expedia.graphql.schema.generator.directive
 
 import com.expedia.graphql.schema.exceptions.GraphQLKotlinException
+import graphql.Scalars
 import graphql.schema.GraphQLArgument
 import graphql.schema.GraphQLDirective
 import graphql.schema.GraphQLDirectiveContainer
@@ -12,12 +13,16 @@ import graphql.schema.GraphQLInputObjectType
 import graphql.schema.GraphQLInterfaceType
 import graphql.schema.GraphQLList
 import graphql.schema.GraphQLObjectType
+import graphql.schema.GraphQLOutputType
 import graphql.schema.GraphQLScalarType
 import graphql.schema.GraphQLType
+import graphql.schema.GraphQLTypeVisitor
 import graphql.schema.GraphQLUnionType
 import graphql.schema.idl.SchemaDirectiveWiring
 import graphql.schema.idl.SchemaDirectiveWiringEnvironment
 import graphql.schema.idl.WiringFactory
+import graphql.util.TraversalControl
+import graphql.util.TraverserContext
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
@@ -115,6 +120,8 @@ internal class DirectiveWiringHelperTest {
             override fun getName(): String = "MyCustomType"
 
             override fun getDirectives(): MutableList<GraphQLDirective> = mutableListOf(graphQLDirective)
+
+            override fun accept(context: TraverserContext<GraphQLType>, visitor: GraphQLTypeVisitor): TraversalControl = context.thisNode().accept(context, visitor)
         }
 
         val manualWiringMap = mapOf("MyDirective" to InvalidWiring())
@@ -166,12 +173,18 @@ internal class DirectiveWiringHelperTest {
     fun `An field with directives and arguments with no directives`() {
         val arugment = GraphQLArgument.newArgument()
             .name("MyArgument")
-            .type { "GraphQLEnum" }
+            .type(Scalars.GraphQLString)
             .build()
 
         val field = GraphQLFieldDefinition.newFieldDefinition()
             .name("MyField")
-            .type { "GraphQLField" }
+            .type(
+                object : GraphQLOutputType {
+                    override fun getName(): String = "GraphQLField"
+
+                    override fun accept(context: TraverserContext<GraphQLType>, visitor: GraphQLTypeVisitor): TraversalControl = context.thisNode().accept(context, visitor)
+                }
+            )
             .argument(arugment)
             .withDirective(graphQLDirective)
             .build()
@@ -190,13 +203,19 @@ internal class DirectiveWiringHelperTest {
     fun `An field with arguments that has directives`() {
         val arugment = GraphQLArgument.newArgument()
             .name("MyArgument")
-            .type { "GraphQLEnum" }
+            .type(Scalars.GraphQLString)
             .withDirective(graphQLDirective)
             .build()
 
         val field = GraphQLFieldDefinition.newFieldDefinition()
             .name("MyField")
-            .type { "GraphQLField" }
+            .type(
+                    object : GraphQLOutputType {
+                        override fun getName(): String = "GraphQLField"
+
+                        override fun accept(context: TraverserContext<GraphQLType>, visitor: GraphQLTypeVisitor): TraversalControl = context.thisNode().accept(context, visitor)
+                    }
+            )
             .argument(arugment)
             .build()
 

src/test/kotlin/com/expedia/graphql/schema/generator/models/KGraphQLTypeTest.kt

@@ -1,14 +1,21 @@
 package com.expedia.graphql.schema.generator.models
 
 import graphql.schema.GraphQLType
+import graphql.schema.GraphQLTypeVisitor
+import graphql.util.TraversalControl
+import graphql.util.TraverserContext
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
 internal class KGraphQLTypeTest {
 
     @Suppress("Detekt.UnusedPrivateClass")
     private data class MyType(val id: Int = 0)
-    private val graphQLType = GraphQLType { "MyType" }
+    private val graphQLType = object : GraphQLType {
+        override fun getName(): String = "MyType"
+
+        override fun accept(context: TraverserContext<GraphQLType>, visitor: GraphQLTypeVisitor): TraversalControl = context.thisNode().accept(context, visitor)
+    }
 
     @Test
     fun `properties are set`() {