Moved subject proxy out of the core logic

Author: oliemansm

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

@@ -1,56 +1,41 @@
 package graphql.kickstart.execution;
 
-import graphql.ExecutionInput;
 import graphql.ExecutionResult;
 import graphql.GraphQL;
 import graphql.kickstart.execution.context.ContextSetting;
 import graphql.kickstart.execution.input.GraphQLBatchedInvocationInput;
 import graphql.kickstart.execution.input.GraphQLInvocationInput;
 import graphql.kickstart.execution.input.GraphQLSingleInvocationInput;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
-import javax.security.auth.Subject;
+import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 
+@AllArgsConstructor
 @RequiredArgsConstructor
 public class GraphQLInvoker {
 
   private final GraphQL graphQL;
+  private GraphQLInvokerProxy proxy = GraphQL::executeAsync;
+
+  public CompletableFuture<ExecutionResult> executeAsync(GraphQLSingleInvocationInput invocationInput) {
+    return proxy.executeAsync(graphQL, invocationInput.getExecutionInput());
+  }
 
   public GraphQLQueryResult query(GraphQLInvocationInput invocationInput) {
     if (invocationInput instanceof GraphQLSingleInvocationInput) {
       return GraphQLQueryResult.create(query((GraphQLSingleInvocationInput) invocationInput));
     }
     GraphQLBatchedInvocationInput batchedInvocationInput = (GraphQLBatchedInvocationInput) invocationInput;
-    return GraphQLQueryResult.create(query(batchedInvocationInput.getExecutionInputs(), batchedInvocationInput.getContextSetting()));
+    return GraphQLQueryResult
+        .create(query(batchedInvocationInput.getExecutionInputs(), batchedInvocationInput.getContextSetting()));
   }
 
   private ExecutionResult query(GraphQLSingleInvocationInput singleInvocationInput) {
     return executeAsync(singleInvocationInput).join();
   }
 
-  public CompletableFuture<ExecutionResult> executeAsync(GraphQLSingleInvocationInput invocationInput) {
-    if (Subject.getSubject(AccessController.getContext()) == null && invocationInput.getSubject().isPresent()) {
-      return Subject
-          .doAs(invocationInput.getSubject().get(), (PrivilegedAction<CompletableFuture<ExecutionResult>>) () -> {
-            try {
-              return query(invocationInput.getExecutionInput());
-            } catch (Exception e) {
-              throw new RuntimeException(e);
-            }
-          });
-    }
-
-    return query(invocationInput.getExecutionInput());
-  }
-
-  private CompletableFuture<ExecutionResult> query(ExecutionInput executionInput) {
-    return graphQL.executeAsync(executionInput);
-  }
-
   private List<ExecutionResult> query(List<GraphQLSingleInvocationInput> batchedInvocationInput,
       ContextSetting contextSetting) {
 //    List<ExecutionInput> executionIds = batchedInvocationInput.stream()

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

@@ -0,0 +1,12 @@
+package graphql.kickstart.execution;
+
+import graphql.ExecutionInput;
+import graphql.ExecutionResult;
+import graphql.GraphQL;
+import java.util.concurrent.CompletableFuture;
+
+public interface GraphQLInvokerProxy {
+
+  CompletableFuture<ExecutionResult> executeAsync(GraphQL graphQL, ExecutionInput executionInput);
+
+}

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

@@ -0,0 +1,29 @@
+package graphql.kickstart.execution;
+
+import graphql.ExecutionInput;
+import graphql.ExecutionResult;
+import graphql.kickstart.execution.context.GraphQLContext;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.concurrent.CompletableFuture;
+import javax.security.auth.Subject;
+
+public class GraphQLInvokerSubjectProxy implements GraphQLInvokerProxy {
+
+  @Override
+  public CompletableFuture<ExecutionResult> executeAsync(GraphQLInvoker graphQLInvoker, ExecutionInput executionInput) {
+    GraphQLContext context = (GraphQLContext) executionInput.getContext();
+    if (Subject.getSubject(AccessController.getContext()) == null && context.getSubject().isPresent()) {
+      return Subject
+          .doAs(context.getSubject().get(), (PrivilegedAction<CompletableFuture<ExecutionResult>>) () -> {
+            try {
+              return graphQLInvoker.executeAsync(executionInput);
+            } catch (Exception e) {
+              throw new RuntimeException(e);
+            }
+          });
+    }
+    return graphQLInvoker.executeAsync(executionInput);
+  }
+
+}