Hacking #3 :)

Author: nosan

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sql/init/SqlInitializationAutoConfigurationTests.java

@@ -113,8 +113,7 @@ void whenBeanIsAnnotatedAsDependingOnDatabaseInitializationThenItDependsOnR2dbcS
 			.withUserConfiguration(DependsOnInitializedDatabaseConfiguration.class)
 			.run((context) -> {
 				BeanDefinition beanDefinition = context.getBeanFactory()
-					.getBeanDefinition(
-							"sqlInitializationAutoConfigurationTests.DependsOnInitializedDatabaseConfiguration");
+					.getBeanDefinition(DependsOnInitializedDatabaseConfiguration.class.getName());
 				assertThat(beanDefinition.getDependsOn()).containsExactlyInAnyOrder("r2dbcScriptDatabaseInitializer");
 			});
 	}
@@ -125,8 +124,7 @@ void whenBeanIsAnnotatedAsDependingOnDatabaseInitializationThenItDependsOnDataSo
 			.withUserConfiguration(DependsOnInitializedDatabaseConfiguration.class)
 			.run((context) -> {
 				BeanDefinition beanDefinition = context.getBeanFactory()
-					.getBeanDefinition(
-							"sqlInitializationAutoConfigurationTests.DependsOnInitializedDatabaseConfiguration");
+					.getBeanDefinition(DependsOnInitializedDatabaseConfiguration.class.getName());
 				assertThat(beanDefinition.getDependsOn())
 					.containsExactlyInAnyOrder("dataSourceScriptDatabaseInitializer");
 			});

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java

@@ -23,16 +23,13 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionCustomizer;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
 import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.boot.context.annotation.Configurations;
 import org.springframework.boot.context.annotation.UserConfigurations;
 import org.springframework.boot.test.context.FilteredClassLoader;
@@ -42,10 +39,11 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotatedBeanDefinitionReader;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.Ordered;
-import org.springframework.core.PriorityOrdered;
 import org.springframework.core.ResolvableType;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.util.Assert;
@@ -446,17 +444,28 @@ private void configureContext(C context, boolean refresh) {
 		this.runnerConfiguration.initializers.forEach((initializer) -> initializer.initialize(context));
 		Class<?>[] classes = Configurations.getClasses(this.runnerConfiguration.configurations);
 		if (classes.length > 0) {
-			context.addBeanFactoryPostProcessor(new ConfigurationClassesRegistrar(classes));
-			// GenericApplicationContext gac = (GenericApplicationContext) context;
-			// for (Class<?> aClass : classes) {
-			// gac.registerBean(aClass.getName(), aClass);
-			// }
+			BeanDefinitionRegistry registry = getBeanDefinitionRegistry(context);
+			ConfigurableEnvironment environment = context.getEnvironment();
+			AnnotatedBeanDefinitionReader reader = new AnnotatedBeanDefinitionReader(registry, environment);
+			for (Class<?> configurationClass : classes) {
+				reader.registerBean(configurationClass, configurationClass.getName());
+			}
 		}
 		if (refresh) {
 			context.refresh();
 		}
 	}
 
+	private BeanDefinitionRegistry getBeanDefinitionRegistry(ApplicationContext context) {
+		if (context instanceof BeanDefinitionRegistry registry) {
+			return registry;
+		}
+		if (context instanceof AbstractApplicationContext abstractContext) {
+			return (BeanDefinitionRegistry) abstractContext.getBeanFactory();
+		}
+		throw new IllegalStateException("Could not locate BeanDefinitionRegistry from context: " + context);
+	}
+
 	private void accept(ContextConsumer<? super A> consumer, A context) {
 		try {
 			consumer.accept(context);
@@ -612,39 +621,4 @@ private static <T> List<T> add(List<T> list, T element) {
 
 	}
 
-	/**
-	 * A {@link BeanDefinitionRegistryPostProcessor} that mimics what an
-	 * {@code ImportSelector} does. In particular, it makes sure registered configuration
-	 * classes use their FQN as bean name.
-	 */
-	private static final class ConfigurationClassesRegistrar
-			implements BeanDefinitionRegistryPostProcessor, PriorityOrdered {
-
-		private final Class<?>[] configurationClasses;
-
-		private ConfigurationClassesRegistrar(Class<?>[] configurationClasses) {
-			this.configurationClasses = configurationClasses;
-		}
-
-		@Override
-		public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry beanDefinitionRegistry)
-				throws BeansException {
-			for (Class<?> configurationClass : this.configurationClasses) {
-				beanDefinitionRegistry.registerBeanDefinition(configurationClass.getName(),
-						new RootBeanDefinition(configurationClass));
-			}
-		}
-
-		@Override
-		public void postProcessBeanFactory(ConfigurableListableBeanFactory configurableListableBeanFactory)
-				throws BeansException {
-		}
-
-		@Override
-		public int getOrder() {
-			return Ordered.LOWEST_PRECEDENCE;
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java

@@ -140,19 +140,19 @@ void runWithConfigurationsShouldRegisterConfigurations() {
 	}
 
 	@Test
-	public void runWithConfigurationsShouldUseFullyQualifiedClassBeanNames() {
+	void runWithConfigurationsShouldUseFullyQualifiedClassBeanNames() {
 		get().withUserConfiguration(FooConfig.class)
-				.run((context) -> assertThat(context).hasBean(FooConfig.class.getName()));
+			.run((context) -> assertThat(context).hasBean(FooConfig.class.getName()));
 	}
 
 	@Test
-	public void runWithConfigurationsWithTheSameNameShouldRegisterBoth() {
-		get().withUserConfiguration(org.springframework.boot.test.context.example.duplicate.first.EmptyConfig.class,
-				org.springframework.boot.test.context.example.duplicate.second.EmptyConfig.class)
-				.run((context) -> assertThat(context)
-						.hasSingleBean(org.springframework.boot.test.context.example.duplicate.first.EmptyConfig.class)
-						.hasSingleBean(
-								org.springframework.boot.test.context.example.duplicate.second.EmptyConfig.class));
+	void runWithConfigurationsWithTheSameNameShouldRegisterBoth() {
+		get()
+			.withUserConfiguration(org.springframework.boot.test.context.example.duplicate.first.EmptyConfig.class,
+					org.springframework.boot.test.context.example.duplicate.second.EmptyConfig.class)
+			.run((context) -> assertThat(context)
+				.hasSingleBean(org.springframework.boot.test.context.example.duplicate.first.EmptyConfig.class)
+				.hasSingleBean(org.springframework.boot.test.context.example.duplicate.second.EmptyConfig.class));
 	}
 
 	@Test