fix: support new graphql context

fixes #393

Author: oliemansm

build.gradle

@@ -92,9 +92,9 @@ subprojects {
 
     jacocoTestReport {
         reports {
-            xml.enabled = true
-            html.enabled = false
-            csv.enabled = false
+            xml.required = true
+            html.required = false
+            csv.required = false
         }
     }
 

gradle.properties

@@ -1,4 +1,4 @@
-version=12.0.1-SNAPSHOT
+version=13.0.0-SNAPSHOT
 group=com.graphql-java-kickstart
 PROJECT_NAME=graphql-java-servlet
 PROJECT_DESC=GraphQL Java Kickstart

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLInvokerSubjectProxy.java

@@ -47,7 +47,7 @@ public enum ContextSetting {
   public GraphQLBatchedInvocationInput getBatch(
       List<GraphQLRequest> requests,
       GraphQLSchema schema,
-      Supplier<GraphQLContext> contextSupplier,
+      Supplier<GraphQLKickstartContext> contextSupplier,
       Object root) {
     switch (this) {
       case PER_QUERY_WITH_INSTRUMENTATION:

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

@@ -1,37 +1,36 @@
 package graphql.kickstart.execution.context;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
-import javax.security.auth.Subject;
 import org.dataloader.DataLoaderRegistry;
 
 /**
  * An object for the DefaultGraphQLContextBuilder to return. Can be extended to include more
  * context.
  */
-public class DefaultGraphQLContext implements GraphQLContext {
-
-  private final Subject subject;
+public class DefaultGraphQLContext implements GraphQLKickstartContext {
 
   private final DataLoaderRegistry dataLoaderRegistry;
 
-  public DefaultGraphQLContext(DataLoaderRegistry dataLoaderRegistry, Subject subject) {
+  public DefaultGraphQLContext(DataLoaderRegistry dataLoaderRegistry) {
     this.dataLoaderRegistry =
         Objects.requireNonNull(dataLoaderRegistry, "dataLoaderRegistry is required");
-    this.subject = subject;
   }
 
   public DefaultGraphQLContext() {
-    this(new DataLoaderRegistry(), null);
+    this(new DataLoaderRegistry());
   }
 
   @Override
-  public Optional<Subject> getSubject() {
-    return Optional.ofNullable(subject);
+  public DataLoaderRegistry getDataLoaderRegistry() {
+    return dataLoaderRegistry;
   }
 
   @Override
-  public DataLoaderRegistry getDataLoaderRegistry() {
-    return dataLoaderRegistry;
+  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/DefaultGraphQLContext.java

@@ -4,7 +4,7 @@
 public class DefaultGraphQLContextBuilder implements GraphQLContextBuilder {
 
   @Override
-  public GraphQLContext build() {
+  public GraphQLKickstartContext build() {
     return new DefaultGraphQLContext();
   }
 }

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

@@ -3,5 +3,5 @@
 public interface GraphQLContextBuilder {
 
   /** @return the graphql context */
-  GraphQLContext build();
+  GraphQLKickstartContext build();
 }

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

@@ -1,17 +1,15 @@
 package graphql.kickstart.execution.context;
 
-import java.util.Optional;
-import javax.security.auth.Subject;
+import java.util.Map;
 import lombok.NonNull;
 import org.dataloader.DataLoaderRegistry;
 
 /** Represents the context required by the servlet to execute a GraphQL request. */
-public interface GraphQLContext {
-
-  /** @return the subject to execute the query as. */
-  Optional<Subject> getSubject();
+public interface GraphQLKickstartContext {
 
   /** @return the Dataloader registry to use for the execution. Must not return <code>null</code> */
   @NonNull
   DataLoaderRegistry getDataLoaderRegistry();
+
+  Map<Object, Object> getMapOfContext();
 }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/context/GraphQLContext.java renamed to graphql-java-kickstart/src/main/java/graphql/kickstart/execution/context/GraphQLKickstartContext.java

@@ -5,12 +5,9 @@
 import graphql.ExecutionInput;
 import graphql.execution.ExecutionId;
 import graphql.kickstart.execution.GraphQLRequest;
-import graphql.kickstart.execution.context.GraphQLContext;
+import graphql.kickstart.execution.context.GraphQLKickstartContext;
 import graphql.schema.GraphQLSchema;
-import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
-import javax.security.auth.Subject;
 
 /** Represents a single GraphQL execution. */
 public class GraphQLSingleInvocationInput implements GraphQLInvocationInput {
@@ -19,32 +16,24 @@ public class GraphQLSingleInvocationInput implements GraphQLInvocationInput {
 
   private final ExecutionInput executionInput;
 
-  private final Subject subject;
-
   public GraphQLSingleInvocationInput(
-      GraphQLRequest request, GraphQLSchema schema, GraphQLContext context, Object root) {
+      GraphQLRequest request, GraphQLSchema schema, GraphQLKickstartContext context, Object root) {
     this.schema = schema;
     this.executionInput = createExecutionInput(request, context, root);
-    subject = context.getSubject().orElse(null);
   }
 
   /** @return the schema to use to execute this query. */
   public GraphQLSchema getSchema() {
     return schema;
   }
 
-  /** @return a subject to execute the query as. */
-  public Optional<Subject> getSubject() {
-    return Optional.ofNullable(subject);
-  }
-
   private ExecutionInput createExecutionInput(
-      GraphQLRequest graphQLRequest, GraphQLContext context, Object root) {
+      GraphQLRequest graphQLRequest, GraphQLKickstartContext context, Object root) {
     return ExecutionInput.newExecutionInput()
         .query(graphQLRequest.getQuery())
         .operationName(graphQLRequest.getOperationName())
         .context(context)
-        .graphQLContext(Collections.singletonMap(context.getClass(), context))
+        .graphQLContext(context.getMapOfContext())
         .root(root)
         .variables(graphQLRequest.getVariables())
         .extensions(graphQLRequest.getExtensions())
@@ -61,5 +50,4 @@ public ExecutionInput getExecutionInput() {
   public List<String> getQueries() {
     return singletonList(executionInput.getQuery());
   }
-
 }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/input/GraphQLSingleInvocationInput.java

@@ -4,7 +4,7 @@
 
 import graphql.kickstart.execution.GraphQLRequest;
 import graphql.kickstart.execution.context.ContextSetting;
-import graphql.kickstart.execution.context.GraphQLContext;
+import graphql.kickstart.execution.context.GraphQLKickstartContext;
 import graphql.schema.GraphQLSchema;
 import java.util.List;
 import java.util.function.Supplier;
@@ -21,7 +21,7 @@ public class PerQueryBatchedInvocationInput implements GraphQLBatchedInvocationI
   public PerQueryBatchedInvocationInput(
       List<GraphQLRequest> requests,
       GraphQLSchema schema,
-      Supplier<GraphQLContext> contextSupplier,
+      Supplier<GraphQLKickstartContext> contextSupplier,
       Object root,
       ContextSetting contextSetting) {
     invocationInputs =

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/input/PerQueryBatchedInvocationInput.java

@@ -4,7 +4,7 @@
 
 import graphql.kickstart.execution.GraphQLRequest;
 import graphql.kickstart.execution.context.ContextSetting;
-import graphql.kickstart.execution.context.GraphQLContext;
+import graphql.kickstart.execution.context.GraphQLKickstartContext;
 import graphql.schema.GraphQLSchema;
 import java.util.List;
 import java.util.function.Supplier;
@@ -20,10 +20,10 @@ public class PerRequestBatchedInvocationInput implements GraphQLBatchedInvocatio
   public PerRequestBatchedInvocationInput(
       List<GraphQLRequest> requests,
       GraphQLSchema schema,
-      Supplier<GraphQLContext> contextSupplier,
+      Supplier<GraphQLKickstartContext> contextSupplier,
       Object root,
       ContextSetting contextSetting) {
-    GraphQLContext context = contextSupplier.get();
+    GraphQLKickstartContext context = contextSupplier.get();
     invocationInputs =
         requests.stream()
             .map(request -> new GraphQLSingleInvocationInput(request, schema, context, root))

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/input/PerRequestBatchedInvocationInput.java

@@ -1,6 +1,7 @@
 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;
@@ -19,20 +20,19 @@ public class DefaultGraphQLServletContext extends DefaultGraphQLContext
 
   protected DefaultGraphQLServletContext(
       DataLoaderRegistry dataLoaderRegistry,
-      Subject subject,
       HttpServletRequest httpServletRequest,
       HttpServletResponse httpServletResponse) {
-    super(dataLoaderRegistry, subject);
+    super(dataLoaderRegistry);
     this.httpServletRequest = httpServletRequest;
     this.httpServletResponse = httpServletResponse;
   }
 
-  public static Builder createServletContext(DataLoaderRegistry registry, Subject subject) {
-    return new Builder(registry, subject);
+  public static Builder createServletContext(DataLoaderRegistry registry) {
+    return new Builder(registry);
   }
 
   public static Builder createServletContext() {
-    return new Builder(new DataLoaderRegistry(), null);
+    return new Builder(new DataLoaderRegistry());
   }
 
   @Override
@@ -59,21 +59,28 @@ 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;
+  }
+
   public static class Builder {
 
     private HttpServletRequest httpServletRequest;
     private HttpServletResponse httpServletResponse;
     private DataLoaderRegistry dataLoaderRegistry;
-    private Subject subject;
 
-    private Builder(DataLoaderRegistry dataLoaderRegistry, Subject subject) {
+    private Builder(DataLoaderRegistry dataLoaderRegistry) {
       this.dataLoaderRegistry = dataLoaderRegistry;
-      this.subject = subject;
     }
 
     public DefaultGraphQLServletContext build() {
       return new DefaultGraphQLServletContext(
-          dataLoaderRegistry, subject, httpServletRequest, httpServletResponse);
+          dataLoaderRegistry, httpServletRequest, httpServletResponse);
     }
 
     public Builder with(HttpServletRequest httpServletRequest) {
@@ -86,11 +93,6 @@ public Builder with(DataLoaderRegistry dataLoaderRegistry) {
       return this;
     }
 
-    public Builder with(Subject subject) {
-      this.subject = subject;
-      return this;
-    }
-
     public Builder with(HttpServletResponse httpServletResponse) {
       this.httpServletResponse = httpServletResponse;
       return this;

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

@@ -1,7 +1,7 @@
 package graphql.kickstart.servlet.context;
 
 import graphql.kickstart.execution.context.DefaultGraphQLContextBuilder;
-import graphql.kickstart.execution.context.GraphQLContext;
+import graphql.kickstart.execution.context.GraphQLKickstartContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.websocket.Session;
@@ -12,12 +12,12 @@ public class DefaultGraphQLServletContextBuilder extends DefaultGraphQLContextBu
     implements GraphQLServletContextBuilder {
 
   @Override
-  public GraphQLContext build(HttpServletRequest request, HttpServletResponse response) {
+  public GraphQLKickstartContext build(HttpServletRequest request, HttpServletResponse response) {
     return DefaultGraphQLServletContext.createServletContext().with(request).with(response).build();
   }
 
   @Override
-  public GraphQLContext build(Session session, HandshakeRequest handshakeRequest) {
+  public GraphQLKickstartContext build(Session session, HandshakeRequest handshakeRequest) {
     return DefaultGraphQLWebSocketContext.createWebSocketContext()
         .with(session)
         .with(handshakeRequest)