diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java index 2e1571bc28..d1af26e17a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java @@ -71,14 +71,13 @@ public class ValidationAutoConfiguration { @Bean @ConditionalOnMissingBean(search = SearchStrategy.CURRENT) public static MethodValidationPostProcessor methodValidationPostProcessor(Environment environment, - ObjectProvider validator, ObjectProvider excludeFilters, - ObjectProvider validationProperties) { + ValidationProperties validationProperties, ObjectProvider validator, + ObjectProvider 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.getObject().getMethod().isAdaptConstraintViolations()); + processor.setAdaptConstraintViolations(validationProperties.getMethod().isAdaptConstraintViolations()); processor.setValidatorProvider(validator); return processor; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationProperties.java index 693ed613c2..67e8bd8fea 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationProperties.java @@ -16,14 +16,18 @@ package org.springframework.boot.autoconfigure.validation; +import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Role; /** - * Configuration properties for validation. + * {@link ConfigurationProperties @ConfigurationProperties} for validation. * * @author Yanming Zhou + * @author Andy Wilkinson * @since 3.5.0 */ +@Role(BeanDefinition.ROLE_INFRASTRUCTURE) @ConfigurationProperties(prefix = "spring.validation") public class ValidationProperties { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationPropertiesTests.java new file mode 100644 index 0000000000..d507516c80 --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationPropertiesTests.java @@ -0,0 +1,38 @@ +/* + * Copyright 2012-2025 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.autoconfigure.validation; + +import org.junit.jupiter.api.Test; + +import org.springframework.validation.beanvalidation.MethodValidationPostProcessor; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link ValidationProperties}. + * + * @author Andy Wilkinson + */ +class ValidationPropertiesTests { + + @Test + void adaptConstraintViolationsPropertyDefaultMatchesPostProcessorDefault() { + assertThat(new MethodValidationPostProcessor()).extracting("adaptConstraintViolations") + .isEqualTo(new ValidationProperties().getMethod().isAdaptConstraintViolations()); + } + +}