invalid syntax error handling (very simple at the moment)

andimarek · andimarek · commit 0be87ca19178 · 2015-07-14T09:40:49.000+02:00
diff --git a/src/main/java/graphql/GraphQL.java b/src/main/java/graphql/GraphQL.java
@@ -8,11 +8,9 @@
 import graphql.schema.GraphQLSchema;
 import graphql.validation.ValidationError;
 import graphql.validation.Validator;
+import org.antlr.v4.runtime.RecognitionException;
 
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -41,7 +39,13 @@ public GraphQL(GraphQLSchema graphQLSchema, String requestString, Map<String, Ob
 
     public ExecutionResult execute() {
         Parser parser = new Parser();
-        Document document = parser.parseDocument(requestString);
+        Document document;
+        try {
+            document = parser.parseDocument(requestString);
+        } catch (RecognitionException e) {
+            ValidationError validationError = new ValidationError("Invalid syntax: " + e.toString());
+            return new ExecutionResult(Arrays.asList(validationError));
+        }
         Execution execution = new Execution(executorService);
         Validator validator = new Validator();
         List<ValidationError> validationErrors = validator.validateDocument(graphQLSchema, document);
diff --git a/src/main/java/graphql/parser/Parser.java b/src/main/java/graphql/parser/Parser.java
@@ -5,20 +5,34 @@
 import graphql.parser.antlr.GraphqlParser;
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.DefaultErrorStrategy;
+import org.antlr.v4.runtime.RecognitionException;
 
 public class Parser {
 
+
     public Document parseDocument(String input) {
 
         GraphqlLexer lexer = new GraphqlLexer(new ANTLRInputStream(input));
+
         CommonTokenStream tokens = new CommonTokenStream(lexer);
 
         GraphqlParser parser = new GraphqlParser(tokens);
+        parser.setErrorHandler(new ErrorStrategy());
         GraphqlParser.DocumentContext document = parser.document();
 
 
         GraphqlAntlrToLanguage antlrToLanguage = new GraphqlAntlrToLanguage();
         antlrToLanguage.visitDocument(document);
         return antlrToLanguage.result;
     }
+
+    private class ErrorStrategy extends DefaultErrorStrategy {
+
+        @Override
+        public void recover(org.antlr.v4.runtime.Parser recognizer, RecognitionException e) {
+            throw e;
+        }
+    }
+
 }
diff --git a/src/main/java/graphql/validation/ValidationError.java b/src/main/java/graphql/validation/ValidationError.java
@@ -9,6 +9,10 @@ public ValidationError(String description, Object... args) {
         this.description = String.format(description, args);
     }
 
+    public String getDescription() {
+        return description;
+    }
+
     @Override
     public String toString() {
         return "ValidationError{" +
diff --git a/src/test/groovy/graphql/GraphQLTest.groovy b/src/test/groovy/graphql/GraphQLTest.groovy
@@ -91,7 +91,21 @@ class GraphQLTest extends Specification {
 
         then:
         errors.size() == 1
+    }
 
+    def "query with invalid syntax"() {
+        given:
+        GraphQLSchema schema = newSchema().query(
+                newObject()
+                        .name("RootQueryType")
+                        .build()
+        ).build()
+
+        when:
+        def errors = new GraphQL(schema, '{ hello(() }').execute().validationErrors
 
+        then:
+        errors.size() == 1
+        errors[0].description.contains("Invalid syntax")
     }
 }
