扩充@Configuration语义

2022-07-27 21:05:12 +08:00
parent eb3617181e
commit ae44ab3250
1 changed files with 9 additions and 1 deletions
@@ -187,7 +187,15 @@ public class SimpleBeanFactory extends AbstractBeanFactory {
 								}
 							}
 						} else if(bean.getType().isAnnotationPresent(Configuration.class)) {
-							bean.setInstance(ConfigUtil.getYmlConfig(bean.getType()));
+							if (CollectionUtil.isEmpty(ReflectUtil.getDeclaredFields(bean.getType()))) {
+								if (bean.isNonIntercept()) {
+									bean.setInstance(bean.getType().newInstance());
+								} else {
+									bean.setInstance(Aop.get(bean.getType()));
+								}
+							} else {
+								bean.setInstance(ConfigUtil.getYmlConfig(bean.getType()));
+							}
 						} else {
 							if (ClassUtil.hasNoArgsConstructor(bean.getType())) {
 								if (bean.isNonIntercept()) {