🐛 fix create beanDefinition with null ref. because the beanDefinition.lazyInit default value is set error

Author: ccoderJava

src/main/java/com/dianpoint/summer/beans/BeanDefinition.java

@@ -13,7 +13,7 @@ public class BeanDefinition {
     String SCOPE_SINGLETON = "singleton";
     String SCOPE_PROTOTYPE = "prototype";
 
-    private boolean lazyInit = false;
+    private boolean lazyInit = true;
     private String[] dependsOn;
     private ArgumentValues constructorArgumentValues;
     private PropertyValues propertyValues;

src/main/java/com/dianpoint/summer/beans/XmlBeanDefinitionReader.java

@@ -36,22 +36,35 @@ public void loadBeanDefinitions(Resource resource) {
             String className = element.attributeValue("class");
             BeanDefinition beanDefinition = new BeanDefinition(id, className);
 
-            // 解析xml文件中property节点 将其映射到PropertyValues中
+            // 处理constructor-arg节点
+            List<Element> constructorElements = element.elements("constructor-arg");
+            ArgumentValues argumentValues = new ArgumentValues();
+            for (Element constructorElement : constructorElements) {
+                String constructorType = constructorElement.attributeValue("type");
+                String constructorName = constructorElement.attributeValue("name");
+                String constructorValue = constructorElement.attributeValue("value");
+
+                argumentValues.addArgumentValues(new ArgumentValue(constructorType, constructorName, constructorValue));
+            }
+            beanDefinition.setConstructorArgumentValues(argumentValues);
+
+            // 解析properties中属性
             List<Element> propertyElements = element.elements("property");
             PropertyValues propertyValues = new PropertyValues();
+
             List<String> refs = new ArrayList<>();
             for (Element propertyElement : propertyElements) {
                 // 获取Property节点
                 String propertyType = propertyElement.attributeValue("type");
                 String propertyName = propertyElement.attributeValue("name");
                 String propertyValue = propertyElement.attributeValue("value");
                 String propertyRef = propertyElement.attributeValue("ref");
-                String refValue;
+                String refValue = "";
                 boolean isRef = false;
                 // 解析property标签后 获取ref节点参数 并且根据是否存在存在ref参数来设置PropertyValue,通过isRef标记一个bean是否引用了另外的bean
                 if (propertyValue != null && !propertyValue.equals("")) {
                     refValue = propertyValue;
-                } else {
+                } else if (propertyRef != null && !propertyRef.equals("")) {
                     isRef = true;
                     refValue = propertyRef;
                     refs.add(refValue);
@@ -61,19 +74,8 @@ public void loadBeanDefinitions(Resource resource) {
             }
             // 将PropertyValues放入BeanDefinition中 以便后续进行实例化
             beanDefinition.setPropertyValues(propertyValues);
-
-            // 获取constructor-arg节点
-            List<Element> constructorElements = element.elements("constructor-arg");
-            ArgumentValues argumentValues = new ArgumentValues();
-            for (Element constructorElement : constructorElements) {
-                String constructorType = constructorElement.attributeValue("type");
-                String constructorName = constructorElement.attributeValue("name");
-                String constructorValue = constructorElement.attributeValue("value");
-
-                argumentValues.addArgumentValues(new ArgumentValue(constructorType, constructorName, constructorValue));
-            }
-            beanDefinition.setConstructorArgumentValues(argumentValues);
             beanDefinition.setDependsOn(refs.toArray(new String[0]));
+
             // 正式注册BeanDefinition
             this.simpleBeanFactory.registerBeanDefinition(id, beanDefinition);
         }

src/test/java/com/dianpoint/summer/test/service/OtherOneService.java

@@ -9,4 +9,11 @@ public void sayHello() {
         otherTwoService.sayHello();
     }
 
+    public OtherTwoService getOtherTwoService() {
+        return otherTwoService;
+    }
+
+    public void setOtherTwoService(OtherTwoService otherTwoService) {
+        this.otherTwoService = otherTwoService;
+    }
 }

src/test/java/com/dianpoint/summer/test/service/OtherTwoService.java

@@ -11,4 +11,12 @@ void sayHello() {
     void sayBye(){
         simpleService.sayBye();
     }
+
+    public SimpleService getSimpleService() {
+        return simpleService;
+    }
+
+    public void setSimpleService(SimpleService simpleService) {
+        this.simpleService = simpleService;
+    }
 }