diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/Channel.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/Channel.java index 469158f3..82d67ae2 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/Channel.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/Channel.java @@ -25,7 +25,7 @@ package fun.asgc.neutrino.core.base; * @author: aoshiguchen * @date: 2022/9/29 */ -public interface Channel { +public interface Channel { /** * 注册接收者 @@ -39,12 +39,6 @@ public interface Channel { */ void unRegisterReceiver(R receiver); - /** - * 设置调度器 - * @param dispatcher 调度器 - */ - void setDispatcher(Dis dispatcher); - /** * 发布消息 * @param msg 消息 diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/event/ApplicationEventChannel.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/event/ApplicationEventChannel.java index d9284db3..6506fb06 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/event/ApplicationEventChannel.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/event/ApplicationEventChannel.java @@ -42,7 +42,6 @@ import java.util.concurrent.TimeUnit; */ public class ApplicationEventChannel implements EventChannel,ApplicationEventReceiver,Dispatcher>>, ChannelConnector> { private List> receiverList; - private Dispatcher> dispatcher; private ThreadPoolExecutor threadPoolExecutor; private static final AntPathMatcher antPathMatcher = new AntPathMatcher(); private List> channelList; @@ -72,12 +71,6 @@ public class ApplicationEventChannel implements EventChannel> dispatcher) { - Assert.notNull(dispatcher, "dispatcher不能为空!"); - this.dispatcher = dispatcher; - } - @Override public void publish(ApplicationEvent msg) { if (msg.context().channelList().contains(this)) { diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/event/EventChannel.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/event/EventChannel.java index 755366ae..cf73246c 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/event/EventChannel.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/base/event/EventChannel.java @@ -28,6 +28,6 @@ import fun.asgc.neutrino.core.base.Dispatcher; * @author: aoshiguchen * @date: 2022/9/29 */ -public interface EventChannel, R extends EventReceiver, Dis extends Dispatcher> extends Channel { +public interface EventChannel, R extends EventReceiver, Dis extends Dispatcher> extends Channel { } diff --git a/neutrino-core/src/test/java/fun/asgc/neutrino/core/base/event/Test3.java b/neutrino-core/src/test/java/fun/asgc/neutrino/core/base/event/Test3.java index 7b50e05b..7ca0dd9b 100644 --- a/neutrino-core/src/test/java/fun/asgc/neutrino/core/base/event/Test3.java +++ b/neutrino-core/src/test/java/fun/asgc/neutrino/core/base/event/Test3.java @@ -63,7 +63,7 @@ public class Test3 { simpleApplicationEventManager.registerReceiver(receiver1); simpleApplicationEventManager.registerReceiver(receiver2); - simpleApplicationEventManager.publish("/aaa", Sets.newHashSet("tag2"), new Student().setId("1").setName("张三").setAge(28).setSex("男")); + simpleApplicationEventManager.publish("/aaa", Sets.newHashSet("tag1"), new Student().setId("1").setName("张三").setAge(28).setSex("男")); SystemUtil.waitProcessDestroy().sync(); } diff --git a/neutrino-core/src/test/java/fun/asgc/neutrino/core/type/Test1.java b/neutrino-core/src/test/java/fun/asgc/neutrino/core/base/type/Test1.java similarity index 98% rename from neutrino-core/src/test/java/fun/asgc/neutrino/core/type/Test1.java rename to neutrino-core/src/test/java/fun/asgc/neutrino/core/base/type/Test1.java index 45762356..f3c7b9da 100644 --- a/neutrino-core/src/test/java/fun/asgc/neutrino/core/type/Test1.java +++ b/neutrino-core/src/test/java/fun/asgc/neutrino/core/base/type/Test1.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.type; +package fun.asgc.neutrino.core.base.type; import org.junit.Test; diff --git a/neutrino-core/src/test/java/fun/asgc/neutrino/core/type/Test2.java b/neutrino-core/src/test/java/fun/asgc/neutrino/core/base/type/Test2.java similarity index 95% rename from neutrino-core/src/test/java/fun/asgc/neutrino/core/type/Test2.java rename to neutrino-core/src/test/java/fun/asgc/neutrino/core/base/type/Test2.java index a1f29b16..27a58f51 100644 --- a/neutrino-core/src/test/java/fun/asgc/neutrino/core/type/Test2.java +++ b/neutrino-core/src/test/java/fun/asgc/neutrino/core/base/type/Test2.java @@ -19,9 +19,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.type; +package fun.asgc.neutrino.core.base.type; -import fun.asgc.neutrino.core.base.type.ResolvableType; import org.junit.Test; import java.util.HashMap;