Merge branch 'master' into bugfix/344

Author: oryan-block

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-java-tools</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
+    <version>6.3.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>GraphQL Java Tools</name>
@@ -17,14 +17,25 @@
         <kotlin.version>1.3.72</kotlin.version>
         <kotlin-coroutines.version>1.3.9</kotlin-coroutines.version>
         <jackson.version>2.10.3</jackson.version>
-        <graphql-java.version>15.0</graphql-java.version>
+        <graphql-java.version>16.1</graphql-java.version>
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <useReleaseProfile>false</useReleaseProfile>
         <project.scm.id>github</project.scm.id>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <!-- graphql-java defines this dependency as 'runtime', but we need it at compile time -->
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-runtime</artifactId>
+                <scope>compile</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -112,7 +123,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
+            <version>1.7.30</version>
         </dependency>
 
         <!-- Optional for supporting spring proxies -->

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

@@ -10,7 +10,7 @@ import graphql.language.*
 import graphql.schema.*
 import graphql.schema.idl.RuntimeWiring
 import graphql.schema.idl.ScalarInfo
-import graphql.schema.idl.SchemaGeneratorHelper
+import graphql.schema.idl.SchemaGeneratorHelperExt
 import graphql.schema.visibility.NoIntrospectionGraphqlFieldVisibility
 import org.slf4j.LoggerFactory
 import kotlin.reflect.KClass
@@ -58,7 +58,7 @@ class SchemaParser internal constructor(
 
     private val codeRegistryBuilder = GraphQLCodeRegistry.newCodeRegistry()
 
-    private val schemaGeneratorHelper = SchemaGeneratorHelper()
+    private val schemaGeneratorHelper = SchemaGeneratorHelperExt()
     private val schemaGeneratorDirectiveHelper = SchemaGeneratorDirectiveHelper()
     private val schemaDirectiveParameters = SchemaGeneratorDirectiveHelper.Parameters(null, runtimeWiring, null, codeRegistryBuilder)
 
@@ -314,7 +314,7 @@ class SchemaParser internal constructor(
                     .build()
 
 
-                output.add(schemaGeneratorHelper.buildDirective(directive, setOf(graphQLDirective), directiveLocation, runtimeWiring.comparatorRegistry))
+                output.add(schemaGeneratorHelper.buildDirective(directive, graphQLDirective, directiveLocation, runtimeWiring.comparatorRegistry))
             }
         }
 

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

@@ -3,7 +3,14 @@
 import graphql.Internal;
 import graphql.language.NamedNode;
 import graphql.language.NodeParentTree;
-import graphql.schema.*;
+import graphql.schema.DataFetcher;
+import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLCodeRegistry;
+import graphql.schema.GraphQLDirective;
+import graphql.schema.GraphQLDirectiveContainer;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLFieldsContainer;
+import graphql.schema.GraphqlElementParentTree;
 import graphql.schema.idl.SchemaDirectiveWiringEnvironment;
 import graphql.schema.idl.TypeDefinitionRegistry;
 import graphql.util.FpKit;
@@ -17,14 +24,14 @@
 /*
  * DO NOT EDIT THIS FILE!
  *
- * File copied from com.graphql-java.graphql-java:15.0 without any changes.
+ * File copied from com.graphql-java.graphql-java:16.1 without any changes.
  */
 @Internal
 public class SchemaDirectiveWiringEnvironmentImpl<T extends GraphQLDirectiveContainer> implements SchemaDirectiveWiringEnvironment<T> {
 
     private final T element;
     private final Map<String, GraphQLDirective> directives;
-    private final NodeParentTree<NamedNode> nodeParentTree;
+    private final NodeParentTree<NamedNode<?>> nodeParentTree;
     private final TypeDefinitionRegistry typeDefinitionRegistry;
     private final Map<String, Object> context;
     private final GraphQLCodeRegistry.Builder codeRegistry;
@@ -33,12 +40,7 @@ public class SchemaDirectiveWiringEnvironmentImpl<T extends GraphQLDirectiveCont
     private final GraphQLFieldDefinition fieldDefinition;
     private final GraphQLDirective registeredDirective;
 
-    public SchemaDirectiveWiringEnvironmentImpl(
-        T element,
-        List<GraphQLDirective> directives,
-        GraphQLDirective registeredDirective,
-        SchemaGeneratorDirectiveHelper.Parameters parameters
-    ) {
+    public SchemaDirectiveWiringEnvironmentImpl(T element, List<GraphQLDirective> directives, GraphQLDirective registeredDirective, SchemaGeneratorDirectiveHelper.Parameters parameters) {
         this.element = element;
         this.registeredDirective = registeredDirective;
         this.typeDefinitionRegistry = parameters.getTypeRegistry();
@@ -77,7 +79,7 @@ public boolean containsDirective(String directiveName) {
     }
 
     @Override
-    public NodeParentTree<NamedNode> getNodeParentTree() {
+    public NodeParentTree<NamedNode<?>> getNodeParentTree() {
         return nodeParentTree;
     }
 
@@ -112,14 +114,14 @@ public GraphQLFieldDefinition getFieldDefinition() {
     }
 
     @Override
-    public DataFetcher getFieldDataFetcher() {
+    public DataFetcher<?> getFieldDataFetcher() {
         assertNotNull(fieldDefinition, () -> "An output field must be in context to call this method");
         assertNotNull(fieldsContainer, () -> "An output field container must be in context to call this method");
         return codeRegistry.getDataFetcher(fieldsContainer, fieldDefinition);
     }
 
     @Override
-    public GraphQLFieldDefinition setFieldDataFetcher(DataFetcher newDataFetcher) {
+    public GraphQLFieldDefinition setFieldDataFetcher(DataFetcher<?> newDataFetcher) {
         assertNotNull(fieldDefinition, () -> "An output field must be in context to call this method");
         assertNotNull(fieldsContainer, () -> "An output field container must be in context to call this method");