Merge branch 'master' into master

Author: oliemansm

README.md

@@ -16,15 +16,15 @@ repositories {
 }
 
 dependencies {
-    compile 'com.graphql-java:graphql-java-servlet:5.0.0'
+    compile 'com.graphql-java:graphql-java-servlet:5.1.0'
 }
 ```
 
 ```xml
 <dependency>
     <groupId>com.graphql-java</groupId>
     <artifactId>graphql-java-servlet</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
 </dependency>
 ```
 

build.gradle

@@ -51,19 +51,17 @@ dependencies {
 
     // Servlet
     compile 'javax.servlet:javax.servlet-api:3.0.1'
-    // Multipart support
-    compile 'commons-fileupload:commons-fileupload:1.3.1'
 
     // GraphQL
-    compile 'com.graphql-java:graphql-java:8.0'
+    compile 'com.graphql-java:graphql-java:9.0'
 
     testCompile 'io.github.graphql-java:graphql-java-annotations:5.2'
 
     // JSON
-    compile 'com.fasterxml.jackson.core:jackson-core:2.8.4'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.4'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.8.4'
-    compile 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.4'
+    compile 'com.fasterxml.jackson.core:jackson-core:2.8.11'
+    compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.11'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.8.11'
+    compile 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.11'
 }
 
 apply plugin: 'osgi'
@@ -72,6 +70,7 @@ apply plugin: 'biz.aQute.bnd.builder'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'maven-publish'
 apply plugin: 'idea'
+apply plugin: 'maven'
 
 jar {
     manifest {

gradle.properties

@@ -1,2 +1,2 @@
-version = 5.0.2
+version = 5.1.1
 group = com.graphql-java

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

@@ -1,10 +1,9 @@
 package graphql.servlet;
 
-import org.apache.commons.fileupload.FileItem;
-
 import javax.security.auth.Subject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -14,7 +13,7 @@ public class GraphQLContext {
     private Optional<HttpServletResponse> response;
 
     private Optional<Subject> subject = Optional.empty();
-    private Optional<Map<String, List<FileItem>>> files = Optional.empty();
+    private Optional<Map<String, List<Part>>> files = Optional.empty();
 
     public GraphQLContext(Optional<HttpServletRequest> request, Optional<HttpServletResponse> response) {
         this.request = request;
@@ -45,11 +44,11 @@ public void setSubject(Optional<Subject> subject) {
         this.subject = subject;
     }
 
-    public Optional<Map<String, List<FileItem>>> getFiles() {
+    public Optional<Map<String, List<Part>>> getFiles() {
         return files;
     }
 
-    public void setFiles(Optional<Map<String, List<FileItem>>> files) {
+    public void setFiles(Optional<Map<String, List<Part>>> files) {
         this.files = files;
     }
 }

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

@@ -56,8 +56,8 @@ public SimpleGraphQLServlet(final GraphQLSchema schema, ExecutionStrategyProvide
      * @deprecated use {@link #builder(GraphQLSchemaProvider)} instead.
      */
     @Deprecated
-    public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrategyProvider executionStrategyProvider, ObjectMapperConfigurer objectMapperConfigurer, List<GraphQLServletListener> listeners, Instrumentation instrumentation, GraphQLErrorHandler errorHandler, GraphQLContextBuilder contextBuilder, GraphQLRootObjectBuilder rootObjectBuilder, PreparsedDocumentProvider preparsedDocumentProvider,boolean asyncServletMode) {
-        super(objectMapperConfigurer, listeners, null,asyncServletMode);
+    public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrategyProvider executionStrategyProvider, ObjectMapperConfigurer objectMapperConfigurer, List<GraphQLServletListener> listeners, Instrumentation instrumentation, GraphQLErrorHandler errorHandler, GraphQLContextBuilder contextBuilder, GraphQLRootObjectBuilder rootObjectBuilder, PreparsedDocumentProvider preparsedDocumentProvider, boolean asyncServletMode) {
+        super(objectMapperConfigurer, listeners, asyncServletMode);
 
         this.schemaProvider = schemaProvider;
         this.executionStrategyProvider = executionStrategyProvider;
@@ -68,33 +68,33 @@ public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrat
             this.instrumentation = instrumentation;
         }
 
-        if(errorHandler == null) {
+        if (errorHandler == null) {
             this.errorHandler = new DefaultGraphQLErrorHandler();
         } else {
             this.errorHandler = errorHandler;
         }
 
-        if(contextBuilder == null) {
+        if (contextBuilder == null) {
             this.contextBuilder = new DefaultGraphQLContextBuilder();
         } else {
             this.contextBuilder = contextBuilder;
         }
 
-        if(rootObjectBuilder == null) {
+        if (rootObjectBuilder == null) {
             this.rootObjectBuilder = new DefaultGraphQLRootObjectBuilder();
         } else {
             this.rootObjectBuilder = rootObjectBuilder;
         }
 
-        if(preparsedDocumentProvider == null) {
+        if (preparsedDocumentProvider == null) {
             this.preparsedDocumentProvider = NoOpPreparsedDocumentProvider.INSTANCE;
         } else {
             this.preparsedDocumentProvider = preparsedDocumentProvider;
         }
     }
 
     protected SimpleGraphQLServlet(Builder builder) {
-        super(builder.objectMapperConfigurer, builder.listeners, null,builder.asyncServletMode);
+        super(builder.objectMapperConfigurer, builder.listeners, builder.asyncServletMode);
 
         this.schemaProvider = builder.schemaProvider;
         this.executionStrategyProvider = builder.executionStrategyProvider;