Skip to content

Add Content-Length HTTP header for non-stream JSON responses. #213

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

Closed
wants to merge 1 commit into from
Closed

Add Content-Length HTTP header for non-stream JSON responses. #213

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
17 changes: 11 additions & 6 deletions src/main/java/graphql/servlet/AbstractGraphQLHttpServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,9 @@ private void query(GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQL
if (!(result.getData() instanceof Publisher || isDeferred)) {
resp.setContentType(APPLICATION_JSON_UTF8);
resp.setStatus(STATUS_OK);
resp.getWriter().write(graphQLObjectMapper.serializeResultAsJson(result));
String responseContent = graphQLObjectMapper.serializeResultAsJson(result);
resp.setContentLength(responseContent.length());
resp.getWriter().write(responseContent);
} else {
if (req == null) {
throw new IllegalStateException("Http servlet request can not be null");
Expand Down Expand Up @@ -409,17 +411,20 @@ private void queryBatched(GraphQLQueryInvoker queryInvoker, GraphQLBatchedInvoca
contextSetting);
response.setContentType(AbstractGraphQLHttpServlet.APPLICATION_JSON_UTF8);
response.setStatus(AbstractGraphQLHttpServlet.STATUS_OK);
Writer writer = response.getWriter();
Iterator<ExecutionResult> executionInputIterator = results.iterator();
writer.write("[");
StringBuilder responseBuilder = new StringBuilder();
responseBuilder.append('[');
GraphQLObjectMapper graphQLObjectMapper = configuration.getObjectMapper();
while (executionInputIterator.hasNext()) {
writer.write(graphQLObjectMapper.serializeResultAsJson(executionInputIterator.next()));
responseBuilder.append(graphQLObjectMapper.serializeResultAsJson(executionInputIterator.next()));
if (executionInputIterator.hasNext()) {
writer.write(",");
responseBuilder.append(',');
}
}
writer.write("]");
responseBuilder.append(']');
String responseContent = responseBuilder.toString();
response.setContentLength(responseContent.length());
response.getWriter().write(responseContent);
} else {
response.sendError(batchInputPreProcessResult.getStatusCode(), batchInputPreProcessResult.getStatusMessage());
}
Expand Down
2 changes: 2 additions & 0 deletions src/test/groovy/graphql/servlet/AbstractGraphQLHttpServletSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ class AbstractGraphQLHttpServletSpec extends Specification {
then:
response.getStatus() == STATUS_OK
response.getContentType() == CONTENT_TYPE_JSON_UTF8
response.getContentLength() == mapper.writeValueAsString(["data":["echo":"test"]]).length()
getResponseContent().data.echo == "test"
}

Expand Down Expand Up @@ -729,6 +730,7 @@ class AbstractGraphQLHttpServletSpec extends Specification {
then:
response.getStatus() == STATUS_OK
response.getContentType() == CONTENT_TYPE_JSON_UTF8
response.getContentLength() == mapper.writeValueAsString([["data": ["echo": "test"]], ["data": ["echo": "test"]]]).length()
getBatchedResponseContent()[0].data.echo == "test"
getBatchedResponseContent()[1].data.echo == "test"
}
Expand Down