- Modify variables setter to use JSON format instead of string format, as is now document in the latest specification here : http://graphql.org/learn/serving-over-http/#post-request

This change is also now done on GraphiQL : graphql/graphiql#168
- Add support for GET parameters (query and variables) as is also specified here : http://graphql.org/learn/serving-over-http/#get-request
- Fix some NPEs when no parameters where specified.

Author: sergehuber

src/main/java/graphql/servlet/GraphQLServlet.java

@@ -168,14 +168,8 @@ public String executeQuery(String query) {
     public static class Request {
         @Getter @Setter
         private String query;
-        @Getter
+        @Getter @Setter
         private Map<String, Object> variables = new HashMap<>();
-
-        @SneakyThrows
-        public void setVariables(String variables) {
-            this.variables = new ObjectMapper().readValue(variables, new TypeReference<Map<String, Object>>() {});
-        }
-
         @Getter @Setter
         private String operationName;
     }
@@ -190,7 +184,15 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
         if (path.contentEquals("/schema.json")) {
             query(CharStreams.toString(new InputStreamReader(GraphQLServlet.class.getResourceAsStream("introspectionQuery"))), new HashMap<>(), schema, req, resp, context);
         } else {
-            query(req.getParameter("q"), new HashMap<>(), readOnlySchema, req, resp, context);
+            if (req.getParameter("q") != null) {
+                query(req.getParameter("q"), 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);
+            }
         }
     }
 
@@ -220,7 +222,11 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
             inputStream = req.getInputStream();
         }
         Request request = new ObjectMapper().readValue(inputStream, Request.class);
-        query(request.query, request.variables, schema, req, resp, context);
+        Map<String,Object> variables = request.variables;
+        if (variables == null) {
+            variables = new HashMap<>();
+        }
+        query(request.query, variables, schema, req, resp, context);
     }
 
     private void query(String query, Map<String, Object> variables, GraphQLSchema schema, HttpServletRequest req, HttpServletResponse resp, GraphQLContext context) throws IOException {