Update dependency com.graphql-java:graphql-java to v17

pom.xml

@@ -17,7 +17,7 @@
         <kotlin.version>1.5.0</kotlin.version>
         <kotlin-coroutines.version>1.5.0-native-mt</kotlin-coroutines.version>
         <jackson.version>2.12.4</jackson.version>
-        <graphql-java.version>16.2</graphql-java.version>
+        <graphql-java.version>17.0</graphql-java.version>
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>

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

@@ -319,7 +319,7 @@ class SchemaParser internal constructor(
                     .build()
 
 
-                output.add(schemaGeneratorHelper.buildDirective(directive, graphQLDirective, directiveLocation, runtimeWiring.comparatorRegistry))
+                output.add(schemaGeneratorHelper.buildAppliedDirective(directive, graphQLDirective, directiveLocation, runtimeWiring.comparatorRegistry))
             }
         }
 

src/main/kotlin/graphql/kickstart/tools/directive/SchemaDirectiveWiringEnvironmentImpl.java

@@ -24,7 +24,7 @@
 /*
  * DO NOT EDIT THIS FILE!
  *
- * File copied from com.graphql-java.graphql-java:16.1 without any changes.
+ * File copied from com.graphql-java.graphql-java:17.0 without any changes.
  */
 @Internal
 public class SchemaDirectiveWiringEnvironmentImpl<T extends GraphQLDirectiveContainer> implements SchemaDirectiveWiringEnvironment<T> {

src/main/kotlin/graphql/kickstart/tools/directive/SchemaGeneratorDirectiveHelper.java

@@ -23,6 +23,7 @@
 
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -32,7 +33,7 @@
 /*
  * DO NOT EDIT THIS FILE!
  *
- * File copied from com.graphql-java.graphql-java:16.1 without changes except making the Parameters inner class public.
+ * File copied from com.graphql-java.graphql-java:17.0 without changes except making the Parameters inner class public.
  */
 
 /**
@@ -43,6 +44,34 @@
 @Internal
 public class SchemaGeneratorDirectiveHelper {
 
+    /**
+     * This will return true if something in the RuntimeWiring requires a {@link SchemaDirectiveWiring}.  This is to allow
+     * a shortcut to decide that that we dont need ANY SchemaDirectiveWiring post processing
+     *
+     * @param directiveContainer the element that has directives
+     * @param typeRegistry       the type registry
+     * @param runtimeWiring      the runtime wiring
+     * @param <T>                for two
+     *
+     * @return true if something in the RuntimeWiring requires a {@link SchemaDirectiveWiring}
+     */
+    public static <T extends GraphQLDirectiveContainer> boolean schemaDirectiveWiringIsRequired(T directiveContainer, TypeDefinitionRegistry typeRegistry, RuntimeWiring runtimeWiring) {
+
+        WiringFactory wiringFactory = runtimeWiring.getWiringFactory();
+
+        Map<String, SchemaDirectiveWiring> registeredWiring = runtimeWiring.getRegisteredDirectiveWiring();
+        List<SchemaDirectiveWiring> otherWiring = runtimeWiring.getDirectiveWiring();
+        boolean thereAreSome = !registeredWiring.isEmpty() || !otherWiring.isEmpty();
+        if (thereAreSome) {
+            return true;
+        }
+
+        Parameters params = new Parameters(typeRegistry, runtimeWiring, new HashMap<>(), null);
+        SchemaDirectiveWiringEnvironment<T> env = new SchemaDirectiveWiringEnvironmentImpl<>(directiveContainer, directiveContainer.getDirectives(), null, params);
+        // do they dynamically provide a wiring for this element?
+        return wiringFactory.providesSchemaDirectiveWiring(env);
+    }
+
     public static class Parameters {
         private final TypeDefinitionRegistry typeRegistry;
         private final RuntimeWiring runtimeWiring;

src/main/kotlin/graphql/schema/idl/SchemaGeneratorHelperExt.kt

@@ -4,18 +4,18 @@ import graphql.introspection.Introspection
 import graphql.language.Directive
 import graphql.schema.GraphQLDirective
 import graphql.schema.GraphqlTypeComparatorRegistry
+import graphql.schema.idl.RuntimeWiring.MOCKED_WIRING
+import graphql.schema.idl.SchemaGenerator.Options.defaultOptions
 
 class SchemaGeneratorHelperExt : SchemaGeneratorHelper() {
     // Re-expose a package protected method as public
-    fun buildDirective(directive: Directive,
-                       graphQLDirective: GraphQLDirective,
-                       directiveLocation: Introspection.DirectiveLocation,
-                       comparatorRegistry: GraphqlTypeComparatorRegistry): GraphQLDirective {
-        // Note 1: for now, it seems safe to pass buildCtx = null, since the code path where buildCtx is used,
-        //         is never called (directive.name == graphQLDirective.name is always true, see line with
-        //         directiveDefOpt = FpKit.findOne ...)
-        // Note 2: repeatable directives (new feature in graphql-java 16) likely don't work,
+    fun buildAppliedDirective(directive: Directive,
+                              graphQLDirective: GraphQLDirective,
+                              directiveLocation: Introspection.DirectiveLocation,
+                              comparatorRegistry: GraphqlTypeComparatorRegistry): GraphQLDirective {
+        // Note: repeatable directives (new feature in graphql-java 16) likely don't work,
         //         since we don't pass in the full set of discovered directives
-        return super.buildDirective(null, directive, setOf(graphQLDirective), directiveLocation, comparatorRegistry)
+        val context = BuildContext(TypeDefinitionRegistry(), MOCKED_WIRING, emptyMap(), defaultOptions())
+        return super.buildAppliedDirective(context, directive, setOf(graphQLDirective), directiveLocation, comparatorRegistry)
     }
-}
+}

src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt

@@ -452,11 +452,11 @@ val customScalarId = GraphQLScalarType.newScalar()
             else -> null
         }
 
-        override fun parseValue(input: Any): UUID? = parseLiteral(input)
+        override fun parseValue(input: Any): UUID = parseLiteral(input)
 
-        override fun parseLiteral(input: Any): UUID? = when (input) {
+        override fun parseLiteral(input: Any): UUID = when (input) {
             is StringValue -> UUID.fromString(input.value)
-            else -> null
+            else -> throw CoercingParseLiteralException()
         }
     })
     .build()
@@ -472,11 +472,11 @@ val customScalarUUID = GraphQLScalarType.newScalar()
             else -> null
         }
 
-        override fun parseValue(input: Any): UUID? = parseLiteral(input)
+        override fun parseValue(input: Any): UUID = parseLiteral(input)
 
-        override fun parseLiteral(input: Any): UUID? = when (input) {
+        override fun parseLiteral(input: Any): UUID = when (input) {
             is StringValue -> UUID.fromString(input.value)
-            else -> null
+            else -> throw CoercingParseLiteralException()
         }
     })
     .build()
@@ -487,12 +487,12 @@ val customScalarMap = GraphQLScalarType.newScalar()
     .coercing(object : Coercing<Map<String, Any>, Map<String, Any>> {
 
         @Suppress("UNCHECKED_CAST")
-        override fun parseValue(input: Any?): Map<String, Any> = input as Map<String, Any>
+        override fun parseValue(input: Any): Map<String, Any> = input as Map<String, Any>
 
         @Suppress("UNCHECKED_CAST")
-        override fun serialize(dataFetcherResult: Any?): Map<String, Any> = dataFetcherResult as Map<String, Any>
+        override fun serialize(dataFetcherResult: Any): Map<String, Any> = dataFetcherResult as Map<String, Any>
 
-        override fun parseLiteral(input: Any?): Map<String, Any> = (input as ObjectValue).objectFields.associateBy { it.name }.mapValues { (it.value.value as StringValue).value }
+        override fun parseLiteral(input: Any): Map<String, Any> = (input as ObjectValue).objectFields.associateBy { it.name }.mapValues { (it.value.value as StringValue).value }
     })
     .build()
 
@@ -505,21 +505,18 @@ val uploadScalar: GraphQLScalarType = GraphQLScalarType.newScalar()
             throw CoercingSerializeException("Upload is an input-only type")
         }
 
-        override fun parseValue(input: Any?): Part? {
+        override fun parseValue(input: Any): Part {
             return when (input) {
                 is Part -> {
                     input
                 }
-                null -> {
-                    null
-                }
                 else -> {
                     throw CoercingParseValueException("Expected type ${Part::class.java.name} but was ${input.javaClass.name}")
                 }
             }
         }
 
-        override fun parseLiteral(input: Any): Part? {
+        override fun parseLiteral(input: Any): Part {
             throw CoercingParseLiteralException(
                 "Must use variables to specify Upload values")
         }

src/test/kotlin/graphql/kickstart/tools/MethodFieldResolverTest.kt

@@ -4,6 +4,8 @@ import graphql.ExecutionInput
 import graphql.GraphQL
 import graphql.language.StringValue
 import graphql.schema.Coercing
+import graphql.schema.CoercingParseLiteralException
+import graphql.schema.CoercingSerializeException
 import graphql.schema.GraphQLScalarType
 import org.junit.Test
 import java.lang.reflect.InvocationHandler
@@ -215,9 +217,9 @@ class MethodFieldResolverTest {
         val value get() = internalValue
 
         companion object {
-            fun of(input: Any?) = when (input) {
+            fun of(input: Any) = when (input) {
                 is String -> CustomScalar(input)
-                else -> null
+                else -> throw IllegalArgumentException()
             }
         }
     }
@@ -231,16 +233,16 @@ class MethodFieldResolverTest {
         .description("customScalar")
         .coercing(object : Coercing<CustomScalar, String> {
 
-            override fun parseValue(input: Any?) = CustomScalar.of(input)
+            override fun parseValue(input: Any) = CustomScalar.of(input)
 
-            override fun parseLiteral(input: Any?) = when (input) {
+            override fun parseLiteral(input: Any): CustomScalar = when (input) {
                 is StringValue -> CustomScalar.of(input.value)
-                else -> null
+                else -> throw CoercingParseLiteralException()
             }
 
-            override fun serialize(dataFetcherResult: Any?) = when (dataFetcherResult) {
+            override fun serialize(dataFetcherResult: Any) = when (dataFetcherResult) {
                 is CustomScalar -> dataFetcherResult.value
-                else -> null
+                else -> throw CoercingSerializeException()
             }
         })
         .build()

src/test/kotlin/graphql/kickstart/tools/SchemaClassScannerTest.kt

@@ -185,9 +185,9 @@ class SchemaClassScannerTest {
                 .name("UUID")
                 .description("Test scalars with duplicate types")
                 .coercing(object : Coercing<Any, Any> {
-                    override fun serialize(dataFetcherResult: Any?): Any? = null
-                    override fun parseValue(input: Any?): Any? = null
-                    override fun parseLiteral(input: Any?): Any? = null
+                    override fun serialize(dataFetcherResult: Any): Any? = null
+                    override fun parseValue(input: Any): Any = input
+                    override fun parseLiteral(input: Any): Any = input
                 }).build())
             .schemaString(
                 """
@@ -306,9 +306,9 @@ class SchemaClassScannerTest {
         val customMap = GraphQLScalarType.newScalar()
             .name("customMap")
             .coercing(object : Coercing<Map<String, Any>, Map<String, Any>> {
-                override fun serialize(dataFetcherResult: Any?): Map<String, Any> = mapOf()
-                override fun parseValue(input: Any?): Map<String, Any> = mapOf()
-                override fun parseLiteral(input: Any?): Map<String, Any> = mapOf()
+                override fun serialize(dataFetcherResult: Any): Map<String, Any> = mapOf()
+                override fun parseValue(input: Any): Map<String, Any> = mapOf()
+                override fun parseLiteral(input: Any): Map<String, Any> = mapOf()
             }).build()
 
         val schema = SchemaParser.newParser()

src/test/resources/Place.graphqls

@@ -18,18 +18,18 @@ interface OtherPlace {
   reviews: [Review!]
 }
 
-type Place1 implements Entity, Place, OtherPlace {
-  id: ID!
-  name: String
-  other: String
-  reviews: [Review1!]
-}
-
-type Place2 implements Entity, Place, OtherPlace {
-  id: ID!
-  name: String
-  other: String
-  reviews: [Review2!]
+type Place1 implements Entity & Place & OtherPlace {
+    id: ID!
+    name: String
+    other: String
+    reviews: [Review1!]
+}
+
+type Place2 implements Entity & Place & OtherPlace {
+    id: ID!
+    name: String
+    other: String
+    reviews: [Review2!]
 }
 
 interface Review {