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

Avoid NPE on BeanDescriptor access with SimpleBeanInfoFactory 

Closes gh-29681
This commit is contained in:
Juergen Hoeller 2022-12-13 11:07:22 +01:00
parent 4c69892f39
commit d74191427e
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-beans/src/main/java/org/springframework/beans/SimpleBeanInfoFactory.java
View File

@ -16,6 +16,7 @@
package org.springframework.beans; package org.springframework.beans;
import java.beans.BeanDescriptor;
import java.beans.BeanInfo; import java.beans.BeanInfo;
import java.beans.IntrospectionException; import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
@ -52,6 +53,10 @@ class SimpleBeanInfoFactory implements BeanInfoFactory, Ordered {
PropertyDescriptorUtils.determineBasicProperties(beanClass); PropertyDescriptorUtils.determineBasicProperties(beanClass);
return new SimpleBeanInfo() { return new SimpleBeanInfo() {
@Override
public BeanDescriptor getBeanDescriptor() {
return new BeanDescriptor(beanClass);
}
@Override @Override
public PropertyDescriptor[] getPropertyDescriptors() { public PropertyDescriptor[] getPropertyDescriptors() {
return pds.toArray(PropertyDescriptorUtils.EMPTY_PROPERTY_DESCRIPTOR_ARRAY); return pds.toArray(PropertyDescriptorUtils.EMPTY_PROPERTY_DESCRIPTOR_ARRAY);

15
spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
View File

@ -77,6 +77,21 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
assertThat(accessor.getPropertyValue("aliasedName")).isEqualTo("tom"); assertThat(accessor.getPropertyValue("aliasedName")).isEqualTo("tom");
} }
@Test
void replaceWrappedInstance() {
GetterBean target = new GetterBean();
BeanWrapperImpl accessor = createAccessor(target);
accessor.setPropertyValue("name", "tom");
assertThat(target.getAliasedName()).isEqualTo("tom");
assertThat(accessor.getPropertyValue("aliasedName")).isEqualTo("tom");
target = new GetterBean();
accessor.setWrappedInstance(target);
accessor.setPropertyValue("name", "tom");
assertThat(target.getAliasedName()).isEqualTo("tom");
assertThat(accessor.getPropertyValue("aliasedName")).isEqualTo("tom");
}
@Test @Test
void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() { void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() {
TestBean target = new TestBean(); TestBean target = new TestBean();