Defer bean context init until singletons ready

Split bean assignment from metadata initialization by replacing `initialize(bean)` with `setBean(bean)` and adding a separate `initialize()` phase. Bean context now lazily resolves the target bean from the Spring context when needed, including bean-name deduction and fallback lookup by type. The listener now initializes all bean contexts in `afterSingletonsInstantiated()`, ensuring property metadata is prepared after binding lifecycle setup. Tests were updated for the new API and expanded with nested `test.projects.*` properties to cover deeper binding/event scenarios.

Author: mercyblitz

microsphere-spring-boot-core/src/main/java/io/microsphere/spring/boot/context/properties/bind/ConfigurationPropertiesBeanContext.java

@@ -44,6 +44,7 @@
 import static io.microsphere.constants.SeparatorConstants.LINE_SEPARATOR;
 import static io.microsphere.constants.SymbolConstants.DOT;
 import static io.microsphere.constants.SymbolConstants.DOT_CHAR;
+import static io.microsphere.constants.SymbolConstants.HYPHEN;
 import static io.microsphere.lang.function.ThrowableSupplier.execute;
 import static io.microsphere.logging.LoggerFactory.getLogger;
 import static io.microsphere.reflect.FieldUtils.findAllDeclaredFields;
@@ -61,7 +62,6 @@
 import static org.springframework.beans.BeanUtils.getPropertyDescriptors;
 import static org.springframework.boot.context.properties.bind.Bindable.of;
 import static org.springframework.boot.context.properties.source.ConfigurationPropertyName.of;
-import static org.springframework.core.ResolvableType.forInstance;
 import static org.springframework.util.ClassUtils.isAssignableValue;
 import static org.springframework.util.ClassUtils.isPrimitiveOrWrapper;
 
@@ -100,6 +100,7 @@ class ConfigurationPropertiesBeanContext {
     @Nullable
     private volatile Object initializedBean;
 
+    @Nullable
     private volatile BeanWrapper beanWrapper;
 
     /**
@@ -125,7 +126,7 @@ class ConfigurationPropertiesBeanContext {
         this.beanProperties = newHashMap();
     }
 
-    void initialize(Object bean) {
+    void setBean(Object bean) {
         if (!this.beanType.isInstance(bean)) {
             if (logger.isWarnEnabled()) {
                 Class<?> beanClass = bean.getClass();
@@ -135,9 +136,10 @@ void initialize(Object bean) {
             return;
         }
         this.initializedBean = bean;
-        this.beanWrapper = new BeanWrapperImpl(bean);
-        initBeanProperties(bean);
+    }
 
+    void initialize() {
+        initBeanProperties();
         if (logger.isTraceEnabled()) {
             StringJoiner beanInfo = new StringJoiner(LINE_SEPARATOR);
             for (Map.Entry<ConfigurationPropertyName, ConfigurationPropertiesBeanProperty> entry : this.beanProperties.entrySet()) {
@@ -150,10 +152,10 @@ void initialize(Object bean) {
         }
     }
 
-    private void initBeanProperties(Object bean) {
-        String prefix = this.prefix;
-        ConfigurationPropertyName prefixName = of(prefix);
-        initBeanProperties(forInstance(bean), prefixName, null);
+    private void initBeanProperties() {
+        Object bean = getBean();
+        this.beanWrapper = new BeanWrapperImpl(bean);
+        initBeanProperties(this.beanType, of(this.prefix), null);
     }
 
     private void initBeanProperties(ResolvableType beanType, ConfigurationPropertyName prefixName, String nestedPath) {
@@ -170,6 +172,37 @@ private void initBeanProperties(ResolvableType beanType, ConfigurationPropertyNa
         }
     }
 
+    Object getBean() {
+        Object bean = this.initializedBean;
+        if (bean == null) {
+            // Get the bean from the Spring context by its name
+            String beanName = getBeanName();
+            bean = this.context.getBean(beanName, getBeanClass());
+            this.initializedBean = bean;
+        }
+        return bean;
+    }
+
+    String getBeanName() {
+        Class<?> beanClass = getBeanClass();
+        ConfigurableApplicationContext context = this.context;
+        String beanName = deduceBeanName(beanClass);
+        if (context.containsBean(beanName)) {
+            return beanName;
+        } else {
+            String[] beanNames = context.getBeanNamesForType(beanClass, true, false);
+            return beanNames[0];
+        }
+    }
+
+    String deduceBeanName(Class<?> beanClass) {
+        return this.prefix + HYPHEN + beanClass.getName();
+    }
+
+    Class<?> getBeanClass() {
+        return this.beanType.getRawClass();
+    }
+
     private Constructor<?> getBindConstructor(ResolvableType beanType) {
         return BindUtils.getBindConstructor(of(beanType), true);
     }
@@ -247,7 +280,7 @@ private void initBeanProperty(ResolvableType beanType, Field field, Configuratio
     }
 
     Object readFieldValue(Field field, @Nullable String nestedPath) {
-        Object instance = getInstance(this.initializedBean, nestedPath);
+        Object instance = getInstance(getBean(), nestedPath);
         if (instance == null) {
             return null;
         }
@@ -395,7 +428,7 @@ void publishEvent(ConfigurationProperty property, ConfigurationPropertiesBeanPro
                       Object oldValue, Object newValue) {
         String propertyName = configurationPropertiesBeanProperty.getName();
         ResolvableType propertyType = configurationPropertiesBeanProperty.getType();
-        this.context.publishEvent(new ConfigurationPropertiesBeanPropertyChangedEvent(initializedBean, propertyName,
+        this.context.publishEvent(new ConfigurationPropertiesBeanPropertyChangedEvent(getBean(), propertyName,
                 propertyType, oldValue, newValue, property));
     }
 }

microsphere-spring-boot-core/src/main/java/io/microsphere/spring/boot/context/properties/bind/EventPublishingConfigurationPropertiesBeanPropertyChangedListener.java

@@ -112,7 +112,7 @@ void initConfigurationPropertiesBeanContext(ConfigurationPropertyName name, Bind
                             name, target, context.getDepth());
                 }
             } else {
-                configurationPropertiesBeanContext.initialize(bean);
+                configurationPropertiesBeanContext.setBean(bean);
                 if (logger.isTraceEnabled()) {
                     logger.trace("The ConfigurationPropertiesBean binding is finished[name : '{}' , target : {} , depth : {} , bean : '{}']",
                             name, target, context.getDepth(), bean);
@@ -245,6 +245,9 @@ public void setApplicationContext(ApplicationContext context) throws BeansExcept
      */
     @Override
     public void afterSingletonsInstantiated() {
+        for (ConfigurationPropertiesBeanContext beanContext : this.beanContexts.values()) {
+            beanContext.initialize();
+        }
         bound = true;
     }
 

microsphere-spring-boot-core/src/test/java/io/microsphere/spring/boot/context/properties/bind/ConfigurationPropertiesBeanContextTest.java

@@ -67,12 +67,12 @@ void setUp() {
     }
 
     @Test
-    void testInitialize() {
+    void testSetBean() {
         ServerProperties serverProperties = new ServerProperties();
-        this.beanContext.initialize(serverProperties);
+        this.beanContext.setBean(serverProperties);
         assertNull(serverProperties.getPort());
 
-        this.beanContext.initialize(new JacksonProperties());
+        this.beanContext.setBean(new JacksonProperties());
     }
 
     @Test
@@ -83,7 +83,7 @@ void testSetProperty() {
         ConfigurationProperty property = newConfigurationProperty(propertyName, propertyValue);
 
         ServerProperties serverProperties = new ServerProperties();
-        this.beanContext.initialize(serverProperties);
+        this.beanContext.setBean(serverProperties);
 
         this.beanContext.setProperty(property, propertyValue, false);
 
@@ -96,7 +96,7 @@ void testSetProperty() {
     @Test
     void testGetPropertyValueOnFailed() {
         assertNull(this.beanContext.getPropertyValue("invalid.property.name"));
-        this.beanContext.initialize(new ServerProperties());
+        this.beanContext.setBean(new ServerProperties());
         assertNull(this.beanContext.getPropertyValue("invalid.property.name"));
     }
 

microsphere-spring-boot-core/src/test/java/io/microsphere/spring/boot/context/properties/bind/EventPublishingConfigurationPropertiesBeanPropertyChangedListenerTest.java

@@ -92,6 +92,9 @@
         "test.aliases[1]=b",
         "test.aliases[2]=c",
         "test.ports=7070,8080,9090",
+        "test.projects.project-1[0].build.location=META-INF/build-info.properties",
+        "test.projects.project-1[1].build.encoding=UTF-8",
+        "test.projects.project-2[0].git.location=my-git.properties",
 
         // TestConstructorBindingConfigurationProperties
         "test.constructor.binding.name=test-constructor-binding-name",