chore: refactor context builder

Author: oliemansm

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/context/DefaultGraphQLContext.java

@@ -12,25 +12,37 @@
 public class DefaultGraphQLContext implements GraphQLKickstartContext {
 
   private final DataLoaderRegistry dataLoaderRegistry;
+  private final Map<Object, Object> map;
 
-  public DefaultGraphQLContext(DataLoaderRegistry dataLoaderRegistry) {
+  public DefaultGraphQLContext(DataLoaderRegistry dataLoaderRegistry, Map<Object, Object> map) {
     this.dataLoaderRegistry =
         Objects.requireNonNull(dataLoaderRegistry, "dataLoaderRegistry is required");
+    this.map = Objects.requireNonNull(map, "map is required");
+  }
+
+  public DefaultGraphQLContext(Map<Object, Object> map) {
+    this(new DataLoaderRegistry(), map);
+  }
+
+  public DefaultGraphQLContext(DataLoaderRegistry dataLoaderRegistry) {
+    this(dataLoaderRegistry, new HashMap<>());
   }
 
   public DefaultGraphQLContext() {
     this(new DataLoaderRegistry());
   }
 
+  public void put(Object key, Object value) {
+    map.put(key, value);
+  }
+
   @Override
   public DataLoaderRegistry getDataLoaderRegistry() {
     return dataLoaderRegistry;
   }
 
   @Override
   public Map<Object, Object> getMapOfContext() {
-    Map<Object, Object> map = new HashMap<>();
-    map.put(DataLoaderRegistry.class, dataLoaderRegistry);
     return map;
   }
 }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/context/GraphQLKickstartContext.java

@@ -7,6 +7,19 @@
 /** Represents the context required by the servlet to execute a GraphQL request. */
 public interface GraphQLKickstartContext {
 
+  static GraphQLKickstartContext of(Map<Object, Object> map) {
+    return new DefaultGraphQLContext(map);
+  }
+
+  static GraphQLKickstartContext of(DataLoaderRegistry dataLoaderRegistry) {
+    return new DefaultGraphQLContext(dataLoaderRegistry);
+  }
+
+  static GraphQLKickstartContext of(
+      DataLoaderRegistry dataLoaderRegistry, Map<Object, Object> map) {
+    return new DefaultGraphQLContext(dataLoaderRegistry, map);
+  }
+
   /** @return the Dataloader registry to use for the execution. Must not return <code>null</code> */
   @NonNull
   DataLoaderRegistry getDataLoaderRegistry();

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

@@ -1,7 +1,6 @@
 package graphql.kickstart.servlet.context;
 
 import graphql.kickstart.execution.context.DefaultGraphQLContext;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -11,19 +10,17 @@
 import lombok.SneakyThrows;
 import org.dataloader.DataLoaderRegistry;
 
+/** @deprecated Use {@link graphql.kickstart.execution.context.GraphQLKickstartContext} instead */
 public class DefaultGraphQLServletContext extends DefaultGraphQLContext
     implements GraphQLServletContext {
 
-  private final HttpServletRequest httpServletRequest;
-  private final HttpServletResponse httpServletResponse;
-
   protected DefaultGraphQLServletContext(
       DataLoaderRegistry dataLoaderRegistry,
       HttpServletRequest httpServletRequest,
       HttpServletResponse httpServletResponse) {
     super(dataLoaderRegistry);
-    this.httpServletRequest = httpServletRequest;
-    this.httpServletResponse = httpServletResponse;
+    put(HttpServletRequest.class, httpServletRequest);
+    put(HttpServletResponse.class, httpServletResponse);
   }
 
   public static Builder createServletContext(DataLoaderRegistry registry) {
@@ -35,60 +32,52 @@ public static Builder createServletContext() {
   }
 
   /**
-   * @deprecated Use
-   *     <tt>dataFetchingEnvironment.getGraphQlContext().get(HttpServletRequest.class)</tt> instead.
-   *     Since 13.0.0
+   * @deprecated Use {@code
+   *     dataFetchingEnvironment.getGraphQlContext().get(HttpServletRequest.class)} instead. Since
+   *     13.0.0
    */
   @Override
   @Deprecated
   public HttpServletRequest getHttpServletRequest() {
-    return httpServletRequest;
+    return (HttpServletRequest) getMapOfContext().get(HttpServletRequest.class);
   }
 
   /**
-   * @deprecated Use
-   *     <tt>dataFetchingEnvironment.getGraphQlContext().get(HttpServletResponse.class)</tt>
-   *     instead. Since 13.0.0
+   * @deprecated Use {@code
+   *     dataFetchingEnvironment.getGraphQlContext().get(HttpServletResponse.class)} instead. Since
+   *     13.0.0
    */
   @Override
   @Deprecated
   public HttpServletResponse getHttpServletResponse() {
-    return httpServletResponse;
+    return (HttpServletResponse) getMapOfContext().get(HttpServletResponse.class);
   }
 
   /**
-   * @deprecated Use
-   *     <tt>dataFetchingEnvironment.getGraphQlContext().get(HttpServletRequest.class)</tt> instead
-   *     to get the request and retrieve the file parts yourself. Since 13.0.0
+   * @deprecated Use {@code
+   *     dataFetchingEnvironment.getGraphQlContext().get(HttpServletRequest.class)} instead to get
+   *     the request and retrieve the file parts yourself. Since 13.0.0
    */
   @Override
   @Deprecated
   @SneakyThrows
   public List<Part> getFileParts() {
-    return httpServletRequest.getParts().stream()
+    return getHttpServletRequest().getParts().stream()
         .filter(part -> part.getContentType() != null)
         .collect(Collectors.toList());
   }
 
   /**
-   * @deprecated Use
-   *     <tt>dataFetchingEnvironment.getGraphQlContext().get(HttpServletRequest.class)</tt> instead
-   *     to get the request and retrieve the parts yourself. Since 13.0.0
+   * @deprecated Use {@code
+   *     dataFetchingEnvironment.getGraphQlContext().get(HttpServletRequest.class)} instead to get
+   *     the request and retrieve the parts yourself. Since 13.0.0
    */
   @Override
   @Deprecated
   @SneakyThrows
   public Map<String, List<Part>> getParts() {
-    return httpServletRequest.getParts().stream().collect(Collectors.groupingBy(Part::getName));
-  }
-
-  @Override
-  public Map<Object, Object> getMapOfContext() {
-    Map<Object, Object> map = new HashMap<>();
-    map.put(DataLoaderRegistry.class, getDataLoaderRegistry());
-    map.put(HttpServletRequest.class, httpServletRequest);
-    map.put(HttpServletResponse.class, httpServletResponse);
-    return map;
+    return getHttpServletRequest().getParts().stream()
+        .collect(Collectors.groupingBy(Part::getName));
   }
 
   public static class Builder {

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/context/DefaultGraphQLServletContextBuilder.java

@@ -2,6 +2,8 @@
 
 import graphql.kickstart.execution.context.DefaultGraphQLContextBuilder;
 import graphql.kickstart.execution.context.GraphQLKickstartContext;
+import java.util.HashMap;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.websocket.Session;
@@ -13,14 +15,17 @@ public class DefaultGraphQLServletContextBuilder extends DefaultGraphQLContextBu
 
   @Override
   public GraphQLKickstartContext build(HttpServletRequest request, HttpServletResponse response) {
-    return DefaultGraphQLServletContext.createServletContext().with(request).with(response).build();
+    Map<Object, Object> map = new HashMap<>();
+    map.put(HttpServletRequest.class, request);
+    map.put(HttpServletResponse.class, response);
+    return GraphQLKickstartContext.of(map);
   }
 
   @Override
   public GraphQLKickstartContext build(Session session, HandshakeRequest handshakeRequest) {
-    return DefaultGraphQLWebSocketContext.createWebSocketContext()
-        .with(session)
-        .with(handshakeRequest)
-        .build();
+    Map<Object, Object> map = new HashMap<>();
+    map.put(Session.class, session);
+    map.put(HandshakeRequest.class, handshakeRequest);
+    return GraphQLKickstartContext.of(map);
   }
 }

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

@@ -1,23 +1,20 @@
 package graphql.kickstart.servlet.context;
 
 import graphql.kickstart.execution.context.DefaultGraphQLContext;
-import java.util.HashMap;
-import java.util.Map;
 import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
 import org.dataloader.DataLoaderRegistry;
 
+/** @deprecated Use {@link graphql.kickstart.execution.context.GraphQLKickstartContext} instead */
+@Deprecated
 public class DefaultGraphQLWebSocketContext extends DefaultGraphQLContext
     implements GraphQLWebSocketContext {
 
-  private final Session session;
-  private final HandshakeRequest handshakeRequest;
-
   private DefaultGraphQLWebSocketContext(
       DataLoaderRegistry dataLoaderRegistry, Session session, HandshakeRequest handshakeRequest) {
     super(dataLoaderRegistry);
-    this.session = session;
-    this.handshakeRequest = handshakeRequest;
+    put(Session.class, session);
+    put(HandshakeRequest.class, handshakeRequest);
   }
 
   public static Builder createWebSocketContext(DataLoaderRegistry registry) {
@@ -29,33 +26,23 @@ public static Builder createWebSocketContext() {
   }
 
   /**
-   * @deprecated Use <tt>dataFetchingEnvironment.getGraphQlContext().get(Session.class)</tt>
-   *     instead. Since 13.0.0
+   * @deprecated Use {@code dataFetchingEnvironment.getGraphQlContext().get(Session.class)} instead.
+   *     Since 13.0.0
    */
   @Override
   @Deprecated
   public Session getSession() {
-    return session;
+    return (Session) getMapOfContext().get(Session.class);
   }
 
   /**
-   * @deprecated Use
-   *     <tt>dataFetchingEnvironment.getGraphQlContext().get(HandshakeRequest.class)</tt> instead.
-   *     Since 13.0.0
+   * @deprecated Use {@code dataFetchingEnvironment.getGraphQlContext().get(HandshakeRequest.class)}
+   *     instead. Since 13.0.0
    */
   @Override
   @Deprecated
   public HandshakeRequest getHandshakeRequest() {
-    return handshakeRequest;
-  }
-
-  @Override
-  public Map<Object, Object> getMapOfContext() {
-    Map<Object, Object> map = new HashMap<>();
-    map.put(DataLoaderRegistry.class, getDataLoaderRegistry());
-    map.put(Session.class, session);
-    map.put(HandshakeRequest.class, handshakeRequest);
-    return map;
+    return (HandshakeRequest) getMapOfContext().get(HandshakeRequest.class);
   }
 
   public static class Builder {

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/context/GraphQLServletContext.java

@@ -7,6 +7,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Part;
 
+/** @deprecated Use {@link graphql.kickstart.execution.context.GraphQLKickstartContext} instead */
 public interface GraphQLServletContext extends GraphQLKickstartContext {
 
   List<Part> getFileParts();

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/context/GraphQLWebSocketContext.java

@@ -4,6 +4,7 @@
 import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
 
+/** @deprecated Use {@link graphql.kickstart.execution.context.GraphQLKickstartContext} instead */
 public interface GraphQLWebSocketContext extends GraphQLKickstartContext {
 
   Session getSession();