Removed HttpKit malarky

bbakerman · bbakerman · commit 982a19ec0e13 · 2017-06-05T09:30:54.000+10:00
diff --git a/src/test/groovy/example/http/HttpKit.java b/src/test/groovy/example/http/HttpKit.java
diff --git a/src/test/groovy/example/http/HttpMain.java b/src/test/groovy/example/http/HttpMain.java
@@ -59,6 +59,8 @@ private void handleStarWars(HttpServletRequest request, HttpServletResponse resp
         // this builds out the parameters we need like the graphql query
         QueryParameters parameters = QueryParameters.from(request);
         if (parameters.getQuery() == null) {
+            //
+            // how to handle nonsensical requests is up to your application
             response.setStatus(400);
             return;
         }
diff --git a/src/test/groovy/example/http/JsonKit.java b/src/test/groovy/example/http/JsonKit.java
@@ -15,6 +15,9 @@
  */
 public class JsonKit {
     static final Gson GSON = new GsonBuilder()
+            //
+            // This is important because the graphql spec says that null values should be present
+            //
             .serializeNulls()
             .create();
 
diff --git a/src/test/groovy/example/http/QueryParameters.java b/src/test/groovy/example/http/QueryParameters.java
@@ -6,7 +6,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 
 /**
  * Graphql clients can send GET or POST HTTP requests.  The spec does not make an explicit
@@ -42,43 +41,20 @@ public Map<String, Object> getVariables() {
     static QueryParameters from(HttpServletRequest request) {
         QueryParameters parameters = new QueryParameters();
         if ("POST".equalsIgnoreCase(request.getMethod())) {
-            //
-            // the graphql guidance says  :
-            //
-            // If the "application/graphql" Content-Type header is present, treat
-            // the HTTP POST body contents as the GraphQL query string.
-            if ("application/graphql".equals(request.getContentType())) {
-                parameters.query = readPostBody(request);
-            } else {
-                Map<String, Object> json = readJSON(request);
-
-                //
-                // the graphql guidance says  :
-                //
-                //  - If the "query" query string parameter is present
-                //  - ..., it should be parsed and handled
-                //  - in the same way as the HTTP GET case.
-                //
-                Optional<String> queryStr = getQueryQueryParameter(request);
-                parameters.query = queryStr.orElseGet(() -> (String) json.get("query"));
-                parameters.operationName = (String) json.get("operationName");
-                parameters.variables = getVariablesFromPost(json.get("variables"));
-            }
+            Map<String, Object> json = readJSON(request);
+            parameters.query = (String) json.get("query");
+            parameters.operationName = (String) json.get("operationName");
+            parameters.variables = getVariables(json.get("variables"));
         } else {
             parameters.query = request.getParameter("query");
             parameters.operationName = request.getParameter("operationName");
-            parameters.variables = getVariablesFromPost(request.getParameter("variables"));
+            parameters.variables = getVariables(request.getParameter("variables"));
         }
         return parameters;
     }
 
-    private static Optional<String> getQueryQueryParameter(HttpServletRequest request) {
-        // http servlet spec getParameter() does not distinguish between POST body or GET query strings
-        // so we have to parse for it in this case
-        return HttpKit.getQueryParameter(request,"query");
-    }
 
-    private static Map<String, Object> getVariablesFromPost(Object variables) {
+    private static Map<String, Object> getVariables(Object variables) {
         if (variables instanceof Map) {
             Map<?, ?> inputVars = (Map) variables;
             Map<String, Object> vars = new HashMap<>();

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ private void handleStarWars(HttpServletRequest request, HttpServletResponse resp`
`59`	`59`	`// this builds out the parameters we need like the graphql query`
`60`	`60`	`QueryParameters parameters = QueryParameters.from(request);`
`61`	`61`	`if (parameters.getQuery() == null) {`
	`62`	`+ //`
	`63`	`+ // how to handle nonsensical requests is up to your application`
`62`	`64`	`response.setStatus(400);`
`63`	`65`	`return;`
`64`	`66`	`}`