breaking changes: ExecutionResult is now an interface and contains generic GraphQLError's

andimarek · andimarek · commit 44b3e797d417 · 2015-07-22T03:07:25.000+02:00
diff --git a/src/main/java/graphql/ExecutionResult.java b/src/main/java/graphql/ExecutionResult.java
@@ -0,0 +1,12 @@
+package graphql;
+
+
+import java.util.List;
+import java.util.Map;
+
+public interface ExecutionResult {
+
+    Map<String, Object> getResult();
+
+    List<GraphQLError> getErrors();
+}
diff --git a/src/main/java/graphql/ExecutionResultImpl.java b/src/main/java/graphql/ExecutionResultImpl.java
@@ -0,0 +1,43 @@
+package graphql;
+
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ExecutionResultImpl implements ExecutionResult {
+
+    private Map<String, Object> result;
+
+    private final List<GraphQLError> errors = new ArrayList<>();
+
+    public void addErrors(List<? extends GraphQLError> errors) {
+        this.errors.addAll(errors);
+    }
+
+    public ExecutionResultImpl(List<? extends GraphQLError> errors) {
+        this.errors.addAll(errors);
+    }
+
+    public ExecutionResultImpl(Map<String, Object> result) {
+        this.result = result;
+    }
+
+
+    public void setResult(Map<String, Object> result) {
+        this.result = result;
+    }
+
+
+    @Override
+    public Map<String, Object> getResult() {
+        return result;
+    }
+
+    @Override
+    public List<GraphQLError> getErrors() {
+        return new ArrayList<>(errors);
+    }
+
+
+}
diff --git a/src/main/java/graphql/GraphQL.java b/src/main/java/graphql/GraphQL.java
@@ -2,7 +2,6 @@
 
 
 import graphql.execution.Execution;
-import graphql.execution.ExecutionResult;
 import graphql.language.Document;
 import graphql.parser.Parser;
 import graphql.schema.GraphQLSchema;
@@ -59,13 +58,13 @@ public ExecutionResult execute(String requestString, String operationName, Objec
             document = parser.parseDocument(requestString);
         } catch (RecognitionException e) {
             ValidationError validationError = new ValidationError(ValidationErrorType.InvalidSyntax);
-            return new ExecutionResult(Arrays.asList(validationError));
+            return new ExecutionResultImpl(Arrays.asList(validationError));
         }
 
         Validator validator = new Validator();
         List<ValidationError> validationErrors = validator.validateDocument(graphQLSchema, document);
         if (validationErrors.size() > 0) {
-            ExecutionResult result = new ExecutionResult(validationErrors);
+            ExecutionResult result = new ExecutionResultImpl(validationErrors);
             return result;
         }
         Execution execution = new Execution(executorService);
diff --git a/src/main/java/graphql/GraphQLError.java b/src/main/java/graphql/GraphQLError.java
@@ -0,0 +1,5 @@
+package graphql;
+
+
+public interface GraphQLError {
+}
diff --git a/src/main/java/graphql/execution/Execution.java b/src/main/java/graphql/execution/Execution.java
@@ -1,6 +1,8 @@
 package graphql.execution;
 
 
+import graphql.ExecutionResult;
+import graphql.ExecutionResultImpl;
 import graphql.GraphQLException;
 import graphql.language.Document;
 import graphql.language.Field;
@@ -67,8 +69,8 @@ private ExecutionResult executeOperation(
                 ) {
             executeFieldsSerially(executionContext, operationRootType, root, fields);
         }
-        Object result = executeFieldsParallel(executionContext, operationRootType, root, fields);
-        return new ExecutionResult(result);
+        Map<String,Object> result = executeFieldsParallel(executionContext, operationRootType, root, fields);
+        return new ExecutionResultImpl(result);
     }
 
     private Map<String, Object> executeFieldsSerially(ExecutionContext executionContext, GraphQLObjectType parentType, Object source, Map<String, List<Field>> fields) {
diff --git a/src/main/java/graphql/execution/ExecutionResult.java b/src/main/java/graphql/execution/ExecutionResult.java
diff --git a/src/main/java/graphql/validation/ValidationError.java b/src/main/java/graphql/validation/ValidationError.java
@@ -1,7 +1,9 @@
 package graphql.validation;
 
 
-public class ValidationError {
+import graphql.GraphQLError;
+
+public class ValidationError implements GraphQLError {
 
     private final ValidationErrorType errorType;
 
diff --git a/src/test/groovy/graphql/GraphQLTest.groovy b/src/test/groovy/graphql/GraphQLTest.groovy
@@ -88,7 +88,7 @@ class GraphQLTest extends Specification {
         ).build()
 
         when:
-        def errors = new GraphQL(schema).execute( '{ hello(arg:11) }').validationErrors
+        def errors = new GraphQL(schema).execute( '{ hello(arg:11) }').errors
 
         then:
         errors.size() == 1
@@ -103,7 +103,7 @@ class GraphQLTest extends Specification {
         ).build()
 
         when:
-        def errors = new GraphQL(schema).execute( '{ hello(() }').validationErrors
+        def errors = new GraphQL(schema).execute( '{ hello(() }').errors
 
         then:
         errors.size() == 1

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package graphql;
++
++
 +public interface GraphQLError {
 +}