Merge pull request dianpoint#8 from dianpoint/enhance-beanDefinition

Enhance bean definition

Author: ccoderJava

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

@@ -0,0 +1,54 @@
+package com.dianpoint.summer.beans;
+
+/**
+ * <p>
+ * 定义BeanDefinition在xml文件中的格式,包括value|type|name属性
+ * </p>
+ * 
+ * @author: congcong
+ * @email: congccoder@gmail.com
+ * @date: 2023/3/17 16:58
+ */
+public class ArgumentValue {
+
+    private Object value;
+
+    private String name;
+
+    private String type;
+
+    public ArgumentValue(String type, Object value) {
+        this.value = value;
+        this.type = type;
+    }
+
+    public ArgumentValue(String type, String name, Object value) {
+        this.value = value;
+        this.name = name;
+        this.type = type;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.dianpoint.summer.beans;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * <p>
+ * 参数值封装对象，提供了 ArgumentValues 和 PropertyValues 两个类，封装、 增加、获取、判断等操作方法
+ * </p>
+ * 
+ * @author: congcong
+ * @email: congccoder@gmail.com
+ * @date: 2023/3/17 16:58
+ */
+public class ArgumentValues {
+
+    private List<ArgumentValue> argumentValues = new LinkedList<>();
+
+    public ArgumentValues() {}
+
+    /**
+     * 根据Index索引顺序获取参数
+     * 
+     * @param index
+     *            参数索引位置
+     * @return 返回参数类型
+     */
+    public ArgumentValue getIndexedArgumentValue(int index) {
+        return this.argumentValues.get(index);
+    }
+
+    public int getArgumentCount() {
+        return this.argumentValues.size();
+    }
+
+    public boolean isEmpty() {
+        return this.argumentValues.isEmpty();
+    }
+
+    public void addArgumentValues(ArgumentValue argumentValue) {
+        this.argumentValues.add(argumentValue);
+    }
+}

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

@@ -1,21 +1,82 @@
 package com.dianpoint.summer.beans;
 
 /**
- * <p>Bean的定义</p>
+ * <p>
+ * Bean的定义
+ * </p>
  *
  * @author: congcong
  * @email: congccoder@gmail.com
  * @date: 2023/3/17 11:51
  */
 public class BeanDefinition {
+    String SCOPE_SINGLETON = "singleton";
+    String SCOPE_PROTOTYPE = "prototype";
+
+    private boolean lazyInit = true;
+    private String[] dependsOn;
+    private ArgumentValues constructorArgumentValues;
+    private PropertyValues propertyValues;
+    private String initMethodName;
+    private volatile Object beanClass;
     private String id;
     private String className;
 
+    private String scope = SCOPE_SINGLETON;
+
     public BeanDefinition(String id, String className) {
         this.id = id;
         this.className = className;
     }
 
+    public boolean isLazyInit() {
+        return lazyInit;
+    }
+
+    public void setLazyInit(boolean lazyInit) {
+        this.lazyInit = lazyInit;
+    }
+
+    public String[] getDependsOn() {
+        return dependsOn;
+    }
+
+    public void setDependsOn(String... dependsOn) {
+        this.dependsOn = dependsOn;
+    }
+
+    public ArgumentValues getConstructorArgumentValues() {
+        return constructorArgumentValues;
+    }
+
+    public void setConstructorArgumentValues(ArgumentValues constructorArgumentValues) {
+        this.constructorArgumentValues = constructorArgumentValues;
+    }
+
+    public PropertyValues getPropertyValues() {
+        return propertyValues;
+    }
+
+    public void setPropertyValues(PropertyValues propertyValues) {
+        this.propertyValues = propertyValues;
+    }
+
+    public String getInitMethodName() {
+        return initMethodName;
+    }
+
+    public void setInitMethodName(String initMethodName) {
+        this.initMethodName = initMethodName;
+    }
+
+    public Class<?> getBeanClass() {
+        return (Class<?>)beanClass;
+    }
+
+    public void setBeanClass(Class<?> beanClass) {
+        this.beanClass = beanClass;
+    }
+
     public String getId() {
         return id;
     }
@@ -31,4 +92,20 @@ public String getClassName() {
     public void setClassName(String className) {
         this.className = className;
     }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public boolean isSingleton() {
+        return SCOPE_SINGLETON.equals(scope);
+    }
+
+    public boolean isPrototype() {
+        return SCOPE_PROTOTYPE.equals(scope);
+    }
 }

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

@@ -0,0 +1,16 @@
+package com.dianpoint.summer.beans;
+
+/**
+ * @author: congcong
+ * @email: congccoder@gmail.com
+ * @date: 2023/3/17 15:20
+ */
+public interface BeanDefinitionRegistry {
+    void registerBeanDefinition(String name, BeanDefinition beanDefinition);
+
+    void removeBeanDefinition(String name);
+
+    BeanDefinition getBeanDefinition(String name);
+
+    boolean containsBeanDefinition(String name);
+}

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

@@ -11,7 +11,15 @@
  */
 public interface BeanFactory {
 
-    Object getBean(String beanName) throws NoSuchBeanDefinitionException;
+    Object getBean(String beanName) throws BeansException;
 
-    void registerBeanDefinition(BeanDefinition beanDefinition);
+    boolean containsBean(String name);
+
+    void registerBean(String beanName, Object object);
+
+    boolean isSingleton(String name);
+
+    boolean isPrototype(String name);
+
+    Class<?> getType(String name);
 }

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

@@ -0,0 +1,12 @@
+package com.dianpoint.summer.beans;
+
+/**
+ * @author: congcong
+ * @email: congccoder@gmail.com
+ * @date: 2023/3/17 15:03
+ */
+public class BeansException extends Exception {
+    public BeansException(String message) {
+        super(message);
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.dianpoint.summer.beans;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author: congcong
+ * @email: congccoder@gmail.com
+ * @date: 2023/3/17 15:12
+ */
+public class DefaultSingletonBeanRegistry implements SingletonBeanRegistry {
+
+    private List<String> beanNames = new ArrayList<>();
+    private Map<String, Object> singletons = new ConcurrentHashMap<>(256);
+
+    @Override
+    public void registerSingleton(String beanName, Object singletonObject) {
+        // 保证BeanNames和singletons的操作的原子性
+        synchronized (this.singletons) {
+            this.singletons.put(beanName, singletonObject);
+            this.beanNames.add(beanName);
+        }
+    }
+
+    @Override
+    public Object getSingleton(String beanName) {
+        return this.singletons.get(beanName);
+    }
+
+    @Override
+    public boolean containsSingleton(String beanName) {
+        return this.singletons.containsKey(beanName);
+    }
+
+    @Override
+    public String[] getSingletonNames() {
+        return (String[])this.beanNames.toArray();
+    }
+
+    protected void removeSingleton(String beanName) {
+        synchronized (this.singletons) {
+            this.singletons.remove(beanName);
+            this.beanNames.remove(beanName);
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.dianpoint.summer.beans;
+
+/**
+ * <p>
+ * 用以保存BeanDefinition在xml文件中的定义,包括待注入的属性类型type、名称name、值value、引用类型ref
+ * </p>
+ * 
+ * @author: congcong
+ * @email: congccoder@gmail.com
+ * @date: 2023/3/17 17:00
+ */
+public class PropertyValue {
+
+    private final String type;
+    private final String name;
+    private final Object value;
+
+    /**
+     * 属性是否是引用属性
+     */
+    private final boolean isRef;
+
+    public PropertyValue(String type, String name, Object value, boolean isRef) {
+        this.type = type;
+        this.name = name;
+        this.value = value;
+        this.isRef = isRef;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public boolean isRef() {
+        return isRef;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.dianpoint.summer.beans;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 解析Resource文件中Property属性节点,将其批量存储PropertyValues中
+ * </p>
+ * 
+ * @author: congcong
+ * @email: congccoder@gmail.com
+ * @date: 2023/3/17 17:00
+ */
+public class PropertyValues {
+
+    private List<PropertyValue> propertyValueList;
+
+    public PropertyValues() {
+        this.propertyValueList = new ArrayList<>(0);
+    }
+
+    /**
+     * 设置propertyValue
+     * 
+     * @param propertyValue
+     *            资源属性值
+     */
+    public void addPropertyValue(PropertyValue propertyValue) {
+        this.propertyValueList.add(propertyValue);
+    }
+
+
+    public boolean isEmpty() {
+        return this.propertyValueList.isEmpty();
+    }
+
+    public int size() {
+        return this.propertyValueList.size();
+    }
+
+    public List<PropertyValue> getPropertyValueList() {
+        return propertyValueList;
+    }
+}