From 6658ecaa1a979a2d8baeee56a093d02764408cc3 Mon Sep 17 00:00:00 2001 From: godotg Date: Tue, 7 Mar 2023 17:36:07 +0800 Subject: [PATCH] ref[event]: rename submit to post --- event/src/main/java/com/zfoo/event/manager/EventBus.java | 2 +- event/src/test/java/com/zfoo/event/ApplicationTest.java | 2 +- .../com/zfoo/net/consumer/registry/ZookeeperRegistry.java | 2 +- .../main/java/com/zfoo/net/handler/ClientRouteHandler.java | 4 ++-- .../main/java/com/zfoo/net/handler/GatewayRouteHandler.java | 2 +- .../main/java/com/zfoo/net/handler/ServerRouteHandler.java | 4 ++-- net/src/main/java/com/zfoo/net/router/Router.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/event/src/main/java/com/zfoo/event/manager/EventBus.java b/event/src/main/java/com/zfoo/event/manager/EventBus.java index 9acb4446..1b0eeaa3 100644 --- a/event/src/main/java/com/zfoo/event/manager/EventBus.java +++ b/event/src/main/java/com/zfoo/event/manager/EventBus.java @@ -97,7 +97,7 @@ public abstract class EventBus { /** * Publish the event */ - public static void submit(IEvent event) { + public static void post(IEvent event) { doSubmit(event, receiverMapSync.get(event.getClass())); doSubmit(event, receiverMapAsync.get(event.getClass())); } diff --git a/event/src/test/java/com/zfoo/event/ApplicationTest.java b/event/src/test/java/com/zfoo/event/ApplicationTest.java index ec1a5b4d..fcae6917 100644 --- a/event/src/test/java/com/zfoo/event/ApplicationTest.java +++ b/event/src/test/java/com/zfoo/event/ApplicationTest.java @@ -33,7 +33,7 @@ public class ApplicationTest { var context = new ClassPathXmlApplicationContext("application.xml"); // see receiver method of MyController1 and MyController2 - EventBus.submit(MyNoticeEvent.valueOf("我的事件")); + EventBus.post(MyNoticeEvent.valueOf("我的事件")); ThreadUtils.sleep(3000); } diff --git a/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java b/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java index 7bd03aff..7edeb6b7 100644 --- a/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java +++ b/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java @@ -490,7 +490,7 @@ public class ZookeeperRegistry implements IRegistry { } else { // 连接上了服务提供者 session.setConsumerAttribute(providerCache); - EventBus.submit(ConsumerStartEvent.valueOf(providerCache, session)); + EventBus.post(ConsumerStartEvent.valueOf(providerCache, session)); try { var localRegisterVO = NetContext.getConfigManager().getLocalConfig().toLocalRegisterVO(); diff --git a/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java b/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java index 22fb7d3f..6ec87d20 100644 --- a/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java @@ -37,7 +37,7 @@ public class ClientRouteHandler extends BaseRouteHandler { super.channelActive(ctx); // 客户端的session初始化在启动的时候已经做了，这边直接获取session var session = SessionUtils.getSession(ctx); - EventBus.submit(ClientSessionActiveEvent.valueOf(session)); + EventBus.post(ClientSessionActiveEvent.valueOf(session)); logger.info("client channel is active {}", SessionUtils.sessionInfo(ctx)); } @@ -52,7 +52,7 @@ public class ClientRouteHandler extends BaseRouteHandler { } NetContext.getSessionManager().removeClientSession(session); - EventBus.submit(ClientSessionInactiveEvent.valueOf(session)); + EventBus.post(ClientSessionInactiveEvent.valueOf(session)); // 如果是消费者inactive，还需要触发客户端消费者检查事件，以便重新连接 if (session.getConsumerAttribute() != null) { diff --git a/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java index b4a38afd..28f28149 100644 --- a/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java @@ -133,7 +133,7 @@ public class GatewayRouteHandler extends ServerRouteHandler { var uid = session.getUid(); // 连接到网关的客户端断开了连接 - EventBus.submit(GatewaySessionInactiveEvent.valueOf(sid, uid)); + EventBus.post(GatewaySessionInactiveEvent.valueOf(sid, uid)); super.channelInactive(ctx); } diff --git a/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java b/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java index 623ca910..ac85143b 100644 --- a/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java @@ -38,7 +38,7 @@ public class ServerRouteHandler extends BaseRouteHandler { var session = initChannel(ctx.channel()); NetContext.getSessionManager().addServerSession(session); logger.info("server channel is active {}", SessionUtils.sessionInfo(ctx)); - EventBus.submit(ServerSessionActiveEvent.valueOf(session)); + EventBus.post(ServerSessionActiveEvent.valueOf(session)); } @Override @@ -51,6 +51,6 @@ public class ServerRouteHandler extends BaseRouteHandler { } NetContext.getSessionManager().removeServerSession(session); logger.warn("server channel is inactive {}", SessionUtils.sessionSimpleInfo(ctx)); - EventBus.submit(ServerSessionInactiveEvent.valueOf(session)); + EventBus.post(ServerSessionInactiveEvent.valueOf(session)); } } diff --git a/net/src/main/java/com/zfoo/net/router/Router.java b/net/src/main/java/com/zfoo/net/router/Router.java index 5146e981..93ab5b2b 100644 --- a/net/src/main/java/com/zfoo/net/router/Router.java +++ b/net/src/main/java/com/zfoo/net/router/Router.java @@ -126,7 +126,7 @@ public class Router implements IRouter { return; } session.setUid(uid); - EventBus.submit(AuthUidToGatewayEvent.valueOf(gatewaySession.getSid(), uid)); + EventBus.post(AuthUidToGatewayEvent.valueOf(gatewaySession.getSid(), uid)); NetContext.getRouter().send(session, AuthUidToGatewayConfirm.valueOf(uid), new GatewayAttachment(gatewaySession, null)); return; @@ -322,7 +322,7 @@ public class Router implements IRouter { // 这个在哪个线程处理取决于：这个上层的PacketReceiverTask被丢到了哪个线程中 PacketBus.route(session, packet, attachment); } catch (Exception e) { - EventBus.submit(ServerExceptionEvent.valueOf(session, packet, attachment, e)); + EventBus.post(ServerExceptionEvent.valueOf(session, packet, attachment, e)); logger.error(StringUtils.format("e[uid:{}][sid:{}] unknown exception", session.getUid(), session.getSid(), e.getMessage()), e); } catch (Throwable t) { logger.error(StringUtils.format("e[uid:{}][sid:{}] unknown error", session.getUid(), session.getSid(), t.getMessage()), t);