Make it possible to provide an external Execution class.

perlow · perlow · commit adf2c47a8d40 · 2016-09-16T23:46:46.000-07:00
diff --git a/src/main/java/graphql/GraphQL.java b/src/main/java/graphql/GraphQL.java
@@ -2,7 +2,7 @@
 
 
 import graphql.execution.Execution;
-import graphql.execution.ExecutionStrategy;
+import graphql.execution.IExecutionStrategy;
 import graphql.language.Document;
 import graphql.language.SourceLocation;
 import graphql.parser.Parser;
@@ -25,7 +25,7 @@ public class GraphQL {
 
 
     private final GraphQLSchema graphQLSchema;
-    private final ExecutionStrategy executionStrategy;
+    private final IExecutionStrategy executionStrategy;
 
     private static final Logger log = LoggerFactory.getLogger(GraphQL.class);
 
@@ -34,7 +34,7 @@ public GraphQL(GraphQLSchema graphQLSchema) {
     }
 
 
-    public GraphQL(GraphQLSchema graphQLSchema, ExecutionStrategy executionStrategy) {
+    public GraphQL(GraphQLSchema graphQLSchema, IExecutionStrategy executionStrategy) {
         this.graphQLSchema = graphQLSchema;
         this.executionStrategy = executionStrategy;
     }
diff --git a/src/main/java/graphql/execution/Execution.java b/src/main/java/graphql/execution/Execution.java
@@ -17,9 +17,9 @@
 public class Execution {
 
     private FieldCollector fieldCollector = new FieldCollector();
-    private ExecutionStrategy strategy;
+    private IExecutionStrategy strategy;
 
-    public Execution(ExecutionStrategy strategy) {
+    public Execution(IExecutionStrategy strategy) {
         this.strategy = strategy;
 
         if (this.strategy == null) {
diff --git a/src/main/java/graphql/execution/ExecutionContext.java b/src/main/java/graphql/execution/ExecutionContext.java
@@ -14,7 +14,7 @@
 public class ExecutionContext {
 
     private GraphQLSchema graphQLSchema;
-    private ExecutionStrategy executionStrategy;
+    private IExecutionStrategy executionStrategy;
     private Map<String, FragmentDefinition> fragmentsByName = new LinkedHashMap<String, FragmentDefinition>();
     private OperationDefinition operationDefinition;
     private Map<String, Object> variables = new LinkedHashMap<String, Object>();
@@ -73,11 +73,11 @@ public List<GraphQLError> getErrors() {
         return errors;
     }
 
-    public ExecutionStrategy getExecutionStrategy() {
+    public IExecutionStrategy getExecutionStrategy() {
         return executionStrategy;
     }
 
-    public void setExecutionStrategy(ExecutionStrategy executionStrategy) {
+    public void setExecutionStrategy(IExecutionStrategy executionStrategy) {
         this.executionStrategy = executionStrategy;
     }
 }
diff --git a/src/main/java/graphql/execution/ExecutionContextBuilder.java b/src/main/java/graphql/execution/ExecutionContextBuilder.java
@@ -18,7 +18,7 @@ public ExecutionContextBuilder(ValuesResolver valuesResolver) {
         this.valuesResolver = valuesResolver;
     }
 
-    public ExecutionContext build(GraphQLSchema graphQLSchema, ExecutionStrategy executionStrategy, Object root, Document document, String operationName, Map<String, Object> args) {
+    public ExecutionContext build(GraphQLSchema graphQLSchema, IExecutionStrategy executionStrategy, Object root, Document document, String operationName, Map<String, Object> args) {
         Map<String, FragmentDefinition> fragmentsByName = new LinkedHashMap<String, FragmentDefinition>();
         Map<String, OperationDefinition> operationsByName = new LinkedHashMap<String, OperationDefinition>();
 
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -13,14 +13,12 @@
 
 import static graphql.introspection.Introspection.*;
 
-public abstract class ExecutionStrategy {
+public abstract class ExecutionStrategy implements IExecutionStrategy {
     private static final Logger log = LoggerFactory.getLogger(ExecutionStrategy.class);
 
     protected ValuesResolver valuesResolver = new ValuesResolver();
     protected FieldCollector fieldCollector = new FieldCollector();
 
-    public abstract ExecutionResult execute(ExecutionContext executionContext, GraphQLObjectType parentType, Object source, Map<String, List<Field>> fields);
-
     protected ExecutionResult resolveField(ExecutionContext executionContext, GraphQLObjectType parentType, Object source, List<Field> fields) {
         GraphQLFieldDefinition fieldDef = getFieldDef(executionContext.getGraphQLSchema(), parentType, fields.get(0));
 
diff --git a/src/main/java/graphql/execution/IExecutionStrategy.java b/src/main/java/graphql/execution/IExecutionStrategy.java
@@ -0,0 +1,12 @@
+package graphql.execution;
+
+import graphql.ExecutionResult;
+import graphql.language.Field;
+import graphql.schema.GraphQLObjectType;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IExecutionStrategy {
+  ExecutionResult execute(ExecutionContext executionContext, GraphQLObjectType parentType, Object source, Map<String, List<Field>> fields);
+}
diff --git a/src/main/java/graphql/execution/batched/GraphQLExecutionNode.java b/src/main/java/graphql/execution/batched/GraphQLExecutionNode.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Map;
 
-class GraphQLExecutionNode {
+public class GraphQLExecutionNode {
 
     private final GraphQLObjectType parentType;
     private final Map<String, List<Field>> fields;
diff --git a/src/main/java/graphql/execution/batched/GraphQLExecutionNodeDatum.java b/src/main/java/graphql/execution/batched/GraphQLExecutionNodeDatum.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-class GraphQLExecutionNodeDatum extends GraphQLExecutionResultContainer {
+public class GraphQLExecutionNodeDatum extends GraphQLExecutionResultContainer {
     private final Map<String, Object> parentResult;
     private final Object source;
 
diff --git a/src/main/java/graphql/execution/batched/GraphQLExecutionResultContainer.java b/src/main/java/graphql/execution/batched/GraphQLExecutionResultContainer.java
@@ -30,6 +30,6 @@ public GraphQLExecutionResultList createAndPutEmptyChildList(String fieldName) {
      * @param fieldName fieldName
      * @param value value
      */
-    abstract void putResult(String fieldName, Object value);
+    public abstract void putResult(String fieldName, Object value);
 
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`public class ExecutionContext {`
`15`	`15`
`16`	`16`	`private GraphQLSchema graphQLSchema;`
`17`		`- private ExecutionStrategy executionStrategy;`
	`17`	`+ private IExecutionStrategy executionStrategy;`
`18`	`18`	`private Map<String, FragmentDefinition> fragmentsByName = new LinkedHashMap<String, FragmentDefinition>();`
`19`	`19`	`private OperationDefinition operationDefinition;`
`20`	`20`	`private Map<String, Object> variables = new LinkedHashMap<String, Object>();`
`@@ -73,11 +73,11 @@ public List<GraphQLError> getErrors() {`
`73`	`73`	`return errors;`
`74`	`74`	`}`
`75`	`75`
`76`		`- public ExecutionStrategy getExecutionStrategy() {`
	`76`	`+ public IExecutionStrategy getExecutionStrategy() {`
`77`	`77`	`return executionStrategy;`
`78`	`78`	`}`
`79`	`79`
`80`		`- public void setExecutionStrategy(ExecutionStrategy executionStrategy) {`
	`80`	`+ public void setExecutionStrategy(IExecutionStrategy executionStrategy) {`
`81`	`81`	`this.executionStrategy = executionStrategy;`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public ExecutionContextBuilder(ValuesResolver valuesResolver) {`
`18`	`18`	`this.valuesResolver = valuesResolver;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public ExecutionContext build(GraphQLSchema graphQLSchema, ExecutionStrategy executionStrategy, Object root, Document document, String operationName, Map<String, Object> args) {`
	`21`	`+ public ExecutionContext build(GraphQLSchema graphQLSchema, IExecutionStrategy executionStrategy, Object root, Document document, String operationName, Map<String, Object> args) {`
`22`	`22`	`Map<String, FragmentDefinition> fragmentsByName = new LinkedHashMap<String, FragmentDefinition>();`
`23`	`23`	`Map<String, OperationDefinition> operationsByName = new LinkedHashMap<String, OperationDefinition>();`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ public GraphQLExecutionResultList createAndPutEmptyChildList(String fieldName) {`
`30`	`30`	`* @param fieldName fieldName`
`31`	`31`	`* @param value value`
`32`	`32`	`*/`
`33`		`- abstract void putResult(String fieldName, Object value);`
	`33`	`+ public abstract void putResult(String fieldName, Object value);`
`34`	`34`
`35`	`35`	`}`