From fc8240ac88c2c436d69cb6a82b5d68a844277425 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 10 May 2013 14:45:18 +0100 Subject: [PATCH] Fix ordering problem with validator being null --- .../ConfigurationPropertiesBindingConfiguration.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java index f458014aab..d98c0541f0 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java @@ -56,11 +56,15 @@ public class ConfigurationPropertiesBindingConfiguration { @Qualifier(VALIDATOR_BEAN_NAME) private Validator validator; - @Bean @ConditionalOnMissingBean(name = VALIDATOR_BEAN_NAME) @ConditionalOnClass(name = "javax.validation.Validator") - protected Validator configurationPropertiesValidator() { - return new LocalValidatorFactoryBean(); + public static class ValidatorConfiguration { + + @Bean + protected Validator configurationPropertiesValidator() { + return new LocalValidatorFactoryBean(); + } + } /**