Add tests based on the spec and refactor GraphQLServlet.

Author: apottere

build.gradle

@@ -37,6 +37,8 @@ dependencies {
     testRuntime "cglib:cglib-nodep:3.2.4"
     testRuntime "org.objenesis:objenesis:2.5.1"
     testCompile 'org.slf4j:slf4j-simple:1.7.24'
+    testCompile 'org.springframework:spring-test:4.3.7.RELEASE' // MockHttpServletRequest, MockHttpServletResponse
+    testRuntime 'org.springframework:spring-web:4.3.7.RELEASE'
 
     // Remove boilerplate
     compile 'org.projectlombok:lombok:1.16.8'

src/main/java/graphql/servlet/GenericGraphQLError.java

@@ -0,0 +1,51 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.servlet;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import graphql.ErrorType;
+import graphql.GraphQLError;
+import graphql.language.SourceLocation;
+
+import java.util.List;
+
+/**
+ * @author Andrew Potter
+ */
+public class GenericGraphQLError implements GraphQLError {
+
+    private final String message;
+
+    public GenericGraphQLError(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    @JsonIgnore
+    public List<SourceLocation> getLocations() {
+        return null;
+    }
+
+    @Override
+    @JsonIgnore
+    public ErrorType getErrorType() {
+        return null;
+    }
+}

src/main/java/graphql/servlet/GraphQLContext.java

@@ -25,7 +25,10 @@
 import javax.security.auth.Subject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -39,5 +42,5 @@ public class GraphQLContext {
     private Optional<Subject> subject = Optional.empty();
 
     @Getter @Setter
-    private Optional<FileItemIterator> files = Optional.empty();
+    private Optional<Collection<Part>> parts = Optional.empty();
 }

src/main/java/graphql/servlet/GraphQLOperationListener.java

@@ -20,7 +20,7 @@
 import java.util.Map;
 
 public interface GraphQLOperationListener {
-    void beforeGraphQLOperation(GraphQLContext context, String operationName, String query, Map<String, Object> variables);
-    void onSuccessfulGraphQLOperation(GraphQLContext context, String operationName, String query, Map<String, Object> variables, Object data);
-    void onFailedGraphQLOperation(GraphQLContext context, String operationName, String query, Map<String, Object> variables, List<GraphQLError> errors);
+    default void beforeGraphQLOperation(GraphQLContext context, String operationName, String query, Map<String, Object> variables) {}
+    default void onSuccessfulGraphQLOperation(GraphQLContext context, String operationName, String query, Map<String, Object> variables, Object data) {}
+    default void onFailedGraphQLOperation(GraphQLContext context, String operationName, String query, Map<String, Object> variables, Object data, List<GraphQLError> errors) {}
 }