changed errors conform to specification

andimarek · andimarek · commit a81d63c06b82 · 2015-07-26T08:38:36.000+02:00
diff --git a/src/main/java/graphql/ExceptionWhileDataFetching.java b/src/main/java/graphql/ExceptionWhileDataFetching.java
@@ -1,6 +1,10 @@
 package graphql;
 
 
+import graphql.language.SourceLocation;
+
+import java.util.List;
+
 public class ExceptionWhileDataFetching implements GraphQLError {
 
     private final Exception exception;
@@ -14,6 +18,16 @@ public Exception getException() {
     }
 
 
+    @Override
+    public String getMessage() {
+        return "Exception while fetching data: " + exception.toString();
+    }
+
+    @Override
+    public List<SourceLocation> getLocations() {
+        return null;
+    }
+
     @Override
     public ErrorType geErrorType() {
         return ErrorType.DataFetchingException;
diff --git a/src/main/java/graphql/GraphQLError.java b/src/main/java/graphql/GraphQLError.java
@@ -1,8 +1,15 @@
 package graphql;
 
 
+import graphql.language.SourceLocation;
+
+import java.util.List;
+
 public interface GraphQLError {
 
+    String getMessage();
+
+    List<SourceLocation> getLocations();
 
     ErrorType geErrorType();
 
diff --git a/src/main/java/graphql/InvalidSyntaxError.java b/src/main/java/graphql/InvalidSyntaxError.java
@@ -3,16 +3,33 @@
 
 import graphql.language.SourceLocation;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class InvalidSyntaxError implements GraphQLError {
 
+    private final List<SourceLocation> sourceLocations = new ArrayList<>();
+
     public InvalidSyntaxError(SourceLocation sourceLocation) {
-        this.sourceLocation = sourceLocation;
+        if (sourceLocation != null)
+            this.sourceLocations.add(sourceLocation);
+    }
+
+    public InvalidSyntaxError(List<SourceLocation> sourceLocations) {
+        if (sourceLocations != null) {
+            this.sourceLocations.addAll(sourceLocations);
+        }
     }
 
-    private final SourceLocation sourceLocation;
 
-    public SourceLocation getSourceLocation() {
-        return sourceLocation;
+    @Override
+    public String getMessage() {
+        return "Invalid Syntax";
+    }
+
+    @Override
+    public List<SourceLocation> getLocations() {
+        return sourceLocations;
     }
 
     @Override
@@ -23,7 +40,7 @@ public ErrorType geErrorType() {
     @Override
     public String toString() {
         return "InvalidSyntaxError{" +
-                "sourceLocation=" + sourceLocation +
+                "sourceLocations=" + sourceLocations +
                 '}';
     }
 
diff --git a/src/main/java/graphql/language/SourceLocation.java b/src/main/java/graphql/language/SourceLocation.java
@@ -4,19 +4,19 @@
 public class SourceLocation {
 
     private final int line;
-    private final int positionInLine;
+    private final int column;
 
-    public SourceLocation(int line, int positionInLine) {
+    public SourceLocation(int line, int column) {
         this.line = line;
-        this.positionInLine = positionInLine;
+        this.column = column;
     }
 
     public int getLine() {
         return line;
     }
 
-    public int getPositionInLine() {
-        return positionInLine;
+    public int getColumn() {
+        return column;
     }
 
     @Override
@@ -27,22 +27,22 @@ public boolean equals(Object o) {
         SourceLocation that = (SourceLocation) o;
 
         if (line != that.line) return false;
-        return positionInLine == that.positionInLine;
+        return column == that.column;
 
     }
 
     @Override
     public int hashCode() {
         int result = line;
-        result = 31 * result + positionInLine;
+        result = 31 * result + column;
         return result;
     }
 
     @Override
     public String toString() {
         return "SourceLocation{" +
                 "line=" + line +
-                ", positionInLine=" + positionInLine +
+                ", column=" + column +
                 '}';
     }
 }
diff --git a/src/main/java/graphql/validation/ValidationError.java b/src/main/java/graphql/validation/ValidationError.java
@@ -5,37 +5,59 @@
 import graphql.GraphQLError;
 import graphql.language.SourceLocation;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ValidationError implements GraphQLError {
 
 
     private final ValidationErrorType validationErrorType;
-    private final SourceLocation sourceLocation;
+    private final List<SourceLocation> sourceLocations = new ArrayList<>();
     private final String description;
 
     public ValidationError(ValidationErrorType validationErrorType) {
-        this(validationErrorType, null, null);
+        this(validationErrorType, (SourceLocation) null, null);
     }
 
     public ValidationError(ValidationErrorType validationErrorType, SourceLocation sourceLocation, String description) {
         this.validationErrorType = validationErrorType;
-        this.sourceLocation = sourceLocation;
+        if (sourceLocation != null)
+            this.sourceLocations.add(sourceLocation);
+        this.description = description;
+    }
+
+    public ValidationError(ValidationErrorType validationErrorType, List<SourceLocation> sourceLocations, String description) {
+        this.validationErrorType = validationErrorType;
+        if (sourceLocations != null)
+            this.sourceLocations.addAll(sourceLocations);
         this.description = description;
     }
 
     public ValidationErrorType getValidationErrorType() {
         return validationErrorType;
     }
 
+    @Override
+    public String getMessage() {
+        return String.format("Validation error of type %s: %s", validationErrorType, description);
+    }
+
+    @Override
+    public List<SourceLocation> getLocations() {
+        return sourceLocations;
+    }
+
     @Override
     public ErrorType geErrorType() {
         return ErrorType.ValidationError;
     }
 
+
     @Override
     public String toString() {
         return "ValidationError{" +
                 "validationErrorType=" + validationErrorType +
-                ", sourceLocation=" + sourceLocation +
+                ", sourceLocations=" + sourceLocations +
                 ", description='" + description + '\'' +
                 '}';
     }
diff --git a/src/test/groovy/graphql/GraphQLTest.groovy b/src/test/groovy/graphql/GraphQLTest.groovy
@@ -108,6 +108,6 @@ class GraphQLTest extends Specification {
         then:
         errors.size() == 1
         errors[0].geErrorType() == ErrorType.InvalidSyntax
-        errors[0].sourceLocation == new SourceLocation(1, 8)
+        errors[0].sourceLocations == [new SourceLocation(1, 8)]
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,6 @@ class GraphQLTest extends Specification {`
`108`	`108`	`then:`
`109`	`109`	`errors.size() == 1`
`110`	`110`	`errors[0].geErrorType() == ErrorType.InvalidSyntax`
`111`		`- errors[0].sourceLocation == new SourceLocation(1, 8)`
	`111`	`+ errors[0].sourceLocations == [new SourceLocation(1, 8)]`
`112`	`112`	`}`
`113`	`113`	`}`