GRAILS-9027 - reorder command object DI

jeffscottbrown · jeffscottbrown · commit 855dda97b20e · 2012-04-13T13:02:26.000-05:00
Dependency injection should happen before validation
diff --git a/src/java/org/codehaus/groovy/grails/web/plugins/support/WebMetaUtils.groovy b/src/java/org/codehaus/groovy/grails/web/plugins/support/WebMetaUtils.groovy
@@ -113,6 +113,10 @@ class WebMetaUtils {
                         }
                         
                         bind.invoke(commandObject, "bindData", [commandObject, commandParams] as Object[])
+                        if(newCommandObject) {
+                            ctx.autowireCapableBeanFactory?.autowireBeanProperties(
+                                commandObject, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false)
+                        }
                         def errors = commandObject.errors ?: new BindException(commandObject, paramType.name)
                         def constrainedProperties = commandObject.constraints?.values()
                         for (constrainedProperty in constrainedProperties) {
@@ -122,10 +126,6 @@ class WebMetaUtils {
                         }
                         commandObject.errors = errors
                         
-                        if(newCommandObject) {
-                            ctx.autowireCapableBeanFactory?.autowireBeanProperties(
-                                commandObject, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false)
-                        }
                     }
                     catch (Exception e) {
                         throw new ControllerExecutionException("Error occurred creating command object.", e)

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,10 @@ class WebMetaUtils {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`bind.invoke(commandObject, "bindData", [commandObject, commandParams] as Object[])`
	`116`	`+ if(newCommandObject) {`
	`117`	`+ ctx.autowireCapableBeanFactory?.autowireBeanProperties(`
	`118`	`+ commandObject, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false)`
	`119`	`+ }`
`116`	`120`	`def errors = commandObject.errors ?: new BindException(commandObject, paramType.name)`
`117`	`121`	`def constrainedProperties = commandObject.constraints?.values()`
`118`	`122`	`for (constrainedProperty in constrainedProperties) {`
`@@ -122,10 +126,6 @@ class WebMetaUtils {`
`122`	`126`	`}`
`123`	`127`	`commandObject.errors = errors`
`124`	`128`
`125`		`- if(newCommandObject) {`
`126`		`- ctx.autowireCapableBeanFactory?.autowireBeanProperties(`
`127`		`- commandObject, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false)`
`128`		`- }`
`129`	`129`	`}`
`130`	`130`	`catch (Exception e) {`
`131`	`131`	`throw new ControllerExecutionException("Error occurred creating command object.", e)`