Skip to content

fix: remove readOnly transaction attribute in GraphQLController #257

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
Apr 8, 2020
Merged

fix: remove readOnly transaction attribute in GraphQLController #257

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
55 changes: 27 additions & 28 deletions ...query-web/src/main/java/com/introproventures/graphql/jpa/query/web/GraphQLController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.introproventures.graphql.jpa.query.schema.GraphQLExecutor;
import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutor;

import graphql.DeferredExecutionResult;
import graphql.ExecutionResult;
import graphql.GraphQL;
Expand All @@ -56,7 +55,7 @@
*
*/
@RestController
@Transactional(readOnly = true)
@Transactional
public class GraphQLController {

private static final String PATH = "${spring.graphql.jpa.query.path:/graphql}";
Expand All @@ -76,7 +75,7 @@ public GraphQLController(GraphQLExecutor graphQLExecutor, ObjectMapper mapper) {
this.graphQLExecutor = graphQLExecutor;
this.mapper = mapper;
}

@GetMapping(value = PATH,
consumes = MediaType.TEXT_EVENT_STREAM_VALUE,
produces = MediaType.TEXT_EVENT_STREAM_VALUE)
Expand All @@ -85,18 +84,18 @@ public SseEmitter getEventStream(@RequestParam(name = "query") final String quer
Map<String, Object> variablesMap = variablesStringToMap(variables);

ExecutionResult executionResult = graphQLExecutor.execute(query, variablesMap);

SseEmitter sseEmitter = new SseEmitter(180_000L); // FIXME need to add parameter
sseEmitter.onTimeout(sseEmitter::complete);

if(!executionResult.getErrors().isEmpty()) {
sseEmitter.send(executionResult.toSpecification(), MediaType.APPLICATION_JSON);
sseEmitter.completeWithError(new RuntimeException(executionResult.getErrors().toString()));
return sseEmitter;
}
Publisher<ExecutionResult> deferredResults = executionResult.getData();

Publisher<ExecutionResult> deferredResults = executionResult.getData();

// now send each deferred part which is given to us as a reactive stream
// of deferred values
deferredResults.subscribe(new Subscriber<ExecutionResult>() {
Expand All @@ -115,7 +114,7 @@ public void onNext(ExecutionResult executionResult) {

try {
SseEventBuilder event = wrap(executionResult);

sseEmitter.send(event);
} catch (IOException e) {
sseEmitter.completeWithError(e);
Expand All @@ -131,21 +130,21 @@ public void onError(Throwable t) {
public void onComplete() {
sseEmitter.complete();
}

SseEventBuilder wrap(ExecutionResult executionResult) {
Map<String, Object> result = executionResult.getData();
String name = result.keySet().iterator().next();

return SseEmitter.event()
.id((id++).toString())
.name(name)
.data(result, MediaType.APPLICATION_JSON);

}
});
});

return sseEmitter;
}
}

/**
* Handle standard GraphQL POST request that consumes
Expand Down Expand Up @@ -191,11 +190,11 @@ public void postJson(@RequestBody @Valid final GraphQLQueryRequest queryRequest,
public void getQuery(@RequestParam(name = "query") final String query,
@RequestParam(name = "variables", required = false) final String variables,
HttpServletResponse httpServletResponse) throws IOException {

Map<String, Object> variablesMap = variablesStringToMap(variables);

ExecutionResult executionResult = graphQLExecutor.execute(query, variablesMap);

sendResponse(httpServletResponse, executionResult);
}

Expand All @@ -220,7 +219,7 @@ public void postForm(@RequestParam(name = "query") final String query,
Map<String, Object> variablesMap = variablesStringToMap(variables);

ExecutionResult executionResult = graphQLExecutor.execute(query, variablesMap);

sendResponse(httpServletResponse, executionResult);
}

Expand Down Expand Up @@ -312,11 +311,11 @@ public void setVariables(Map<String, Object> variables) {
}

}

private void sendResponse(HttpServletResponse response, ExecutionResult executionResult) throws IOException {
if (hasDeferredResults(executionResult)) {
sendDeferredResponse(response, executionResult, executionResult.getExtensions());
}
}
else if (hasPublisherResults(executionResult)) {
sendMultipartResponse(response, executionResult, executionResult.getData());
} else {
Expand All @@ -328,8 +327,8 @@ private void sendNormalResponse(HttpServletResponse response, ExecutionResult ex
response.setContentType("application/json");
response.setStatus(HttpServletResponse.SC_OK);
mapper.writeValue(response.getOutputStream(), executionResult.toSpecification());
}
}

private boolean hasDeferredResults(ExecutionResult executionResult) {
return Optional.ofNullable(executionResult.getExtensions())
.map(it -> it.containsKey(GraphQL.DEFERRED_RESULTS))
Expand All @@ -339,12 +338,12 @@ private boolean hasDeferredResults(ExecutionResult executionResult) {
private boolean hasPublisherResults(ExecutionResult executionResult) {
return Publisher.class.isInstance(executionResult.getData());
}

private static final String CRLF = "\r\n";

@SuppressWarnings("unchecked")
private void sendDeferredResponse(HttpServletResponse response,
ExecutionResult executionResult,
private void sendDeferredResponse(HttpServletResponse response,
ExecutionResult executionResult,
Map<Object, Object> extensions) {
Publisher<DeferredExecutionResult> deferredResults = (Publisher<DeferredExecutionResult>) extensions.get(GraphQL.DEFERRED_RESULTS);
try {
Expand All @@ -354,8 +353,8 @@ private void sendDeferredResponse(HttpServletResponse response,
}
}

private void sendMultipartResponse(HttpServletResponse response,
ExecutionResult executionResult,
private void sendMultipartResponse(HttpServletResponse response,
ExecutionResult executionResult,
Publisher<? extends ExecutionResult> deferredResults) {
// this implements this Apollo defer spec: https://github.com/apollographql/apollo-server/blob/defer-support/docs/source/defer-support.md
// the spec says CRLF + "-----" + CRLF is needed at the end, but it works without it and with it we get client
Expand Down Expand Up @@ -445,6 +444,6 @@ private String bodyToString() {
throw new RuntimeException(e);
}
}
}
}

}