Skip to content

Deserialize payload depending on type fix #252 #254

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 20, 2020
Merged

Deserialize payload depending on type fix #252 #254

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
18 changes: 15 additions & 3 deletions ...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 @@ -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) {
Expand Down
4 changes: 2 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 @@ -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);
Expand Down
1 change: 1 addition & 0 deletions graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLWebsocketServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request,
response.getHeaders().put(HandshakeRequest.SEC_WEBSOCKET_PROTOCOL,
new ArrayList<>(asList(subscriptionProtocolFactory.getProtocol())));
}

}

/**
Expand Down
4 changes: 2 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 @@ -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);

Expand All @@ -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);
Expand Down