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

Freeze configuration before invoking MBDPP instances 

This commit updates refresh for AOT processing so that the configuration
is frozen before invoking MergedBeanDefinitionPostProcessor instances.
This makes sure that post-processed MergedBeanDefinitions are kept in
cache and not lost if a component attempts to clear the metadata cache.

Closes gh-28941
This commit is contained in:
Stephane Nicoll 2022-08-09 13:26:47 +02:00
parent 0a9db7cc47
commit 005713066c
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
View File

@ -406,6 +406,7 @@ public class GenericApplicationContext extends AbstractApplicationContext implem
prepareBeanFactory(this.beanFactory); prepareBeanFactory(this.beanFactory);
postProcessBeanFactory(this.beanFactory); postProcessBeanFactory(this.beanFactory);
invokeBeanFactoryPostProcessors(this.beanFactory); invokeBeanFactoryPostProcessors(this.beanFactory);
this.beanFactory.freezeConfiguration();
PostProcessorRegistrationDelegate.invokeMergedBeanDefinitionPostProcessors(this.beanFactory); PostProcessorRegistrationDelegate.invokeMergedBeanDefinitionPostProcessors(this.beanFactory);
} }

13
spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
View File

@ -409,6 +409,19 @@ class GenericApplicationContextTests {
context.close(); context.close();
} }
@Test
void refreshForAotFreezeConfiguration() {
GenericApplicationContext context = new GenericApplicationContext();
context.registerBeanDefinition("test", new RootBeanDefinition(String.class));
MergedBeanDefinitionPostProcessor bpp = registerMockMergedBeanDefinitionPostProcessor(context);
context.refreshForAotProcessing();
RootBeanDefinition mergedBeanDefinition = getBeanDefinition(context, "test");
verify(bpp).postProcessMergedBeanDefinition(mergedBeanDefinition, String.class, "test");
context.getBeanFactory().clearMetadataCache();
assertThat(context.getBeanFactory().getMergedBeanDefinition("test")).isSameAs(mergedBeanDefinition);
context.close();
}
@Test @Test
void refreshForAotInvokesBeanPostProcessorContractOnMergedBeanDefinitionPostProcessors() { void refreshForAotInvokesBeanPostProcessorContractOnMergedBeanDefinitionPostProcessors() {
MergedBeanDefinitionPostProcessor bpp = new MergedBeanDefinitionPostProcessor() { MergedBeanDefinitionPostProcessor bpp = new MergedBeanDefinitionPostProcessor() {