Fix failing functional tests

Author: graemerocher

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
@@ -33,6 +34,7 @@ import org.grails.web.mapping.mvc.UrlMappingsHandlerMapping
 import org.grails.web.servlet.mvc.exceptions.ControllerExecutionException
 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.ViewResolver
@@ -264,8 +266,8 @@ trait Interceptor implements ResponseRenderer, ResponseRedirector, RequestForwar
     /**
      * Registers the default match strategy if non has been registered
      */
-    @PostConstruct
-    void defaultMatcher() {
+    @Autowired
+    void setGrailsApplication(GrailsApplication grailsApplication) {
         if(matchers.isEmpty()) {
             // default to map just the controller by convention
             def matcher = new UrlMappingMatcher(this)

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
@@ -61,6 +62,15 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {
         setOrder(-5)
     }
 
+    @Autowired
+    void setHandlerInterceptors(HandlerInterceptor[] handlerInterceptors) {
+        for(hi in handlerInterceptors) {
+            if(!(hi instanceof MappedInterceptor)) {
+                setInterceptors(hi)
+            }
+        }
+    }
+
     @Autowired(required = false)
     void setWebRequestInterceptors(WebRequestInterceptor[] webRequestInterceptors) {
         webRequestHandlerInterceptors = webRequestInterceptors.collect( { WebRequestInterceptor wri ->
@@ -75,16 +85,42 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {
 
     @Override
     protected HandlerExecutionChain getHandlerExecutionChain(Object handler, HttpServletRequest request) {
-        def chain = super.getHandlerExecutionChain(handler, request)
+        HandlerExecutionChain chain = (handler instanceof HandlerExecutionChain ?
+                (HandlerExecutionChain) handler : new HandlerExecutionChain(handler))
 
         // WebRequestInterceptor need to come first, as these include things like Hibernate OSIV
         if(webRequestHandlerInterceptors) {
             chain.addInterceptors webRequestHandlerInterceptors
         }
+
+        String lookupPath = this.urlPathHelper.getLookupPathForRequest(request)
+        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)
+            }
+        }
+
+        for(MappedInterceptor mi in getMappedInterceptors()) {
+            if (mi.matches(lookupPath, this.pathMatcher)) {
+                chain.addInterceptor(mi.getInterceptor())
+            }
+        }
+
         chain.addInterceptor(new ErrorHandlingHandler())
         return chain
     }
 
+    @CompileDynamic
+    protected MappedInterceptor mappedInterceptor(HandlerInterceptor interceptor) {
+        (MappedInterceptor) interceptor
+    }
+
     @Override
     protected Object getHandlerInternal(HttpServletRequest request) throws Exception {