Revert "Fix Subscription GraphQLRequest deserialization"

This reverts commit 836c972

Author: oliemansm

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

@@ -4,9 +4,7 @@
 import graphql.ExecutionResult;
 import graphql.kickstart.execution.GraphQLObjectMapper;
 import graphql.kickstart.execution.GraphQLRequest;
-import java.io.IOException;
 import java.util.Map;
-import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
@@ -15,12 +13,7 @@ public class GraphQLSubscriptionMapper {
   private final GraphQLObjectMapper graphQLObjectMapper;
 
   public GraphQLRequest readGraphQLRequest(Object payload) {
-    Objects.requireNonNull(payload, "Payload is required");
-    try {
-      return graphQLObjectMapper.readGraphQLRequest(payload.toString());
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+    return graphQLObjectMapper.getJacksonMapper().convertValue(payload, GraphQLRequest.class);
   }
 
   public ExecutionResult sanitizeErrors(ExecutionResult executionResult) {

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

@@ -10,6 +10,7 @@
 import graphql.kickstart.execution.subscriptions.GraphQLSubscriptionMapper;
 import graphql.kickstart.execution.subscriptions.SubscriptionSession;
 import java.util.Collection;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,6 +33,7 @@ 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);
 
     GraphQLSingleInvocationInput invocationInput = invocationInputFactory.create(graphQLRequest, session);

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

@@ -7,6 +7,7 @@
 import graphql.kickstart.execution.subscriptions.GraphQLSubscriptionInvocationInputFactory;
 import graphql.kickstart.execution.subscriptions.GraphQLSubscriptionMapper;
 import graphql.kickstart.execution.subscriptions.SubscriptionSession;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
@@ -30,6 +31,7 @@ public void accept(String text) {
   }
 
   private CompletableFuture<ExecutionResult> executeAsync(Object payload, SubscriptionSession session) {
+    Objects.requireNonNull(payload, "Payload is required");
     GraphQLRequest graphQLRequest = mapper.readGraphQLRequest(payload);
 
     GraphQLSingleInvocationInput invocationInput = invocationInputFactory.create(graphQLRequest, session);