From 7bbb79f140a7670f84e8e958cc5790794e4265c3 Mon Sep 17 00:00:00 2001 From: jaysunxiao Date: Thu, 1 Jul 2021 11:28:49 +0800 Subject: [PATCH] rename[net]: rename TcpCodecHandler --- .../main/java/com/zfoo/net/core/gateway/GatewayServer.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 ++-- .../tcp/{TcpPacketCodecHandler.java => TcpCodecHandler.java} | 4 ++-- .../net/handler/codec/websocket/WebSocketCodecHandler.java | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-) rename net/src/main/java/com/zfoo/net/handler/codec/tcp/{TcpPacketCodecHandler.java => TcpCodecHandler.java} (96%) 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 fb128c21..875f7a2a 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 @@ -15,7 +15,7 @@ package com.zfoo.net.core.gateway; import com.zfoo.net.core.AbstractServer; import com.zfoo.net.handler.GatewayDispatcherHandler; -import com.zfoo.net.handler.codec.tcp.TcpPacketCodecHandler; +import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.net.session.model.Session; import com.zfoo.protocol.IPacket; @@ -58,7 +58,7 @@ public class GatewayServer extends AbstractServer { protected void initChannel(SocketChannel channel) { channel.pipeline().addLast(new IdleStateHandler(0, 0, 180)); channel.pipeline().addLast(new ServerIdleHandler()); - channel.pipeline().addLast(new TcpPacketCodecHandler()); + channel.pipeline().addLast(new TcpCodecHandler()); channel.pipeline().addLast(new GatewayDispatcherHandler(packetFilter)); } } 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 84d5da75..6a22703f 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 @@ -15,7 +15,7 @@ package com.zfoo.net.core.tcp; import com.zfoo.net.core.AbstractClient; import com.zfoo.net.handler.ClientDispatcherHandler; -import com.zfoo.net.handler.codec.tcp.TcpPacketCodecHandler; +import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ClientIdleHandler; import com.zfoo.util.net.HostAndPort; import io.netty.channel.Channel; @@ -44,7 +44,7 @@ public class TcpClient extends AbstractClient { protected void initChannel(SocketChannel channel) { channel.pipeline().addLast(new IdleStateHandler(0, 0, 60)); channel.pipeline().addLast(new ClientIdleHandler()); - channel.pipeline().addLast(new TcpPacketCodecHandler()); + channel.pipeline().addLast(new TcpCodecHandler()); channel.pipeline().addLast(new ClientDispatcherHandler()); } } 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 8a729e79..542aeaa4 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 @@ -15,7 +15,7 @@ package com.zfoo.net.core.tcp; import com.zfoo.net.core.AbstractServer; import com.zfoo.net.handler.ServerDispatcherHandler; -import com.zfoo.net.handler.codec.tcp.TcpPacketCodecHandler; +import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import com.zfoo.util.net.HostAndPort; import io.netty.channel.ChannelInitializer; @@ -43,7 +43,7 @@ public class TcpServer extends AbstractServer { protected void initChannel(SocketChannel channel) { channel.pipeline().addLast(new IdleStateHandler(0, 0, 180)); channel.pipeline().addLast(new ServerIdleHandler()); - channel.pipeline().addLast(new TcpPacketCodecHandler()); + channel.pipeline().addLast(new TcpCodecHandler()); channel.pipeline().addLast(new ServerDispatcherHandler()); } } diff --git a/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpPacketCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpCodecHandler.java similarity index 96% rename from net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpPacketCodecHandler.java rename to net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpCodecHandler.java index e0c9e053..98508dad 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpPacketCodecHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpCodecHandler.java @@ -35,9 +35,9 @@ import java.util.List; * @author jaysunxiao * @version 3.0 */ -public class TcpPacketCodecHandler extends ByteToMessageCodec { +public class TcpCodecHandler extends ByteToMessageCodec { - private static final Logger logger = LoggerFactory.getLogger(TcpPacketCodecHandler.class); + private static final Logger logger = LoggerFactory.getLogger(TcpCodecHandler.class); @Override protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) { diff --git a/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java index 4d4c7622..3c1f3e39 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java @@ -14,7 +14,6 @@ package com.zfoo.net.handler.codec.websocket; import com.zfoo.net.NetContext; -import com.zfoo.net.handler.codec.tcp.TcpPacketCodecHandler; import com.zfoo.net.packet.model.DecodedPacketInfo; import com.zfoo.net.packet.model.EncodedPacketInfo; import com.zfoo.net.packet.service.PacketService; @@ -42,7 +41,7 @@ import java.util.List; */ public class WebSocketCodecHandler extends MessageToMessageCodec { - private static final Logger logger = LoggerFactory.getLogger(TcpPacketCodecHandler.class); + private static final Logger logger = LoggerFactory.getLogger(WebSocketCodecHandler.class); @Override protected void decode(ChannelHandlerContext channelHandlerContext, WebSocketFrame webSocketFrame, List list) {