From 263973ff66e5b60086206aface7dd417e411079e Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Thu, 7 Jul 2022 16:30:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fun/asgc/neutrino/core/bean/AbstractBeanFactory.java | 2 -- .../java/fun/asgc/neutrino/core/bean/SimpleBeanFactory.java | 2 +- .../fun/asgc/neutrino/core/context/ApplicationContext.java | 1 - .../neutrino/core/{runner => context}/ApplicationRunner.java | 2 +- .../core/{launcher => context}/NeutrinoLauncher.java | 5 +---- .../java/fun/asgc/neutrino/core/bean/test1/Launcher.java | 2 +- .../test/java/fun/asgc/neutrino/core/bean/test1/Test1.java | 2 +- .../test/java/fun/asgc/neutrino/core/db/mapper/Launcher.java | 2 +- .../test/java/fun/asgc/neutrino/core/db/mapper/Test1.java | 4 +--- .../java/fun/asgc/neutrino/proxy/client/ProxyClient.java | 2 +- .../asgc/neutrino/proxy/client/core/ProxyClientRunner.java | 2 +- .../java/fun/asgc/neutrino/proxy/server/ProxyServer.java | 2 +- .../asgc/neutrino/proxy/server/core/ProxyServerRunner.java | 2 +- 13 files changed, 11 insertions(+), 19 deletions(-) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/{runner => context}/ApplicationRunner.java (96%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/{launcher => context}/NeutrinoLauncher.java (95%) 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/AbstractBeanFactory.java index 86b4b787..2448cbf8 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/AbstractBeanFactory.java @@ -21,7 +21,6 @@ */ package fun.asgc.neutrino.core.bean; -import fun.asgc.neutrino.core.annotation.Component; import fun.asgc.neutrino.core.context.LifeCycle; import fun.asgc.neutrino.core.context.LifeCycleManager; import fun.asgc.neutrino.core.context.LifeCycleStatus; @@ -29,7 +28,6 @@ import fun.asgc.neutrino.core.exception.BeanException; import fun.asgc.neutrino.core.util.*; import lombok.extern.slf4j.Slf4j; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; 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/SimpleBeanFactory.java index 54b4e278..9946575b 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/SimpleBeanFactory.java @@ -29,7 +29,7 @@ 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.exception.BeanException; -import fun.asgc.neutrino.core.runner.ApplicationRunner; +import fun.asgc.neutrino.core.context.ApplicationRunner; import fun.asgc.neutrino.core.util.*; import lombok.extern.slf4j.Slf4j; 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 437f1a41..cd4be2bc 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 @@ -25,7 +25,6 @@ package fun.asgc.neutrino.core.context; 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.runner.ApplicationRunner; 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/runner/ApplicationRunner.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationRunner.java similarity index 96% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/runner/ApplicationRunner.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationRunner.java index d459a419..bb604e44 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/runner/ApplicationRunner.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationRunner.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.core.runner; +package fun.asgc.neutrino.core.context; /** * diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/launcher/NeutrinoLauncher.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/NeutrinoLauncher.java similarity index 95% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/launcher/NeutrinoLauncher.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/context/NeutrinoLauncher.java index f61a0a6d..ecc772e6 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/launcher/NeutrinoLauncher.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/NeutrinoLauncher.java @@ -20,14 +20,11 @@ * SOFTWARE. */ -package fun.asgc.neutrino.core.launcher; +package fun.asgc.neutrino.core.context; import com.google.common.collect.Lists; import fun.asgc.neutrino.core.annotation.NeutrinoApplication; import fun.asgc.neutrino.core.constant.MetaDataConstant; -import fun.asgc.neutrino.core.context.ApplicationConfig; -import fun.asgc.neutrino.core.context.ApplicationContext; -import fun.asgc.neutrino.core.context.Environment; import fun.asgc.neutrino.core.util.*; import lombok.extern.slf4j.Slf4j; 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 51bb0284..c0579700 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 @@ -25,7 +25,7 @@ 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.launcher.NeutrinoLauncher; +import fun.asgc.neutrino.core.context.NeutrinoLauncher; import java.util.List; import java.util.Set; diff --git a/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Test1.java b/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Test1.java index c607a5ac..d11133d9 100644 --- a/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Test1.java +++ b/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Test1.java @@ -23,7 +23,7 @@ package fun.asgc.neutrino.core.bean.test1; import fun.asgc.neutrino.core.annotation.Autowired; import fun.asgc.neutrino.core.annotation.Component; -import fun.asgc.neutrino.core.runner.ApplicationRunner; +import fun.asgc.neutrino.core.context.ApplicationRunner; /** * diff --git a/neutrino-core/src/test/java/fun/asgc/neutrino/core/db/mapper/Launcher.java b/neutrino-core/src/test/java/fun/asgc/neutrino/core/db/mapper/Launcher.java index 586a5eac..1cc68487 100644 --- a/neutrino-core/src/test/java/fun/asgc/neutrino/core/db/mapper/Launcher.java +++ b/neutrino-core/src/test/java/fun/asgc/neutrino/core/db/mapper/Launcher.java @@ -22,7 +22,7 @@ package fun.asgc.neutrino.core.db.mapper; import fun.asgc.neutrino.core.annotation.*; -import fun.asgc.neutrino.core.launcher.NeutrinoLauncher; +import fun.asgc.neutrino.core.context.NeutrinoLauncher; /** * diff --git a/neutrino-core/src/test/java/fun/asgc/neutrino/core/db/mapper/Test1.java b/neutrino-core/src/test/java/fun/asgc/neutrino/core/db/mapper/Test1.java index 8a4eadb5..d3b244eb 100644 --- a/neutrino-core/src/test/java/fun/asgc/neutrino/core/db/mapper/Test1.java +++ b/neutrino-core/src/test/java/fun/asgc/neutrino/core/db/mapper/Test1.java @@ -16,10 +16,8 @@ import com.alibaba.fastjson.JSONObject; import fun.asgc.neutrino.core.annotation.Autowired; import fun.asgc.neutrino.core.annotation.Component; import fun.asgc.neutrino.core.annotation.Init; -import fun.asgc.neutrino.core.aop.interceptor.ExceptionHandler; import fun.asgc.neutrino.core.aop.interceptor.InnerGlobalInterceptor; -import fun.asgc.neutrino.core.db.template.JdbcTemplateTest; -import fun.asgc.neutrino.core.runner.ApplicationRunner; +import fun.asgc.neutrino.core.context.ApplicationRunner; import lombok.extern.slf4j.Slf4j; import java.util.Date; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/ProxyClient.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/ProxyClient.java index 7de569f3..705cdaa4 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/ProxyClient.java +++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/ProxyClient.java @@ -23,7 +23,7 @@ package fun.asgc.neutrino.proxy.client; import fun.asgc.neutrino.core.annotation.NeutrinoApplication; -import fun.asgc.neutrino.core.launcher.NeutrinoLauncher; +import fun.asgc.neutrino.core.context.NeutrinoLauncher; /** * diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientRunner.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientRunner.java index 17128075..cb1d6dd4 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientRunner.java +++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientRunner.java @@ -27,7 +27,7 @@ import fun.asgc.neutrino.core.annotation.Autowired; import fun.asgc.neutrino.core.annotation.Bean; import fun.asgc.neutrino.core.annotation.Component; import fun.asgc.neutrino.core.annotation.NonIntercept; -import fun.asgc.neutrino.core.runner.ApplicationRunner; +import fun.asgc.neutrino.core.context.ApplicationRunner; import fun.asgc.neutrino.core.util.CollectionUtil; import fun.asgc.neutrino.core.util.FileUtil; import fun.asgc.neutrino.core.util.StringUtil; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java index 5549f376..83541167 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java @@ -23,7 +23,7 @@ package fun.asgc.neutrino.proxy.server; import fun.asgc.neutrino.core.annotation.NeutrinoApplication; -import fun.asgc.neutrino.core.launcher.NeutrinoLauncher; +import fun.asgc.neutrino.core.context.NeutrinoLauncher; /** * diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/ProxyServerRunner.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/ProxyServerRunner.java index 31099237..bc18ac23 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/ProxyServerRunner.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/ProxyServerRunner.java @@ -26,7 +26,7 @@ import fun.asgc.neutrino.core.annotation.Autowired; import fun.asgc.neutrino.core.annotation.Bean; import fun.asgc.neutrino.core.annotation.Component; import fun.asgc.neutrino.core.annotation.NonIntercept; -import fun.asgc.neutrino.core.runner.ApplicationRunner; +import fun.asgc.neutrino.core.context.ApplicationRunner; import fun.asgc.neutrino.core.util.FileUtil; import fun.asgc.neutrino.proxy.core.IdleCheckHandler; import fun.asgc.neutrino.proxy.core.ProxyMessageDecoder;