Merge remote-tracking branch 'upstream/3.1.x' into 3.1.x

Author: jameskleeh

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

@@ -155,7 +155,6 @@ class GrailsGradlePlugin extends GroovyPlugin {
     }
 
     protected Task createBuildPropertiesTask(Project project) {
-
         def buildInfoFile = project.file("${project.buildDir}/grails.build.info")
 
         def buildPropertiesTask = project.tasks.create("buildProperties")
@@ -169,7 +168,7 @@ class GrailsGradlePlugin extends GroovyPlugin {
         buildPropertiesTask << {
             project.buildDir.mkdirs()
             ant.propertyfile(file: buildInfoFile) {
-                for(me in buildPropertiesContents) {
+                for(me in buildPropertiesTask.inputs.properties) {
                     entry key: me.key, value: me.value
                 }
             }

grails-plugin-interceptors/src/main/groovy/grails/artefact/Interceptor.groovy

@@ -18,6 +18,7 @@ package grails.artefact
 import grails.artefact.controller.support.RequestForwarder
 import grails.artefact.controller.support.ResponseRedirector
 import grails.artefact.controller.support.ResponseRenderer
+import grails.core.GrailsApplication
 import grails.interceptors.Matcher
 import grails.util.GrailsNameUtils
 import grails.web.api.ServletAttributes
@@ -34,11 +35,12 @@ import org.grails.web.servlet.mvc.exceptions.ControllerExecutionException
 import org.grails.web.servlet.view.CompositeViewResolver
 import org.grails.web.util.GrailsApplicationAttributes
 import org.grails.web.util.WebUtils
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.Ordered
 import org.springframework.web.servlet.ModelAndView
-import org.springframework.web.servlet.View
 import org.springframework.web.servlet.ViewResolver
 
+import javax.annotation.PostConstruct
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
 import java.util.concurrent.ConcurrentLinkedQueue
@@ -81,13 +83,6 @@ trait Interceptor implements ResponseRenderer, ResponseRedirector, RequestForwar
             return (Boolean)existing
         }
 
-        if(matchers.isEmpty()) {
-            // default to map just the controller by convention
-            def matcher = new UrlMappingMatcher(this)
-            matcher.matches(controller:Pattern.compile(GrailsNameUtils.getLogicalPropertyName(getClass().simpleName, "Interceptor")))
-            matchers << matcher
-        }
-
         def req = request
         def uri = req.requestURI
 
@@ -269,4 +264,17 @@ trait Interceptor implements ResponseRenderer, ResponseRedirector, RequestForwar
         }
     }
 
+    /**
+     * Registers the default match strategy if non has been registered
+     */
+    @Autowired
+    void setGrailsApplication(GrailsApplication grailsApplication) {
+        if(matchers.isEmpty()) {
+            // default to map just the controller by convention
+            def matcher = new UrlMappingMatcher(this)
+            matcher.matches(controller:Pattern.compile(GrailsNameUtils.getLogicalPropertyName(getClass().simpleName, InterceptorArtefactHandler.TYPE)))
+            matchers << matcher
+        }
+
+    }
 }

grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsGrailsPlugin.groovy

@@ -22,6 +22,8 @@ import grails.plugins.Plugin
 import grails.util.GrailsUtil
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
+import org.springframework.web.servlet.HandlerInterceptor
+import org.springframework.web.servlet.handler.MappedInterceptor
 
 
 /**
@@ -45,7 +47,7 @@ class InterceptorsGrailsPlugin extends Plugin {
             GrailsClass[] interceptors = grailsApplication.getArtefacts(InterceptorArtefactHandler.TYPE)
             if(interceptors.length == 0) return
 
-            grailsInterceptorHandlerInterceptorAdapter(GrailsInterceptorHandlerInterceptorAdapter)
+            grailsInterceptorMappedInterceptor(MappedInterceptor, ['/**'] as String[], bean(GrailsInterceptorHandlerInterceptorAdapter))
 
             def enableJsessionId = config.getProperty(Settings.GRAILS_VIEWS_ENABLE_JSESSIONID, Boolean, false)
             for(GrailsClass i in interceptors) {
@@ -61,8 +63,8 @@ class InterceptorsGrailsPlugin extends Plugin {
 
     @Override
     void doWithApplicationContext() {
-        if(applicationContext.containsBeanDefinition("grailsInterceptorHandlerInterceptorAdapter")) {
-            interceptorAdapter = applicationContext.getBean("grailsInterceptorHandlerInterceptorAdapter", GrailsInterceptorHandlerInterceptorAdapter)
+        if(applicationContext.containsBeanDefinition("grailsInterceptorMappedInterceptor")) {
+            interceptorAdapter = (GrailsInterceptorHandlerInterceptorAdapter)applicationContext.getBean("grailsInterceptorMappedInterceptor", MappedInterceptor).getInterceptor()
         }
     }
 
@@ -76,7 +78,7 @@ class InterceptorsGrailsPlugin extends Plugin {
             def interceptorClass = (Class) source
             def grailsClass = grailsApplication.addArtefact(InterceptorArtefactHandler.TYPE, interceptorClass)
 
-            def interceptorAdapter = this.interceptorAdapter ?: applicationContext.getBean(GrailsInterceptorHandlerInterceptorAdapter)
+            def interceptorAdapter = this.interceptorAdapter ?: (GrailsInterceptorHandlerInterceptorAdapter)applicationContext.getBean("grailsInterceptorMappedInterceptor", MappedInterceptor).getInterceptor()
             defineInterceptorBean(grailsClass, interceptorClass, enableJsessionId)
             interceptorAdapter.setInterceptors(
                     applicationContext.getBeansOfType(Interceptor).values() as Interceptor[]

grails-plugin-interceptors/src/test/groovy/grails/artefact/InterceptorSpec.groovy

@@ -39,6 +39,7 @@ class InterceptorSpec extends Specification {
     void "Test the default interceptor mappings"() {
         given:"A test interceptor"
             def i = new TestInterceptor()
+            i.setGrailsApplication(null)
             def webRequest = GrailsWebMockUtil.bindMockWebRequest()
             HttpServletRequest request = webRequest.request
         when:"The current request is for a controller called test"

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy

@@ -15,6 +15,7 @@
  */
 package org.grails.web.mapping.mvc
 
+import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import grails.web.mapping.UrlMapping
 import grails.web.mapping.UrlMappingInfo
@@ -63,7 +64,11 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {
 
     @Autowired
     void setHandlerInterceptors(HandlerInterceptor[] handlerInterceptors) {
-        setInterceptors(handlerInterceptors)
+        for(hi in handlerInterceptors) {
+            if(!(hi instanceof MappedInterceptor)) {
+                setInterceptors(hi)
+            }
+        }
     }
 
     @Autowired(required = false)
@@ -81,26 +86,35 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {
     @Override
     protected HandlerExecutionChain getHandlerExecutionChain(Object handler, HttpServletRequest request) {
         HandlerExecutionChain chain = (handler instanceof HandlerExecutionChain ?
-                (HandlerExecutionChain) handler : new HandlerExecutionChain(handler));
+                (HandlerExecutionChain) handler : new HandlerExecutionChain(handler))
 
         // WebRequestInterceptor need to come first, as these include things like Hibernate OSIV
         if(webRequestHandlerInterceptors) {
             chain.addInterceptors webRequestHandlerInterceptors
         }
 
-        chain.addInterceptors getAdaptedInterceptors()
-
         String lookupPath = this.urlPathHelper.getLookupPathForRequest(request)
-        for (MappedInterceptor mappedInterceptor in getMappedInterceptors()) {
-            if (mappedInterceptor.matches(lookupPath, this.pathMatcher)) {
-                chain.addInterceptor(mappedInterceptor.interceptor)
+        for (HandlerInterceptor interceptor in this.adaptedInterceptors) {
+            if (interceptor instanceof MappedInterceptor) {
+                MappedInterceptor mappedInterceptor = mappedInterceptor(interceptor)
+                if (mappedInterceptor.matches(lookupPath, this.pathMatcher)) {
+                    chain.addInterceptor(mappedInterceptor.getInterceptor())
+                }
+            }
+            else {
+                chain.addInterceptor(interceptor)
             }
         }
 
         chain.addInterceptor(new ErrorHandlingHandler())
         return chain
     }
 
+    @CompileDynamic
+    protected MappedInterceptor mappedInterceptor(HandlerInterceptor interceptor) {
+        (MappedInterceptor) interceptor
+    }
+
     @Override
     protected Object getHandlerInternal(HttpServletRequest request) throws Exception {