root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2015-08-03 11:09:33 -07:00
parent acfb07bdd6
commit 2c0ec1b428
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
View File

@ -322,15 +322,15 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
}
private Validator determineValidator(Object bean) {
boolean globalValidatorSupportBean = (this.validator != null
&& this.validator.supports(bean.getClass()));
boolean globalValidatorSupportBean = (this.validator != null && this.validator
.supports(bean.getClass()));
if (ClassUtils.isAssignable(Validator.class, bean.getClass())) {
if (!globalValidatorSupportBean) {
return (Validator) bean;
}
return new ChainingValidator(this.validator, (Validator) bean);
}
return globalValidatorSupportBean ? this.validator : null;
return (globalValidatorSupportBean ? this.validator : null);
}
private PropertySources loadPropertySources(String[] locations,

2
spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java
View File

@ -429,7 +429,7 @@ public class ConfigurationPropertiesBindingPostProcessorTests {
private String foo;
public String getFoo() {
return foo;
return this.foo;
}
public void setFoo(String foo) {