Polish

Author: philwebb

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

@@ -58,31 +58,37 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
 			BeanDefinitionRegistry registry) {
-		if (this.beanFactory == null) {
-			return;
+		BeanDefinition definition = getAutoConfiguredValidator(registry);
+		if (definition != null) {
+			definition.setPrimary(!hasPrimarySpringValidator(registry));
 		}
-		if (!registry.containsBeanDefinition(VALIDATOR_BEAN_NAME)) {
-			return;
-		}
-		BeanDefinition def = registry.getBeanDefinition(VALIDATOR_BEAN_NAME);
-		if (def != null
-				&& this.beanFactory.isTypeMatch(VALIDATOR_BEAN_NAME, LocalValidatorFactoryBean.class)
-				&& def.getRole() == BeanDefinition.ROLE_INFRASTRUCTURE) {
-			def.setPrimary(!hasPrimarySpringValidator(registry));
+	}
+
+	private BeanDefinition getAutoConfiguredValidator(BeanDefinitionRegistry registry) {
+		if (registry.containsBeanDefinition(VALIDATOR_BEAN_NAME)) {
+			BeanDefinition definition = registry.getBeanDefinition(VALIDATOR_BEAN_NAME);
+			if (definition.getRole() == BeanDefinition.ROLE_INFRASTRUCTURE && isTypeMatch(
+					VALIDATOR_BEAN_NAME, LocalValidatorFactoryBean.class)) {
+				return definition;
+			}
 		}
+		return null;
+	}
+
+	private boolean isTypeMatch(String name, Class<?> type) {
+		return this.beanFactory != null && this.beanFactory.isTypeMatch(name, type);
 	}
 
 	private boolean hasPrimarySpringValidator(BeanDefinitionRegistry registry) {
 		String[] validatorBeans = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
 				this.beanFactory, Validator.class, false, false);
 		for (String validatorBean : validatorBeans) {
-			BeanDefinition def = registry.getBeanDefinition(validatorBean);
-			if (def != null && def.isPrimary()) {
+			BeanDefinition definition = registry.getBeanDefinition(validatorBean);
+			if (definition != null && definition.isPrimary()) {
 				return true;
 			}
 		}
 		return false;
 	}
 
 }
-