From 3e9649a8e00113cc1dc69656c1e27db7279f4512 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 10 May 2021 18:55:36 +0300 Subject: [PATCH] refactoring: PacketInboundHandler --- .../handler}/PacketInboundHandler.java | 25 ++++++------------- .../{ => handler}/codec/ProtocolDecoder.java | 2 +- .../{ => handler}/codec/ProtocolEncoder.java | 2 +- .../{ => handler}/codec/ProtocolSplitter.java | 2 +- .../codec/ProtocolSplitterTest.java | 2 +- 5 files changed, 11 insertions(+), 22 deletions(-) rename {protocol/src/main/java/mc/protocol => protocol-new/src/main/java/mc/protocol/handler}/PacketInboundHandler.java (61%) rename protocol-new/src/main/java/mc/protocol/{ => handler}/codec/ProtocolDecoder.java (97%) rename protocol-new/src/main/java/mc/protocol/{ => handler}/codec/ProtocolEncoder.java (96%) rename protocol-new/src/main/java/mc/protocol/{ => handler}/codec/ProtocolSplitter.java (96%) rename protocol-new/src/test/java/mc/protocol/{ => handler}/codec/ProtocolSplitterTest.java (98%) diff --git a/protocol/src/main/java/mc/protocol/PacketInboundHandler.java b/protocol-new/src/main/java/mc/protocol/handler/PacketInboundHandler.java similarity index 61% rename from protocol/src/main/java/mc/protocol/PacketInboundHandler.java rename to protocol-new/src/main/java/mc/protocol/handler/PacketInboundHandler.java index 712a833..7cfd820 100644 --- a/protocol/src/main/java/mc/protocol/PacketInboundHandler.java +++ b/protocol-new/src/main/java/mc/protocol/handler/PacketInboundHandler.java @@ -1,13 +1,12 @@ -package mc.protocol; +package mc.protocol.handler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import mc.protocol.NettyAttributes; +import mc.protocol.State; import mc.protocol.packets.ClientSidePacket; -import mc.protocol.event.EventBus; -import mc.protocol.pool.PacketPool; -import org.apache.commons.pool2.ObjectPool; import java.io.IOException; @@ -17,21 +16,11 @@ public class PacketInboundHandler extends SimpleChannelInboundHandler poolNettyConnectionContext; - private final PacketPool poolPackets; - private final EventBus eventBus; - @Override - protected void channelRead0(ChannelHandlerContext ctx, ClientSidePacket packet) throws Exception { - State state = ctx.channel().attr(NetworkAttributes.STATE).get(); + protected void channelRead0(ChannelHandlerContext ctx, ClientSidePacket packet) { + State state = ctx.channel().attr(NettyAttributes.STATE).get(); - NettyConnectionContext context = poolNettyConnectionContext.borrowObject().setCtx(ctx); - eventBus.emit(state, context, packet); - - if (!context.isUsedContext()) { - poolNettyConnectionContext.returnObject(context); - } - poolPackets.returnObject(packet); + //TODO process } @Override @@ -39,7 +28,7 @@ public class PacketInboundHandler extends SimpleChannelInboundHandler