Skip to content

Add support for operationName that was not implemented #6

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
Oct 12, 2016
Merged

Add support for operationName that was not implemented #6

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: 11 additions & 7 deletions src/main/java/graphql/servlet/GraphQLServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,20 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
path = req.getServletPath();
}
if (path.contentEquals("/schema.json")) {
query(CharStreams.toString(new InputStreamReader(GraphQLServlet.class.getResourceAsStream("introspectionQuery"))), new HashMap<>(), schema, req, resp, context);
query(CharStreams.toString(new InputStreamReader(GraphQLServlet.class.getResourceAsStream("introspectionQuery"))), null, new HashMap<>(), schema, req, resp, context);
} else {
if (req.getParameter("q") != null) {
query(req.getParameter("q"), new HashMap<>(), readOnlySchema, req, resp, context);
query(req.getParameter("q"), null, new HashMap<>(), readOnlySchema, req, resp, context);
} else if (req.getParameter("query") != null) {
Map<String,Object> variables = new HashMap<>();
if (req.getParameter("variables") != null) {
variables.putAll(new ObjectMapper().readValue(req.getParameter("variables"), new TypeReference<Map<String,Object>>() {}));
}
query(req.getParameter("query"), variables, readOnlySchema, req, resp, context);
String operationName = null;
if (req.getParameter("operationName") != null) {
operationName = req.getParameter("operationName");
}
query(req.getParameter("query"), operationName, variables, readOnlySchema, req, resp, context);
}
}
}
Expand Down Expand Up @@ -226,20 +230,20 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
if (variables == null) {
variables = new HashMap<>();
}
query(request.query, variables, schema, req, resp, context);
query(request.query, request.operationName, variables, schema, req, resp, context);
}

private void query(String query, Map<String, Object> variables, GraphQLSchema schema, HttpServletRequest req, HttpServletResponse resp, GraphQLContext context) throws IOException {
private void query(String query, String operationName, Map<String, Object> variables, GraphQLSchema schema, HttpServletRequest req, HttpServletResponse resp, GraphQLContext context) throws IOException {
if (Subject.getSubject(AccessController.getContext()) == null && context.getSubject().isPresent()) {
Subject.doAs(context.getSubject().get(), new PrivilegedAction<Void>() {
@Override @SneakyThrows
public Void run() {
query(query, variables, schema, req, resp, context);
query(query, operationName, variables, schema, req, resp, context);
return null;
}
});
} else {
ExecutionResult result = new GraphQL(schema, executionStrategyProvider.getExecutionStrategy()).execute(query, context, variables);
ExecutionResult result = new GraphQL(schema, executionStrategyProvider.getExecutionStrategy()).execute(query, operationName, context, variables);
resp.setContentType("application/json");
if (result.getErrors().isEmpty()) {
Map<String, Object> dict = new HashMap<>();
Expand Down