Merge branch '5.3.x'

# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
#	spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java
#	spring-beans/src/main/java/org/springframework/beans/SimpleBeanInfoFactory.java
#	spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java

@@ -48,7 +48,7 @@ abstract class PropertyDescriptorUtils {
 	 * @param beanClass the target class to introspect
 	 * @return a collection of property descriptors
 	 * @throws IntrospectionException from introspecting the given bean class
-	 * @since 6.0
+	 * @since 5.3.24
 	 * @see SimpleBeanInfoFactory
 	 * @see java.beans.Introspector#getBeanInfo(Class)
 	 */
@@ -57,6 +57,7 @@ public static Collection<PropertyDescriptor> determineBasicProperties(Class<?> b
 
 		for (Method method : beanClass.getMethods()) {
 			String methodName = method.getName();
+
 			boolean setter;
 			int nameIndex;
 			if (methodName.startsWith("set") && method.getParameterCount() == 1) {
@@ -76,6 +77,10 @@ else if (methodName.startsWith("is") && method.getParameterCount() == 0 && metho
 			}
 
 			String propertyName = StringUtils.uncapitalizeAsProperty(methodName.substring(nameIndex));
+			if (propertyName.isEmpty()) {
+				continue;
+			}
+
 			PropertyDescriptor pd = pdMap.get(propertyName);
 			if (pd != null) {
 				if (setter) {
@@ -262,6 +267,7 @@ public static boolean equals(PropertyDescriptor pd, PropertyDescriptor otherPd)
 	 * PropertyDescriptor for {@link #determineBasicProperties(Class)},
 	 * not performing any early type determination for
 	 * {@link #setReadMethod}/{@link #setWriteMethod}.
+	 * @since 5.3.24
 	 */
 	private static class BasicPropertyDescriptor extends PropertyDescriptor {
 

spring-beans/src/main/java/org/springframework/beans/SimpleBeanInfoFactory.java

@@ -39,7 +39,7 @@
  * {@link BeanInfoFactory} types to take precedence.
  *
  * @author Juergen Hoeller
- * @since 6.0
+ * @since 5.3.24
  * @see ExtendedBeanInfoFactory
  * @see CachedIntrospectionResults
  */

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

@@ -157,7 +157,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 
 	/** Cache of pre-filtered post-processors. */
 	@Nullable
-	private volatile BeanPostProcessorCache beanPostProcessorCache;
+	private BeanPostProcessorCache beanPostProcessorCache;
 
 	/** Map from scope identifier String to corresponding Scope. */
 	private final Map<String, Scope> scopes = new LinkedHashMap<>(8);
@@ -926,10 +926,12 @@ public String resolveEmbeddedValue(@Nullable String value) {
 	@Override
 	public void addBeanPostProcessor(BeanPostProcessor beanPostProcessor) {
 		Assert.notNull(beanPostProcessor, "BeanPostProcessor must not be null");
-		// Remove from old position, if any
-		this.beanPostProcessors.remove(beanPostProcessor);
-		// Add to end of list
-		this.beanPostProcessors.add(beanPostProcessor);
+		synchronized (this.beanPostProcessors) {
+			// Remove from old position, if any
+			this.beanPostProcessors.remove(beanPostProcessor);
+			// Add to end of list
+			this.beanPostProcessors.add(beanPostProcessor);
+		}
 	}
 
 	/**
@@ -939,8 +941,12 @@ public void addBeanPostProcessor(BeanPostProcessor beanPostProcessor) {
 	 * @see #addBeanPostProcessor
 	 */
 	public void addBeanPostProcessors(Collection<? extends BeanPostProcessor> beanPostProcessors) {
-		this.beanPostProcessors.removeAll(beanPostProcessors);
-		this.beanPostProcessors.addAll(beanPostProcessors);
+		synchronized (this.beanPostProcessors) {
+			// Remove from old position, if any
+			this.beanPostProcessors.removeAll(beanPostProcessors);
+			// Add to end of list
+			this.beanPostProcessors.addAll(beanPostProcessors);
+		}
 	}
 
 	@Override
@@ -962,26 +968,34 @@ public List<BeanPostProcessor> getBeanPostProcessors() {
 	 * @since 5.3
 	 */
 	BeanPostProcessorCache getBeanPostProcessorCache() {
-		BeanPostProcessorCache bppCache = this.beanPostProcessorCache;
-		if (bppCache == null) {
-			bppCache = new BeanPostProcessorCache();
-			for (BeanPostProcessor bpp : this.beanPostProcessors) {
-				if (bpp instanceof InstantiationAwareBeanPostProcessor instantiationAwareBpp) {
-					bppCache.instantiationAware.add(instantiationAwareBpp);
-					if (bpp instanceof SmartInstantiationAwareBeanPostProcessor smartInstantiationAwareBpp) {
-						bppCache.smartInstantiationAware.add(smartInstantiationAwareBpp);
+		synchronized (this.beanPostProcessors) {
+			BeanPostProcessorCache bppCache = this.beanPostProcessorCache;
+			if (bppCache == null) {
+				bppCache = new BeanPostProcessorCache();
+				for (BeanPostProcessor bpp : this.beanPostProcessors) {
+					if (bpp instanceof InstantiationAwareBeanPostProcessor instantiationAwareBpp) {
+						bppCache.instantiationAware.add(instantiationAwareBpp);
+						if (bpp instanceof SmartInstantiationAwareBeanPostProcessor smartInstantiationAwareBpp) {
+							bppCache.smartInstantiationAware.add(smartInstantiationAwareBpp);
+						}
+					}
+					if (bpp instanceof DestructionAwareBeanPostProcessor destructionAwareBpp) {
+						bppCache.destructionAware.add(destructionAwareBpp);
+					}
+					if (bpp instanceof MergedBeanDefinitionPostProcessor mergedBeanDefBpp) {
+						bppCache.mergedDefinition.add(mergedBeanDefBpp);
 					}
 				}
-				if (bpp instanceof DestructionAwareBeanPostProcessor destructionAwareBpp) {
-					bppCache.destructionAware.add(destructionAwareBpp);
-				}
-				if (bpp instanceof MergedBeanDefinitionPostProcessor mergedBeanDefBpp) {
-					bppCache.mergedDefinition.add(mergedBeanDefBpp);
-				}
+				this.beanPostProcessorCache = bppCache;
 			}
-			this.beanPostProcessorCache = bppCache;
+			return bppCache;
+		}
+	}
+
+	private void resetBeanPostProcessorCache() {
+		synchronized (this.beanPostProcessors) {
+			this.beanPostProcessorCache = null;
 		}
-		return bppCache;
 	}
 
 	/**
@@ -1937,35 +1951,35 @@ private class BeanPostProcessorCacheAwareList extends CopyOnWriteArrayList<BeanP
 		@Override
 		public BeanPostProcessor set(int index, BeanPostProcessor element) {
 			BeanPostProcessor result = super.set(index, element);
-			beanPostProcessorCache = null;
+			resetBeanPostProcessorCache();
 			return result;
 		}
 
 		@Override
 		public boolean add(BeanPostProcessor o) {
 			boolean success = super.add(o);
-			beanPostProcessorCache = null;
+			resetBeanPostProcessorCache();
 			return success;
 		}
 
 		@Override
 		public void add(int index, BeanPostProcessor element) {
 			super.add(index, element);
-			beanPostProcessorCache = null;
+			resetBeanPostProcessorCache();
 		}
 
 		@Override
 		public BeanPostProcessor remove(int index) {
 			BeanPostProcessor result = super.remove(index);
-			beanPostProcessorCache = null;
+			resetBeanPostProcessorCache();
 			return result;
 		}
 
 		@Override
 		public boolean remove(Object o) {
 			boolean success = super.remove(o);
 			if (success) {
-				beanPostProcessorCache = null;
+				resetBeanPostProcessorCache();
 			}
 			return success;
 		}
@@ -1974,7 +1988,7 @@ public boolean remove(Object o) {
 		public boolean removeAll(Collection<?> c) {
 			boolean success = super.removeAll(c);
 			if (success) {
-				beanPostProcessorCache = null;
+				resetBeanPostProcessorCache();
 			}
 			return success;
 		}
@@ -1983,7 +1997,7 @@ public boolean removeAll(Collection<?> c) {
 		public boolean retainAll(Collection<?> c) {
 			boolean success = super.retainAll(c);
 			if (success) {
-				beanPostProcessorCache = null;
+				resetBeanPostProcessorCache();
 			}
 			return success;
 		}
@@ -1992,7 +2006,7 @@ public boolean retainAll(Collection<?> c) {
 		public boolean addAll(Collection<? extends BeanPostProcessor> c) {
 			boolean success = super.addAll(c);
 			if (success) {
-				beanPostProcessorCache = null;
+				resetBeanPostProcessorCache();
 			}
 			return success;
 		}
@@ -2001,7 +2015,7 @@ public boolean addAll(Collection<? extends BeanPostProcessor> c) {
 		public boolean addAll(int index, Collection<? extends BeanPostProcessor> c) {
 			boolean success = super.addAll(index, c);
 			if (success) {
-				beanPostProcessorCache = null;
+				resetBeanPostProcessorCache();
 			}
 			return success;
 		}
@@ -2010,15 +2024,15 @@ public boolean addAll(int index, Collection<? extends BeanPostProcessor> c) {
 		public boolean removeIf(Predicate<? super BeanPostProcessor> filter) {
 			boolean success = super.removeIf(filter);
 			if (success) {
-				beanPostProcessorCache = null;
+				resetBeanPostProcessorCache();
 			}
 			return success;
 		}
 
 		@Override
 		public void replaceAll(UnaryOperator<BeanPostProcessor> operator) {
 			super.replaceAll(operator);
-			beanPostProcessorCache = null;
+			resetBeanPostProcessorCache();
 		}
 	}