Merge remote-tracking branch 'remotes/origin/master' into subscription-support

# Conflicts:
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/graphql/servlet/GraphQLContext.java
#	src/main/java/graphql/servlet/GraphQLServlet.java
#	src/main/java/graphql/servlet/SimpleGraphQLServlet.java

Author: oliemansm

README.md

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

build.gradle

@@ -53,19 +53,16 @@ dependencies {
     compile 'javax.servlet:javax.servlet-api:4.0.0'
     compile 'javax.websocket:javax.websocket-api:1.1'
 
-    // Multipart support
-    compile 'commons-fileupload:commons-fileupload:1.3.1'
-
     // GraphQL
-    compile 'com.graphql-java:graphql-java:6.0'
+    compile 'com.graphql-java:graphql-java:9.2'
 
-    testCompile 'com.graphql-java:graphql-java-annotations:0.13.1'
+    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'
@@ -74,6 +71,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.0-SNAPSHOT
+version = 5.2.1
 group = com.graphql-java

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Wed Apr 25 17:03:16 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

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

@@ -1,57 +1,61 @@
 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 javax.websocket.server.HandshakeRequest;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 public class GraphQLContext {
-    private final HttpServletRequest httpServletRequest;
-    private final HandshakeRequest handshakeRequest;
-    private final Subject subject;
+    private Optional<HttpServletRequest> request;
+    private Optional<HttpServletResponse> response;
+    private HandshakeRequest handshakeRequest;
 
-    private Map<String, List<FileItem>> files = null;
+    private Optional<Subject> subject = Optional.empty();
+    private Optional<Map<String, List<Part>>> files = Optional.empty();
 
-    public GraphQLContext(HttpServletRequest httpServletRequest, HandshakeRequest handshakeRequest, Subject subject) {
-        this.httpServletRequest = httpServletRequest;
+    public GraphQLContext(Optional<HttpServletRequest> request, Optional<HttpServletResponse> response, HandshakeRequest handshakeRequest) {
+        this.request = request;
+        this.response = response;
         this.handshakeRequest = handshakeRequest;
-        this.subject = subject;
     }
 
-    public GraphQLContext(HttpServletRequest httpServletRequest) {
-        this(httpServletRequest, null, null);
+    public Optional<HttpServletRequest> getRequest() {
+        return request;
     }
 
-    public GraphQLContext(HandshakeRequest handshakeRequest) {
-        this(null, handshakeRequest, null);
+    public void setRequest(Optional<HttpServletRequest> request) {
+        this.request = request;
     }
 
-    public GraphQLContext() {
-        this(null, null, null);
+    public Optional<HttpServletResponse> getResponse() {
+        return response;
     }
 
-    public Optional<HttpServletRequest> getHttpServletRequest() {
-        return Optional.ofNullable(httpServletRequest);
+    public void setResponse(Optional<HttpServletResponse> response) {
+        this.response = response;
     }
 
-    public Optional<HandshakeRequest> getHandshakeRequest() {
-        return Optional.ofNullable(handshakeRequest);
+    public Optional<Subject> getSubject() {
+        return subject;
     }
 
-    public Optional<Subject> getSubject() {
-        return Optional.ofNullable(subject);
+    public void setSubject(Optional<Subject> subject) {
+        this.subject = subject;
+    }
+
+    public Optional<HandshakeRequest> getHandshakeRequest() {
+        return Optional.ofNullable(handshakeRequest);
     }
 
-    public Optional<Map<String, List<FileItem>>> getFiles() {
-        return Optional.ofNullable(files);
+    public Optional<Map<String, List<Part>>> getFiles() {
+        return files;
     }
 
-    public void setFiles(Map<String, List<FileItem>> files) {
+    public void setFiles(Optional<Map<String, List<Part>>> files) {
         this.files = files;
     }
 }