Merge pull request #42610 from quaff

* pr/42610:
  Polish ConfigurationPropertiesBinder

Closes gh-42610
This commit is contained in:
Moritz Halbritter
2024-10-14 10:53:29 +02:00

View File

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