chore: merge main into release [skip ci]

Author: github-actions[bot]

microsphere-spring-context/src/main/java/io/microsphere/spring/beans/factory/support/ListenableAutowireCandidateResolverInitializer.java

@@ -19,14 +19,11 @@
 import io.microsphere.annotation.ConfigurationProperty;
 import io.microsphere.constants.PropertyConstants;
 import io.microsphere.spring.context.ConfigurableApplicationContextInitializer;
-import io.microsphere.spring.core.env.ListenableConfigurableEnvironment;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 
-import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
 import static io.microsphere.spring.constants.PropertyConstants.MICROSPHERE_SPRING_PROPERTY_NAME_PREFIX;
 import static java.lang.Boolean.parseBoolean;
@@ -99,8 +96,7 @@ public class ListenableAutowireCandidateResolverInitializer extends Configurable
     @Override
     protected void initialize(ConfigurableApplicationContext context, ConfigurableEnvironment environment) {
         ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-        BeanDefinitionRegistry beanDefinitionRegistry = asBeanDefinitionRegistry(beanFactory);
-        registerBeanDefinition(beanDefinitionRegistry, ListenableAutowireCandidateResolver.class);
+        registerBeanDefinition(beanFactory, ListenableAutowireCandidateResolver.class);
     }
 
     @Override

microsphere-spring-context/src/main/java/io/microsphere/spring/config/CollectingConfigurationPropertyListener.java

@@ -25,7 +25,6 @@
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.core.env.ConfigurablePropertyResolver;
 
-import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBean;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBeanDefinition;
 import static org.springframework.util.SystemPropertyUtils.PLACEHOLDER_PREFIX;
@@ -221,9 +220,8 @@ public void afterSetPlaceholderSuffix(ConfigurablePropertyResolver propertyResol
     @Override
     public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
         this.beanFactory = beanFactory;
-        BeanDefinitionRegistry registry = asBeanDefinitionRegistry(beanFactory);
-        registerBeanDefinition(registry, ConfigurationPropertyRepository.BEAN_NAME, ConfigurationPropertyRepository.class);
-        registerBean(registry, BEAN_NAME, this);
+        registerBeanDefinition(beanFactory, ConfigurationPropertyRepository.BEAN_NAME, ConfigurationPropertyRepository.class);
+        registerBean(beanFactory, BEAN_NAME, this);
     }
 
     /**

microsphere-spring-context/src/main/java/io/microsphere/spring/context/ConfigurableApplicationContextInitializer.java

@@ -20,7 +20,6 @@
 import io.microsphere.logging.Logger;
 import io.microsphere.spring.beans.BeanUtils;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -29,7 +28,6 @@
 import static io.microsphere.constants.SymbolConstants.DOT;
 import static io.microsphere.logging.LoggerFactory.getLogger;
 import static io.microsphere.spring.beans.BeanUtils.generateBeanName;
-import static io.microsphere.spring.beans.factory.BeanFactoryUtils.asBeanDefinitionRegistry;
 import static io.microsphere.spring.beans.factory.support.BeanRegistrar.registerBean;
 import static io.microsphere.spring.constants.PropertyConstants.APPLICATION_CONTEXT_INITIALIZER_PROPERTY_NAME_PREFIX;
 
@@ -157,7 +155,6 @@ protected boolean isRegistered(ConfigurableApplicationContext context) {
      */
     protected void registerSelf(ConfigurableApplicationContext context) {
         ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-        BeanDefinitionRegistry registry = asBeanDefinitionRegistry(beanFactory);
-        registerBean(registry, getBeanName(), this);
+        registerBean(beanFactory, getBeanName(), this);
     }
 }