Add accept and content-type headers silently

Author: oliemansm

graphiql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/graphiql/boot/GraphiQLController.java

@@ -2,25 +2,23 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.text.StrSubstitutor;
+import org.apache.commons.text.StringSubstitutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.MediaType;
 import org.springframework.security.web.csrf.CsrfToken;
 import org.springframework.util.StreamUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
 /**
  * @author Andrew Potter
  */
@@ -63,7 +61,8 @@ private void loadHeaders() {
     headerProperties = propertyReader.load();
   }
 
-  public byte[] graphiql(String contextPath, @PathVariable Map<String, String> params, Object csrf) {
+  public byte[] graphiql(String contextPath, @PathVariable Map<String, String> params,
+      Object csrf) {
     if (csrf != null) {
       CsrfToken csrfToken = (CsrfToken) csrf;
       headerProperties.setProperty(csrfToken.getHeaderName(), csrfToken.getToken());
@@ -75,7 +74,7 @@ public byte[] graphiql(String contextPath, @PathVariable Map<String, String> par
         contextPath + graphiQLProperties.getSTATIC().getBasePath()
     );
 
-    String populatedTemplate = StrSubstitutor.replace(template, replacements);
+    String populatedTemplate = StringSubstitutor.replace(template, replacements);
     return populatedTemplate.getBytes(Charset.defaultCharset());
   }
 
@@ -89,7 +88,8 @@ private Map<String, String> getReplacements(
     replacements.put("subscriptionsEndpoint", subscriptionsEndpoint);
     replacements.put("staticBasePath", staticBasePath);
     replacements.put("pageTitle", graphiQLProperties.getPageTitle());
-    replacements.put("pageFavicon", getResourceUrl(staticBasePath, "favicon.ico", FAVICON_GRAPHQL_ORG));
+    replacements
+        .put("pageFavicon", getResourceUrl(staticBasePath, "favicon.ico", FAVICON_GRAPHQL_ORG));
     replacements.put("es6PromiseJsUrl", getResourceUrl(staticBasePath, "es6-promise.auto.min.js",
         joinCdnjsPath("es6-promise", "4.1.1", "es6-promise.auto.min.js")));
     replacements.put("fetchJsUrl", getResourceUrl(staticBasePath, "fetch.min.js",
@@ -115,9 +115,11 @@ private Map<String, String> getReplacements(
       log.error("Cannot serialize headers", e);
     }
     replacements
-        .put("subscriptionClientTimeout", String.valueOf(graphiQLProperties.getSubscriptions().getTimeout() * 1000));
+        .put("subscriptionClientTimeout",
+            String.valueOf(graphiQLProperties.getSubscriptions().getTimeout() * 1000));
     replacements
-        .put("subscriptionClientReconnect", String.valueOf(graphiQLProperties.getSubscriptions().isReconnect()));
+        .put("subscriptionClientReconnect",
+            String.valueOf(graphiQLProperties.getSubscriptions().isReconnect()));
     replacements.put("editorThemeCss", getEditorThemeCssURL());
     return replacements;
   }
@@ -153,7 +155,8 @@ private String joinJsDelivrPath(String library, String cdnVersion, String cdnFil
     return CDN_JSDELIVR_NET_NPM + library + "@" + cdnVersion + "/" + cdnFileName;
   }
 
-  private String constructGraphQlEndpoint(String contextPath, @RequestParam Map<String, String> params) {
+  private String constructGraphQlEndpoint(String contextPath,
+      @RequestParam Map<String, String> params) {
     String endpoint = graphiQLProperties.getEndpoint().getGraphql();
     for (Map.Entry<String, String> param : params.entrySet()) {
       endpoint = endpoint.replaceAll("\\{" + param.getKey() + "}", param.getValue());