From 83186b689f11f5e6efe7ccc08fdeb92f66fcd583 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 11 May 2022 08:32:06 +0200 Subject: [PATCH] Refine CachedIntrospectionResults property introspection Closes gh-28445 --- .../beans/CachedIntrospectionResults.java | 26 ++++++++++++------- .../beans/BeanWrapperTests.java | 21 ++++++++++++++- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java b/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java index 8332045197de..bd234eb58f59 100644 --- a/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java +++ b/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java @@ -22,6 +22,7 @@ import java.beans.PropertyDescriptor; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.net.URL; import java.security.ProtectionDomain; import java.util.Collections; import java.util.HashSet; @@ -292,10 +293,12 @@ private CachedIntrospectionResults(Class beanClass) throws BeansException { // Only allow all name variants of Class properties continue; } - if (pd.getWriteMethod() == null && pd.getPropertyType() != null && - (ClassLoader.class.isAssignableFrom(pd.getPropertyType()) || - ProtectionDomain.class.isAssignableFrom(pd.getPropertyType()))) { - // Ignore ClassLoader and ProtectionDomain read-only properties - no need to bind to those + if (URL.class == beanClass && "content".equals(pd.getName())) { + // Only allow URL attribute introspection, not content resolution + continue; + } + if (pd.getWriteMethod() == null && isInvalidReadOnlyPropertyType(pd.getPropertyType())) { + // Ignore read-only properties such as ClassLoader - no need to bind to those continue; } if (logger.isTraceEnabled()) { @@ -344,10 +347,8 @@ private void introspectInterfaces(Class beanClass, Class currClass, Set 0 || method.getReturnType() == void.class || - ClassLoader.class.isAssignableFrom(method.getReturnType()) || - ProtectionDomain.class.isAssignableFrom(method.getReturnType())) { + isInvalidReadOnlyPropertyType(method.getReturnType())) { return false; } try { @@ -393,6 +393,12 @@ private boolean isPlainAccessor(Method method) { } } + private boolean isInvalidReadOnlyPropertyType(@Nullable Class returnType) { + return (returnType != null && (AutoCloseable.class.isAssignableFrom(returnType) || + ClassLoader.class.isAssignableFrom(returnType) || + ProtectionDomain.class.isAssignableFrom(returnType))); + } + BeanInfo getBeanInfo() { return this.beanInfo; diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index ab154ea3c4e6..dd79e71cb13f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -25,6 +25,7 @@ import org.springframework.beans.testfixture.beans.TestBean; import org.springframework.core.OverridingClassLoader; import org.springframework.core.io.DefaultResourceLoader; +import org.springframework.core.io.UrlResource; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -153,7 +154,7 @@ void setPropertyTypeMismatch() { } @Test - void propertyDescriptors() { + void propertyDescriptors() throws Exception { TestBean target = new TestBean(); target.setSpouse(new TestBean()); BeanWrapper accessor = createAccessor(target); @@ -182,11 +183,29 @@ void propertyDescriptors() { assertThat(accessor.isReadableProperty("class.package")).isFalse(); assertThat(accessor.isReadableProperty("class.module")).isFalse(); assertThat(accessor.isReadableProperty("class.classLoader")).isFalse(); + assertThat(accessor.isReadableProperty("class.name")).isTrue(); + assertThat(accessor.isReadableProperty("class.simpleName")).isTrue(); assertThat(accessor.isReadableProperty("classLoader")).isTrue(); assertThat(accessor.isWritableProperty("classLoader")).isTrue(); OverridingClassLoader ocl = new OverridingClassLoader(getClass().getClassLoader()); accessor.setPropertyValue("classLoader", ocl); assertThat(accessor.getPropertyValue("classLoader")).isSameAs(ocl); + + accessor = createAccessor(new UrlResource("https://spring.io")); + + assertThat(accessor.isReadableProperty("class.package")).isFalse(); + assertThat(accessor.isReadableProperty("class.module")).isFalse(); + assertThat(accessor.isReadableProperty("class.classLoader")).isFalse(); + assertThat(accessor.isReadableProperty("class.name")).isTrue(); + assertThat(accessor.isReadableProperty("class.simpleName")).isTrue(); + assertThat(accessor.isReadableProperty("URL.protocol")).isTrue(); + assertThat(accessor.isReadableProperty("URL.host")).isTrue(); + assertThat(accessor.isReadableProperty("URL.port")).isTrue(); + assertThat(accessor.isReadableProperty("URL.file")).isTrue(); + assertThat(accessor.isReadableProperty("URL.content")).isFalse(); + assertThat(accessor.isReadableProperty("inputStream")).isFalse(); + assertThat(accessor.isReadableProperty("filename")).isTrue(); + assertThat(accessor.isReadableProperty("description")).isTrue(); } @Test