Fixes #9137 - "Well known" Filters should be ordered correctly

graemerocher · graemerocher · commit 16ac8da3798d · 2015-11-30T17:12:01.000+01:00
diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersGrailsPlugin.groovy b/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersGrailsPlugin.groovy
@@ -91,19 +91,19 @@ class ControllersGrailsPlugin extends Plugin {
                 forceEncoding = filtersForceEncoding
             }
             urlPatterns = catchAllMapping
-            order = Ordered.HIGHEST_PRECEDENCE + 10
+            order = FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER + 10
         }
 
         hiddenHttpMethodFilter(FilterRegistrationBean) {
             filter = bean(HiddenHttpMethodFilter)
             urlPatterns = catchAllMapping
-            order = Ordered.HIGHEST_PRECEDENCE + 20
+            order = FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER + 20
         }
 
         grailsWebRequestFilter(FilterRegistrationBean) {
             filter = bean(GrailsWebRequestFilter)
             urlPatterns = catchAllMapping
-            order = Ordered.HIGHEST_PRECEDENCE + 30
+            order = FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER + 30
         }
 
 

Original file line number	Diff line number	Diff line change
`@@ -91,19 +91,19 @@ class ControllersGrailsPlugin extends Plugin {`
`91`	`91`	`forceEncoding = filtersForceEncoding`
`92`	`92`	`}`
`93`	`93`	`urlPatterns = catchAllMapping`
`94`		`- order = Ordered.HIGHEST_PRECEDENCE + 10`
	`94`	`+ order = FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER + 10`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`hiddenHttpMethodFilter(FilterRegistrationBean) {`
`98`	`98`	`filter = bean(HiddenHttpMethodFilter)`
`99`	`99`	`urlPatterns = catchAllMapping`
`100`		`- order = Ordered.HIGHEST_PRECEDENCE + 20`
	`100`	`+ order = FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER + 20`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`grailsWebRequestFilter(FilterRegistrationBean) {`
`104`	`104`	`filter = bean(GrailsWebRequestFilter)`
`105`	`105`	`urlPatterns = catchAllMapping`
`106`		`- order = Ordered.HIGHEST_PRECEDENCE + 30`
	`106`	`+ order = FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER + 30`
`107`	`107`	`}`
`108`	`108`
`109`	`109`