Make sure inferred destroy method is set on the original bean definition

This commit updates InitDestroyAnnotationBeanPostProcessor to mutate
the original bean definition rather than the merged one that can be
recreated without it if the cache gets stale.

See gh-28215

Author: snicoll

spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java

@@ -41,7 +41,9 @@
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
 import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -158,20 +160,30 @@ public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, C
 
 	@Override
 	public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
-		RootBeanDefinition beanDefinition = registeredBean.getMergedBeanDefinition();
-		beanDefinition.resolveDestroyMethodIfNecessary();
-		LifecycleMetadata metadata = findInjectionMetadata(beanDefinition, registeredBean.getBeanClass());
-		if (!CollectionUtils.isEmpty(metadata.initMethods)) {
-			String[] initMethodNames = safeMerge(beanDefinition.getInitMethodNames(), metadata.initMethods);
-			beanDefinition.setInitMethodNames(initMethodNames);
-		}
-		if (!CollectionUtils.isEmpty(metadata.destroyMethods)) {
-			String[] destroyMethodNames = safeMerge(beanDefinition.getDestroyMethodNames(), metadata.destroyMethods);
-			beanDefinition.setDestroyMethodNames(destroyMethodNames);
+		AbstractBeanDefinition beanDefinition = getOriginalBeanDefinition(registeredBean);
+		if (beanDefinition != null) {
+			RootBeanDefinition mergedBeanDefinition = registeredBean.getMergedBeanDefinition();
+			beanDefinition.resolveDestroyMethodIfNecessary();
+			LifecycleMetadata metadata = findInjectionMetadata(mergedBeanDefinition, registeredBean.getBeanClass());
+			if (!CollectionUtils.isEmpty(metadata.initMethods)) {
+				String[] initMethodNames = safeMerge(beanDefinition.getInitMethodNames(), metadata.initMethods);
+				beanDefinition.setInitMethodNames(initMethodNames);
+			}
+			if (!CollectionUtils.isEmpty(metadata.destroyMethods)) {
+				String[] destroyMethodNames = safeMerge(beanDefinition.getDestroyMethodNames(), metadata.destroyMethods);
+				beanDefinition.setDestroyMethodNames(destroyMethodNames);
+			}
+			registeredBean.getBeanFactory().clearMetadataCache();
 		}
 		return null;
 	}
 
+	@Nullable
+	private AbstractBeanDefinition getOriginalBeanDefinition(RegisteredBean registeredBean) {
+		BeanDefinition beanDefinition = registeredBean.getBeanFactory().getBeanDefinition(registeredBean.getBeanName());
+		return (beanDefinition instanceof AbstractBeanDefinition abd ? abd : null);
+	}
+
 	private LifecycleMetadata findInjectionMetadata(RootBeanDefinition beanDefinition, Class<?> beanType) {
 		LifecycleMetadata metadata = findLifecycleMetadata(beanType);
 		metadata.checkConfigMembers(beanDefinition);

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

@@ -1186,6 +1186,14 @@ else if (count == 1) {
 		}
 	}
 
+	/**
+	 * Resolve the inferred destroy method if necessary.
+	 * @since 6.0
+	 */
+	public void resolveDestroyMethodIfNecessary() {
+		setDestroyMethodNames(DisposableBeanAdapter
+				.inferDestroyMethodsIfNecessary(getResolvableType().toClass(), this));
+	}
 
 	/**
 	 * Public declaration of Object's {@code clone()} method.

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

@@ -344,13 +344,14 @@ public static boolean hasDestroyMethod(Object bean, RootBeanDefinition beanDefin
 	 * interfaces, reflectively calling the "close" method on implementing beans as well.
 	 */
 	@Nullable
-	static String[] inferDestroyMethodsIfNecessary(Class<?> target, RootBeanDefinition beanDefinition) {
+	static String[] inferDestroyMethodsIfNecessary(Class<?> target, AbstractBeanDefinition beanDefinition) {
 		String[] destroyMethodNames = beanDefinition.getDestroyMethodNames();
 		if (destroyMethodNames != null && destroyMethodNames.length > 1) {
 			return destroyMethodNames;
 		}
 
-		String destroyMethodName = beanDefinition.resolvedDestroyMethodName;
+		String destroyMethodName = (beanDefinition instanceof RootBeanDefinition rbd
+				? rbd.resolvedDestroyMethodName : null);
 		if (destroyMethodName == null) {
 			destroyMethodName = beanDefinition.getDestroyMethodName();
 			boolean autoCloseable = (AutoCloseable.class.isAssignableFrom(target));
@@ -378,7 +379,9 @@ static String[] inferDestroyMethodsIfNecessary(Class<?> target, RootBeanDefiniti
 					}
 				}
 			}
-			beanDefinition.resolvedDestroyMethodName = (destroyMethodName != null ? destroyMethodName : "");
+			if (beanDefinition instanceof RootBeanDefinition rbd) {
+				rbd.resolvedDestroyMethodName = (destroyMethodName != null ? destroyMethodName : "");
+			}
 		}
 		return (StringUtils.hasLength(destroyMethodName) ? new String[] {destroyMethodName} : null);
 	}

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

@@ -550,15 +550,6 @@ public Set<String> getExternallyManagedInitMethods() {
 		}
 	}
 
-	/**
-	 * Resolve the inferred destroy method if necessary.
-	 * @since 6.0
-	 */
-	public void resolveDestroyMethodIfNecessary() {
-		setDestroyMethodNames(DisposableBeanAdapter
-				.inferDestroyMethodsIfNecessary(getResolvableType().toClass(), this));
-	}
-
 	/**
 	 * Register an externally managed configuration destruction method &mdash;
 	 * for example, a method annotated with JSR-250's

spring-beans/src/test/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessorTests.java

@@ -90,6 +90,19 @@ void processAheadOfTimeWhenHasInferredDestroyMethodAddsDestroyMethodName() {
 		assertThat(mergedBeanDefinition.getDestroyMethodNames()).containsExactly("close");
 	}
 
+	@Test
+	void processAheadOfTimeWhenHasInferredDestroyMethodIsRetainedIfMergedBeanDefinitionIsStale() {
+		RootBeanDefinition beanDefinition = new RootBeanDefinition(InferredDestroyBean.class);
+		beanDefinition.setDestroyMethodNames(AbstractBeanDefinition.INFER_METHOD);
+		processAheadOfTime(beanDefinition);
+		RootBeanDefinition mergedBeanDefinition = getMergedBeanDefinition();
+		assertThat(mergedBeanDefinition.getInitMethodNames()).isNull();
+		assertThat(mergedBeanDefinition.getDestroyMethodNames()).containsExactly("close");
+		RootBeanDefinition originalBeanDefinition = (RootBeanDefinition) this.beanFactory.getBeanDefinition("test");
+		assertThat(originalBeanDefinition.getInitMethodNames()).isNull();
+		assertThat(originalBeanDefinition.getDestroyMethodNames()).containsExactly("close");
+	}
+
 	@Test
 	void processAheadOfTimeWhenHasInferredDestroyMethodAndNoCandidateDoesNotMutateRootBeanDefinition() {
 		RootBeanDefinition beanDefinition = new RootBeanDefinition(NoInitDestroyBean.class);