Merge branch 'main' into 4.0.x

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java

@@ -27,7 +27,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.validation.MessageInterpolatorFactory;
 import org.springframework.boot.validation.beanvalidation.FilteredMethodValidationPostProcessor;
 import org.springframework.boot.validation.beanvalidation.MethodValidationExcludeFilter;
@@ -51,7 +50,6 @@
 @AutoConfiguration
 @ConditionalOnClass(ExecutableValidator.class)
 @ConditionalOnResource(resources = "classpath:META-INF/services/jakarta.validation.spi.ValidationProvider")
-@EnableConfigurationProperties(ValidationProperties.class)
 @Import(PrimaryDefaultValidatorPostProcessor.class)
 public class ValidationAutoConfiguration {
 
@@ -71,13 +69,14 @@ public static LocalValidatorFactoryBean defaultValidator(ApplicationContext appl
 	@Bean
 	@ConditionalOnMissingBean(search = SearchStrategy.CURRENT)
 	public static MethodValidationPostProcessor methodValidationPostProcessor(Environment environment,
-			ValidationProperties validationProperties, ObjectProvider<Validator> validator,
-			ObjectProvider<MethodValidationExcludeFilter> excludeFilters) {
+			ObjectProvider<Validator> validator, ObjectProvider<MethodValidationExcludeFilter> excludeFilters) {
 		FilteredMethodValidationPostProcessor processor = new FilteredMethodValidationPostProcessor(
 				excludeFilters.orderedStream());
 		boolean proxyTargetClass = environment.getProperty("spring.aop.proxy-target-class", Boolean.class, true);
 		processor.setProxyTargetClass(proxyTargetClass);
-		processor.setAdaptConstraintViolations(validationProperties.getMethod().isAdaptConstraintViolations());
+		boolean adaptConstraintViolations = environment
+			.getProperty("spring.validation.method.adapt-constraint-violations", Boolean.class, false);
+		processor.setAdaptConstraintViolations(adaptConstraintViolations);
 		processor.setValidatorProvider(validator);
 		return processor;
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationProperties.java

@@ -2580,6 +2580,12 @@
       "name": "spring.thymeleaf.suffix",
       "defaultValue": ".html"
     },
+    {
+      "name": "spring.validation.method.adapt-constraint-violations",
+      "type": "java.lang.Boolean",
+      "description": "Whether to adapt ConstraintViolations to MethodValidationResult.",
+      "defaultValue": false
+    },
     {
       "name": "spring.webflux.hiddenmethod.filter.enabled",
       "type": "java.lang.Boolean",

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -221,6 +221,14 @@ void validationCanBeConfiguredToAdaptConstraintViolations() {
 			});
 	}
 
+	@Test
+	void validationUseDefaultAdaptToConstraintViolationsValue() {
+		this.contextRunner.withUserConfiguration(AnotherSampleServiceConfiguration.class).run((context) -> {
+			MethodValidationPostProcessor postProcessor = context.getBean(MethodValidationPostProcessor.class);
+			assertThat(postProcessor).hasFieldOrPropertyWithValue("adaptConstraintViolations", false);
+		});
+	}
+
 	@Test
 	@SuppressWarnings("unchecked")
 	void userDefinedMethodValidationPostProcessorTakesPrecedence() {