From f1a8121ec8ab9ee153bb8dbd323c5dff6ee15dd5 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Thu, 15 Sep 2022 11:44:49 +0800 Subject: [PATCH] =?UTF-8?q?bean=E7=9B=B8=E5=85=B3=E5=8C=85=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../neutrino/core/bean/{ => factory}/AbstractBeanFactory.java | 4 ++-- .../asgc/neutrino/core/bean/{ => factory}/BeanFactory.java | 3 ++- .../neutrino/core/bean/{ => factory}/BeanFactoryAware.java | 2 +- .../neutrino/core/bean/{ => factory}/SimpleBeanFactory.java | 3 ++- .../fun/asgc/neutrino/core/context/ApplicationContext.java | 4 ++-- .../asgc/neutrino/core/context/ExtensionServiceLoader.java | 2 +- .../main/java/fun/asgc/neutrino/core/util/BeanManager.java | 4 ++-- .../asgc/neutrino/core/web/context/WebApplicationContext.java | 2 +- .../fun/asgc/neutrino/core/web/context/WebContextHolder.java | 2 +- .../test/java/fun/asgc/neutrino/core/bean/test1/Launcher.java | 2 +- 10 files changed, 15 insertions(+), 13 deletions(-) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/{ => factory}/AbstractBeanFactory.java (99%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/{ => factory}/BeanFactory.java (96%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/{ => factory}/BeanFactoryAware.java (96%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/{ => factory}/SimpleBeanFactory.java (99%) diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/AbstractBeanFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/AbstractBeanFactory.java similarity index 99% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/AbstractBeanFactory.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/AbstractBeanFactory.java index dad96d35..29f10d19 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/AbstractBeanFactory.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/AbstractBeanFactory.java @@ -19,9 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.bean; +package fun.asgc.neutrino.core.bean.factory; import fun.asgc.neutrino.core.base.CustomThreadFactory; +import fun.asgc.neutrino.core.bean.*; import fun.asgc.neutrino.core.context.Environment; import fun.asgc.neutrino.core.context.LifeCycle; import fun.asgc.neutrino.core.context.LifeCycleManager; @@ -35,7 +36,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactory.java similarity index 96% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactory.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactory.java index 5d365a3b..d4ffceeb 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactory.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactory.java @@ -19,8 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.bean; +package fun.asgc.neutrino.core.bean.factory; +import fun.asgc.neutrino.core.bean.BeanIdentity; import fun.asgc.neutrino.core.exception.BeanException; import java.util.List; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactoryAware.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactoryAware.java similarity index 96% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactoryAware.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactoryAware.java index 7388daa9..032461be 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactoryAware.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactoryAware.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.bean; +package fun.asgc.neutrino.core.bean.factory; /** * 用于标识需要beanFactory的组件 diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/SimpleBeanFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/SimpleBeanFactory.java similarity index 99% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/SimpleBeanFactory.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/SimpleBeanFactory.java index 0c900201..17f4b009 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/SimpleBeanFactory.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/SimpleBeanFactory.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.bean; +package fun.asgc.neutrino.core.bean.factory; import com.google.common.collect.Lists; import fun.asgc.neutrino.core.annotation.*; @@ -28,6 +28,7 @@ import fun.asgc.neutrino.core.aop.interceptor.ExceptionHandler; import fun.asgc.neutrino.core.aop.interceptor.Filter; import fun.asgc.neutrino.core.aop.interceptor.Interceptor; import fun.asgc.neutrino.core.aop.interceptor.ResultAdvice; +import fun.asgc.neutrino.core.bean.*; import fun.asgc.neutrino.core.exception.BeanException; import fun.asgc.neutrino.core.context.ApplicationRunner; import fun.asgc.neutrino.core.util.*; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationContext.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationContext.java index 12a0d3d7..603d34af 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationContext.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationContext.java @@ -24,8 +24,8 @@ package fun.asgc.neutrino.core.context; import fun.asgc.neutrino.core.annotation.PreLoad; import fun.asgc.neutrino.core.base.GlobalConfig; -import fun.asgc.neutrino.core.bean.BeanFactoryAware; -import fun.asgc.neutrino.core.bean.SimpleBeanFactory; +import fun.asgc.neutrino.core.bean.factory.BeanFactoryAware; +import fun.asgc.neutrino.core.bean.factory.SimpleBeanFactory; import fun.asgc.neutrino.core.util.*; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ExtensionServiceLoader.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ExtensionServiceLoader.java index 451c4513..58f2929c 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ExtensionServiceLoader.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ExtensionServiceLoader.java @@ -24,7 +24,7 @@ package fun.asgc.neutrino.core.context; import fun.asgc.neutrino.core.annotation.Autowired; import fun.asgc.neutrino.core.annotation.Component; import fun.asgc.neutrino.core.annotation.NonIntercept; -import fun.asgc.neutrino.core.bean.SimpleBeanFactory; +import fun.asgc.neutrino.core.bean.factory.SimpleBeanFactory; import fun.asgc.neutrino.core.web.context.WebApplicationContext; import fun.asgc.neutrino.core.web.context.WebContextHolder; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/BeanManager.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/BeanManager.java index be64545f..7032490e 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/BeanManager.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/BeanManager.java @@ -23,8 +23,8 @@ package fun.asgc.neutrino.core.util; import fun.asgc.neutrino.core.annotation.Component; -import fun.asgc.neutrino.core.bean.BeanFactory; -import fun.asgc.neutrino.core.bean.BeanFactoryAware; +import fun.asgc.neutrino.core.bean.factory.BeanFactory; +import fun.asgc.neutrino.core.bean.factory.BeanFactoryAware; import fun.asgc.neutrino.core.bean.BeanIdentity; import fun.asgc.neutrino.core.exception.BeanException; import lombok.extern.slf4j.Slf4j; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebApplicationContext.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebApplicationContext.java index 38479c8d..7b1fd2f7 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebApplicationContext.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebApplicationContext.java @@ -23,7 +23,7 @@ package fun.asgc.neutrino.core.web.context; import com.google.common.collect.Sets; import fun.asgc.neutrino.core.annotation.*; -import fun.asgc.neutrino.core.bean.SimpleBeanFactory; +import fun.asgc.neutrino.core.bean.factory.SimpleBeanFactory; import fun.asgc.neutrino.core.context.ApplicationContext; import fun.asgc.neutrino.core.context.ApplicationRunner; import fun.asgc.neutrino.core.web.HttpRequestHandler; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebContextHolder.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebContextHolder.java index a5231add..fb1e21a0 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebContextHolder.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebContextHolder.java @@ -26,7 +26,7 @@ import fun.asgc.neutrino.core.annotation.Component; import fun.asgc.neutrino.core.annotation.Init; import fun.asgc.neutrino.core.annotation.NonIntercept; import fun.asgc.neutrino.core.bean.BeanWrapper; -import fun.asgc.neutrino.core.bean.SimpleBeanFactory; +import fun.asgc.neutrino.core.bean.factory.SimpleBeanFactory; import fun.asgc.neutrino.core.context.ApplicationConfig; import fun.asgc.neutrino.core.util.*; import fun.asgc.neutrino.core.web.annotation.RestController; diff --git a/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Launcher.java b/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Launcher.java index c0579700..a0aa7f36 100644 --- a/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Launcher.java +++ b/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Launcher.java @@ -24,7 +24,7 @@ package fun.asgc.neutrino.core.bean.test1; import fun.asgc.neutrino.core.annotation.*; import fun.asgc.neutrino.core.base.GlobalConfig; import fun.asgc.neutrino.core.bean.BeanMatchMode; -import fun.asgc.neutrino.core.bean.SimpleBeanFactory; +import fun.asgc.neutrino.core.bean.factory.SimpleBeanFactory; import fun.asgc.neutrino.core.context.NeutrinoLauncher; import java.util.List;