Merge remote-tracking branch 'origin/master'

Author: oliemansm

graphql-spring-boot-test/src/main/java/com/graphql/spring/boot/test/GraphQLTestTemplate.java

@@ -9,6 +9,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.StreamUtils;
@@ -27,6 +28,7 @@ public class GraphQLTestTemplate {
     private String graphqlMapping;
 
     private ObjectMapper objectMapper = new ObjectMapper();
+    private HttpHeaders headers = new HttpHeaders();
 
     private String createJsonQuery(String graphql, ObjectNode variables)
             throws JsonProcessingException {
@@ -48,6 +50,32 @@ private String loadResource(Resource resource) throws IOException {
         }
     }
 
+    /**
+     * Add an HTTP header that will be sent with each request this sends.
+     *
+     * @param name Name (key) of HTTP header to add.
+     * @param value Value of HTTP header to add.
+     */
+    public void addHeader(String name, String value) {
+        headers.add(name, value);
+    }
+
+    /**
+     * Replace any associated HTTP headers with the provided headers.
+     *
+     * @param newHeaders Headers to use.
+     */
+    public void setHeaders(HttpHeaders newHeaders) {
+        headers = newHeaders;
+    }
+
+    /**
+     * Clear all associated HTTP headers.
+     */
+    public void clearHeaders() {
+        setHeaders(new HttpHeaders());
+    }
+
     /**
      * @deprecated Use {@link #postForResource(String)} instead
      *
@@ -77,11 +105,11 @@ public GraphQLResponse postForResource(String graphqlResource) throws IOExceptio
     }
 
     public GraphQLResponse postMultipart(String query, String variables) {
-        return postRequest(RequestFactory.forMultipart(query, variables));
+        return postRequest(RequestFactory.forMultipart(query, variables, headers));
     }
 
     private GraphQLResponse post(String payload) {
-        return postRequest(RequestFactory.forJson(payload));
+        return postRequest(RequestFactory.forJson(payload, headers));
     }
 
     private GraphQLResponse postRequest(HttpEntity<Object> request) {

graphql-spring-boot-test/src/main/java/com/graphql/spring/boot/test/RequestFactory.java

@@ -11,18 +11,16 @@ private RequestFactory() {
         // utility class
     }
 
-    static HttpEntity<Object> forJson(String json) {
-        HttpHeaders headers = new HttpHeaders();
+    static HttpEntity<Object> forJson(String json, HttpHeaders headers) {
         headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
         return new HttpEntity<>(json, headers);
     }
 
-    static HttpEntity<Object> forMultipart(String query, String variables) {
-        HttpHeaders headers = new HttpHeaders();
+    static HttpEntity<Object> forMultipart(String query, String variables, HttpHeaders headers) {
         headers.setContentType(MediaType.MULTIPART_FORM_DATA);
         LinkedMultiValueMap<String, Object> values = new LinkedMultiValueMap<>();
-        values.add("query", forJson(query));
-        values.add("variables", forJson(variables));
+        values.add("query", forJson(query, headers));
+        values.add("variables", forJson(variables, headers));
         return new HttpEntity<>(values, headers);
     }