Skip to content

Fix Subscription GraphQLRequest deserialization #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2020
Merged

Fix Subscription GraphQLRequest deserialization #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...rt/src/main/java/graphql/kickstart/execution/subscriptions/GraphQLSubscriptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
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
Expand All @@ -13,7 +15,12 @@ public class GraphQLSubscriptionMapper {
private final GraphQLObjectMapper graphQLObjectMapper;

public GraphQLRequest readGraphQLRequest(Object payload) {
return graphQLObjectMapper.getJacksonMapper().convertValue(payload, GraphQLRequest.class);
Objects.requireNonNull(payload, "Payload is required");
try {
return graphQLObjectMapper.readGraphQLRequest(payload.toString());
} catch (IOException e) {
throw new RuntimeException(e);
}
}

public ExecutionResult sanitizeErrors(ExecutionResult executionResult) {
Expand Down
2 changes: 0 additions & 2 deletions .../main/java/graphql/kickstart/execution/subscriptions/apollo/SubscriptionStartCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
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;
Expand All @@ -33,7 +32,6 @@ 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);
Expand Down
2 changes: 0 additions & 2 deletions ...t/src/main/java/graphql/kickstart/servlet/subscriptions/FallbackSubscriptionConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
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;
Expand All @@ -31,7 +30,6 @@ 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);
Expand Down