Skip to content

Prefer non-reflective access to ConfigurationClassPostProcessor #22858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Prefer non-reflective access to ConfigurationClassPostProcessor #22858

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion ...org/springframework/boot/autoconfigure/SharedMetadataReaderFactoryContextInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@

package org.springframework.boot.autoconfigure;

import java.util.function.Supplier;

import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
Expand Down Expand Up @@ -53,7 +56,7 @@ class SharedMetadataReaderFactoryContextInitializer

@Override
public void initialize(ConfigurableApplicationContext applicationContext) {
applicationContext.addBeanFactoryPostProcessor(new CachingMetadataReaderFactoryPostProcessor());
applicationContext.addBeanFactoryPostProcessor(new CachingMetadataReaderFactoryPostProcessor(applicationContext));
}

@Override
Expand All @@ -69,6 +72,12 @@ public int getOrder() {
private static class CachingMetadataReaderFactoryPostProcessor
implements BeanDefinitionRegistryPostProcessor, PriorityOrdered {

private ConfigurableApplicationContext context;

CachingMetadataReaderFactoryPostProcessor(ConfigurableApplicationContext context) {
this.context = context;
}

@Override
public int getOrder() {
// Must happen before the ConfigurationClassPostProcessor is created
Expand Down Expand Up @@ -96,12 +105,28 @@ private void configureConfigurationClassPostProcessor(BeanDefinitionRegistry reg
try {
BeanDefinition definition = registry
.getBeanDefinition(AnnotationConfigUtils.CONFIGURATION_ANNOTATION_PROCESSOR_BEAN_NAME);
if (definition instanceof AbstractBeanDefinition) {
AbstractBeanDefinition bean = (AbstractBeanDefinition) definition;
if (bean.getInstanceSupplier() != null) {
Supplier<?> supplier = bean.getInstanceSupplier();
bean.setInstanceSupplier(() -> modify(supplier));
return;
}
}
definition.getPropertyValues().add("metadataReaderFactory", new RuntimeBeanReference(BEAN_NAME));
}
catch (NoSuchBeanDefinitionException ex) {
}
}

private Object modify(Supplier<?> supplier) {
Object object = supplier.get();
if (object instanceof ConfigurationClassPostProcessor) {
((ConfigurationClassPostProcessor) object).setMetadataReaderFactory(this.context.getBean(BEAN_NAME, MetadataReaderFactory.class));
}
return object;
}

}

/**
Expand Down