Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use BeanRegistrationExcludeFilter as an exclude signal

Browse Source 
Closes gh-28833
This commit is contained in:
Phillip Webb
2022-07-27 15:15:45 +01:00
parent 472c23455a
commit e928943d1a
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactory.java
View File

@@ -111,11 +111,14 @@ class BeanDefinitionMethodGeneratorFactory {
private boolean isImplicitlyExcluded(RegisteredBean registeredBean) {
Class<?> beanClass = registeredBean.getBeanClass();
if (BeanRegistrationExcludeFilter.class.isAssignableFrom(beanClass)) {
return false;
if (BeanFactoryInitializationAotProcessor.class.isAssignableFrom(beanClass)) {
return true;
}
return BeanFactoryInitializationAotProcessor.class.isAssignableFrom(beanClass)
|| BeanRegistrationAotProcessor.class.isAssignableFrom(beanClass);
if (BeanRegistrationAotProcessor.class.isAssignableFrom(beanClass)) {
BeanRegistrationAotProcessor processor = this.aotProcessors.findByBeanName(registeredBean.getBeanName());
return (processor == null) || processor.isBeanExcludedFromAotProcessing();
}
return false;
}
private List<BeanRegistrationAotContribution> getAotContributions(

12
spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationAotProcessor.java
View File

@@ -47,4 +47,16 @@ public interface BeanRegistrationAotProcessor {
@Nullable
BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean);
/**
* Return if the bean instance associated with this processor should be
* excluded from AOT processing itself. By default this method will return
* {@code true} to automatically exclude the bean, if the definition should
* be written then this method may be overridden to return {@code true}.
* @return if the bean should be excluded from AOT processing
* @see BeanRegistrationExcludeFilter
*/
default boolean isBeanExcludedFromAotProcessing() {
return true;
}
}