Merge branch '2.4.x'

Closes gh-25864

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.validation;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -37,6 +36,8 @@ import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
  * as primary.
  *
  * @author Stephane Nicoll
+ * @author Matej Nedic
+ * @author Andy Wilkinson
  */
 class PrimaryDefaultValidatorPostProcessor implements ImportBeanDefinitionRegistrar, BeanFactoryAware {
 
@@ -58,7 +59,7 @@ class PrimaryDefaultValidatorPostProcessor implements ImportBeanDefinitionRegist
 	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
 		BeanDefinition definition = getAutoConfiguredValidator(registry);
 		if (definition != null) {
-			definition.setPrimary(!hasPrimarySpringValidator(registry));
+			definition.setPrimary(!hasPrimarySpringValidator());
 		}
 	}
 
@@ -77,12 +78,11 @@ class PrimaryDefaultValidatorPostProcessor implements ImportBeanDefinitionRegist
 		return this.beanFactory != null && this.beanFactory.isTypeMatch(name, type);
 	}
 
-	private boolean hasPrimarySpringValidator(BeanDefinitionRegistry registry) {
+	private boolean hasPrimarySpringValidator() {
-		String[] validatorBeans = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.beanFactory, Validator.class,
+		String[] validatorBeans = this.beanFactory.getBeanNamesForType(Validator.class, false, false);
-				false, false);
 		for (String validatorBean : validatorBeans) {
-			BeanDefinition definition = registry.getBeanDefinition(validatorBean);
+			BeanDefinition definition = this.beanFactory.getBeanDefinition(validatorBean);
-			if (definition != null && definition.isPrimary()) {
+			if (definition.isPrimary()) {
 				return true;
 			}
 		}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java

@@ -26,6 +26,7 @@ import javax.validation.constraints.Size;
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -129,6 +130,37 @@ class ValidationAutoConfigurationTests {
 		});
 	}
 
+	@Test
+	void whenUserProvidesSpringValidatorInParentContextThenAutoConfiguredValidatorIsPrimary() {
+		new ApplicationContextRunner().withUserConfiguration(UserDefinedSpringValidatorConfig.class).run((parent) -> {
+			this.contextRunner.withParent(parent).run((context) -> {
+				assertThat(context.getBeanNamesForType(Validator.class)).containsExactly("defaultValidator");
+				assertThat(context.getBeanNamesForType(org.springframework.validation.Validator.class))
+						.containsExactly("defaultValidator");
+				assertThat(BeanFactoryUtils.beanNamesForTypeIncludingAncestors(context.getBeanFactory(),
+						org.springframework.validation.Validator.class)).containsExactly("defaultValidator",
+								"customValidator", "anotherCustomValidator");
+				assertThat(isPrimaryBean(context, "defaultValidator")).isTrue();
+			});
+		});
+	}
+
+	@Test
+	void whenUserProvidesPrimarySpringValidatorInParentContextThenAutoConfiguredValidatorIsPrimary() {
+		new ApplicationContextRunner().withUserConfiguration(UserDefinedPrimarySpringValidatorConfig.class)
+				.run((parent) -> {
+					this.contextRunner.withParent(parent).run((context) -> {
+						assertThat(context.getBeanNamesForType(Validator.class)).containsExactly("defaultValidator");
+						assertThat(context.getBeanNamesForType(org.springframework.validation.Validator.class))
+								.containsExactly("defaultValidator");
+						assertThat(BeanFactoryUtils.beanNamesForTypeIncludingAncestors(context.getBeanFactory(),
+								org.springframework.validation.Validator.class)).containsExactly("defaultValidator",
+										"customValidator", "anotherCustomValidator");
+						assertThat(isPrimaryBean(context, "defaultValidator")).isTrue();
+					});
+				});
+	}
+
 	@Test
 	void validationIsEnabled() {
 		this.contextRunner.withUserConfiguration(SampleService.class).run((context) -> {