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

Polish

This commit is contained in:
Phillip Webb 2022-05-26 17:38:03 -07:00
parent 718ef42d68
commit efa8ffb728
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,21 +62,14 @@ class BeanDefinitionMethodGeneratorFactoryTests {
@Test
void getBeanDefinitionMethodGeneratorConsidersFactoryLoadedExcludeFiltersAndBeansInOrderedOrder() {
MockBeanRegistrationExcludeFilter filter1 = new MockBeanRegistrationExcludeFilter(
false, 1);
MockBeanRegistrationExcludeFilter filter2 = new MockBeanRegistrationExcludeFilter(
false, 2);
MockBeanRegistrationExcludeFilter filter3 = new MockBeanRegistrationExcludeFilter(
false, 3);
MockBeanRegistrationExcludeFilter filter4 = new MockBeanRegistrationExcludeFilter(
true, 4);
MockBeanRegistrationExcludeFilter filter5 = new MockBeanRegistrationExcludeFilter(
true, 5);
MockBeanRegistrationExcludeFilter filter6 = new MockBeanRegistrationExcludeFilter(
true, 6);
MockBeanRegistrationExcludeFilter filter1 = new MockBeanRegistrationExcludeFilter(false, 1);
MockBeanRegistrationExcludeFilter filter2 = new MockBeanRegistrationExcludeFilter(false, 2);
MockBeanRegistrationExcludeFilter filter3 = new MockBeanRegistrationExcludeFilter(false, 3);
MockBeanRegistrationExcludeFilter filter4 = new MockBeanRegistrationExcludeFilter(true, 4);
MockBeanRegistrationExcludeFilter filter5 = new MockBeanRegistrationExcludeFilter(true, 5);
MockBeanRegistrationExcludeFilter filter6 = new MockBeanRegistrationExcludeFilter(true, 6);
MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader();
springFactoriesLoader.addInstance(BeanRegistrationExcludeFilter.class, filter3,
filter1, filter5);
springFactoriesLoader.addInstance(BeanRegistrationExcludeFilter.class, filter3, filter1, filter5);
DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
beanFactory.registerSingleton("filter4", filter4);
beanFactory.registerSingleton("filter2", filter2);

2
spring-context/src/main/java/org/springframework/context/aot/ApplicationContextAotGenerator.java
View File

@ -52,7 +52,7 @@ public class ApplicationContextAotGenerator {
DefaultListableBeanFactory beanFactory = applicationContext
.getDefaultListableBeanFactory();
ApplicationContextInitializationCodeGenerator codeGenerator = new ApplicationContextInitializationCodeGenerator();
new BeanFactoryInitializationContributions(beanFactory).applyTo(generationContext,
new BeanFactoryInitializationAotContributions(beanFactory).applyTo(generationContext,
codeGenerator);
JavaFile javaFile = codeGenerator.generateJavaFile(generatedInitializerClassName);
generationContext.getGeneratedFiles().addSourceFile(javaFile);

6
spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationContributions.java → spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationAotContributions.java
View File

@ -35,16 +35,16 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
* @author Phillip Webb
* @since 6.0
*/
class BeanFactoryInitializationContributions {
class BeanFactoryInitializationAotContributions {
private final List<BeanFactoryInitializationAotContribution> contributions;
BeanFactoryInitializationContributions(DefaultListableBeanFactory beanFactory) {
BeanFactoryInitializationAotContributions(DefaultListableBeanFactory beanFactory) {
this(beanFactory, new AotFactoriesLoader(beanFactory));
}
BeanFactoryInitializationContributions(DefaultListableBeanFactory beanFactory,
BeanFactoryInitializationAotContributions(DefaultListableBeanFactory beanFactory,
AotFactoriesLoader loader) {
this.contributions = getContributions(beanFactory, getProcessors(loader));
}