PoC subscription support and being refining

Author: apottere

build.gradle

@@ -50,7 +50,9 @@ dependencies {
     compileOnly 'biz.aQute.bnd:biz.aQute.bndlib:3.1.0'
 
     // Servlet
-    compile 'javax.servlet:javax.servlet-api:3.0.1'
+    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'
 

gradle.properties

@@ -1,2 +1,2 @@
-version = 4.6.1
+version = 4.6.1-SNAPSHOT
 group = com.graphql-java

src/main/java/graphql/servlet/DefaultGraphQLContextBuilder.java

@@ -1,14 +1,22 @@
 package graphql.servlet;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Optional;
+import javax.websocket.server.HandshakeRequest;
 
 public class DefaultGraphQLContextBuilder implements GraphQLContextBuilder {
 
     @Override
-    public GraphQLContext build(Optional<HttpServletRequest> req, Optional<HttpServletResponse> resp) {
-        return new GraphQLContext(req, resp);
+    public GraphQLContext build(HttpServletRequest httpServletRequest) {
+        return new GraphQLContext(httpServletRequest);
     }
 
+    @Override
+    public GraphQLContext build(HandshakeRequest handshakeRequest) {
+        return new GraphQLContext(handshakeRequest);
+    }
+
+    @Override
+    public GraphQLContext build() {
+        return new GraphQLContext();
+    }
 }

src/main/java/graphql/servlet/DefaultGraphQLSchemaProvider.java

@@ -3,6 +3,7 @@
 import graphql.schema.GraphQLSchema;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.websocket.server.HandshakeRequest;
 
 /**
  * @author Andrew Potter
@@ -27,6 +28,11 @@ public GraphQLSchema getSchema(HttpServletRequest request) {
         return getSchema();
     }
 
+    @Override
+    public GraphQLSchema getSchema(HandshakeRequest request) {
+        return getSchema();
+    }
+
     @Override
     public GraphQLSchema getSchema() {
         return schema;

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

@@ -5,51 +5,53 @@
 import javax.security.auth.Subject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.websocket.server.HandshakeRequest;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 public class GraphQLContext {
-    private Optional<HttpServletRequest> request;
-    private Optional<HttpServletResponse> response;
+    private final HttpServletRequest httpServletRequest;
+    private final HandshakeRequest handshakeRequest;
+    private final Subject subject;
 
-    private Optional<Subject> subject = Optional.empty();
-    private Optional<Map<String, List<FileItem>>> files = Optional.empty();
+    private Map<String, List<FileItem>> files = null;
 
-    public GraphQLContext(Optional<HttpServletRequest> request, Optional<HttpServletResponse> response) {
-        this.request = request;
-        this.response = response;
+    public GraphQLContext(HttpServletRequest httpServletRequest, HandshakeRequest handshakeRequest, Subject subject) {
+        this.httpServletRequest = httpServletRequest;
+        this.handshakeRequest = handshakeRequest;
+        this.subject = subject;
     }
 
-    public Optional<HttpServletRequest> getRequest() {
-        return request;
+    public GraphQLContext(HttpServletRequest httpServletRequest) {
+        this(httpServletRequest, null, null);
     }
 
-    public void setRequest(Optional<HttpServletRequest> request) {
-        this.request = request;
+    public GraphQLContext(HandshakeRequest handshakeRequest) {
+        this(null, handshakeRequest, null);
     }
 
-    public Optional<HttpServletResponse> getResponse() {
-        return response;
+    public GraphQLContext() {
+        this(null, null, null);
     }
 
-    public void setResponse(Optional<HttpServletResponse> response) {
-        this.response = response;
+    public Optional<HttpServletRequest> getHttpServletRequest() {
+        return Optional.ofNullable(httpServletRequest);
     }
 
-    public Optional<Subject> getSubject() {
-        return subject;
+    public Optional<HandshakeRequest> getHandshakeRequest() {
+        return Optional.ofNullable(handshakeRequest);
     }
 
-    public void setSubject(Optional<Subject> subject) {
-        this.subject = subject;
+    public Optional<Subject> getSubject() {
+        return Optional.ofNullable(subject);
     }
 
     public Optional<Map<String, List<FileItem>>> getFiles() {
-        return files;
+        return Optional.ofNullable(files);
     }
 
-    public void setFiles(Optional<Map<String, List<FileItem>>> files) {
+    public void setFiles(Map<String, List<FileItem>> files) {
         this.files = files;
     }
 }

src/main/java/graphql/servlet/GraphQLContextBuilder.java

@@ -2,8 +2,16 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.websocket.server.HandshakeRequest;
 import java.util.Optional;
 
 public interface GraphQLContextBuilder {
-    GraphQLContext build(Optional<HttpServletRequest> req, Optional<HttpServletResponse> resp);
+    GraphQLContext build(HttpServletRequest httpServletRequest);
+    GraphQLContext build(HandshakeRequest handshakeRequest);
+
+    /**
+     * Only used for MBean calls.
+     * @return the graphql context
+     */
+    GraphQLContext build();
 }

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

@@ -2,8 +2,16 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.websocket.server.HandshakeRequest;
 import java.util.Optional;
 
 public interface GraphQLRootObjectBuilder {
-    Object build(Optional<HttpServletRequest> req, Optional<HttpServletResponse> resp);
+    Object build(HttpServletRequest req);
+    Object build(HandshakeRequest req);
+
+    /**
+     * Only used for MBean calls.
+     * @return the graphql root object
+     */
+    Object build();
 }

src/main/java/graphql/servlet/GraphQLSchemaProvider.java

@@ -3,6 +3,7 @@
 import graphql.schema.GraphQLSchema;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.websocket.server.HandshakeRequest;
 
 public interface GraphQLSchemaProvider {
 
@@ -12,10 +13,15 @@ static GraphQLSchema copyReadOnly(GraphQLSchema schema) {
 
     /**
      * @param request the http request
-     * @return a schema based on the request (auth, etc).  Optional is empty when called from an mbean.
+     * @return a schema based on the request (auth, etc).
      */
     GraphQLSchema getSchema(HttpServletRequest request);
 
+    /**
+     * @param request the http request
+     * @return a schema based on the request (auth, etc).
+     */
+    GraphQLSchema getSchema(HandshakeRequest request);
 
     /**
      * @return a schema for handling mbean calls.
@@ -24,7 +30,7 @@ static GraphQLSchema copyReadOnly(GraphQLSchema schema) {
 
     /**
      * @param request the http request
-     * @return a read-only schema based on the request (auth, etc).  Should return the same schema as {@link #getSchema(HttpServletRequest)} for a given request.
+     * @return a read-only schema based on the request (auth, etc).  Should return the same schema (query-only version) as {@link #getSchema(HttpServletRequest)} for a given request.
      */
     GraphQLSchema getReadOnlySchema(HttpServletRequest request);
 }