Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

validation helper bug fixes

Browse Source
This commit is contained in:
Keith Donald
2008-11-13 15:08:21 +00:00
parent c66b1d6492
commit 6464801d8c
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webflow-samples/booking-mvc/.springWebflow
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<webflow-project-description>
<version>1</version>
<pluginVersion><![CDATA[2.1.0.v200808011800]]></pluginVersion>
<pluginVersion><![CDATA[2.2.0.v200809261800]]></pluginVersion>
<configs>
<config>
<file>src/main/webapp/WEB-INF/hotels/booking/booking.xml</file>
<name><![CDATA[booking]]></name>
<file>src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml</file>
<name><![CDATA[booking-flow]]></name>
</config>
</configs>
</webflow-project-description>

16
spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java
View File

@@ -143,6 +143,7 @@ public class ValidationHelper {
private boolean invokeModelValidator(Object model, Object validator) {
if (validator instanceof Validator) {
// TODO - fallback to validator last not first
// existing validator, just invoke it
MessageContextErrors errors = new MessageContextErrors(requestContext.getMessageContext(), modelName,
model, expressionParser, mappingResults);
@@ -159,8 +160,8 @@ public class ValidationHelper {
private boolean invokeValidatorValidateMethodForCurrentState(Object model, Object validator) {
String methodName = "validate" + StringUtils.capitalize(requestContext.getCurrentState().getId());
Method validateMethod = ReflectionUtils.findMethod(validator.getClass(), methodName,
new Class[] { ValidationContext.class });
Method validateMethod = ReflectionUtils.findMethod(validator.getClass(), methodName, new Class[] {
model.getClass(), ValidationContext.class });
if (validateMethod != null) {
ReflectionUtils.invokeMethod(validateMethod, validator, new Object[] { model,
new DefaultValidationContext(requestContext, eventId, mappingResults) });
@@ -175,10 +176,11 @@ public class ValidationHelper {
ReflectionUtils.invokeMethod(validateMethod, validator, new Object[] { model, errors });
return true;
}
validateMethod = ReflectionUtils.findMethod(validator.getClass(), methodName,
new Class[] { MessageContext.class });
validateMethod = ReflectionUtils.findMethod(validator.getClass(), methodName, new Class[] { model.getClass(),
MessageContext.class });
if (validateMethod != null) {
ReflectionUtils.invokeMethod(validateMethod, model, new Object[] { requestContext.getMessageContext() });
ReflectionUtils.invokeMethod(validateMethod, validator, new Object[] { model,
requestContext.getMessageContext() });
return true;
}
return false;
@@ -188,8 +190,8 @@ public class ValidationHelper {
Method validateMethod = ReflectionUtils.findMethod(validator.getClass(), "validate", new Class[] {
model.getClass(), ValidationContext.class });
if (validateMethod != null) {
ReflectionUtils.invokeMethod(validateMethod, model, new Object[] { new DefaultValidationContext(
requestContext, eventId, mappingResults) });
ReflectionUtils.invokeMethod(validateMethod, validator, new Object[] { model,
new DefaultValidationContext(requestContext, eventId, mappingResults) });
return true;
} else {
return false;