Merge branch '3.0.x' into 3.1.x

Author: graemerocher

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

@@ -65,7 +65,7 @@ trait Interceptor implements ResponseRenderer, ResponseRedirector, RequestForwar
     /**
      * The matchers defined by this interceptor
      */
-    Collection<Matcher> matchers = new ConcurrentLinkedQueue<>()
+    final Collection<Matcher> matchers = new ConcurrentLinkedQueue<>()
 
     /**
      * @return Whether the current interceptor does match
@@ -77,6 +77,14 @@ trait Interceptor implements ResponseRenderer, ResponseRedirector, RequestForwar
      * @return Whether the current interceptor does match
      */
     boolean doesMatch(HttpServletRequest request) {
+        def allMatchers = matchers
+        if(allMatchers.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)))
+            allMatchers << matcher
+        }
+
         String interceptorMatchKey = "${getClass().name}${InterceptorArtefactHandler.MATCH_SUFFIX}"
         def existing = request.getAttribute(interceptorMatchKey)
         if(existing != null && !WebUtils.isForward(request) && !WebUtils.isInclude(request)) {
@@ -89,7 +97,7 @@ trait Interceptor implements ResponseRenderer, ResponseRedirector, RequestForwar
         def matchedInfo = request.getAttribute(UrlMappingsHandlerMapping.MATCHED_REQUEST)
         UrlMappingInfo grailsMappingInfo = (UrlMappingInfo)matchedInfo
 
-        for(Matcher matcher in matchers) {
+        for(Matcher matcher in allMatchers) {
             if(matcher.doesMatch(uri, grailsMappingInfo)) {
                 request.setAttribute(interceptorMatchKey, Boolean.TRUE)
                 return true
@@ -264,17 +272,4 @@ 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/test/groovy/grails/artefact/InterceptorSpec.groovy

@@ -39,7 +39,6 @@ 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"