fix: request scoped dataloader tests

Author: oliemansm

request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/CustomGraphQLContextBuilder.java

@@ -2,10 +2,7 @@
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
-import graphql.kickstart.execution.context.DefaultGraphQLContext;
-import graphql.kickstart.execution.context.GraphQLContext;
-import graphql.kickstart.servlet.context.DefaultGraphQLServletContext;
-import graphql.kickstart.servlet.context.DefaultGraphQLWebSocketContext;
+import graphql.kickstart.execution.context.GraphQLKickstartContext;
 import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -25,24 +22,18 @@ public CustomGraphQLContextBuilder(CustomerRepository customerRepository) {
   }
 
   @Override
-  public GraphQLContext build(HttpServletRequest req, HttpServletResponse response) {
-    return DefaultGraphQLServletContext.createServletContext(buildDataLoaderRegistry(), null)
-        .with(req)
-        .with(response)
-        .build();
+  public GraphQLKickstartContext build(HttpServletRequest req, HttpServletResponse response) {
+    return GraphQLKickstartContext.of(buildDataLoaderRegistry());
   }
 
   @Override
-  public GraphQLContext build() {
-    return new DefaultGraphQLContext(buildDataLoaderRegistry(), null);
+  public GraphQLKickstartContext build() {
+    return GraphQLKickstartContext.of(buildDataLoaderRegistry());
   }
 
   @Override
-  public GraphQLContext build(Session session, HandshakeRequest request) {
-    return DefaultGraphQLWebSocketContext.createWebSocketContext(buildDataLoaderRegistry(), null)
-        .with(session)
-        .with(request)
-        .build();
+  public GraphQLKickstartContext build(Session session, HandshakeRequest request) {
+    return GraphQLKickstartContext.of(buildDataLoaderRegistry());
   }
 
   private DataLoaderRegistry buildDataLoaderRegistry() {

request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/CustomerResolver.java

@@ -1,6 +1,5 @@
 package graphql.servlet.examples.dataloader.requestscope;
 
-import graphql.kickstart.execution.context.GraphQLContext;
 import graphql.kickstart.tools.GraphQLResolver;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -12,7 +11,7 @@
 public class CustomerResolver implements GraphQLResolver<Customer> {
 
   public CompletableFuture<String> getName(Customer customer, DataFetchingEnvironment dfe) {
-    DataLoaderRegistry registry = ((GraphQLContext) dfe.getContext()).getDataLoaderRegistry();
+    DataLoaderRegistry registry = dfe.getDataLoaderRegistry();
     DataLoader<Integer, String> customerLoader = registry.getDataLoader("customerDataLoader");
     if (customerLoader != null) {
       return customerLoader.load(customer.getCustomerId());