added the ability to set execution id within ExecutionInput

jmccaull · bbakerman · commit 9a61bfe98dde · 2019-06-03T08:53:02.000+10:00
diff --git a/src/main/java/graphql/ExecutionInput.java b/src/main/java/graphql/ExecutionInput.java
@@ -1,6 +1,7 @@
 package graphql;
 
 import graphql.cachecontrol.CacheControl;
+import graphql.execution.ExecutionId;
 import org.dataloader.DataLoaderRegistry;
 
 import java.util.Collections;
@@ -22,21 +23,23 @@ public class ExecutionInput {
     private final Map<String, Object> variables;
     private final DataLoaderRegistry dataLoaderRegistry;
     private final CacheControl cacheControl;
+    private final ExecutionId executionId;
 
 
     public ExecutionInput(String query, String operationName, Object context, Object root, Map<String, Object> variables) {
-        this(query, operationName, context, root, variables, new DataLoaderRegistry(), null);
+        this(query, operationName, context, root, variables, new DataLoaderRegistry(), null, null);
     }
 
     @Internal
-    private ExecutionInput(String query, String operationName, Object context, Object root, Map<String, Object> variables, DataLoaderRegistry dataLoaderRegistry, CacheControl cacheControl) {
+    private ExecutionInput(String query, String operationName, Object context, Object root, Map<String, Object> variables, DataLoaderRegistry dataLoaderRegistry, CacheControl cacheControl, ExecutionId executionId) {
         this.query = query;
         this.operationName = operationName;
         this.context = context;
         this.root = root;
         this.variables = variables;
         this.dataLoaderRegistry = dataLoaderRegistry;
         this.cacheControl = cacheControl;
+        this.executionId = executionId;
     }
 
     /**
@@ -88,23 +91,30 @@ public CacheControl getCacheControl() {
         return cacheControl;
     }
 
+    /**
+     * @return Id that will be/was used to execute this operation.
+     */
+    public ExecutionId getExecutionId() {
+        return executionId;
+    }
+
     /**
      * This helps you transform the current ExecutionInput object into another one by starting a builder with all
      * the current values and allows you to transform it how you want.
      *
      * @param builderConsumer the consumer code that will be given a builder to transform
-     *
      * @return a new ExecutionInput object based on calling build on that builder
      */
     public ExecutionInput transform(Consumer<Builder> builderConsumer) {
         Builder builder = new Builder()
-                .query(this.query)
-                .operationName(this.operationName)
-                .context(this.context)
-                .root(this.root)
-                .dataLoaderRegistry(this.dataLoaderRegistry)
-                .cacheControl(this.cacheControl)
-                .variables(this.variables);
+            .query(this.query)
+            .operationName(this.operationName)
+            .context(this.context)
+            .root(this.root)
+            .dataLoaderRegistry(this.dataLoaderRegistry)
+            .cacheControl(this.cacheControl)
+            .variables(this.variables)
+            .executionId(executionId);
 
         builderConsumer.accept(builder);
 
@@ -115,13 +125,14 @@ public ExecutionInput transform(Consumer<Builder> builderConsumer) {
     @Override
     public String toString() {
         return "ExecutionInput{" +
-                "query='" + query + '\'' +
-                ", operationName='" + operationName + '\'' +
-                ", context=" + context +
-                ", root=" + root +
-                ", variables=" + variables +
-                ", dataLoaderRegistry=" + dataLoaderRegistry +
-                '}';
+            "query='" + query + '\'' +
+            ", operationName='" + operationName + '\'' +
+            ", context=" + context +
+            ", root=" + root +
+            ", variables=" + variables +
+            ", dataLoaderRegistry=" + dataLoaderRegistry +
+            ", executionId= " + executionId +
+            '}';
     }
 
     /**
@@ -135,7 +146,6 @@ public static Builder newExecutionInput() {
      * Creates a new builder of ExecutionInput objects with the given query
      *
      * @param query the query to execute
-     *
      * @return a new builder of ExecutionInput objects
      */
     public static Builder newExecutionInput(String query) {
@@ -151,6 +161,7 @@ public static class Builder {
         private Map<String, Object> variables = Collections.emptyMap();
         private DataLoaderRegistry dataLoaderRegistry = new DataLoaderRegistry();
         private CacheControl cacheControl = CacheControl.newCacheControl();
+        private ExecutionId executionId = null;
 
         public Builder query(String query) {
             this.query = query;
@@ -162,11 +173,20 @@ public Builder operationName(String operationName) {
             return this;
         }
 
+        /**
+         * A default one will be assigned, but you can set your own.
+         * @param executionId an execution id object
+         * @return this builder
+         */
+        public Builder executionId(ExecutionId executionId) {
+            this.executionId = executionId;
+            return this;
+        }
+
         /**
          * By default you will get a {@link GraphQLContext} object but you can set your own.
          *
          * @param context the context object to use
-         *
          * @return this builder
          */
         public Builder context(Object context) {
@@ -196,11 +216,11 @@ public Builder variables(Map<String, Object> variables) {
         }
 
         /**
-         * You should create new {@link org.dataloader.DataLoaderRegistry}s and new {@link org.dataloader.DataLoader}s for each execution.  Do not re-use
+         * You should create new {@link org.dataloader.DataLoaderRegistry}s and new {@link org.dataloader.DataLoader}s for each execution.  Do not
+         * re-use
          * instances as this will create unexpected results.
          *
          * @param dataLoaderRegistry a registry of {@link org.dataloader.DataLoader}s
-         *
          * @return this builder
          */
         public Builder dataLoaderRegistry(DataLoaderRegistry dataLoaderRegistry) {
@@ -214,7 +234,7 @@ public Builder cacheControl(CacheControl cacheControl) {
         }
 
         public ExecutionInput build() {
-            return new ExecutionInput(query, operationName, context, root, variables, dataLoaderRegistry, cacheControl);
+            return new ExecutionInput(query, operationName, context, root, variables, dataLoaderRegistry, cacheControl, executionId);
         }
     }
-}
+}
diff --git a/src/main/java/graphql/GraphQL.java b/src/main/java/graphql/GraphQL.java
@@ -482,6 +482,7 @@ public CompletableFuture<ExecutionResult> executeAsync(UnaryOperator<ExecutionIn
     public CompletableFuture<ExecutionResult> executeAsync(ExecutionInput executionInput) {
         try {
             log.debug("Executing request. operation name: '{}'. query: '{}'. variables '{}'", executionInput.getOperationName(), executionInput.getQuery(), executionInput.getVariables());
+            executionInput = ensureInputHasId(executionInput);
 
             InstrumentationState instrumentationState = instrumentation.createState(new InstrumentationCreateStateParameters(this.graphQLSchema, executionInput));
 
@@ -506,6 +507,16 @@ public CompletableFuture<ExecutionResult> executeAsync(ExecutionInput executionI
         }
     }
 
+    private ExecutionInput ensureInputHasId(ExecutionInput executionInput) {
+        if (executionInput.getExecutionId() != null) {
+            return executionInput;
+        }
+        String queryString = executionInput.getQuery();
+        String operationName = executionInput.getOperationName();
+        Object context = executionInput.getContext();
+        return executionInput.transform(builder -> builder.executionId(idProvider.provide(queryString, operationName, context)));
+    }
+
 
     private CompletableFuture<ExecutionResult> parseValidateAndExecute(ExecutionInput executionInput, GraphQLSchema graphQLSchema, InstrumentationState instrumentationState) {
         AtomicReference<ExecutionInput> executionInputRef = new AtomicReference<>(executionInput);
@@ -581,12 +592,9 @@ private List<ValidationError> validate(ExecutionInput executionInput, Document d
     }
 
     private CompletableFuture<ExecutionResult> execute(ExecutionInput executionInput, Document document, GraphQLSchema graphQLSchema, InstrumentationState instrumentationState) {
-        String query = executionInput.getQuery();
-        String operationName = executionInput.getOperationName();
-        Object context = executionInput.getContext();
 
         Execution execution = new Execution(queryStrategy, mutationStrategy, subscriptionStrategy, instrumentation);
-        ExecutionId executionId = idProvider.provide(query, operationName, context);
+        ExecutionId executionId = executionInput.getExecutionId();
 
         log.debug("Executing '{}'. operation name: '{}'. query: '{}'. variables '{}'", executionId, executionInput.getOperationName(), executionInput.getQuery(), executionInput.getVariables());
         CompletableFuture<ExecutionResult> future = execution.execute(document, graphQLSchema, executionId, executionInput, instrumentationState);
