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 3bb89dab..62b5cfdc 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 @@ -16,7 +16,7 @@ package com.zfoo.net.core.tcp; import com.zfoo.net.core.AbstractServer; import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.ServerRouteHandler; -import com.zfoo.net.handler.codec.tcp.TcpCodecServerHandler; +import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; @@ -34,7 +34,7 @@ public class TcpServer extends AbstractServer { protected void initChannel(SocketChannel channel) throws Exception { channel.pipeline().addLast(new IdleStateHandler(0, 0, 180)); channel.pipeline().addLast(new ServerIdleHandler()); - channel.pipeline().addLast(new TcpCodecServerHandler()); + channel.pipeline().addLast(new TcpCodecHandler()); channel.pipeline().addLast(new ServerRouteHandler()); } } diff --git a/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpCodecServerHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpCodecServerHandler.java deleted file mode 100644 index cf15316b..00000000 --- a/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpCodecServerHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2020 The zfoo Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and limitations under the License. - */ - -package com.zfoo.net.handler.codec.tcp; - -import com.zfoo.net.packet.EncodedPacketInfo; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelHandlerContext; - -import java.util.List; - -/** - * header(4byte) + protocolId(2byte) + packet - * header = body(bytes.length) + protocolId.length(2byte) - * - * @author godotg - */ -@ChannelHandler.Sharable -public class TcpCodecServerHandler extends TcpCodecHandler { - - @Override - public void decode(ChannelHandlerContext ctx, ByteBuf in, List out) { - super.decode(ctx, in, out); - } - - @Override - public void encode(ChannelHandlerContext ctx, EncodedPacketInfo packetInfo, ByteBuf out) { - super.encode(ctx, packetInfo, out); - } - -}