diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java index f9dc7040cf3..e238a8570ff 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java @@ -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); diff --git a/spring-context/src/main/java/org/springframework/context/aot/ApplicationContextAotGenerator.java b/spring-context/src/main/java/org/springframework/context/aot/ApplicationContextAotGenerator.java index 4c7528e6819..07f4d0f9c06 100644 --- a/spring-context/src/main/java/org/springframework/context/aot/ApplicationContextAotGenerator.java +++ b/spring-context/src/main/java/org/springframework/context/aot/ApplicationContextAotGenerator.java @@ -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); diff --git a/spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationContributions.java b/spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationAotContributions.java similarity index 93% rename from spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationContributions.java rename to spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationAotContributions.java index bf03a9d5894..a9e5d164ce5 100644 --- a/spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationContributions.java +++ b/spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationAotContributions.java @@ -35,16 +35,16 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; * @author Phillip Webb * @since 6.0 */ -class BeanFactoryInitializationContributions { +class BeanFactoryInitializationAotContributions { private final List 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)); }