From cf3b715222daf359f694643dcac687c03d5d6083 Mon Sep 17 00:00:00 2001 From: jaysunxiao Date: Wed, 13 Oct 2021 23:36:23 +0800 Subject: [PATCH] =?UTF-8?q?ref[net]:=20=E9=87=8D=E6=9E=84net?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net/src/main/java/com/zfoo/net/core/AbstractClient.java | 4 ++-- .../java/com/zfoo/net/core/gateway/GatewayServer.java | 4 ++-- .../com/zfoo/net/core/gateway/WebsocketGatewayServer.java | 4 ++-- .../zfoo/net/core/gateway/WebsocketSslGatewayServer.java | 4 ++-- net/src/main/java/com/zfoo/net/core/http/HttpServer.java | 4 ++-- net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java | 4 ++-- net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java | 4 ++-- net/src/main/java/com/zfoo/net/core/udp/UdpClient.java | 8 ++++---- net/src/main/java/com/zfoo/net/core/udp/UdpServer.java | 4 ++-- .../java/com/zfoo/net/core/websocket/WebsocketClient.java | 4 ++-- .../java/com/zfoo/net/core/websocket/WebsocketServer.java | 4 ++-- .../{BaseDispatcherHandler.java => BaseRouteHandler.java} | 4 ++-- ...ientDispatcherHandler.java => ClientRouteHandler.java} | 4 ++-- ...wayDispatcherHandler.java => GatewayRouteHandler.java} | 6 +++--- ...rverDispatcherHandler.java => ServerRouteHandler.java} | 4 ++-- net/src/main/java/com/zfoo/net/util/SessionUtils.java | 2 +- 16 files changed, 34 insertions(+), 34 deletions(-) rename net/src/main/java/com/zfoo/net/handler/{BaseDispatcherHandler.java => BaseRouteHandler.java} (96%) rename net/src/main/java/com/zfoo/net/handler/{ClientDispatcherHandler.java => ClientRouteHandler.java} (95%) rename net/src/main/java/com/zfoo/net/handler/{GatewayDispatcherHandler.java => GatewayRouteHandler.java} (96%) rename net/src/main/java/com/zfoo/net/handler/{ServerDispatcherHandler.java => ServerRouteHandler.java} (94%) diff --git a/net/src/main/java/com/zfoo/net/core/AbstractClient.java b/net/src/main/java/com/zfoo/net/core/AbstractClient.java index b418a836..7bc85096 100644 --- a/net/src/main/java/com/zfoo/net/core/AbstractClient.java +++ b/net/src/main/java/com/zfoo/net/core/AbstractClient.java @@ -14,7 +14,7 @@ package com.zfoo.net.core; import com.zfoo.net.NetContext; -import com.zfoo.net.handler.BaseDispatcherHandler; +import com.zfoo.net.handler.BaseRouteHandler; import com.zfoo.net.session.model.Session; import com.zfoo.protocol.exception.ExceptionUtils; import com.zfoo.protocol.util.IOUtils; @@ -72,7 +72,7 @@ public abstract class AbstractClient implements IClient { if (channelFuture.isSuccess()) { if (channelFuture.channel().isActive()) { var channel = channelFuture.channel(); - var session = BaseDispatcherHandler.initChannel(channel); + var session = BaseRouteHandler.initChannel(channel); NetContext.getSessionManager().addClientSession(session); logger.info("TcpClient started at [{}]", channel.localAddress()); return session; diff --git a/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java b/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java index 875f7a2a..ccd9f53e 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.gateway; import com.zfoo.net.core.AbstractServer; -import com.zfoo.net.handler.GatewayDispatcherHandler; +import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.net.session.model.Session; @@ -59,7 +59,7 @@ public class GatewayServer extends AbstractServer { channel.pipeline().addLast(new IdleStateHandler(0, 0, 180)); channel.pipeline().addLast(new ServerIdleHandler()); channel.pipeline().addLast(new TcpCodecHandler()); - channel.pipeline().addLast(new GatewayDispatcherHandler(packetFilter)); + channel.pipeline().addLast(new GatewayRouteHandler(packetFilter)); } } } diff --git a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java index c7de4003..642b8898 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.gateway; import com.zfoo.net.core.AbstractServer; -import com.zfoo.net.handler.GatewayDispatcherHandler; +import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.net.session.model.Session; @@ -69,7 +69,7 @@ public class WebsocketGatewayServer extends AbstractServer { channel.pipeline().addLast(new WebSocketServerProtocolHandler("/websocket")); channel.pipeline().addLast(new ChunkedWriteHandler()); channel.pipeline().addLast(new WebSocketCodecHandler()); - channel.pipeline().addLast(new GatewayDispatcherHandler(packetFilter)); + channel.pipeline().addLast(new GatewayRouteHandler(packetFilter)); } } } diff --git a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java index e643b768..d1828ab5 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.gateway; import com.zfoo.net.core.AbstractServer; -import com.zfoo.net.handler.GatewayDispatcherHandler; +import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.net.session.model.Session; @@ -87,7 +87,7 @@ public class WebsocketSslGatewayServer extends AbstractServer { channel.pipeline().addLast(new WebSocketServerProtocolHandler("/")); channel.pipeline().addLast(new ChunkedWriteHandler()); channel.pipeline().addLast(new WebSocketCodecHandler()); - channel.pipeline().addLast(new GatewayDispatcherHandler(packetFilter)); + channel.pipeline().addLast(new GatewayRouteHandler(packetFilter)); } } } diff --git a/net/src/main/java/com/zfoo/net/core/http/HttpServer.java b/net/src/main/java/com/zfoo/net/core/http/HttpServer.java index 9518ba9f..4f8e0d91 100644 --- a/net/src/main/java/com/zfoo/net/core/http/HttpServer.java +++ b/net/src/main/java/com/zfoo/net/core/http/HttpServer.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.http; import com.zfoo.net.core.AbstractServer; -import com.zfoo.net.handler.ServerDispatcherHandler; +import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.http.HttpCodecHandler; import com.zfoo.net.packet.model.DecodedPacketInfo; import com.zfoo.protocol.util.IOUtils; @@ -57,7 +57,7 @@ public class HttpServer extends AbstractServer { channel.pipeline().addLast(new HttpObjectAggregator(16 * IOUtils.BYTES_PER_MB)); channel.pipeline().addLast(new ChunkedWriteHandler()); channel.pipeline().addLast(new HttpCodecHandler(uriResolver)); - channel.pipeline().addLast(new ServerDispatcherHandler()); + channel.pipeline().addLast(new ServerRouteHandler()); } } } diff --git a/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java b/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java index 6a22703f..46dc8f11 100644 --- a/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java +++ b/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.tcp; import com.zfoo.net.core.AbstractClient; -import com.zfoo.net.handler.ClientDispatcherHandler; +import com.zfoo.net.handler.ClientRouteHandler; import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ClientIdleHandler; import com.zfoo.util.net.HostAndPort; @@ -45,7 +45,7 @@ public class TcpClient extends AbstractClient { channel.pipeline().addLast(new IdleStateHandler(0, 0, 60)); channel.pipeline().addLast(new ClientIdleHandler()); channel.pipeline().addLast(new TcpCodecHandler()); - channel.pipeline().addLast(new ClientDispatcherHandler()); + channel.pipeline().addLast(new ClientRouteHandler()); } } diff --git a/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java b/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java index 542aeaa4..3b4063b5 100644 --- a/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java +++ b/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.tcp; import com.zfoo.net.core.AbstractServer; -import com.zfoo.net.handler.ServerDispatcherHandler; +import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.util.net.HostAndPort; @@ -44,7 +44,7 @@ public class TcpServer extends AbstractServer { channel.pipeline().addLast(new IdleStateHandler(0, 0, 180)); channel.pipeline().addLast(new ServerIdleHandler()); channel.pipeline().addLast(new TcpCodecHandler()); - channel.pipeline().addLast(new ServerDispatcherHandler()); + channel.pipeline().addLast(new ServerRouteHandler()); } } } diff --git a/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java b/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java index 2c353e2a..b4d79975 100644 --- a/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java +++ b/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java @@ -15,8 +15,8 @@ package com.zfoo.net.core.udp; import com.zfoo.net.NetContext; import com.zfoo.net.core.AbstractClient; -import com.zfoo.net.handler.BaseDispatcherHandler; -import com.zfoo.net.handler.ClientDispatcherHandler; +import com.zfoo.net.handler.BaseRouteHandler; +import com.zfoo.net.handler.ClientRouteHandler; import com.zfoo.net.handler.codec.udp.UdpCodecHandler; import com.zfoo.net.session.model.Session; import com.zfoo.protocol.exception.ExceptionUtils; @@ -55,7 +55,7 @@ public class UdpClient extends AbstractClient { if (channelFuture.isSuccess()) { if (channelFuture.channel().isActive()) { var channel = channelFuture.channel(); - var session = BaseDispatcherHandler.initChannel(channel); + var session = BaseRouteHandler.initChannel(channel); NetContext.getSessionManager().addClientSession(session); logger.info("UdpClient started at [{}]", channel.localAddress()); return session; @@ -81,7 +81,7 @@ public class UdpClient extends AbstractClient { @Override protected void initChannel(Channel channel) { channel.pipeline().addLast(new UdpCodecHandler()); - channel.pipeline().addLast(new ClientDispatcherHandler()); + channel.pipeline().addLast(new ClientRouteHandler()); } } diff --git a/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java b/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java index 52c105b7..f753ca60 100644 --- a/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java +++ b/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java @@ -13,7 +13,7 @@ package com.zfoo.net.core.udp; import com.zfoo.net.core.AbstractServer; -import com.zfoo.net.handler.ServerDispatcherHandler; +import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.udp.UdpCodecHandler; import com.zfoo.util.net.HostAndPort; import io.netty.bootstrap.Bootstrap; @@ -76,7 +76,7 @@ public class UdpServer extends AbstractServer { @Override protected void initChannel(Channel channel) { channel.pipeline().addLast(new UdpCodecHandler()); - channel.pipeline().addLast(new ServerDispatcherHandler()); + channel.pipeline().addLast(new ServerRouteHandler()); } } } diff --git a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java index ae56d73b..6a0b4cfb 100644 --- a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java +++ b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.websocket; import com.zfoo.net.core.AbstractClient; -import com.zfoo.net.handler.ClientDispatcherHandler; +import com.zfoo.net.handler.ClientRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.protocol.util.IOUtils; import com.zfoo.util.net.HostAndPort; @@ -54,7 +54,7 @@ public class WebsocketClient extends AbstractClient { channel.pipeline().addLast(new WebSocketClientProtocolHandler(webSocketClientProtocolConfig)); channel.pipeline().addLast(new ChunkedWriteHandler()); channel.pipeline().addLast(new WebSocketCodecHandler()); - channel.pipeline().addLast(new ClientDispatcherHandler()); + channel.pipeline().addLast(new ClientRouteHandler()); } } diff --git a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java index 739e2fd3..369e66aa 100644 --- a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java +++ b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.websocket; import com.zfoo.net.core.AbstractServer; -import com.zfoo.net.handler.ServerDispatcherHandler; +import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.protocol.util.IOUtils; import com.zfoo.util.net.HostAndPort; @@ -56,7 +56,7 @@ public class WebsocketServer extends AbstractServer { channel.pipeline().addLast(new ChunkedWriteHandler()); // 编解码WebSocketFrame二进制协议 channel.pipeline().addLast(new WebSocketCodecHandler()); - channel.pipeline().addLast(new ServerDispatcherHandler()); + channel.pipeline().addLast(new ServerRouteHandler()); } } diff --git a/net/src/main/java/com/zfoo/net/handler/BaseDispatcherHandler.java b/net/src/main/java/com/zfoo/net/handler/BaseRouteHandler.java similarity index 96% rename from net/src/main/java/com/zfoo/net/handler/BaseDispatcherHandler.java rename to net/src/main/java/com/zfoo/net/handler/BaseRouteHandler.java index b73b04d0..af3943e1 100644 --- a/net/src/main/java/com/zfoo/net/handler/BaseDispatcherHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/BaseRouteHandler.java @@ -32,9 +32,9 @@ import org.slf4j.LoggerFactory; * @version 3.0 */ @ChannelHandler.Sharable -public class BaseDispatcherHandler extends ChannelInboundHandlerAdapter { +public class BaseRouteHandler extends ChannelInboundHandlerAdapter { - private static final Logger logger = LoggerFactory.getLogger(BaseDispatcherHandler.class); + private static final Logger logger = LoggerFactory.getLogger(BaseRouteHandler.class); public static final AttributeKey SESSION_KEY = AttributeKey.valueOf("session"); diff --git a/net/src/main/java/com/zfoo/net/handler/ClientDispatcherHandler.java b/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java similarity index 95% rename from net/src/main/java/com/zfoo/net/handler/ClientDispatcherHandler.java rename to net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java index 4e024b30..a4e62b77 100644 --- a/net/src/main/java/com/zfoo/net/handler/ClientDispatcherHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java @@ -28,9 +28,9 @@ import org.slf4j.LoggerFactory; * @version 3.0 */ @ChannelHandler.Sharable -public class ClientDispatcherHandler extends BaseDispatcherHandler { +public class ClientRouteHandler extends BaseRouteHandler { - private static final Logger logger = LoggerFactory.getLogger(ClientDispatcherHandler.class); + private static final Logger logger = LoggerFactory.getLogger(ClientRouteHandler.class); @Override public void channelActive(ChannelHandlerContext ctx) throws Exception { diff --git a/net/src/main/java/com/zfoo/net/handler/GatewayDispatcherHandler.java b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java similarity index 96% rename from net/src/main/java/com/zfoo/net/handler/GatewayDispatcherHandler.java rename to net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java index 28d4d5f1..317910fa 100644 --- a/net/src/main/java/com/zfoo/net/handler/GatewayDispatcherHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java @@ -44,13 +44,13 @@ import java.util.function.BiFunction; * @version 3.0 */ @ChannelHandler.Sharable -public class GatewayDispatcherHandler extends ServerDispatcherHandler { +public class GatewayRouteHandler extends ServerRouteHandler { - private static final Logger logger = LoggerFactory.getLogger(GatewayDispatcherHandler.class); + private static final Logger logger = LoggerFactory.getLogger(GatewayRouteHandler.class); private BiFunction packetFilter; - public GatewayDispatcherHandler(BiFunction packetFilter) { + public GatewayRouteHandler(BiFunction packetFilter) { this.packetFilter = packetFilter; } diff --git a/net/src/main/java/com/zfoo/net/handler/ServerDispatcherHandler.java b/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java similarity index 94% rename from net/src/main/java/com/zfoo/net/handler/ServerDispatcherHandler.java rename to net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java index bd0c96ab..8f886619 100644 --- a/net/src/main/java/com/zfoo/net/handler/ServerDispatcherHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java @@ -27,9 +27,9 @@ import org.slf4j.LoggerFactory; * @version 3.0 */ @ChannelHandler.Sharable -public class ServerDispatcherHandler extends BaseDispatcherHandler { +public class ServerRouteHandler extends BaseRouteHandler { - private static final Logger logger = LoggerFactory.getLogger(ServerDispatcherHandler.class); + private static final Logger logger = LoggerFactory.getLogger(ServerRouteHandler.class); @Override public void channelActive(ChannelHandlerContext ctx) throws Exception { diff --git a/net/src/main/java/com/zfoo/net/util/SessionUtils.java b/net/src/main/java/com/zfoo/net/util/SessionUtils.java index 68bab9a7..7f5ea60f 100644 --- a/net/src/main/java/com/zfoo/net/util/SessionUtils.java +++ b/net/src/main/java/com/zfoo/net/util/SessionUtils.java @@ -19,7 +19,7 @@ import com.zfoo.protocol.util.StringUtils; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; -import static com.zfoo.net.handler.BaseDispatcherHandler.SESSION_KEY; +import static com.zfoo.net.handler.BaseRouteHandler.SESSION_KEY; /** * @author jaysunxiao