Instantiate default DataLoaderRegistry when building GraphQLContext

Author: oliemansm

src/main/java/graphql/servlet/AbstractGraphQLHttpServlet.java

@@ -5,19 +5,19 @@
 import graphql.ExecutionResult;
 import graphql.introspection.IntrospectionQuery;
 import graphql.schema.GraphQLFieldDefinition;
+import graphql.servlet.config.GraphQLConfiguration;
+import graphql.servlet.context.ContextSetting;
 import graphql.servlet.core.GraphQLMBean;
 import graphql.servlet.core.GraphQLObjectMapper;
 import graphql.servlet.core.GraphQLQueryInvoker;
 import graphql.servlet.core.GraphQLServletListener;
-import graphql.servlet.config.GraphQLConfiguration;
-import graphql.servlet.context.ContextSetting;
+import graphql.servlet.core.internal.GraphQLRequest;
+import graphql.servlet.core.internal.VariableMapper;
 import graphql.servlet.input.BatchInputPreProcessResult;
 import graphql.servlet.input.BatchInputPreProcessor;
 import graphql.servlet.input.GraphQLBatchedInvocationInput;
-import graphql.servlet.input.GraphQLSingleInvocationInput;
 import graphql.servlet.input.GraphQLInvocationInputFactory;
-import graphql.servlet.core.internal.GraphQLRequest;
-import graphql.servlet.core.internal.VariableMapper;
+import graphql.servlet.input.GraphQLSingleInvocationInput;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
@@ -136,15 +136,15 @@ public void init() {
             }
             if (path.contentEquals("/schema.json")) {
                 query(queryInvoker, graphQLObjectMapper, invocationInputFactory.create(INTROSPECTION_REQUEST, request, response),
-                    request, response);
+                        request, response);
             } else {
                 String query = request.getParameter("query");
                 if (query != null) {
 
                     if (isBatchedQuery(query)) {
                         List<GraphQLRequest> requests = graphQLObjectMapper.readBatchedGraphQLRequest(query);
                         GraphQLBatchedInvocationInput batchedInvocationInput =
-                            invocationInputFactory.createReadOnly(configuration.getContextSetting(), requests, request, response);
+                                invocationInputFactory.createReadOnly(configuration.getContextSetting(), requests, request, response);
                         queryBatched(queryInvoker, batchedInvocationInput, request, response, configuration);
                     } else {
                         final Map<String, Object> variables = new HashMap<>();
@@ -155,8 +155,8 @@ public void init() {
                         String operationName = request.getParameter("operationName");
 
                         query(queryInvoker, graphQLObjectMapper,
-                            invocationInputFactory.createReadOnly(new GraphQLRequest(query, variables, operationName), request, response),
-                            request, response);
+                                invocationInputFactory.createReadOnly(new GraphQLRequest(query, variables, operationName), request, response),
+                                request, response);
                     }
                 } else {
                     response.setStatus(STATUS_BAD_REQUEST);
@@ -174,8 +174,8 @@ public void init() {
                 if (APPLICATION_GRAPHQL.equals(request.getContentType())) {
                     String query = CharStreams.toString(request.getReader());
                     query(queryInvoker, graphQLObjectMapper,
-                        invocationInputFactory.create(new GraphQLRequest(query, null, null), request, response),
-                        request, response);
+                            invocationInputFactory.create(new GraphQLRequest(query, null, null), request, response),
+                            request, response);
                 } else if (request.getContentType() != null && request.getContentType().startsWith("multipart/form-data") && !request.getParts().isEmpty()) {
                     final Map<String, List<Part>> fileItems = request.getParts()
                             .stream()
@@ -203,7 +203,7 @@ public void init() {
                                     graphQLObjectMapper.readBatchedGraphQLRequest(inputStream);
                             variablesMap.ifPresent(map -> graphQLRequests.forEach(r -> mapMultipartVariables(r, map, fileItems)));
                             GraphQLBatchedInvocationInput batchedInvocationInput = invocationInputFactory.create(configuration.getContextSetting(),
-                                graphQLRequests, request, response);
+                                    graphQLRequests, request, response);
                             queryBatched(queryInvoker, batchedInvocationInput, request, response, configuration);
                             return;
                         } else {
@@ -231,7 +231,7 @@ public void init() {
                     if (isBatchedQuery(inputStream)) {
                         List<GraphQLRequest> requests = graphQLObjectMapper.readBatchedGraphQLRequest(inputStream);
                         GraphQLBatchedInvocationInput batchedInvocationInput =
-                            invocationInputFactory.create(configuration.getContextSetting(), requests, request, response);
+                                invocationInputFactory.create(configuration.getContextSetting(), requests, request, response);
                         queryBatched(queryInvoker, batchedInvocationInput, request, response, configuration);
                     } else {
                         query(queryInvoker, graphQLObjectMapper, invocationInputFactory.create(graphQLObjectMapper.readGraphQLRequest(inputStream), request, response), request, response);
@@ -244,9 +244,9 @@ public void init() {
         };
     }
 
-    private static InputStream asMarkableInputStream(InputStream inputStream) {
+    private InputStream asMarkableInputStream(InputStream inputStream) {
         if (!inputStream.markSupported()) {
-            inputStream = new BufferedInputStream(inputStream);
+            return new BufferedInputStream(inputStream);
         }
         return inputStream;
     }
@@ -409,7 +409,7 @@ private void queryBatched(GraphQLQueryInvoker queryInvoker, GraphQLBatchedInvoca
         BatchInputPreProcessResult batchInputPreProcessResult = batchInputPreProcessor.preProcessBatch(batchedInvocationInput, request, response);
         if (batchInputPreProcessResult.isExecutable()) {
             List<ExecutionResult> results = queryInvoker.query(batchInputPreProcessResult.getBatchedInvocationInput().getExecutionInputs(),
-                contextSetting);
+                    contextSetting);
             response.setContentType(AbstractGraphQLHttpServlet.APPLICATION_JSON_UTF8);
             response.setStatus(AbstractGraphQLHttpServlet.STATUS_OK);
             Writer writer = response.getWriter();

src/main/java/graphql/servlet/context/DefaultGraphQLServletContext.java

@@ -59,7 +59,7 @@ public static Builder createServletContext(DataLoaderRegistry registry, Subject
     }
 
     public static Builder createServletContext() {
-        return new Builder(null, null);
+        return new Builder(new DataLoaderRegistry(), null);
     }
 
     public static class Builder {

src/main/java/graphql/servlet/context/DefaultGraphQLWebSocketContext.java

@@ -40,7 +40,7 @@ public static Builder createWebSocketContext(DataLoaderRegistry registry, Subjec
     }
 
     public static Builder createWebSocketContext() {
-        return new Builder(null, null);
+        return new Builder(new DataLoaderRegistry(), null);
     }
 
     public static class Builder {