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

Polish ConfigurationPropertiesBinder 

See gh-42610
This commit is contained in:
Yanming Zhou 2024-10-14 15:20:01 +08:00 committed by Moritz Halbritter
parent 47129c0c81
commit a80d7d6aff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinder.java
View File

@ -156,7 +156,7 @@ class ConfigurationPropertiesBinder {
return (value instanceof Validator validator) ? validator : null; return (value instanceof Validator validator) ? validator : null;
} }
Class<?> type = target.getType().resolve(); Class<?> type = target.getType().resolve();
if (Validator.class.isAssignableFrom(type)) { if (type != null && Validator.class.isAssignableFrom(type)) {
return new SelfValidatingConstructorBoundBindableValidator(type); return new SelfValidatingConstructorBoundBindableValidator(type);
} }
return null; return null;
@ -208,7 +208,7 @@ class ConfigurationPropertiesBinder {
.rootBeanDefinition(ConfigurationPropertiesBinderFactory.class) .rootBeanDefinition(ConfigurationPropertiesBinderFactory.class)
.getBeanDefinition(); .getBeanDefinition();
definition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); definition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
registry.registerBeanDefinition(ConfigurationPropertiesBinder.BEAN_NAME, definition); registry.registerBeanDefinition(BEAN_NAME, definition);
} }
} }