Deserialize payload depending on type fix #252

Author: oliemansm

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/subscriptions/GraphQLSubscriptionMapper.java

@@ -2,26 +2,38 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import graphql.ExecutionResult;
+import graphql.GraphQLException;
 import graphql.kickstart.execution.GraphQLObjectMapper;
 import graphql.kickstart.execution.GraphQLRequest;
 import java.util.Map;
+import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 public class GraphQLSubscriptionMapper {
 
   private final GraphQLObjectMapper graphQLObjectMapper;
 
-  public GraphQLRequest readGraphQLRequest(Object payload) {
+  public GraphQLRequest readGraphQLRequest(String payload) {
+    Objects.requireNonNull(payload, "Payload is required");
+    try {
+      return graphQLObjectMapper.getJacksonMapper().readValue(payload, GraphQLRequest.class);
+    } catch (JsonProcessingException e) {
+      throw new GraphQLException("Cannot read GraphQL request from payload '" + payload + "'", e);
+    }
+  }
+
+  public GraphQLRequest convertGraphQLRequest(Object payload) {
+    Objects.requireNonNull(payload, "Payload is required");
     return graphQLObjectMapper.getJacksonMapper().convertValue(payload, GraphQLRequest.class);
   }
 
   public ExecutionResult sanitizeErrors(ExecutionResult executionResult) {
     return graphQLObjectMapper.sanitizeErrors(executionResult);
   }
 
-  public boolean areErrorsPresent(ExecutionResult executionResult) {
-    return graphQLObjectMapper.areErrorsPresent(executionResult);
+  public boolean hasNoErrors(ExecutionResult executionResult) {
+    return !graphQLObjectMapper.areErrorsPresent(executionResult);
   }
 
   public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult executionResult) {

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/subscriptions/apollo/SubscriptionStartCommand.java

@@ -34,15 +34,15 @@ public void apply(SubscriptionSession session, OperationMessage message) {
 
   private CompletableFuture<ExecutionResult> executeAsync(Object payload, SubscriptionSession session) {
     Objects.requireNonNull(payload, "Payload is required");
-    GraphQLRequest graphQLRequest = mapper.readGraphQLRequest(payload);
+    GraphQLRequest graphQLRequest = mapper.convertGraphQLRequest(payload);
 
     GraphQLSingleInvocationInput invocationInput = invocationInputFactory.create(graphQLRequest, session);
     return graphQLInvoker.executeAsync(invocationInput);
   }
 
   private void handleSubscriptionStart(SubscriptionSession session, String id, ExecutionResult executionResult) {
     ExecutionResult sanitizedExecutionResult = mapper.sanitizeErrors(executionResult);
-    if (!mapper.areErrorsPresent(sanitizedExecutionResult)) {
+    if (mapper.hasNoErrors(sanitizedExecutionResult)) {
       session.subscribe(id, sanitizedExecutionResult.getData());
     } else {
       Object payload = mapper.convertSanitizedExecutionResult(sanitizedExecutionResult);

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLWebsocketServlet.java

@@ -198,6 +198,7 @@ public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request,
       response.getHeaders().put(HandshakeRequest.SEC_WEBSOCKET_PROTOCOL,
           new ArrayList<>(asList(subscriptionProtocolFactory.getProtocol())));
     }
+
   }
 
   /**

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/subscriptions/FallbackSubscriptionConsumer.java

@@ -30,7 +30,7 @@ public void accept(String text) {
     executionResult.thenAccept(result -> handleSubscriptionStart(session, UUID.randomUUID().toString(), result));
   }
 
-  private CompletableFuture<ExecutionResult> executeAsync(Object payload, SubscriptionSession session) {
+  private CompletableFuture<ExecutionResult> executeAsync(String payload, SubscriptionSession session) {
     Objects.requireNonNull(payload, "Payload is required");
     GraphQLRequest graphQLRequest = mapper.readGraphQLRequest(payload);
 
@@ -40,7 +40,7 @@ private CompletableFuture<ExecutionResult> executeAsync(Object payload, Subscrip
 
   private void handleSubscriptionStart(SubscriptionSession session, String id, ExecutionResult executionResult) {
     ExecutionResult sanitizedExecutionResult = mapper.sanitizeErrors(executionResult);
-    if (!mapper.areErrorsPresent(sanitizedExecutionResult)) {
+    if (mapper.hasNoErrors(sanitizedExecutionResult)) {
       session.subscribe(id, sanitizedExecutionResult.getData());
     } else {
       Object payload = mapper.convertSanitizedExecutionResult(sanitizedExecutionResult);