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

Enforce BeanRegistrationExcludeFilter beans are also AOT processors

Browse Source 
Update `BeanDefinitionMethodGeneratorFactory` to enforce that any
`BeanRegistrationExcludeFilter` filter that is from a bean factory
also implements an AOT processor interface.

See gh-28866
This commit is contained in:
Phillip Webb
2022-07-28 13:48:52 +01:00
parent a4f3d1d6e8
commit 9413383d72
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java
View File

@@ -26,6 +26,8 @@ import org.springframework.core.Ordered;
import org.springframework.core.mock.MockSpringFactoriesLoader;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.mockito.Mockito.mock;
/**
@@ -35,6 +37,25 @@ import static org.mockito.Mockito.mock;
*/
class BeanDefinitionMethodGeneratorFactoryTests {
@Test
void createWhenBeanRegistrationExcludeFilterBeanIsNotAotProcessorThrowsException() {
BeanRegistrationExcludeFilter filter = registeredBean -> false;
DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
beanFactory.registerSingleton("filter", filter);
assertThatIllegalStateException()
.isThrownBy(() -> new BeanDefinitionMethodGeneratorFactory(beanFactory))
.withMessageContaining("also implement an AOT processor interface");
}
@Test
void createWhenBeanRegistrationExcludeFilterFactoryIsNotAotProcessorLoads() {
BeanRegistrationExcludeFilter filter = registeredBean -> false;
MockSpringFactoriesLoader loader = new MockSpringFactoriesLoader();
loader.addInstance(BeanRegistrationExcludeFilter.class, filter);
assertThatNoException().isThrownBy(() -> new BeanDefinitionMethodGeneratorFactory(
AotServices.factories(loader)));
}
@Test
void getBeanDefinitionMethodGeneratorWhenExcludedByBeanRegistrationExcludeFilterReturnsNull() {
MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader();
@@ -144,8 +165,8 @@ class BeanDefinitionMethodGeneratorFactoryTests {
return RegisteredBean.of(beanFactory, "test");
}
static class MockBeanRegistrationExcludeFilter
implements BeanRegistrationExcludeFilter, Ordered {
static class MockBeanRegistrationExcludeFilter implements
BeanRegistrationAotProcessor, BeanRegistrationExcludeFilter, Ordered {
private final boolean excluded;
@@ -159,7 +180,13 @@ class BeanDefinitionMethodGeneratorFactoryTests {
}
@Override
public boolean isExcluded(RegisteredBean registeredBean) {
public BeanRegistrationAotContribution processAheadOfTime(
RegisteredBean registeredBean) {
return null;
}
@Override
public boolean isExcludedFromAotProcessing(RegisteredBean registeredBean) {
this.registeredBean = registeredBean;
return this.excluded;
}