Update to graphql-java 4.1 (fixes #40)

Author: apottere

build.gradle

@@ -56,7 +56,7 @@ dependencies {
     compile 'commons-fileupload:commons-fileupload:1.3.1'
 
     // GraphQL
-    compile 'com.graphql-java:graphql-java:3.0.0'
+    compile 'com.graphql-java:graphql-java:4.1'
 
     compileOnly 'com.graphql-java:graphql-java-annotations:0.13.1'
     testCompile 'com.graphql-java:graphql-java-annotations:0.13.1'

src/main/java/graphql/servlet/DefaultExecutionStrategyProvider.java

@@ -14,8 +14,8 @@
  */
 package graphql.servlet;
 
+import graphql.execution.AsyncExecutionStrategy;
 import graphql.execution.ExecutionStrategy;
-import graphql.execution.SimpleExecutionStrategy;
 
 /**
  * @author Andrew Potter
@@ -41,7 +41,7 @@ public DefaultExecutionStrategyProvider(ExecutionStrategy queryExecutionStrategy
     }
 
     private ExecutionStrategy defaultIfNull(ExecutionStrategy executionStrategy) {
-        return defaultIfNull(executionStrategy, new SimpleExecutionStrategy());
+        return defaultIfNull(executionStrategy, new AsyncExecutionStrategy());
     }
 
     private ExecutionStrategy defaultIfNull(ExecutionStrategy executionStrategy, ExecutionStrategy defaultStrategy) {

src/main/java/graphql/servlet/DefaultGraphQLRootObjectBuilder.java

@@ -0,0 +1,26 @@
+/**
+ * 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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Optional;
+
+public class DefaultGraphQLRootObjectBuilder implements GraphQLRootObjectBuilder {
+    @Override
+    public Object build(Optional<HttpServletRequest> req, Optional<HttpServletResponse> resp) {
+        return new Object();
+    }
+}

src/main/java/graphql/servlet/EnhancedExecutionStrategyProvider.java

@@ -0,0 +1,23 @@
+/**
+ * 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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Optional;
+
+public interface GraphQLRootObjectBuilder {
+    Object build(Optional<HttpServletRequest> req, Optional<HttpServletResponse> resp);
+}

src/main/java/graphql/servlet/GraphQLRootObjectBuilder.java

@@ -14,23 +14,16 @@
  */
 package graphql.servlet;
 
-import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.RuntimeJsonMappingException;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.module.SimpleModule;
 import graphql.ExecutionResult;
 import graphql.GraphQL;
 import graphql.GraphQLError;
-import graphql.execution.TypeInfo;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.introspection.IntrospectionQuery;
 import graphql.schema.GraphQLFieldDefinition;
@@ -75,16 +68,7 @@ public abstract class GraphQLServlet extends HttpServlet implements Servlet, Gra
     public static final int STATUS_OK = 200;
     public static final int STATUS_BAD_REQUEST = 400;
 
-    private static final ObjectMapper mapper = new ObjectMapper().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS).registerModule(new SimpleModule().addSerializer(TypeInfo.class, new JsonSerializer<TypeInfo>() {
-        @Override
-        public void serialize(TypeInfo value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-            gen.writeStartObject();
-            serializers.defaultSerializeField("type", value.type(), gen);
-            serializers.defaultSerializeField("parentTypeInfo", value.parentTypeInfo(), gen);
-            serializers.defaultSerializeField("typeIsNonNull", value.typeIsNonNull(), gen);
-            gen.writeEndObject();
-        }
-    }));
+    private static final ObjectMapper mapper = new ObjectMapper().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
 
     protected abstract GraphQLSchemaProvider getSchemaProvider();
     protected abstract GraphQLContext createContext(Optional<HttpServletRequest> request, Optional<HttpServletResponse> response);

src/main/java/graphql/servlet/GraphQLServlet.java

@@ -46,7 +46,7 @@ public class OsgiGraphQLServlet extends GraphQLServlet {
     private final List<GraphQLTypesProvider> typesProviders = new ArrayList<>();
 
     private GraphQLContextBuilder contextBuilder = new DefaultGraphQLContextBuilder();
-    private ExecutionStrategyProvider executionStrategyProvider = new EnhancedExecutionStrategyProvider();
+    private ExecutionStrategyProvider executionStrategyProvider = new DefaultExecutionStrategyProvider();
     private InstrumentationProvider instrumentationProvider = new NoOpInstrumentationProvider();
     private GraphQLErrorHandler errorHandler = new DefaultGraphQLErrorHandler();
 
@@ -164,7 +164,7 @@ public void setExecutionStrategyProvider(ExecutionStrategyProvider provider) {
         executionStrategyProvider = provider;
     }
     public void unsetExecutionStrategyProvider(ExecutionStrategyProvider provider) {
-        executionStrategyProvider = new EnhancedExecutionStrategyProvider();
+        executionStrategyProvider = new DefaultExecutionStrategyProvider();
     }
 
     @Reference(cardinality = ReferenceCardinality.OPTIONAL)

src/main/java/graphql/servlet/OsgiGraphQLServlet.java

@@ -16,7 +16,7 @@ package graphql.servlet
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import graphql.Scalars
-import graphql.execution.TypeInfo
+import graphql.execution.ExecutionTypeInfo
 import graphql.schema.DataFetcher
 import graphql.schema.GraphQLFieldDefinition
 import graphql.schema.GraphQLNonNull
@@ -419,25 +419,8 @@ class GraphQLServletSpec extends Specification {
             resp.errors != null
     }
 
-    def "NonNullableFieldWasNullException is masked by default"() {
-        setup:
-            request.addParameter('query', 'query { returnsNullIncorrectly }')
-
-        when:
-            servlet.doGet(request, response)
-
-        then:
-            response.getStatus() == STATUS_OK
-            response.getContentType() == CONTENT_TYPE_JSON_UTF8
-            def resp = getResponseContent()
-            resp.containsKey("data")
-            resp.data == null
-            resp.errors != null
-            resp.errors.first().message.contains('Internal Server Error')
-    }
-
     def "typeInfo is serialized correctly"() {
         expect:
-            GraphQLServlet.mapper.writeValueAsString(TypeInfo.newTypeInfo().type(new GraphQLNonNull(Scalars.GraphQLString)).build()) != "{}"
+            GraphQLServlet.mapper.writeValueAsString(ExecutionTypeInfo.newTypeInfo().type(new GraphQLNonNull(Scalars.GraphQLString)).build()) != "{}"
     }
 }