refactoring: PacketInboundHandler

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<ClientSide
 
 	private static final String CLIENT_FORCE_DISCONNECTED_IOEXCEPTION_MESSAGE_RU = "Программа на вашем хост-компьютере разорвала установленное подключение";
 
-	private final ObjectPool<NettyConnectionContext> poolNettyConnectionContext;
-	private final PacketPool poolPackets;
-	private final EventBus eventBus;
-
 	@Override
-	protected void channelRead0(ChannelHandlerContext ctx, ClientSidePacket packet) throws Exception {
+	protected void channelRead0(ChannelHandlerContext ctx, ClientSidePacket packet) {
-		State state = ctx.channel().attr(NetworkAttributes.STATE).get();
+		State state = ctx.channel().attr(NettyAttributes.STATE).get();
 
-		NettyConnectionContext context = poolNettyConnectionContext.borrowObject().setCtx(ctx);
+		//TODO process
-		eventBus.emit(state, context, packet);
-
-		if (!context.isUsedContext()) {
-			poolNettyConnectionContext.returnObject(context);
-		}
-		poolPackets.returnObject(packet);
 	}
 
 	@Override
@@ -39,7 +28,7 @@ public class PacketInboundHandler extends SimpleChannelInboundHandler<ClientSide
 		if (cause instanceof IOException && cause.getLocalizedMessage().equalsIgnoreCase(CLIENT_FORCE_DISCONNECTED_IOEXCEPTION_MESSAGE_RU)) {
 			log.warn("Client '{}' force disconnected", ctx.channel().remoteAddress());
 			if (log.isTraceEnabled()) {
-				log.trace("", cause);
+				log.trace("{}", cause.getMessage(), cause);
 			}
 		} else {
 			log.error("{}", cause.getMessage(), cause);

protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolDecoder.java

@@ -1,4 +1,4 @@
-package mc.protocol.codec;
+package mc.protocol.handler.codec;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;

protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolEncoder.java

@@ -1,4 +1,4 @@
-package mc.protocol.codec;
+package mc.protocol.handler.codec;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolSplitter.java

@@ -1,4 +1,4 @@
-package mc.protocol.codec;
+package mc.protocol.handler.codec;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

protocol-new/src/test/java/mc/protocol/handler/codec/ProtocolSplitterTest.java

@@ -1,4 +1,4 @@
-package mc.protocol.codec;
+package mc.protocol.handler.codec;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;