Merge pull request #188 from graphql-java-kickstart/renovate/major-lib_graphql_spring_boot_ver

fix(deps): update lib_graphql_spring_boot_ver to v14 (major)

Author: oliemansm

gradle.properties

@@ -1,5 +1,5 @@
 LIB_GRAPHQL_SERVLET_VER=14.0.0
-LIB_GRAPHQL_SPRING_BOOT_VER=12.0.0
+LIB_GRAPHQL_SPRING_BOOT_VER=14.0.0
 LIB_GRAPHQL_TOOLS_VER=13.0.1
 LIB_GRAPHQL_EXTENDED_VALIDATION_VER=19.1
 LIB_SPRING_BOOT_VER=2.7.4

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

@@ -2,16 +2,16 @@
 
 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 java.util.HashMap;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
 import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderFactory;
 import org.dataloader.DataLoaderRegistry;
 import org.springframework.stereotype.Component;
 
@@ -25,30 +25,30 @@ 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 request, HttpServletResponse response) {
+    Map<Object, Object> map = new HashMap<>();
+    map.put(HttpServletRequest.class, request);
+    map.put(HttpServletResponse.class, response);
+    return GraphQLKickstartContext.of(buildDataLoaderRegistry(), map);
   }
 
   @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 handshakeRequest) {
+    Map<Object, Object> map = new HashMap<>();
+    map.put(Session.class, session);
+    map.put(HandshakeRequest.class, handshakeRequest);
+    return GraphQLKickstartContext.of(buildDataLoaderRegistry(), map);
   }
 
   private DataLoaderRegistry buildDataLoaderRegistry() {
     DataLoaderRegistry dataLoaderRegistry = new DataLoaderRegistry();
     DataLoader<Integer, String> customerLoader =
-        new DataLoader<>(
+        DataLoaderFactory.newDataLoader(
             customerIds -> supplyAsync(() -> customerRepository.getUserNamesForIds(customerIds)));
     dataLoaderRegistry.register("customerDataLoader", customerLoader);
     return dataLoaderRegistry;

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());

tools-spring-security-async/src/main/resources/application.yml

@@ -11,6 +11,7 @@ graphql:
   servlet:
     exception-handlers-enabled: true
     async:
+      enabled: true
       timeout: 500
   graphiql:
     enabled: true