Merge branch 'master' into mediatype

Author: andimarek

build.gradle

@@ -39,7 +39,7 @@ subprojects {
     group = 'com.graphql-java'
 
     ext {
-        graphqlJavaVersion = "12.0"
+        graphqlJavaVersion = "15.0"
         springVersion = "5.1.7.RELEASE"
         springBootVersion = "2.1.5.RELEASE"
         jacksonVersion = "2.9.8"

graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/GraphQLInvocationData.java

@@ -14,7 +14,7 @@ public class GraphQLInvocationData {
     private final Map<String, Object> variables;
 
     public GraphQLInvocationData(String query, String operationName, Map<String, Object> variables) {
-        this.query = Assert.assertNotNull(query, "query must be provided");
+        this.query = Assert.assertNotNull(query, () -> "query must be provided");
         this.operationName = operationName;
         this.variables = variables != null ? variables : Collections.emptyMap();
     }

graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/components/DefaultGraphQLInvocation.java

@@ -7,6 +7,7 @@
 import graphql.spring.web.reactive.ExecutionInputCustomizer;
 import graphql.spring.web.reactive.GraphQLInvocation;
 import graphql.spring.web.reactive.GraphQLInvocationData;
+import org.dataloader.DataLoaderRegistry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
@@ -19,16 +20,22 @@ public class DefaultGraphQLInvocation implements GraphQLInvocation {
     @Autowired
     GraphQL graphQL;
 
+    @Autowired(required = false)
+    DataLoaderRegistry dataLoaderRegistry;
+
     @Autowired
     ExecutionInputCustomizer executionInputCustomizer;
 
     @Override
     public Mono<ExecutionResult> invoke(GraphQLInvocationData invocationData, ServerWebExchange serverWebExchange) {
-        ExecutionInput executionInput = ExecutionInput.newExecutionInput()
+        ExecutionInput.Builder executionInputBuilder = ExecutionInput.newExecutionInput()
                 .query(invocationData.getQuery())
                 .operationName(invocationData.getOperationName())
-                .variables(invocationData.getVariables())
-                .build();
+                .variables(invocationData.getVariables());
+        if (dataLoaderRegistry != null) {
+            executionInputBuilder.dataLoaderRegistry(dataLoaderRegistry);
+        }
+        ExecutionInput executionInput = executionInputBuilder.build();
         Mono<ExecutionInput> customizedExecutionInputMono = executionInputCustomizer.customizeExecutionInput(executionInput, serverWebExchange);
         return customizedExecutionInputMono.flatMap(customizedExecutionInput -> Mono.fromCompletionStage(graphQL.executeAsync(customizedExecutionInput)));
     }

graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/GraphQLInvocationData.java

@@ -14,7 +14,7 @@ public class GraphQLInvocationData {
     private final Map<String, Object> variables;
 
     public GraphQLInvocationData(String query, String operationName, Map<String, Object> variables) {
-        this.query = Assert.assertNotNull(query, "query must be provided");
+        this.query = Assert.assertNotNull(query, () -> "query must be provided");
         this.operationName = operationName;
         this.variables = variables != null ? variables : Collections.emptyMap();
     }

graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/components/DefaultGraphQLInvocation.java

@@ -7,6 +7,7 @@
 import graphql.spring.web.servlet.ExecutionInputCustomizer;
 import graphql.spring.web.servlet.GraphQLInvocation;
 import graphql.spring.web.servlet.GraphQLInvocationData;
+import org.dataloader.DataLoaderRegistry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.WebRequest;
@@ -20,16 +21,22 @@ public class DefaultGraphQLInvocation implements GraphQLInvocation {
     @Autowired
     GraphQL graphQL;
 
+    @Autowired(required = false)
+    DataLoaderRegistry dataLoaderRegistry;
+
     @Autowired
     ExecutionInputCustomizer executionInputCustomizer;
 
     @Override
     public CompletableFuture<ExecutionResult> invoke(GraphQLInvocationData invocationData, WebRequest webRequest) {
-        ExecutionInput executionInput = ExecutionInput.newExecutionInput()
+        ExecutionInput.Builder executionInputBuilder = ExecutionInput.newExecutionInput()
                 .query(invocationData.getQuery())
                 .operationName(invocationData.getOperationName())
-                .variables(invocationData.getVariables())
-                .build();
+                .variables(invocationData.getVariables());
+        if (dataLoaderRegistry != null) {
+            executionInputBuilder.dataLoaderRegistry(dataLoaderRegistry);
+        }
+        ExecutionInput executionInput = executionInputBuilder.build();
         CompletableFuture<ExecutionInput> customizedExecutionInput = executionInputCustomizer.customizeExecutionInput(executionInput, webRequest);
         return customizedExecutionInput.thenCompose(graphQL::executeAsync);
     }