Tests for @lazy Validator setup

Issue: SPR-15807

Author: jhoeller

spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/MethodValidationTests.java

@@ -18,6 +18,7 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import javax.validation.Validator;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
 import javax.validation.groups.Default;
@@ -26,11 +27,16 @@
 
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.MutablePropertyValues;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncAnnotationAdvisor;
 import org.springframework.scheduling.annotation.AsyncAnnotationBeanPostProcessor;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.validation.beanvalidation.CustomValidatorBean;
 import org.springframework.validation.beanvalidation.MethodValidationInterceptor;
 import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
 
@@ -39,7 +45,6 @@
 /**
  * @author Juergen Hoeller
  */
-@SuppressWarnings("rawtypes")
 public class MethodValidationTests {
 
 	@Test
@@ -64,8 +69,6 @@ public void testMethodValidationPostProcessor() {
 		ac.close();
 	}
 
-
-	@SuppressWarnings("unchecked")
 	private void doTestProxyValidation(MyValidInterface proxy) {
 		assertNotNull(proxy.myValidMethod("value", 5));
 		try {
@@ -116,6 +119,13 @@ private void doTestProxyValidation(MyValidInterface proxy) {
 		}
 	}
 
+	@Test
+	public void testLazyValidatorForMethodValidation() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(
+				LazyMethodValidationConfig.class, CustomValidatorBean.class, MyValidBean.class);
+		ctx.getBean(MyValidInterface.class).myValidMethod("value", 5);
+	}
+
 
 	@MyStereotype
 	public static class MyValidBean implements MyValidInterface<String> {
@@ -166,4 +176,16 @@ public interface OtherGroup {
 	public @interface MyValid {
 	}
 
+
+	@Configuration
+	public static class LazyMethodValidationConfig {
+
+		@Bean
+		public static MethodValidationPostProcessor methodValidationPostProcessor(@Lazy Validator validator) {
+			MethodValidationPostProcessor postProcessor = new MethodValidationPostProcessor();
+			postProcessor.setValidator(validator);
+			return postProcessor;
+		}
+	}
+
 }

spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java

@@ -18,6 +18,7 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import javax.validation.Validator;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
 import javax.validation.groups.Default;
@@ -26,6 +27,10 @@
 
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.MutablePropertyValues;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncAnnotationAdvisor;
@@ -37,7 +42,6 @@
 /**
  * @author Juergen Hoeller
  */
-@SuppressWarnings("rawtypes")
 public class MethodValidationTests {
 
 	@Test
@@ -62,8 +66,6 @@ public void testMethodValidationPostProcessor() {
 		ac.close();
 	}
 
-
-	@SuppressWarnings("unchecked")
 	private void doTestProxyValidation(MyValidInterface proxy) {
 		assertNotNull(proxy.myValidMethod("value", 5));
 		try {
@@ -114,6 +116,13 @@ private void doTestProxyValidation(MyValidInterface proxy) {
 		}
 	}
 
+	@Test
+	public void testLazyValidatorForMethodValidation() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(
+				LazyMethodValidationConfig.class, CustomValidatorBean.class, MyValidBean.class);
+		ctx.getBean(MyValidInterface.class).myValidMethod("value", 5);
+	}
+
 
 	@MyStereotype
 	public static class MyValidBean implements MyValidInterface<String> {
@@ -164,4 +173,16 @@ public interface OtherGroup {
 	public @interface MyValid {
 	}
 
+
+	@Configuration
+	public static class LazyMethodValidationConfig {
+
+		@Bean
+		public static MethodValidationPostProcessor methodValidationPostProcessor(@Lazy Validator validator) {
+			MethodValidationPostProcessor postProcessor = new MethodValidationPostProcessor();
+			postProcessor.setValidator(validator);
+			return postProcessor;
+		}
+	}
+
 }