Improving method validation support for BV 1.1

beamerblvd · philwebb · commit 7b2c74b05c5c · 2013-06-24T13:21:03.000-07:00
Update MethodValidationPostProcessor.setValidator(...) to use
LocalValidatorFactoryBean.getValidator() when possible.

This is required because LocalValidatorFactoryBean does not directly
implement the forExecutables() method introduced in bean validation v1.1.

Issue: SPR-10644
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
@@ -83,7 +83,12 @@ public void setValidatedAnnotationType(Class<? extends Annotation> validatedAnno
 	 * <p>Default is the default ValidatorFactory's default Validator.
 	 */
 	public void setValidator(Validator validator) {
-		this.validator = validator;
+		if(validator instanceof LocalValidatorFactoryBean) {
+			this.validator = ((LocalValidatorFactoryBean) validator).getValidator();
+		}
+		else {
+			this.validator = validator;
+		}
 	}
 
 	/**
