Skip to content

SLING-11458 - fixed a regresssion for the original Ticket SLING-9626 #29

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

Open
schaefa wants to merge 4 commits into
base: master
Choose a base branch
from
Open

SLING-11458 - fixed a regresssion for the original Ticket SLING-9626 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
939ee99
SLING-11458 - fixed a regresssion for the original Ticket SLING-9626
Jul 15, 2022
169b013
Fixed also non-persistent execute
Jul 15, 2022
66c0ab9
Added a better comment to both times the writer must not be closed
Jul 18, 2022
a4864bc
Write a simple Print Writer Wrapper to prevent the closing on end of …
Jul 21, 2022
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
19 changes: 15 additions & 4 deletions src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
package org.apache.sling.graphql.core.servlet;

import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
import java.util.Arrays;
import java.util.Map;
import java.util.regex.Matcher;
Expand Down Expand Up @@ -314,10 +316,10 @@ private void execute(Resource resource, SlingHttpServletRequest request, SlingHt
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Missing request parameter:" + P_QUERY);
return;
}

try (JsonWriter writer = Json.createWriter(response.getWriter())) {
// The Response Writer cannot be flushed or closed here to avoid issues with Redirects etc
try (JsonWriter writer = Json.createWriter(new NoCloseWriterWrapper(response.getWriter()))) {
Map<String, Object> executionResult = queryExecutor.execute(query, result.getVariables(), resource,
request.getRequestPathInfo().getSelectors());
request.getRequestPathInfo().getSelectors());
writer.write(Json.createObjectBuilder(executionResult).build().asJsonObject());
} catch(Exception ex) {
throw new IOException(ex);
Expand All @@ -327,7 +329,8 @@ private void execute(Resource resource, SlingHttpServletRequest request, SlingHt
private void execute(@NotNull String persistedQuery, SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
response.setContentType("application/json");
response.setCharacterEncoding("UTF-8");
try (JsonWriter writer = Json.createWriter(response.getWriter())) {
// The Response Writer cannot be flushed or closed here to avoid issues with Redirects etc
try (JsonWriter writer = Json.createWriter(new NoCloseWriterWrapper(response.getWriter()))) {
final QueryParser.Result result = QueryParser.fromJSON(persistedQuery);
Map<String, Object> executionResult = queryExecutor.execute(result.getQuery(), result.getVariables(), request.getResource(),
request.getRequestPathInfo().getSelectors());
Expand All @@ -353,4 +356,12 @@ private String getLocationHeaderValue(@NotNull SlingHttpServletRequest request,
}


private class NoCloseWriterWrapper extends PrintWriter {
public NoCloseWriterWrapper(@NotNull Writer out) {
super(out);
}

@Override
public void close() {}
}
}
4 changes: 4 additions & 0 deletions src/test/java/org/apache/sling/graphql/core/servlet/GraphQLServletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -183,6 +185,7 @@ private void assertPostWithBody(String contentType, int expectedStatus) throws I

MockSlingHttpServletResponse response = context.response();
MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(context.bundleContext());
java.io.PrintWriter writer = spy(response.getWriter());

request.setMethod("POST");
request.setContent(TEST_QUERY.getBytes(StandardCharsets.UTF_8));
Expand All @@ -195,6 +198,7 @@ private void assertPostWithBody(String contentType, int expectedStatus) throws I

servlet.doPost(request, response);
assertEquals(expectedStatus, response.getStatus());
verify(writer, never()).close();
}

@Test
Expand Down