Skip to content

Reordered properties in JSON response according to recommendation in GraphQL spec #158

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.

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
Mar 23, 2019
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/main/java/graphql/servlet/GraphQLObjectMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,6 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu
public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult executionResult, boolean includeData) {
final Map<String, Object> result = new LinkedHashMap<>();

if(includeData) {
result.put("data", executionResult.getData());
}

if (areErrorsPresent(executionResult)) {
result.put("errors", executionResult.getErrors());
}
Expand All @@ -141,6 +137,10 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu
result.put("extensions", executionResult.getExtensions());
}

if(includeData) {
result.put("data", executionResult.getData());
}

return result;
}

Expand Down