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

tighten DI requirements for model and requestcontext. No longer attempt to find a bean validator is the modelName has no text

Browse Source
This commit is contained in:
Scott Andrews
2008-10-15 21:20:53 +00:00
parent 855182fb0b
commit 61890d354d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import org.springframework.binding.mapping.MappingResults;
import org.springframework.binding.message.MessageContext;
import org.springframework.binding.message.MessageContextErrors;
import org.springframework.binding.validation.ValidationContext;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.validation.Errors;
@@ -62,6 +63,8 @@ public class ValidationHelper {
*/
public ValidationHelper(Object model, RequestContext requestContext, String eventId, String modelName,
ExpressionParser expressionParser, MappingResults mappingResults) {
Assert.notNull(model, "The model to validate is requried");
Assert.notNull(requestContext, "The request context for the validator is required");
this.model = model;
this.requestContext = requestContext;
this.eventId = eventId;
@@ -77,7 +80,7 @@ public class ValidationHelper {
String validateMethodName = "validate" + StringUtils.capitalize(requestContext.getCurrentState().getId());
validateWithContext(model, validateMethodName);
BeanFactory beanFactory = requestContext.getActiveFlow().getApplicationContext();
if (beanFactory != null) {
if (beanFactory != null && StringUtils.hasText(modelName)) {
String validatorName = modelName + "Validator";
if (beanFactory.containsBean(validatorName)) {
Object validator = beanFactory.getBean(validatorName);