Merge branch '3.1.x' into 3.2.x

Author: graemerocher

grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultMimeTypeResolver.groovy

@@ -17,6 +17,7 @@ package org.grails.web.mime
 
 import grails.web.mime.MimeType
 import grails.web.mime.MimeTypeResolver
+import groovy.transform.CompileStatic
 import org.grails.web.servlet.mvc.GrailsWebRequest
 
 /**
@@ -25,6 +26,7 @@ import org.grails.web.servlet.mvc.GrailsWebRequest
  * @author Graeme Rocher
  * @since 2.3
  */
+@CompileStatic
 class DefaultMimeTypeResolver implements MimeTypeResolver {
 
     /**
@@ -36,7 +38,7 @@ class DefaultMimeTypeResolver implements MimeTypeResolver {
     @Override
     MimeType resolveResponseMimeType(GrailsWebRequest webRequest= GrailsWebRequest.lookup()) {
         if (webRequest != null) {
-            return webRequest.response.mimeType
+            return HttpServletResponseExtension.getMimeType(webRequest.response)
         }
         return null
     }
@@ -50,7 +52,7 @@ class DefaultMimeTypeResolver implements MimeTypeResolver {
     @Override
     MimeType resolveRequestMimeType(GrailsWebRequest webRequest = GrailsWebRequest.lookup()) {
         if (webRequest != null) {
-            final allMimeTypes = webRequest.request.mimeTypes
+            final allMimeTypes = HttpServletRequestExtension.getMimeTypes(webRequest.request)
             if(allMimeTypes) {
                 return allMimeTypes[0]
             }

grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletRequestExtension.groovy

@@ -17,7 +17,9 @@ package org.grails.web.mime
 
 import grails.web.http.HttpHeaders
 import grails.web.mime.MimeType
+import groovy.transform.CompileStatic
 import org.grails.web.util.GrailsApplicationAttributes
+import org.springframework.web.context.WebApplicationContext
 import org.springframework.web.context.support.WebApplicationContextUtils
 
 import javax.servlet.http.HttpServletRequest
@@ -33,6 +35,7 @@ import org.grails.plugins.web.api.MimeTypesApiSupport
  * @since 3.0
  * 
  */
+@CompileStatic
 class HttpServletRequestExtension {
 
     protected static MimeTypesApiSupport apiSupport = new MimeTypesApiSupport()
@@ -52,7 +55,7 @@ class HttpServletRequestExtension {
     static String getFormat(HttpServletRequest request) {
         def result = request.getAttribute(GrailsApplicationAttributes.CONTENT_FORMAT)
         if (!result) {
-            result = request.getMimeTypes()[0].extension
+            result = getMimeTypes(request)[0].extension
             request.setAttribute(GrailsApplicationAttributes.CONTENT_FORMAT, result)
         }
         result
@@ -67,9 +70,10 @@ class HttpServletRequestExtension {
     static MimeType[] getMimeTypes(HttpServletRequest request) {
         MimeType[] result = (MimeType[])request.getAttribute(GrailsApplicationAttributes.REQUEST_FORMATS)
         if (!result) {
-            def context = WebApplicationContextUtils.getRequiredWebApplicationContext(request.servletContext)
-            def parser = new DefaultAcceptHeaderParser((MimeType[])context.getBean(MimeType.BEAN_NAME))
-            def header = request.contentType
+            WebApplicationContext context = WebApplicationContextUtils.getWebApplicationContext(request.servletContext)
+            MimeType[] mimeTypes = context != null ? (MimeType[])context.getBean(MimeType.BEAN_NAME) : MimeType.getConfiguredMimeTypes()
+            def parser = new DefaultAcceptHeaderParser(mimeTypes)
+            String header = request.contentType
             if (!header) header = request.getHeader(HttpHeaders.CONTENT_TYPE)
             result = parser.parse(header, header ? new MimeType(header) : MimeType.HTML)