Fixed build errors of apparently incomplete changes

Author: oliemansm

gradle.properties

@@ -1,2 +1,2 @@
-version = 5.2.1
+version = 6.0.0
 group = com.graphql-java

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

@@ -21,6 +21,18 @@ public GraphQLContext(HttpServletRequest httpServletRequest, HandshakeRequest ha
         this.subject = subject;
     }
 
+    public GraphQLContext(HttpServletRequest httpServletRequest) {
+        this(httpServletRequest, null, null);
+    }
+
+    public GraphQLContext(HandshakeRequest handshakeRequest) {
+        this(null, handshakeRequest, null);
+    }
+
+    public GraphQLContext() {
+        this(null, null, null);
+    }
+
     public Optional<HttpServletRequest> getHttpServletRequest() {
         return Optional.ofNullable(httpServletRequest);
     }

src/main/java/graphql/servlet/GraphQLQueryInvoker.java

@@ -4,7 +4,7 @@
 import graphql.ExecutionResult;
 import graphql.GraphQL;
 import graphql.execution.instrumentation.Instrumentation;
-import graphql.execution.instrumentation.NoOpInstrumentation;
+import graphql.execution.instrumentation.SimpleInstrumentation;
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLSchema;
@@ -79,7 +79,7 @@ public static Builder newBuilder() {
 
     public static class Builder {
         private Supplier<ExecutionStrategyProvider> getExecutionStrategyProvider = DefaultExecutionStrategyProvider::new;
-        private Supplier<Instrumentation> getInstrumentation = () -> NoOpInstrumentation.INSTANCE;
+        private Supplier<Instrumentation> getInstrumentation = () -> SimpleInstrumentation.INSTANCE;
         private Supplier<PreparsedDocumentProvider> getPreparsedDocumentProvider = () -> NoOpPreparsedDocumentProvider.INSTANCE;
 
         public Builder withExecutionStrategyProvider(ExecutionStrategyProvider provider) {

src/main/java/graphql/servlet/SimpleGraphQLServlet.java

@@ -20,7 +20,7 @@
 /**
  * @author Andrew Potter
  */
-public class ApolloSubscriptionProtocolHandler implements SubscriptionProtocolHandler {
+public class ApolloSubscriptionProtocolHandler extends SubscriptionProtocolHandler {
 
     private static final Logger log = LoggerFactory.getLogger(ApolloSubscriptionProtocolHandler.class);
 

src/main/java/graphql/servlet/internal/ApolloSubscriptionProtocolHandler.java

@@ -6,7 +6,7 @@
 /**
  * @author Andrew Potter
  */
-public class FallbackSubscriptionProtocolHandler implements SubscriptionProtocolHandler {
+public class FallbackSubscriptionProtocolHandler extends SubscriptionProtocolHandler {
 
     private final SubscriptionHandlerInput input;
 

src/main/java/graphql/servlet/internal/FallbackSubscriptionProtocolHandler.java

@@ -20,14 +20,13 @@ public abstract class SubscriptionProtocolHandler {
 
     private static final Logger log = LoggerFactory.getLogger(SubscriptionProtocolHandler.class);
 
-    abstract void onMessage(HandshakeRequest request, Session session, WsSessionSubscriptions subscriptions, String text) throws Exception;
+    public abstract void onMessage(HandshakeRequest request, Session session, WsSessionSubscriptions subscriptions, String text) throws Exception;
 
     protected void subscribe(ExecutionResult executionResult, WsSessionSubscriptions subscriptions, String id) {
         final Object data = executionResult.getData();
 
-        if(data instanceof Publisher) {
-            @SuppressWarnings("unchecked")
-            final Publisher<ExecutionResult> publisher = (Publisher<ExecutionResult>) data;
+        if (data instanceof Publisher) {
+            @SuppressWarnings("unchecked") final Publisher<ExecutionResult> publisher = (Publisher<ExecutionResult>) data;
             final AtomicReference<Subscription> subscriptionReference = new AtomicReference<>();
 
             publisher.subscribe(new Subscriber<ExecutionResult>() {
@@ -44,25 +43,22 @@ public void onNext(ExecutionResult executionResult) {
                     subscriptionReference.get().request(1);
                     Map<String, Object> result = new HashMap<>();
                     result.put("data", executionResult.getData());
-                    sendMessage(session, ApolloSubscriptionProtocolHandler.OperationMessage.Type.GQL_DATA, id, result);
+//                    sendMessage(session, ApolloSubscriptionProtocolHandler.OperationMessage.Type.GQL_DATA, id, result);
                 }
 
                 @Override
                 public void onError(Throwable throwable) {
                     log.error("Subscription error", throwable);
                     subscriptions.cancel(id);
-                    sendMessage(session, ApolloSubscriptionProtocolHandler.OperationMessage.Type.GQL_ERROR, id);
+//                    sendMessage(session, ApolloSubscriptionProtocolHandler.OperationMessage.Type.GQL_ERROR, id);
                 }
 
                 @Override
                 public void onComplete() {
                     subscriptions.cancel(id);
-                    sendMessage(session, ApolloSubscriptionProtocolHandler.OperationMessage.Type.GQL_COMPLETE, id);
+//                    sendMessage(session, ApolloSubscriptionProtocolHandler.OperationMessage.Type.GQL_COMPLETE, id);
                 }
             });
         }
-        }
     }
-
-    public static
 }