DefaultConfiguringBFPP to BDRegistryPP

* Make a `DefaultConfiguringBeanFactoryPostProcessor` as a `BeanDefinitionRegistryPostProcessor`
to let it be processed properly in Spring AOT
* Register `DefaultConfiguringBeanFactoryPostProcessor` as a `BeanDefinition.ROLE_INFRASTRUCTURE`,
so it is removed in Spring AOT after processing and writing target bean definitions

spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java

@@ -24,7 +24,6 @@
 import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.HierarchicalBeanFactory;
 import org.springframework.beans.factory.SmartInitializingSingleton;
@@ -36,6 +35,7 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
@@ -83,7 +83,7 @@
  * @see IntegrationContextUtils
  */
 public class DefaultConfiguringBeanFactoryPostProcessor
-		implements BeanFactoryPostProcessor, BeanClassLoaderAware, SmartInitializingSingleton {
+		implements BeanDefinitionRegistryPostProcessor, SmartInitializingSingleton {
 
 	private static final LogAccessor LOGGER = new LogAccessor(DefaultConfiguringBeanFactoryPostProcessor.class);
 
@@ -119,38 +119,32 @@ public class DefaultConfiguringBeanFactoryPostProcessor
 	}
 
 	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.classLoader = classLoader;
+	public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
+		this.registry = registry;
+		this.beanFactory = (ConfigurableListableBeanFactory) registry;
+		this.classLoader = this.beanFactory.getBeanClassLoader();
+
+		registerBeanFactoryChannelResolver();
+		registerMessagePublishingErrorHandler();
+		registerNullChannel();
+		registerErrorChannel();
+		registerIntegrationEvaluationContext();
+		registerTaskScheduler();
+		registerIdGeneratorConfigurer();
+		registerIntegrationProperties();
+		registerBuiltInBeans();
+		registerRoleController();
+		registerMessageBuilderFactory();
+		registerHeaderChannelRegistry();
+		registerGlobalChannelInterceptorProcessor();
+		registerDefaultDatatypeChannelMessageConverter();
+		registerArgumentResolverMessageConverter();
+		registerMessageHandlerMethodFactory();
+		registerListMessageHandlerMethodFactory();
 	}
 
 	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-		if (beanFactory instanceof BeanDefinitionRegistry) {
-			this.beanFactory = beanFactory;
-			this.registry = (BeanDefinitionRegistry) beanFactory;
-
-			registerBeanFactoryChannelResolver();
-			registerMessagePublishingErrorHandler();
-			registerNullChannel();
-			registerErrorChannel();
-			registerIntegrationEvaluationContext();
-			registerTaskScheduler();
-			registerIdGeneratorConfigurer();
-			registerIntegrationProperties();
-			registerBuiltInBeans();
-			registerRoleController();
-			registerMessageBuilderFactory();
-			registerHeaderChannelRegistry();
-			registerGlobalChannelInterceptorProcessor();
-			registerDefaultDatatypeChannelMessageConverter();
-			registerArgumentResolverMessageConverter();
-			registerMessageHandlerMethodFactory();
-			registerListMessageHandlerMethodFactory();
-		}
-		else {
-			LOGGER.warn("BeanFactory is not a BeanDefinitionRegistry. " +
-					"The default Spring Integration infrastructure beans are not going to be registered");
-		}
 	}
 
 	@Override

spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java

@@ -70,9 +70,12 @@ public void registerBeanDefinitions(@Nullable AnnotationMetadata importingClassM
 	 */
 	private void registerDefaultConfiguringBeanFactoryPostProcessor(BeanDefinitionRegistry registry) {
 		if (!registry.containsBeanDefinition(IntegrationContextUtils.DEFAULT_CONFIGURING_POSTPROCESSOR_BEAN_NAME)) {
+			BeanDefinitionBuilder postProcessorBuilder =
+					BeanDefinitionBuilder.genericBeanDefinition(DefaultConfiguringBeanFactoryPostProcessor.class,
+									DefaultConfiguringBeanFactoryPostProcessor::new)
+							.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 			registry.registerBeanDefinition(IntegrationContextUtils.DEFAULT_CONFIGURING_POSTPROCESSOR_BEAN_NAME,
-					new RootBeanDefinition(DefaultConfiguringBeanFactoryPostProcessor.class,
-							DefaultConfiguringBeanFactoryPostProcessor::new));
+					postProcessorBuilder.getBeanDefinition());
 		}
 	}