Make cloneConfigurationPropertiesBean generic

Change cloneConfigurationPropertiesBean to return a typed instance (<T> T) and add the corresponding @param <T> javadoc; cast the autowired bean to T. Add unit test testCloneConfigurationPropertiesBean with Test1Properties and Test2Properties to verify constructor autowiring of Environment and ConfigurableApplicationContext, and add required imports/assertions.

Author: mercyblitz

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

@@ -92,16 +92,17 @@ public ConfigurationPropertiesBeanContext(Class<?> beanClass, ConfigurationPrope
      *
      * @param beanClass the bean class
      * @param context   {@link ConfigurableApplicationContext}
+     * @param <T>       the type of the bean
      * @return the cloned bean
      */
     @Nonnull
-    protected Object cloneConfigurationPropertiesBean(Class<?> beanClass, ConfigurableApplicationContext context) {
+    protected <T> T cloneConfigurationPropertiesBean(Class<T> beanClass, ConfigurableApplicationContext context) {
         if (hasNonPrivateConstructorWithoutParameters(beanClass)) {
             return instantiateClass(beanClass);
         }
         ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
         Object clonedBean = beanFactory.autowire(beanClass, AUTOWIRE_CONSTRUCTOR, true);
-        return clonedBean;
+        return (T) clonedBean;
     }
 
     /**

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

@@ -23,16 +23,20 @@
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.properties.source.ConfigurationProperty;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.env.Environment;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
 
 import static io.microsphere.spring.boot.context.properties.bind.ConfigurationPropertiesBeanContext.isCandidateClass;
 import static io.microsphere.spring.boot.context.properties.bind.ConfigurationPropertiesBeanContext.isCandidateProperty;
+import static io.microsphere.spring.test.util.SpringTestUtils.testInSpringContainer;
 import static java.lang.Integer.valueOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -58,6 +62,21 @@ void setUp() {
                 beanInfo.getPrefix(), context);
     }
 
+    @Test
+    void testCloneConfigurationPropertiesBean() {
+        testInSpringContainer(context -> {
+            ServerProperties serverProperties = this.beanContext.cloneConfigurationPropertiesBean(ServerProperties.class, context);
+            assertNotNull(serverProperties);
+
+            Test1Properties test1Properties = this.beanContext.cloneConfigurationPropertiesBean(Test1Properties.class, context);
+            assertSame(context.getEnvironment(), test1Properties.environment);
+
+            Test2Properties test2Properties = this.beanContext.cloneConfigurationPropertiesBean(Test2Properties.class, context);
+            assertSame(context.getEnvironment(), test2Properties.environment);
+            assertSame(context, test2Properties.context);
+        });
+    }
+
     @Test
     void testInitialize() {
         ServerProperties serverProperties = new ServerProperties();
@@ -112,4 +131,25 @@ void testIsCandidateClass() {
         assertTrue(isCandidateClass(ServerProperties.class));
         assertFalse(isCandidateClass(String.class));
     }
+
+    static class Test1Properties {
+
+        private Environment environment;
+
+        public Test1Properties(Environment environment) {
+            this.environment = environment;
+        }
+    }
+
+    static class Test2Properties {
+
+        private Environment environment;
+
+        private ConfigurableApplicationContext context;
+
+        public Test2Properties(Environment environment, ConfigurableApplicationContext context) {
+            this.environment = environment;
+            this.context = context;
+        }
+    }
 }